5 files changed, 30 insertions, 41 deletions
diff --git a/network/madwifi-driver/README b/network/madwifi-driver/README
index b1ce2d9bc2..c65140458e 100644
--- a/network/madwifi-driver/README
+++ b/network/madwifi-driver/README
@@ -10,23 +10,17 @@ kernel version, two things are required:
     2) run the script as: KERNELVERSION=<version> sh madwifi-driver.SlackBuild
 In place of <version> use only the version, not the full path. The <version>
 string from 1) and 2) must be identical.
-    Examples: KERNELVERSION=2.4.33.3 or KERNELVERSION=2.6.18
+    Example: KERNELVERSION=2.6.22.7
 The kernel module will then be installed to /lib/modules/<version>/....
 You may use this SlackBuild to build the madwifi module for as many *different*
 kernels as you like and they can be installed alongside each other without
 conflict.
 
-NOTE: MadWifi 0.9.2.1 and earlier do NOT compile against kernel 2.6.19 and
-      higher.  MadWifi 0.9.3 will address this issue.  SlackBuilds for
-      madwifi-tools and madwifi-driver will be updated when 0.9.3 is
-      released.
-
 Requirements:
 
 Kernel requirements:
     Linux Kernel 2.4.23+ or 2.6.x series 
     Kernel source and headers of running kernel 
-
     No module versioning support 
         option CONFIG_MODVERSIONS 
     Wireless Extensions support in kernel 
@@ -42,11 +36,9 @@ Kernel requirements:
 
 Requirements for configuring the wireless card:
   madwifi-tools -- suite of tools designed specifically for madwifi-supported cards
-  iwconfig -- part of "wireless-tools" package in /n for Slackware 11.0
-  wpa_supplicant -- for WPA encrypted networks. 
-                 -- Available in /testing for Slackware 11.0
+  iwconfig -- part of "wireless-tools" package in N series
+  wpa_supplicant -- for WPA encrypted networks - in N package series
 
 NOTE: You can place the SlackBuild and slack-desc.{tools,driver} files
       in the same directory without conflicts, and then you only have to
       keep one copy of the madwifi source code around...
-
diff --git a/network/madwifi-driver/doinst.sh b/network/madwifi-driver/doinst.sh
new file mode 100644
index 0000000000..bc367424f5
--- /dev/null
+++ b/network/madwifi-driver/doinst.sh
@@ -0,0 +1,3 @@
+
+chroot . /sbin/depmod -ae
+
diff --git a/network/madwifi-driver/madwifi-driver.SlackBuild b/network/madwifi-driver/madwifi-driver.SlackBuild
index 9a729fd5d9..547c0ad93a 100644
--- a/network/madwifi-driver/madwifi-driver.SlackBuild
+++ b/network/madwifi-driver/madwifi-driver.SlackBuild
@@ -3,42 +3,30 @@
 ## Slackware build script for madwifi-driver
 
 ## Written by hollywoodb (hollywoodb@fastmail.fm)
-## Modified by the SlackBuilds.org project
+## Maintained by Robby Workman <rworkman@slackbuilds.org>
 
-## Feel free to use, modify, redistribute this script.
-## If you make changes please modify the "Written by"
-## so that I don't recieve emails about a script I
-## did not write.  Thanks.
-
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit
-fi
-
-KERNELVERSION=${KERNELVERSION:-`uname -r`}
+KERNELVERSION=${KERNELVERSION:-$(uname -r)}
 KERNELPATH=${KERNELPATH:-/lib/modules/${KERNELVERSION}/build}
 
 NAME=madwifi
-VERSION=0.9.2.1
-ARCHIVE=tar.bz2
+VERSION=0.9.4
 PKG_NAME=madwifi-driver
-PKG_VERS=$VERSION\_$KERNELVERSION
+PKG_VERS=$(echo ${VERSION}_$KERNELVERSION | tr '-' '_')
 
 ARCH=${ARCH:-i486}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=${PKG:-$TMP/package-$NAME}
 OUTPUT=${OUTPUT:-/tmp}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $NAME-$VERSION
-tar jxvf $CWD/$NAME-$VERSION.$ARCHIVE || exit 1
+tar xvf $CWD/$NAME-$VERSION.tar.gz || exit 1
 cd $NAME-$VERSION || exit 1
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -53,6 +41,7 @@ cat $CWD/$PKG_NAME.SlackBuild > $PKG/usr/doc/$PKG_NAME-$PKG_VERS/$PKG_NAME.Slack
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc.driver > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PKG_NAME-$PKG_VERS-$ARCH-$BUILD$TAG.tgz
diff --git a/network/madwifi-driver/madwifi-driver.info b/network/madwifi-driver/madwifi-driver.info
index 9ffddc2f9d..dd78205a16 100644
--- a/network/madwifi-driver/madwifi-driver.info
+++ b/network/madwifi-driver/madwifi-driver.info
@@ -1,8 +1,8 @@
 PRGNAM="madwifi-driver"
-VERSION="0.9.2.1"
+VERSION="0.9.4"
 HOMEPAGE="http://madwifi.org/"
-DOWNLOAD="http://dl.sourceforge.net/madwifi/madwifi-0.9.2.1.tar.bz2"
-MD5SUM="bf5509fccd3852e22551826063b1b61e"
-MAINTAINER="hollywoodb"
-EMAIL="hollywoodb@fastmail.fm"
-APPROVED="alien,robw810"
+DOWNLOAD="http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz"
+MD5SUM="399d20de8d855a59f20058857c2178ad"
+MAINTAINER="Robby Workman"
+EMAIL="rw@rlworkman.net"
+APPROVED="David Somero"
diff --git a/network/madwifi-driver/slack-desc.driver b/network/madwifi-driver/slack-desc.driver
index 1fbdb2121c..f905d64aa5 100644
--- a/network/madwifi-driver/slack-desc.driver
+++ b/network/madwifi-driver/slack-desc.driver
@@ -1,7 +1,12 @@
-              |-----handy-ruler--------------------------------------------------------|
-madwifi-driver: madwifi-driver (kernel module for the madwifi wireless NIC driver)
+              |-----handy-ruler---------------------------------------------|
+madwifi-driver: madwifi-driver (kernel module for madwifi wireless driver)
+madwifi-driver: 
+madwifi-driver: This package includes the madwifi kernel module part of the
+madwifi-driver: madwifi driver for Atheros chipsets.  The madwifi tools must
+madwifi-driver: be built seperately.
+madwifi-driver: 
+madwifi-driver: 
+madwifi-driver: 
+madwifi-driver: 
 madwifi-driver: 
-madwifi-driver: This package includes the madwifi kernel module part of the madwifi
-madwifi-driver: driver for Atheros chipsets.  The madwifi tools must be built
-madwifi-driver: seperately.
 madwifi-driver: