4 files changed, 31 insertions, 32 deletions
diff --git a/desktop/wminfo/README b/desktop/wminfo/README
index cf1eb5159d5c2..76ed489beabca 100644
--- a/desktop/wminfo/README
+++ b/desktop/wminfo/README
@@ -1,11 +1,5 @@
-wminfo is Window Maker information dockable application
+wminfo is Window Maker showing information dockable application
 
-wminfo displays different text information. To use it, write plugin
-grabbing information from the system or website. For example:
-
-  ps -a | awk '{print $1,$4}' | grep -vE "ps|awk|grep|tac" | tac
-
-or:
-
-  lynx --source http://www.kernel.org/pub/linux/kernel/v2.6/ | \
-    grep bz2.sign | grep linux | sed 's/.*linux-//;s/.tar.*//' | tac
+wminfo displays different text information.  To use it, write the
+plugin grabbing the information from the system or website.  The
+source package includes a lot of sample working plugins.
diff --git a/desktop/wminfo/slack-desc b/desktop/wminfo/slack-desc
index 8e861aca9cbd7..40b03c16643fa 100644
--- a/desktop/wminfo/slack-desc
+++ b/desktop/wminfo/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-wminfo: wminfo (Window Maker information dockable application)
+wminfo: wminfo (Window Maker showing information dockable application)
+wminfo:
+wminfo: wminfo displays different text information.  To use it write the
+wminfo: plugin grabbing the information from the system or website.  The
+wminfo: source package includes a lot of sample working plugins.
+wminfo:
+wminfo:
 wminfo:
-wminfo: wminfo displays different text information. To use it write plugin
-wminfo: grabbing information from the system or website. For example:
 wminfo:
-wminfo:   ps -a | awk '{print $1,$4}' | grep -vE "ps|awk|grep|tac" | tac
-wminfo: or:
-wminfo:   lynx --source http://www.kernel.org/pub/linux/kernel/v2.6/ | \
-wminfo:     grep bz2.sign | grep linux | sed 's/.*linux-//;s/.tar.*//' | tac
 wminfo:
 wminfo:
diff --git a/desktop/wminfo/wminfo.SlackBuild b/desktop/wminfo/wminfo.SlackBuild
index f6e3ea3b42a0b..83dad4b70864a 100644
--- a/desktop/wminfo/wminfo.SlackBuild
+++ b/desktop/wminfo/wminfo.SlackBuild
@@ -6,16 +6,14 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=wminfo
-VERSION=${VERSION:-1.51}
+VERSION=${VERSION:-2.00}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -44,9 +42,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,20 +53,27 @@ find . \
  -exec chmod 644 {} \;
 
 cd wminfo
+  ./configure --prefix=/usr
   make \
     LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" \
     FLAGS="$SLKCFLAGS"
-  # Copy executable to the correct location
-  mkdir -p $PKG/usr/bin $PKG/usr/share/pixmaps
-  cp -a wminfo $PKG/usr/bin
-  cp -a wminfo.xpm $PKG/usr/share/pixmaps
+
+# Copy executable to the correct location
+mkdir -p $PKG/usr/bin
+cp -a wminfo $PKG/usr/bin
+cp -a ../contrib/* $PKG/usr/bin
+rm $PKG/usr/bin/README.contrib
 cd -
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/man/man1
+cp -a doc/wminfo.1 $PKG/usr/man/man1
+gzip -9 $PKG/usr/man/man1/wminfo.1
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES COPYING INSTALL README TODO plugins \
+cp -a COPYING ChangeLog INSTALL Plugins-HOWTO README TODO plugins.offline plugins.online samples \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/wminfo/wminfo.info b/desktop/wminfo/wminfo.info
index 0f1996ad9b4e2..95360b3b46006 100644
--- a/desktop/wminfo/wminfo.info
+++ b/desktop/wminfo/wminfo.info
@@ -1,10 +1,10 @@
 PRGNAM="wminfo"
-VERSION="1.51"
-HOMEPAGE="http://linux-bsd-unix.strefa.pl"
-DOWNLOAD="http://linux-bsd-unix.strefa.pl/wminfo-1.51.tar.gz"
-MD5SUM="dd4b168a31847694dfdb74772c57b7da"
+VERSION="2.00"
+HOMEPAGE="http://linux-bsd-unix.strefa.pl/"
+DOWNLOAD="http://linux-bsd-unix.strefa.pl/wminfo-2.00.tar.gz"
+MD5SUM="c6625269418714ebe56bcec6992a35eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Cezary M. Kruk"
 EMAIL="c.kruk@bigfoot.com"
-APPROVED="dsomero"
+APPROVED="Niels Horn"