desktop/wmnet: Updated for version 1.06

4 files changed, 23 insertions, 24 deletions

diff --git a/desktop/wmnet/README b/desktop/wmnet/README
index 1c632a164fbaf..c1522adf75c03 100644
--- a/desktop/wmnet/README
+++ b/desktop/wmnet/README
@@ -4,5 +4,3 @@ wmnet polls network statistics and does a few things with the data it
 gets. It has small blinking lights for the rx and tx of IP packets, a
 digital speedometer of your networks current speed and a bar graph
 like xload plotting your throughput.
-
-wmnet hasn't any explicit license.
diff --git a/desktop/wmnet/slack-desc b/desktop/wmnet/slack-desc
index 349b2a04ab3be..370eadd2ee2b9 100644
--- a/desktop/wmnet/slack-desc
+++ b/desktop/wmnet/slack-desc
@@ -7,13 +7,13 @@
 
      |-----handy-ruler------------------------------------------------------|
 wmnet: wmnet (Window Maker network monitor dockable application)
-wmnet: 
+wmnet:
 wmnet: wmnet polls network statistics and does a few things with the data it
 wmnet: gets. It has small blinking lights for the rx and tx of IP packets, a
 wmnet: digital speedometer of your networks current speed and a bar graph
 wmnet: like xload plotting your throughput.          
-wmnet: 
-wmnet: wmnet hasn't any explicit license.
-wmnet: 
-wmnet: 
-wmnet: 
+wmnet:
+wmnet:
+wmnet:
+wmnet:
+wmnet:
diff --git a/desktop/wmnet/wmnet.SlackBuild b/desktop/wmnet/wmnet.SlackBuild
index dba75abbe20ae..b027a1d4323ed 100644
--- a/desktop/wmnet/wmnet.SlackBuild
+++ b/desktop/wmnet/wmnet.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wmnet
 # Written by Cezary M. Kruk (c.kruk@bigfoot.com)
-#
+
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=wmnet
@@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -30,7 +33,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -42,11 +45,14 @@ find . \
 xmkmf
 mkdir -p $PKG/usr/man/man1
 
-CFLAGS="$SLKCFLAGS" make
+make \
+  CFLAGS="$SLKCFLAGS" \
+  INCDIR="-I/usr/include/X11" \
+  LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
 make install DESTDIR=$PKG
 
 # Copying manual to the correct location 
-cp wmnet.man $PKG/usr/man/man1/wmnet.1
+gzip -9c wmnet.man > $PKG/usr/man/man1/wmnet.1.gz
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -55,19 +61,12 @@ cp wmnet.man $PKG/usr/man/man1/wmnet.1
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-( 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
-)
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmnet/wmnet.info b/desktop/wmnet/wmnet.info
index e83e637657cd5..f09e90c7ed5d8 100644
--- a/desktop/wmnet/wmnet.info
+++ b/desktop/wmnet/wmnet.info
@@ -1,8 +1,10 @@
 PRGNAM="wmnet"
 VERSION="1.06"
-HOMEPAGE="http://dockapps.org/file.php/id/77"
-DOWNLOAD="http://dockapps.org/download.php/id/115/wmnet-1.06.tar.gz"
+HOMEPAGE="http://c.kruk.webpark.pl"
+DOWNLOAD="http://c.kruk.webpark.pl/wmnet-1.06.tar.gz"
 MD5SUM="64e74c37c0cb5fd4fb81cfb0f5c4a264"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Cezary M. Kruk"
 EMAIL="c.kruk@bigfoot.com"
-APPROVED="dsomero"
+APPROVED="rworkman"