system/pmount: Updated for version 0.9.17

5 files changed, 18 insertions, 26 deletions

diff --git a/system/pmount/README b/system/pmount/README
index 7db295dc0c36..618165f0b8bb 100644
--- a/system/pmount/README
+++ b/system/pmount/README
@@ -1,13 +1,11 @@
 pmount is a wrapper around the standard mount program which permits
-normal users to mount removable devices without a matching
-/etc/fstab entry.
+normal users to mount removable devices without a matching entry in
+/etc/fstab.
 
 The program also includes "pmount-hal" which reads information from
 hal (device labels, mount options) and passes them to pmount.
-Note that this pmoumt SlackBuild by default uses --enable-hal since
-hal is included in Slackware 12.0.
 
-After installing pmount, you've to be sure the users you want to be
-able to use it are in "plugdev" group.
+After installing pmount, make sure that the users you want to be able 
+to use it are in the "plugdev" group.
 
-You can read pmount's man page if you want detailed information.
+Read pmount's man page if you want detailed information.
diff --git a/system/pmount/doinst.sh b/system/pmount/doinst.sh
index 3b82b97e99b4..f34d4a61bb80 100644
--- a/system/pmount/doinst.sh
+++ b/system/pmount/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
diff --git a/system/pmount/pmount.SlackBuild b/system/pmount/pmount.SlackBuild
index 0cd834f0e2e9..2dce8b0710df 100644
--- a/system/pmount/pmount.SlackBuild
+++ b/system/pmount/pmount.SlackBuild
@@ -25,13 +25,12 @@
 # Modified by Robby Workman  <http://rlworkman.net>
 # No additional license terms added.
 
-set -e
-
 PRGNAM=pmount
-VERSION=0.9.16
+VERSION=0.9.17
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -43,11 +42,13 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || ( echo "Cannot find sources file: $PRGNAM-$VERSION.tar.gz"; exit 1; )
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -59,7 +60,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-hal
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-hal \
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -82,7 +86,7 @@ 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 README.devel \
+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
 
diff --git a/system/pmount/pmount.info b/system/pmount/pmount.info
index 74f0e950c0dd..67ef424a9f75 100644
--- a/system/pmount/pmount.info
+++ b/system/pmount/pmount.info
@@ -1,8 +1,8 @@
 PRGNAM="pmount"
-VERSION="0.9.16"
+VERSION="0.9.17"
 HOMEPAGE="http://pmount.alioth.debian.org/"
-DOWNLOAD="http://alioth.debian.org/frs/download.php/2057/pmount-0.9.16.tar.gz"
-MD5SUM="25fafae5d7ad3cb81bcc2131b1698f45"
+DOWNLOAD="http://alioth.debian.org/frs/download.php/2247/pmount-0.9.17.tar.gz"
+MD5SUM="24a676bf495bec367b2d971cdca1c54c"
 MAINTAINER="Guillermo Bonvehi"
 EMAIL="gbonvehi@gmail.com"
 APPROVED="rworkman"
diff --git a/system/pmount/slack-desc b/system/pmount/slack-desc
index fa28dfe187e0..5cb3a0057037 100644
--- a/system/pmount/slack-desc
+++ b/system/pmount/slack-desc
@@ -1,11 +1,3 @@
-# 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 project!)
 pmount:
 pmount: pmount is a wrapper around the standard mount program which