network/wmnd: New maintainer, minor fixes.

3 files changed, 37 insertions, 19 deletions

diff --git a/network/wmnd/README b/network/wmnd/README
index dc039fe64b..a346f7e3e1 100644
--- a/network/wmnd/README
+++ b/network/wmnd/README
@@ -1,10 +1,13 @@
-WMND is a dockapp for monitoring network interfaces under WindowMaker and other compatible window
-managers. WMND currently works on Linux, FreeBSD, NetBSD, Solaris, OpenSolaris, Darwin and IRIX.
+WMND is a dockapp for monitoring network interfaces under WindowMaker
+and other compatible window managers. WMND currently works on Linux,
+FreeBSD, NetBSD, Solaris, OpenSolaris, Darwin and IRIX.
 
-WMND can monitor multiple interfaces at the same time, sports several display modes and can also monitor
-remote interfaces through SNMP.
+WMND can monitor multiple interfaces at the same time, sports several
+display modes and can also monitor remote interfaces through SNMP.
 
-An optional dep is "Trend" (not on SBo) which can be used to zoom in on the bars inside the DockApp.
+An optional dep is "Trend" (not on SBo) which can be used to zoom in on
+the bars inside the dockapp.
 
-Note: This dockapp has an automatically generated RC file in the home folder. You can see an example of
-how to customize it in the /usr/doc folder. 
+Note: This dockapp has an automatically generated RC file in
+~/.wmnd FIXME You can see an example of how to customize it in
+/usr/doc/wmnd-0.4.17/examples/wmndrc
diff --git a/network/wmnd/wmnd.SlackBuild b/network/wmnd/wmnd.SlackBuild
index 8b9e7f21e8..a996f95b74 100644
--- a/network/wmnd/wmnd.SlackBuild
+++ b/network/wmnd/wmnd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wmnd
 #
-# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2015 Gethyn ThomasQuail <email removed>
 # All rights reserved.
 #
 # Based on:
@@ -25,14 +25,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# 20160816 bkw:
+# - take over maintenance
+# - BUILD=2
+# - i486 => i586
+# - actually use SLKCFLAGS
+# - install binary stripped
+# - don't install INSTALL in docdir
+# - fix path to example config in man page
+
 PRGNAM=wmnd
 VERSION=${VERSION:-0.4.17}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 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
@@ -43,8 +54,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"
@@ -72,7 +83,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Let's compile!
+sed -i \
+  "s,/usr/share/doc/$PRGNAM/,/usr/doc/$PRGNAM-$VERSION/${PRGNAM}rc," \
+  doc/$PRGNAM.1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -83,13 +99,12 @@ find -L . \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-# Compresses man page
-gzip -9 $PKG/usr/man/man1/wmnd.1
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog ChangeLog.0 COPYING examples INSTALL NEWS README THANKS TODO \
+cp -a AUTHORS ChangeLog* COPYING examples/${PRGNAM}rc NEWS README THANKS TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/wmnd/wmnd.info b/network/wmnd/wmnd.info
index 7b668e30b4..ab516c2634 100644
--- a/network/wmnd/wmnd.info
+++ b/network/wmnd/wmnd.info
@@ -6,5 +6,5 @@ MD5SUM="dbf6d6c42ab3e036388d261d2e7bea16"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Gethyn ThomasQuail"
-EMAIL="gethyn@bloodbathsoftworks.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"