4 files changed, 31 insertions, 26 deletions
diff --git a/network/madwifi-tools/README b/network/madwifi-tools/README
index aae6ebc22b..a2664a8c4d 100644
--- a/network/madwifi-tools/README
+++ b/network/madwifi-tools/README
@@ -6,7 +6,3 @@ http://madwifi.org/wiki/Compatibility
 This SlackBuild builds the madwifi tools, not the kernel module.  You will
 need to use the "madwifi-driver" SlackBuild to build the madwifi module for
 your kernel version.
-
-Requirements for configuring the wireless card:
-  iwconfig -- part of "wireless-tools" package in N series
-  wpa_supplicant -- if you use WPA encryption - in N package series
diff --git a/network/madwifi-tools/madwifi-tools.SlackBuild b/network/madwifi-tools/madwifi-tools.SlackBuild
index 63cf7c8fdd..4866c85150 100644
--- a/network/madwifi-tools/madwifi-tools.SlackBuild
+++ b/network/madwifi-tools/madwifi-tools.SlackBuild
@@ -3,44 +3,46 @@
 ## Slackware build script for madwifi-tools
 
 ## Written by hollywoodb (hollywoodb@fastmail.fm)
-## Maintained by Robby Workman <rworkman@slackbuilds.org>
+## Modified by Larry Hajali <larryhaja[at]gmail[dot]com>
 
-NAME=madwifi
-PKG_NAME=madwifi-tools
+PRGNAM=madwifi
 VERSION=0.9.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+PKG_NAME=madwifi-tools
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$NAME}
+PKG=${PKG:-$TMP/package-$PKG_NAME}
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf $NAME-$VERSION
-tar xvf $CWD/$NAME-$VERSION.tar.gz || exit 1
-cd $NAME-$VERSION || exit 1
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 sed -i 's|/usr/local|/usr|g' tools/Makefile
-make tools || exit 1
-make install-tools DESTDIR=$PKG || exit 1
+make tools
+make install-tools DESTDIR=$PKG
 
-find $PKG | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find $PKG | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+find $PKG | xargs file | grep -e "executable" -e "shared object" | \
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-mkdir -p $PKG/usr/doc/$NAME-$VERSION
-cp -a {COPYRIGHT,INSTALL,README,THANKS} \
-    $PKG/usr/doc/$NAME-$VERSION/
-cp -a {docs/WEP-HOWTO.txt,docs/users-guide.pdf,docs/users-guide.tex} \
-    $PKG/usr/doc/$NAME-$VERSION/
-cat $CWD/$PKG_NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYRIGHT INSTALL README THANKS docs/{WEP-HOWTO.txt,users-guide.pdf} \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PKG_NAME.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/madwifi-tools/madwifi-tools.info b/network/madwifi-tools/madwifi-tools.info
index f3b7177c4c..78ebb300d3 100644
--- a/network/madwifi-tools/madwifi-tools.info
+++ b/network/madwifi-tools/madwifi-tools.info
@@ -3,6 +3,6 @@ VERSION="0.9.4"
 HOMEPAGE="http://madwifi.org/"
 DOWNLOAD="http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz"
 MD5SUM="399d20de8d855a59f20058857c2178ad"
-MAINTAINER="Robby Workman"
-EMAIL="rw@rlworkman.net"
-APPROVED="David Somero"
+MAINTAINER="Nobody"
+EMAIL="nobody@nowhere"
+APPROVED="rworkman"
diff --git a/network/madwifi-tools/slack-desc b/network/madwifi-tools/slack-desc
index 2b94724282..442097945f 100644
--- a/network/madwifi-tools/slack-desc
+++ b/network/madwifi-tools/slack-desc
@@ -1,10 +1,17 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
              |-----handy-ruler--------------------------------------------------------|
 madwifi-tools: madwifi-tools (tools for the madwifi wireless NIC driver)
 madwifi-tools: 
 madwifi-tools: This package includes the madwifi tools for the madwifi driver for
 madwifi-tools: Atheros chipsets.  The kernel module itself must be built seperately.
 madwifi-tools: 
-madwifi-tools: 
+madwifi-tools: Homepage: http://madwifi.org/
 madwifi-tools: 
 madwifi-tools: 
 madwifi-tools: