system/imwheel: Miscellaneous cleanups.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

2 files changed, 22 insertions, 22 deletions

diff --git a/system/imwheel/README b/system/imwheel/README
index e0892b04ee..d444531fbb 100644
--- a/system/imwheel/README
+++ b/system/imwheel/README
@@ -1,17 +1,15 @@
-IMWheel is a universal mouse wheel and mouse stick translator for the X
-Windows System.  Using  either  a  special  version  of  gpm  and  it's
-/dev/gpmwheel  FIFO, or the support for a ZAxis on the mouse built into
-some servers, such as XFree86.  Utilizing the input from gpm or X  Win-
-dows,  imwheel translates mouse wheel and mouse stick actions into key-
-board events using the XTest extension to X.  Use xdpyinfo for informa-
-tion on the supported extensions in your X server.
+IMWheel is a universal mouse wheel and mouse stick translator for X Windows 
+using either a special version of gpm and its /dev/gpmwheel FIFO or the 
+support for a ZAxis on the mouse built into X.  Utilizing the input from gpm 
+or X Windows, imwheel translates mouse wheel and mouse stick actions into 
+keyboard events using the XTest extension to X.  Use xdpyinfo for information 
+on the supported extensions in your X server.
 
-This build script has a patch that disables the configurator appearing
-when you mouse up and down on the root window. I did this because it
-stopped the ability for workspace changing in fluxbox and other WMs
-and it would also pop up at the most annoying times ;)
+This build script has a patch that disables the configurator appearing when 
+you mouse up and down on the root window.  I did this because it stopped the 
+ability for workspace changing in fluxbox and other WMs, and it would also 
+pop up at the most annoying times ;)  However, the configurator window can 
+still be found with the "-c" switch.
 
-The configurator window can still be found however with the -c switch.
-
-To stop this patch from applying you only need edit the line in the
-slackbuild script.
+If you do NOT wish to apply this patch, run the script with PATCH=no in the
+environment (e.g. PATCH=no sh imwheel.SlackBuild)
diff --git a/system/imwheel/imwheel.SlackBuild b/system/imwheel/imwheel.SlackBuild
index a4d2b6dd9b..ba502bb42d 100644
--- a/system/imwheel/imwheel.SlackBuild
+++ b/system/imwheel/imwheel.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=imwheel
 VERSION=${VERSION:-1.0.0pre12}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -65,8 +65,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-patch -p1 < $CWD/noautoconfigurator.patch
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -74,6 +72,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ ${PATCH:-"yes"} != "yes" ]; then
+  true # do not apply patch
+else
+  patch -p1 < $CWD/noautoconfigurator.patch
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -90,10 +94,8 @@ make install DESTDIR=$PKG ETCDIR=$PKG/etc/X11/imwheel
 find $PKG | 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/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp AUTHORS NEWS BUGS README COPYING TODO ChangeLog EMACS FREEBSD INSTALL M-BA47 \