system/pmount: Updated for version 0.9.19

4 files changed, 24 insertions, 13 deletions

diff --git a/system/pmount/README b/system/pmount/README
index 618165f0b8..70630bbb6e 100644
--- a/system/pmount/README
+++ b/system/pmount/README
@@ -7,5 +7,3 @@ hal (device labels, mount options) and passes them to pmount.
 
 After installing pmount, make sure that the users you want to be able 
 to use it are in the "plugdev" group.
-
-Read pmount's man page if you want detailed information.
diff --git a/system/pmount/pmount.SlackBuild b/system/pmount/pmount.SlackBuild
index 2dce8b0710..d2233e596f 100644
--- a/system/pmount/pmount.SlackBuild
+++ b/system/pmount/pmount.SlackBuild
@@ -22,11 +22,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Robby Workman  <http://rlworkman.net>
+# Modified by Robby Workman  <rworkman@slackbuilds.org>
 # No additional license terms added.
 
 PRGNAM=pmount
-VERSION=0.9.17
+VERSION=0.9.19
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -40,6 +40,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -66,7 +68,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
 
 # Give pmount/pumount suid bit.
 chown root.plugdev $PKG/usr/bin/pmount $PKG/usr/bin/pumount
@@ -76,8 +78,10 @@ chmod 4750 $PKG/usr/bin/pmount $PKG/usr/bin/pumount
 mv $PKG/etc/pmount.allow $PKG/etc/pmount.allow.new
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -86,8 +90,9 @@ mv $PKG/etc/pmount.allow $PKG/etc/pmount.allow.new
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS README* COPYING ChangeLog INSTALL NEWS TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS README* COPYING ChangeLog INSTALL NEWS TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/pmount/pmount.info b/system/pmount/pmount.info
index 67ef424a9f..98ab278030 100644
--- a/system/pmount/pmount.info
+++ b/system/pmount/pmount.info
@@ -1,8 +1,8 @@
 PRGNAM="pmount"
-VERSION="0.9.17"
+VERSION="0.9.19"
 HOMEPAGE="http://pmount.alioth.debian.org/"
-DOWNLOAD="http://alioth.debian.org/frs/download.php/2247/pmount-0.9.17.tar.gz"
-MD5SUM="24a676bf495bec367b2d971cdca1c54c"
+DOWNLOAD="http://alioth.debian.org/frs/download.php/2867/pmount-0.9.19.tar.gz"
+MD5SUM="2fd9fe103375dbd0c91af2f302250a8c"
 MAINTAINER="Guillermo Bonvehi"
 EMAIL="gbonvehi@gmail.com"
 APPROVED="rworkman"
diff --git a/system/pmount/slack-desc b/system/pmount/slack-desc
index 5cb3a00570..20ed3ee3c2 100644
--- a/system/pmount/slack-desc
+++ b/system/pmount/slack-desc
@@ -1,4 +1,12 @@
-pmount: pmount (mount removable devices as normal project!)
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+pmount: pmount (mount removable devices as normal user)
 pmount:
 pmount: pmount is a wrapper around the standard mount program which 
 pmount: permits normal users to mount removable devices without a