4 files changed, 16 insertions, 22 deletions
diff --git a/system/pipemeter/README b/system/pipemeter/README
index 1173296b8b..14e4b22829 100644
--- a/system/pipemeter/README
+++ b/system/pipemeter/README
@@ -1 +1,4 @@
-pipemeter copies its input to output with progress bar and/or speed indicator.
+pipemeter (I/O pipe with progress and speed indicators)
+
+pipemeter copies its standard input to its standard output with a
+progress bar and/or speed indicator.
diff --git a/system/pipemeter/pipemeter.SlackBuild b/system/pipemeter/pipemeter.SlackBuild
index b591019aaa..2f3506530f 100644
--- a/system/pipemeter/pipemeter.SlackBuild
+++ b/system/pipemeter/pipemeter.SlackBuild
@@ -9,7 +9,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pipemeter
-VERSION=${VERSION:-1.1.3}
+VERSION=${VERSION:-1.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -51,13 +48,10 @@ rm -rf $PRGNAM-$VERSION
 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wl,-s" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
@@ -66,12 +60,9 @@ CFLAGS="$SLKCFLAGS" \
 
 make
 
-# 'make install' doesn't create these for us:
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1
-# ...but it does strip the pipemeter binary.
-make install PREFIX=$PKG/usr
+make install DESTDIR=$PKG
 
-cp pipecp $PKG/usr/bin
+cp -a pipecp $PKG/usr/bin
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/pipemeter/pipemeter.info b/system/pipemeter/pipemeter.info
index f0269a1e60..b6a88d462b 100644
--- a/system/pipemeter/pipemeter.info
+++ b/system/pipemeter/pipemeter.info
@@ -1,8 +1,8 @@
 PRGNAM="pipemeter"
-VERSION="1.1.3"
-HOMEPAGE="http://spamaps.org/pipemeter.php"
-DOWNLOAD="http://spamaps.org/files/pipemeter/pipemeter-1.1.3.tar.gz"
-MD5SUM="55cf189d3d1de92bbc2bc7d3396e20b1"
+VERSION="1.1.5"
+HOMEPAGE="https://launchpad.net/pipemeter"
+DOWNLOAD="https://launchpad.net/pipemeter/trunk/1.1.5/+download/pipemeter-1.1.5.tar.gz"
+MD5SUM="3900d8a848eaed2e9f5bfd6af0491173"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pipemeter/slack-desc b/system/pipemeter/slack-desc
index fd67d919dc..24af4102be 100644
--- a/system/pipemeter/slack-desc
+++ b/system/pipemeter/slack-desc
@@ -8,8 +8,8 @@
          |-----handy-ruler------------------------------------------------------|
 pipemeter: pipemeter (I/O pipe with progress and speed indicators)
 pipemeter:
-pipemeter: pipemeter copies its input to output with progress bar and/or speed
-pipemeter: indicators.
+pipemeter: pipemeter copies its standard input to its standard output with a
+pipemeter: progress bar and/or speed indicator.
 pipemeter:
 pipemeter:
 pipemeter: