4 files changed, 54 insertions, 47 deletions
diff --git a/desktop/wmudmount/README b/desktop/wmudmount/README
index bd0e92d087188..e5f518ffc3200 100644
--- a/desktop/wmudmount/README
+++ b/desktop/wmudmount/README
@@ -1,4 +1,10 @@
-wmudmount is a (dockapp) filesystem mounter that uses udisks to handle
-notification of new 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).
+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).
+
+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
+
+I would also accept a patch from anyone who backports the latest version to GTK2.
diff --git a/desktop/wmudmount/slack-desc b/desktop/wmudmount/slack-desc
index 12420af4d9507..3fff7fa4fed9a 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)
+         |-----handy-ruler--------------------------------------------------------|
+wmudmount: wmudmount (Filesystem Mounter and Manager DockApp)
 wmudmount:
-wmudmount: wmudmount is a (dockapp) filesystem mounter that uses udisks to handle
-wmudmount: notification of new filesystems as a non-root user. It also includes
-wmudmount: a mode to display the mounted filesystems with the least free space
-wmudmount: percentage (similar to wmfsm).
+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:
+wmudmount: Homepage: http://sourceforge.net/projects/wmudmount/
 wmudmount:
 wmudmount:
-wmudmount: Home page:          http://sourceforge.net/projects/wmudmount/
-wmudmount: dockapps.org entry: http://www.dockapps.org/file.php/id/357
 wmudmount:
diff --git a/desktop/wmudmount/wmudmount.SlackBuild b/desktop/wmudmount/wmudmount.SlackBuild
index f823258307fcf..1e5739ea8e0b0 100644
--- a/desktop/wmudmount/wmudmount.SlackBuild
+++ b/desktop/wmudmount/wmudmount.SlackBuild
@@ -1,29 +1,33 @@
 #!/bin/sh
-#
+
 # Slackware build script for wmudmount
 #
-# Written by Rex Hauser <thundermachinegun[AT]gmail.com>
+# Originally written by Rex Hauser <thundermachinegun[AT]gmail.com>
+# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# All rights reserved.
 #
-#   Redistribution and use of this script, with or without modification, is
-#   permitted provided that the following conditions are met:
+# Based on:
+# SBo's cmake-template
 #
-#   1. Redistributions of this script must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-#   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-#   EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wmudmount
-VERSION=${VERSION:-1.13}
+VERSION=${VERSION:-1.13} #If you want to use the newest version, read the comments below
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,16 +64,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+# Let's compile!
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -77,21 +81,18 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make DESTDIR=$PKG install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install DESTDIR=$PKG
 
-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
+# Compresses man page. For 2.2 users, remove the x in wmudmount.1x
+gzip -9 $PKG/usr/man/man1/wmudmount.1x
 
+# For 2.2 users, change line 95 to: ChangeLog COPYING \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION
 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 ca802217812b6..679a95a9a9304 100644
--- a/desktop/wmudmount/wmudmount.info
+++ b/desktop/wmudmount/wmudmount.info
@@ -1,10 +1,10 @@
 PRGNAM="wmudmount"
 VERSION="1.13"
 HOMEPAGE="http://sourceforge.net/projects/wmudmount/"
-DOWNLOAD="http://downloads.sourceforge.net/project/wmudmount/wmudmount/wmudmount-1.13.tar.gz"
+DOWNLOAD="http://sourceforge.net/projects/wmudmount/files/wmudmount/wmudmount-1.13.tar.gz"
 MD5SUM="988955faca6db4f9c4d26f8b79a38744"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Rex Hauser"
-EMAIL="thundermachinegun@gmail.com"
+MAINTAINER="Gethyn ThomasQuail"
+EMAIL="gethyn@bloodbathsoftworks.com"