desktop/wmsystemtray: Updated for version 1.4, new maintainer.

4 files changed, 29 insertions, 24 deletions

diff --git a/desktop/wmsystemtray/README b/desktop/wmsystemtray/README
index c51cef01b5ed..c3ebba2f75eb 100644
--- a/desktop/wmsystemtray/README
+++ b/desktop/wmsystemtray/README
@@ -1,5 +1,7 @@
-wmsystemtray is a system  tray using the freedesktop.org system tray
-protocol designed as a Window Maker dock app. It has the  ability to
+wmsystemtray (A system tray as a Window Maker dock app)
+
+wmsystemtray is a system tray using the freedesktop.org system tray
+protocol designed as a Window Maker dock app. It has the ability to
 display more than one dock window to make room for more tray icons, 
 and the ability to scroll through the icons if more are present than
 will fit.
diff --git a/desktop/wmsystemtray/slack-desc b/desktop/wmsystemtray/slack-desc
index a87b2dd0f4f1..16bbbd2c1996 100644
--- a/desktop/wmsystemtray/slack-desc
+++ b/desktop/wmsystemtray/slack-desc
@@ -8,8 +8,8 @@
             |-----handy-ruler------------------------------------------------------|
 wmsystemtray: wmsystemtray (A system tray as a Window Maker dock app)
 wmsystemtray:
-wmsystemtray: wmsystemtray is a system  tray using the freedesktop.org system tray
-wmsystemtray: protocol designed as a Window Maker dock app. It has the  ability to
+wmsystemtray: wmsystemtray is a system tray using the freedesktop.org system tray
+wmsystemtray: protocol designed as a Window Maker dock app. It has the ability to
 wmsystemtray: display more than one dock window to make room for more tray icons,
 wmsystemtray: and the ability to scroll through the icons if more are present than
 wmsystemtray: will fit.
diff --git a/desktop/wmsystemtray/wmsystemtray.SlackBuild b/desktop/wmsystemtray/wmsystemtray.SlackBuild
index e730e70a7c8b..60fa511591fa 100644
--- a/desktop/wmsystemtray/wmsystemtray.SlackBuild
+++ b/desktop/wmsystemtray/wmsystemtray.SlackBuild
@@ -2,16 +2,26 @@
 
 # Slackware build script for wmsystemtray
 
-# Written by Pablo Santamaria (pablosantamaria@gmail.com)
+# Originally written by Pablo Santamaria (email removed)
+
+# Now maintained by B. Watson <yalhcru@gmail.com>. Original version
+# had no license, modified version released under the WTFPL. See
+# http://www.wtfpl.net/txt/copying/ for details.
+
+# 20170210 bkw:
+# - Take over maintenance
+# - Update for v1.4
+# - i486 => i586
+# - cosmetic fixes to script, README, slack-desc
 
 PRGNAM=wmsystemtray
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.4}
 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
@@ -22,8 +32,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"
@@ -62,18 +72,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+make install-strip DESTDIR=$PKG
+gzip $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/wmsystemtray/wmsystemtray.info b/desktop/wmsystemtray/wmsystemtray.info
index 935dc6688145..32c5294c2692 100644
--- a/desktop/wmsystemtray/wmsystemtray.info
+++ b/desktop/wmsystemtray/wmsystemtray.info
@@ -1,10 +1,10 @@
 PRGNAM="wmsystemtray"
-VERSION="1.2"
+VERSION="1.4"
 HOMEPAGE="http://wmsystemtray.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/wmsystemtray/wmsystemtray/wmsystemtray-1.2.tar.gz"
-MD5SUM="425b3cc8fc717a997a67706b8013ad21"
+DOWNLOAD="http://downloads.sourceforge.net/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz"
+MD5SUM="5f04edd3989b5030176492943795b6b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Pablo Santamaria"
-EMAIL="pablosantamaria@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"