2 files changed, 19 insertions, 26 deletions
diff --git a/accessibility/linuxwacom/linuxwacom.SlackBuild b/accessibility/linuxwacom/linuxwacom.SlackBuild
index 8f79e5d4c31a7..4b3a255a931fc 100644
--- a/accessibility/linuxwacom/linuxwacom.SlackBuild
+++ b/accessibility/linuxwacom/linuxwacom.SlackBuild
@@ -1,18 +1,23 @@
 #!/bin/sh
 
 # Slackware build script for The Linux Wacom Project
-# Written by Menno E. Duursma <druiloor@zonnet.nl>
+# Written by Menno Duursma <druiloor@zonnet.nl>
 
 # This program is free software. It comes without any warranty.
 # Granted WTFPL, Version 2, as published by Sam Hocevar. See
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
+# Modified by the SlackBuilds.org project.
+
 PRGNAM=linuxwacom
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.8.2_2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Thanks to paul wisehart for sugesting this
+SRCVER=$(echo $VERSION | tr _ -)
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -31,9 +36,9 @@ set -e # Exit on most errors
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-3.tar.bz2
-cd $PRGNAM-$VERSION-3
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -62,14 +67,9 @@ mkdir -p $PKG/lib/modules/$(uname -r)/kernel/drivers/usb/input
 cp src/$(uname -r | cut -d- -f1 | cut -d. -f1,2,3)/wacom.ko \
   $PKG/lib/modules/$(uname -r)/kernel/drivers/usb/input
 
-( cd $PKG/usr
-  find . -type f \
-    | xargs file \
-      | grep -e "executable" \
-             -e "shared object" \
-        | grep ELF \
-          | cut -f 1 -d : \
-            | xargs strip --strip-unneeded 2> /dev/null || true
+( cd $PKG/usr || exit 1
+  find . -type f | xargs file | grep -e "executable" -e "shared object" \
+    | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -77,16 +77,8 @@ cp -a [A-Z][A-Z]*  ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
 
-# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Make the package; be sure to leave it in $OUTPUT
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
-# Clean up the extra stuff
-if [ "$1" = "--cleanup" ]; then
-  rm -rf $TMP/$PRGNAM-$VERSION-3
-  rm -rf $PKG
-fi
diff --git a/accessibility/linuxwacom/linuxwacom.info b/accessibility/linuxwacom/linuxwacom.info
index c319a0b344fb8..583cbd6da4aaa 100644
--- a/accessibility/linuxwacom/linuxwacom.info
+++ b/accessibility/linuxwacom/linuxwacom.info
@@ -1,8 +1,9 @@
 PRGNAM="linuxwacom"
-VERSION="0.8.0"
+VERSION="0.8.2_2"
 HOMEPAGE="http://linuxwacom.sourceforge.net/"
-DOWNLOAD="http://dl.sourceforge.net/sourceforge/linuxwacom/linuxwacom-0.8.0-3.tar.bz2"
-MD5SUM="629698976f9eb7d861802b22669c5aee"
-MAINTAINER="Menno E. Duursma"
+DOWNLOAD="http://downloads.sourceforge.net/linuxwacom/linuxwacom-0.8.2-2.tar.bz2"
+MD5SUM="bdfaf6da49b446e251ac1f98754a89a2"
+MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="David Somero"
-\ No newline at end of file
+APPROVED="dsomero"
+