Updated the SlackBuild for a madwifi-ng package

1 files changed, 65 insertions, 22 deletions

diff --git a/madwifi/build/madwifi.SlackBuild b/madwifi/build/madwifi.SlackBuild
index 57bbb94e..c25a96b0 100755
--- a/madwifi/build/madwifi.SlackBuild
+++ b/madwifi/build/madwifi.SlackBuild
@@ -15,39 +15,82 @@
 # Changelog:
 # 20060126-1:  30/jan/2006 by Eric Hameleers <alien@slackware.com>
 #              * First build of the madwifi-ng code.
+# 20060131-1:  31/jan/2006 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 
 # ----------------------------------------------------------------------------
 CWD=`pwd` 
-PRGNAM=madwifi
-PKG=/tmp/package-$PRGNAM
-TMP=/tmp/tmp-$PRGNAM
-
-rm -rf $TMP
-rm -rf $PKG
+if [ "$TMP" = "" ]; then
+  TMP=/tmp
+fi
 
-mkdir -p $TMP
-mkdir -p $PKG
+PRGNAM=madwifi
+PKG=$TMP/package-$PRGNAM
 
-VERSION=20060126
+VERSION=20060131
 BUILD=1
 ARCH=${ARCH:-i486}
 KVER=${KVER:-`uname -r`}
 KSRC=${KSRC:-/lib/modules/${KVER}/build}
 PATCHLEVEL=`echo $KVER|cut -f 2 -d '.'`
 
+##
+## --- with a little luck, you won't have to edit below this point --- ##
+##
+
+case "$ARCH" in
+  i386)      SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  i486)      SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  s390)      SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  powerpc)   SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             ;;
+  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+esac
+
+if [ ! -d $TMP/tmp-$PRGNAM ]; then
+  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+elif [ "$1" != "--oldbuild" ]; then
+  # If the "--oldbuild" parameter is present, we keep
+  #  the old build files and continue;
+  # By default we remove the remnants of previous build and continue:
+  rm -rf $TMP/tmp-$PRGNAM/*
+fi
+
 # --- PACKAGE BUILDING ---
 
+echo "+=================+"
+echo "| $PRGNAM-$VERSION |"
+echo "+=================+"
+
+if [ "$PKG" = "" -o "$PKG" = "/" ] ; then
+  echo "Please provide a sane value for the variable 'PKG'."
+  exit 1
+elif [ ! -d $PKG ]; then
+  mkdir -p $PKG  # place for the package to be built
+else
+  rm -rf $PKG/*  # We always erase old package's contents:
+fi
+
+cd $PKG
+
 # Explode the package framework:
-cd $TMP
 if [ -f $CWD/_$PRGNAM.tar.gz ]; then
   explodepkg $CWD/_$PRGNAM.tar.gz
 fi
 
-echo "+=================+"
-echo "| $PRGNAM-$VERSION |"
-echo "+=================+"
-
-cd $TMP/
+cd $TMP/tmp-$PRGNAM
 
 # Actually you must get the sources from SVN:
 # $ svn checkout http://svn.madwifi.org/trunk madwifi-ng
@@ -71,19 +114,21 @@ cd -
 
 cd ${PRGNAM}-ng*${VERSION}
 chown -R root:root *
+find . -perm 777 -exec chmod 755 {} \;
 
 # Build the kernel modules and the utilities
 
-# enable the SOFTLED with -DSOFTLED
-#export COPTS="$COPTS -DSOFTLED"
 # If you need another rate control module than ath_rate_sample (the default),
 # you'll need to set the ATH_RATE variable before starting make. For instance,
 # (read the INSTALL file why you could want this) to build ath_rate_amrr, set:
 # export ATH_RATE=ath_rate/amrr
+
+echo Building ...
+
+LDFLAGS="$SLKLDFLAGS" \
+CFLAGS="$SLKCFLAGS" \
 make clean all KERNELPATH=${KSRC} KERNELRELEASE=${KVER} \
   2>&1 | tee $CWD/make-${PRGNAM}.log
-make -C tools \
-  2>&1 | tee -a $CWD/make-${PRGNAM}.log
 
 # Install the kernel module and tools
 mkdir -p $PKG/usr/{bin,man}
@@ -158,13 +203,11 @@ makepkg -l y -c n $TMP/$PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz \
 (cd $TMP && md5sum $PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz > $PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.tgz.md5)
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $TMP/$PRGNAM-${VERSION}_${KVER}-$ARCH-$BUILD.txt
 
-
 cd $CWD
 
 # Clean up the extra stuff:
 if [ "$1" = "--cleanup" ]; then
-  rm -rf $TMP
+  rm -rf $TMP/tmp-$PRGNAM
   rm -rf $PKG
 fi
 
-