4 files changed, 36 insertions, 11 deletions
diff --git a/desktop/wminfo/doinst.sh b/desktop/wminfo/doinst.sh
new file mode 100644
index 0000000000000..a0e3bb3c73703
--- /dev/null
+++ b/desktop/wminfo/doinst.sh
@@ -0,0 +1,15 @@
+( cd /usr/bin                              ; rm -rf empty.wmi )
+( cd /usr/bin                              ; ln -sf /usr/bin/bash-empty.wmi empty.wmi )
+( cd /usr/doc/wminfo-4.0.0/plugins.binary  ; rm -rf run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/plugins.binary  ; ln -sf /usr/bin/run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/plugins.conky   ; rm -rf run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/plugins.conky   ; ln -sf /usr/bin/run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/plugins.offline ; rm -rf run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/plugins.offline ; ln -sf /usr/bin/run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/plugins.online  ; rm -rf run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/plugins.online  ; ln -sf /usr/bin/run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/plugins.system  ; rm -rf run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/plugins.system  ; ln -sf /usr/bin/run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/samples         ; rm -rf run-all-wminfo-plugins )
+( cd /usr/doc/wminfo-4.0.0/samples         ; ln -sf /usr/bin/run-all-wminfo-plugins )
+
diff --git a/desktop/wminfo/slack-desc b/desktop/wminfo/slack-desc
index 5ca1aaa8fe895..81cb55cccb1e6 100644
--- a/desktop/wminfo/slack-desc
+++ b/desktop/wminfo/slack-desc
@@ -15,5 +15,5 @@ wminfo: it row by row.  Using the appropriate plugins wminfo can display
 wminfo: different information got from the system or from Internet.  The
 wminfo: program is provided with a lot of sample plugins.
 wminfo:
-wminfo:
+wminfo: homepage: http://linux-bsd-unix.strefa.pl/
 wminfo:
diff --git a/desktop/wminfo/wminfo.SlackBuild b/desktop/wminfo/wminfo.SlackBuild
index f30f5f0b28ed2..06eb04290972d 100644
--- a/desktop/wminfo/wminfo.SlackBuild
+++ b/desktop/wminfo/wminfo.SlackBuild
@@ -6,7 +6,7 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=wminfo
-VERSION=${VERSION:-3.0.0}
+VERSION=${VERSION:-4.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,26 +54,36 @@ find . \
 
 cd wminfo
   ./configure --prefix=/usr
-  make FLAGS="$SLKCFLAGS"
-  mkdir -p $PKG/usr/bin
-  cp -a wminfo $PKG/usr/bin
-cd ..
+  make \
+    LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" \
+    FLAGS="$SLKCFLAGS"
+
+# 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.*
+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
+cp -a man/wminfo.1 $PKG/usr/man/man1
 gzip -9 $PKG/usr/man/man1/wminfo.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  BUGS COPYING ChangeLog INSTALL Plugins-HOWTO README* TODO contrib plugins.* samples \
+  BUGS COPYING ChangeLog INSTALL Plugins-HOWTO README README.1st README.CPU.usage \
+  README.benchmarks README.colors README.multi+wrapper THANKS TODO \
+  contrib plugins.binary plugins.conky plugins.offline plugins.online \
+  plugins.system samples \
   $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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wminfo/wminfo.info b/desktop/wminfo/wminfo.info
index 32603f32cdb29..5330316ed1111 100644
--- a/desktop/wminfo/wminfo.info
+++ b/desktop/wminfo/wminfo.info
@@ -1,8 +1,8 @@
 PRGNAM="wminfo"
-VERSION="3.0.0"
+VERSION="4.0.0"
 HOMEPAGE="http://linux-bsd-unix.strefa.pl/"
-DOWNLOAD="http://linux-bsd-unix.strefa.pl/wminfo-3.0.0.tar.gz"
-MD5SUM="3bd3f93fcf70dda068e5aa738d7d7f69"
+DOWNLOAD="http://linux-bsd-unix.strefa.pl/wminfo-4.0.0.tar.gz"
+MD5SUM="39c9e28a739e0286776f7452586e060d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""