4 files changed, 52 insertions, 31 deletions
diff --git a/desktop/wmudmount/README b/desktop/wmudmount/README
index e5f518ffc3..826fb79088 100644
--- a/desktop/wmudmount/README
+++ b/desktop/wmudmount/README
@@ -1,10 +1,17 @@
-A filesystem mounter that uses udisks to handle notification of new filesystems and mounting
-of the filesystems as a non-root user. It also includes a mode to display the mounted
-filesystems with the least free space percentage (similar to wmfsm).
+wmudmount (file system mounter, windowmaker dockapp)
 
-Note: This SlackBuild uses the last version to support GTK2 and UDisks1. The latest versions
-are GTK3 and UDisks2 only. I may update this in the future with an optional patch for those
-who use GTK2. If you desire the latest version, visit the link to the home page below. The
-SlackBuild contains comments on what to change if you want to build version 2.2
+A filesystem mounter that uses udisks to handle notification of new
+filesystems and mounting of the filesystems as a non-root user. It also
+includes a mode to display the mounted filesystems with the least free
+space percentage (similar to wmfsm).
 
-I would also accept a patch from anyone who backports the latest version to GTK2.
+This build is for version 2.2, which uses udisks2 and GTK3. If you'd
+prefer to build an older version with udisks1 and GTK2, download the
+source from here:
+
+http://sourceforge.net/projects/wmudmount/files/wmudmount/wmudmount-1.13.tar.gz
+
+Its md5sum is: 988955faca6db4f9c4d26f8b79a38744
+
+Run wmudmount.SlackBuild with VERSION=1.13 set in the environment. It's
+not possible to install both versions of wmudmount at the same time.
diff --git a/desktop/wmudmount/slack-desc b/desktop/wmudmount/slack-desc
index 3fff7fa4fe..014f64678f 100644
--- a/desktop/wmudmount/slack-desc
+++ b/desktop/wmudmount/slack-desc
@@ -5,15 +5,15 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-         |-----handy-ruler--------------------------------------------------------|
-wmudmount: wmudmount (Filesystem Mounter and Manager DockApp)
+         |-----handy-ruler------------------------------------------------------|
+wmudmount: wmudmount (file system mounter, windowmaker dockapp)
 wmudmount:
 wmudmount: A filesystem mounter that uses udisks to handle notification of new
-wmudmount: filesystems and mounting of the filesystems as a non-root user. It also
-wmudmount: includes a mode to display the mounted filesystems with the least free
-wmudmount: space percentage (similar to wmfsm).
+wmudmount: filesystems and mounting of the filesystems as a non-root user. It
+wmudmount: also includes a mode to display the mounted filesystems with the
+wmudmount: least free space percentage (similar to wmfsm).
+wmudmount:
 wmudmount:
-wmudmount: Homepage: http://sourceforge.net/projects/wmudmount/
 wmudmount:
 wmudmount:
 wmudmount:
diff --git a/desktop/wmudmount/wmudmount.SlackBuild b/desktop/wmudmount/wmudmount.SlackBuild
index 1e5739ea8e..cb5322bbd7 100644
--- a/desktop/wmudmount/wmudmount.SlackBuild
+++ b/desktop/wmudmount/wmudmount.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for wmudmount
 #
-# Originally written by Rex Hauser <thundermachinegun[AT]gmail.com>
-# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Originally written by Rex Hauser <email removed>
+# Copyright 2015 Gethyn ThomasQuail <email removed>
 # All rights reserved.
 #
 # Based on:
@@ -26,14 +26,26 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# 20160818 bkw:
+# - take over maintenance
+# - i486 => i586
+# - unify 1.13 and 2.2 builds (no script changes needed)
+# - make 2.2 the default version (1.13 can still be built)
+# - actually use SLKCFLAGS
+# - actually install the doinst.sh
+# - install binary stripped
+# - clarify README, stop asking for patches that aren't coming
+
 PRGNAM=wmudmount
-VERSION=${VERSION:-1.13} #If you want to use the newest version, read the comments below
+VERSION=${VERSION:-2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +56,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -73,7 +85,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Let's compile!
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -81,18 +94,19 @@ find -L . \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-# Compresses man page. For 2.2 users, remove the x in wmudmount.1x
-gzip -9 $PKG/usr/man/man1/wmudmount.1x
+gzip -9 $PKG/usr/man/man1/$PRGNAM.*
 
-# For 2.2 users, change line 95 to: ChangeLog COPYING \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION
+for i in ChangeLog debian/copyright COPYING; do
+  [ -e $i ] && cp -a $i $PKG/usr/doc/$PRGNAM-$VERSION
+done
 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
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmudmount/wmudmount.info b/desktop/wmudmount/wmudmount.info
index 679a95a9a9..27b776175f 100644
--- a/desktop/wmudmount/wmudmount.info
+++ b/desktop/wmudmount/wmudmount.info
@@ -1,10 +1,10 @@
 PRGNAM="wmudmount"
-VERSION="1.13"
+VERSION="2.2"
 HOMEPAGE="http://sourceforge.net/projects/wmudmount/"
-DOWNLOAD="http://sourceforge.net/projects/wmudmount/files/wmudmount/wmudmount-1.13.tar.gz"
-MD5SUM="988955faca6db4f9c4d26f8b79a38744"
+DOWNLOAD="http://sourceforge.net/projects/wmudmount/files/wmudmount/wmudmount-2.2.tar.gz"
+MD5SUM="5d57419affe7e71080b2d839c1ce5312"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Gethyn ThomasQuail"
-EMAIL="gethyn@bloodbathsoftworks.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"