system/wmfsm: Updated for version 0.36.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 35 insertions, 34 deletions

diff --git a/system/wmfsm/README b/system/wmfsm/README
index 89334104dde2..a18f5f25642c 100644
--- a/system/wmfsm/README
+++ b/system/wmfsm/README
@@ -1,12 +1,6 @@
-wmfsm is a WindowMaker dock application that shows the amount of disk
-space available on mounted file systems with colored bars.
+Nice graphical "df", showing you to what degree the mounted filesystems are used.
 
-NOTE 1: You may choose one of the "wmfsm_*.xpm" avaiable in wmfsm directory.
-        Just choose one you like most and use it as "wmfsm_master.xpm"
-        Than, recreate the "tar.gz" source file and run the SlackBuild script.
+Copy "sample.wmfsmrc" to "~/.wmfsmrc" and edit it for custom configuration.
 
-NOTE 2: Copy the "wmfsmrc.sample" to "~/.wmfsmrc" and edit it to
-        configure your shown filesystems. You may exclude or include
-        with first line either [include] or [exclude]. The next lines
-        are filesystems that are either explicitly included or excluded
-        respectively.
+There are 3 available themes: "cyan", "highcolor" (default) and "lowcolor"
+Find and edit "--with-xpm=" in "wmfsm.SlackBuild" to change the theme if wanted.
diff --git a/system/wmfsm/slack-desc b/system/wmfsm/slack-desc
index 2f0df0f837a3..258284414bcf 100644
--- a/system/wmfsm/slack-desc
+++ b/system/wmfsm/slack-desc
@@ -8,12 +8,12 @@
      |-----handy-ruler------------------------------------------------------|
 wmfsm: wmfsm (dock application)
 wmfsm:
-wmfsm: wmfsm is a dockapp that shows the amount of disk space available.
+wmfsm: Nice graphical "df", showing you to what degree the mounted
+wmfsm: filesystems are used.
 wmfsm:
 wmfsm:
-wmfsm:
-wmfsm: The information of amount of disk space available is displayed as
-wmfsm: colored bars.
+wmfsm: Copy "sample.wmfsmrc" to "~/.wmfsmrc" and edit it for custom
+wmfsm: configuration.
 wmfsm:
 wmfsm:
 wmfsm:
diff --git a/system/wmfsm/wmfsm.SlackBuild b/system/wmfsm/wmfsm.SlackBuild
index e26cebaba551..c57fc1c3847b 100644
--- a/system/wmfsm/wmfsm.SlackBuild
+++ b/system/wmfsm/wmfsm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wmfsm
 
-# Copyright (c) 2014, Yanes Checcacci Balod <yanes@pobox.com>, Brazil
+# Copyright (c) 2018, Yanes Checcacci Balod <yanes@pobox.com>, Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,14 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wmfsm
-VERSION=${VERSION:-0.34}
+SRCDIR=dockapps-83c2c40
+VERSION=${VERSION:-0.36}
 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
@@ -40,15 +41,15 @@ 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"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  echo "This Arch is not supported."
-  exit 1
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -61,21 +62,29 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd $SRCDIR
 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 \
+  -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 {} \;
 
+mkdir -p $PKG/usr/bin
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+autoreconf -i
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --with-xpm=highcolor      # Choices are:cyan highcolor lowcolor
 
 make
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG PREFIX=$PKG/usr MANDIR=$PKG/usr/man
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -83,10 +92,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-# Collecting each file to DOC package build directory
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -a AUTHORS ChangeLog.old COPYING INSTALL TODO ChangeLog README wmfsm/wmfsmrc.sample $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -v AUTHORS ChangeLog COPYING NEWS README wmfsm/wmfsmrc.sample $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/wmfsm/wmfsm.info b/system/wmfsm/wmfsm.info
index ab7ef5186d1a..f526c9191e51 100644
--- a/system/wmfsm/wmfsm.info
+++ b/system/wmfsm/wmfsm.info
@@ -1,10 +1,10 @@
 PRGNAM="wmfsm"
-VERSION="0.34"
-HOMEPAGE="http://freecode.com/projects/wmfsm"
-DOWNLOAD="http://fossies.org/linux/privat/old/wmfsm-0.34.tar.gz"
-MD5SUM="5ec81127146d8340a698cc5e26a66e43"
-DOWNLOAD_x86_64="UNSUPPORTED"
+VERSION="0.36"
+HOMEPAGE="http://www.dockapps.net/wmfsm"
+DOWNLOAD="http://www.dockapps.net/download/wmfsm-0.36.tar.gz"
+MD5SUM="9749614baa0c305061cfb359904e1aa5"
+DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libdockapp"
 MAINTAINER="Yanes Checcacci Balod"
 EMAIL="yanes@pobox.com"