From 0730e3738db95c77f2d6c89eb6e60cf7130b27db Mon Sep 17 00:00:00 2001
From: Robby Workman <rw@rlworkman.net>
Date: Wed, 12 May 2010 17:43:54 +0200
Subject: network/ndiswrapper: Updated for version 1.54

---
 network/ndiswrapper/ndiswrapper.SlackBuild | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'network/ndiswrapper/ndiswrapper.SlackBuild')

diff --git a/network/ndiswrapper/ndiswrapper.SlackBuild b/network/ndiswrapper/ndiswrapper.SlackBuild
index 2141fc53fd..8b4e1ca4b8 100644
--- a/network/ndiswrapper/ndiswrapper.SlackBuild
+++ b/network/ndiswrapper/ndiswrapper.SlackBuild
@@ -25,9 +25,9 @@
 # Maintained by Robby Workman <rworkman@slackbuilds.org> now
 
 PRGNAM=ndiswrapper
-VERSION=${VERSION:-1.53}
+VERSION=${VERSION:-1.54}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -35,10 +35,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# This *should* work, but if it doesn't, let me know.  I've walked through
-# the relevant Makefiles and if everything does what I think it does, you
-# should be able to build for something other than the running kernel.  
-# Again, let me know if I'm wrong.  --rworkman
 KERNEL=${KERNEL:-$(uname -r)}
 
 if [ "$ARCH" = "i486" ]; then
@@ -64,6 +60,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Patch to build on 2.6.29.x
+patch -p1 < $CWD/ndiswrapper_kernel_2.6.29.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 make KVERS=$KERNEL
@@ -86,7 +85,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+sed "s%@VERSION@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n \
-- 
cgit v1.2.3