aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/wminfo/README2
-rw-r--r--desktop/wminfo/slack-desc4
-rw-r--r--desktop/wminfo/wminfo.SlackBuild22
-rw-r--r--desktop/wminfo/wminfo.info2
4 files changed, 16 insertions, 14 deletions
diff --git a/desktop/wminfo/README b/desktop/wminfo/README
index 3db00beecde44..cf1eb5159d5c2 100644
--- a/desktop/wminfo/README
+++ b/desktop/wminfo/README
@@ -1,6 +1,6 @@
wminfo is Window Maker information dockable application
-wminfo displays different text information. To use it write plugin
+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
diff --git a/desktop/wminfo/slack-desc b/desktop/wminfo/slack-desc
index 6610fed663ccd..d301c17c91ed7 100644
--- a/desktop/wminfo/slack-desc
+++ b/desktop/wminfo/slack-desc
@@ -12,8 +12,8 @@ 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:
wminfo: or:
-wminfo:
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 b0bf0c3fa184c..ed75f57b69737 100644
--- a/desktop/wminfo/wminfo.SlackBuild
+++ b/desktop/wminfo/wminfo.SlackBuild
@@ -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
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM
chown -R root:root .
find . \
@@ -40,10 +43,13 @@ find . \
-exec chmod 644 {} \;
cd wminfo
- CFLAGS="$SLKCFLAGS" make
- # Copying executable to the correct location
- mkdir -p $PKG/usr/bin
+ 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
cd -
( cd $PKG
@@ -53,11 +59,6 @@ cd -
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 CHANGES COPYING INSTALL README TODO plugins \
$PKG/usr/doc/$PRGNAM-$VERSION
@@ -67,5 +68,4 @@ 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/wminfo/wminfo.info b/desktop/wminfo/wminfo.info
index 946d8509df76d..1b02a723c2112 100644
--- a/desktop/wminfo/wminfo.info
+++ b/desktop/wminfo/wminfo.info
@@ -3,6 +3,8 @@ VERSION="1.51"
HOMEPAGE="http://c.kruk.webpark.pl"
DOWNLOAD="http://c.kruk.webpark.pl/wminfo-1.51.tar.gz"
MD5SUM="dd4b168a31847694dfdb74772c57b7da"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Cezary M. Kruk"
EMAIL="c.kruk@bigfoot.com"
APPROVED="dsomero"