Updated for CVS version 20080518

Add TAG=alien, add SlackBuild to docdir, better SRCDIR determination

1 files changed, 18 insertions, 17 deletions

diff --git a/rt73/build/rt73.SlackBuild b/rt73/build/rt73.SlackBuild
index c57f2848..52c7623c 100755
--- a/rt73/build/rt73.SlackBuild
+++ b/rt73/build/rt73.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2007-2008 Eric Hameleers <alien@slackware.com>
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -36,6 +36,8 @@
 #             * This needed an update.
 # 20071014-1: 14/oct/2007 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 20080518-1: 18/may/2008 by Eric Hameleers <alien@slackware.com>
+#             * Update - this driver is still needed in Slackware 12.1 for some.
 # 
 # Run 'sh rt73.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -46,16 +48,15 @@
 # Set initial variables:
 
 PRGNAM=rt73
-VERSION=${VERSION:-20071014}
+VERSION=${VERSION:-20080518}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
+TAG=${TAG:-alien}
 
 DOCS="CHANGELOG FAQ LICENSE Module/iwpriv_usage.txt Module/TESTING README THANKS"
 
 # Where do we look for sources?
-CWD=$(pwd)
-SRCDIR=$(dirname $0)
-[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+SRCDIR=$(cd $(dirname $0); pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
@@ -90,9 +91,6 @@ else
 fi
 
 case "$ARCH" in
-  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
   i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
@@ -112,10 +110,10 @@ esac
 
 # Create working directories:
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build
-mkdir -p $PKG     # Place for the package to be built
-rm -rf $PKG/*     # We always erase old package's contents:
-mkdir -p $OUTPUT  # Place for the package to be saved
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+mkdir -p $PKG             # Place for the package to be built
+rm -rf $PKG/*             # erase old package's contents
+mkdir -p $OUTPUT          # Place for the package to be saved
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
@@ -124,7 +122,7 @@ if ! [ -f ${SOURCE} ]; then
     [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
     echo "Source '$(basename ${SOURCE})' not available yet..."
     echo "Will download file to $(dirname $SOURCE)"
-    wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true
+    wget -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
@@ -160,6 +158,7 @@ if ! cd ${PRGNAM}-cvs-${VERSION}* ; then
   echo "** This does not match the version '${VERSION}' of the package you're trying to build!"
   echo "** Please remove '$(basename ${SOURCE})',"
   echo "** and (let the script) download '${SRCURL}' again!"
+  echo "**  - or change the VERSION value of the script."
   echo "**"
   exit 1
 fi
@@ -169,6 +168,7 @@ chmod -R u+w,go+r-w,a-s *
 echo Building ...
 export LDFLAGS="$SLKLDFLAGS"
 export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
 (cd Module
  if [ $PATCHLEVEL -eq 4 ]; then
    # Patch out an incorrect 2.6.x kernel include:
@@ -207,7 +207,8 @@ cat <<-EEOOTT >> $PKG/install/doinst.sh
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Add a package description:
 mkdir -p $PKG/install
@@ -218,11 +219,11 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}${TAG}.tgz.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}${TAG}.txt
 
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then