summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/wmtop/slack-desc16
-rw-r--r--desktop/wmtop/wmtop.SlackBuild38
-rw-r--r--desktop/wmtop/wmtop.info2
3 files changed, 25 insertions, 31 deletions
diff --git a/desktop/wmtop/slack-desc b/desktop/wmtop/slack-desc
index 8c5ab75404..ddf186b2fd 100644
--- a/desktop/wmtop/slack-desc
+++ b/desktop/wmtop/slack-desc
@@ -7,13 +7,13 @@
|-----handy-ruler------------------------------------------------------|
wmtop: wmtop (Window Maker processes monitor application)
-wmtop:
+wmtop:
wmtop: wmtop maintains a view of the three top CPU (or memory) consuming
wmtop: processes displaying the amount of CPU used as a horizontal bar.
-wmtop:
-wmtop:
-wmtop:
-wmtop:
-wmtop:
-wmtop:
-wmtop:
+wmtop:
+wmtop:
+wmtop:
+wmtop:
+wmtop:
+wmtop:
+wmtop:
diff --git a/desktop/wmtop/wmtop.SlackBuild b/desktop/wmtop/wmtop.SlackBuild
index 5db808ef45..9bd5f32650 100644
--- a/desktop/wmtop/wmtop.SlackBuild
+++ b/desktop/wmtop/wmtop.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-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@@ -39,35 +42,24 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" make linux
+make \
+ PREFIX=/usr \
+ INCS="-I/usr/include" \
+ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" \
+ OPTS="$SLKCFLAGS" \
+ linux
-mkdir -p $PKG/usr/bin
-mkdir -p $PKG/usr/man/man1
-
-# Executable and manual are copied to the correct location
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
cp -a wmtop $PKG/usr/bin
-cp -a wmtop.1 $PKG/usr/man/man1
-
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
- 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
-)
+strip --strip-unneeded $PKG/usr/bin/wmtop
+gzip -9c wmtop.1 > $PKG/usr/man/man1/wmtop.1.gz
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUGS CHANGES COPYING README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUGS CHANGES COPYING README TODO $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/wmtop/wmtop.info b/desktop/wmtop/wmtop.info
index fa9ad1de2c..32f5fae9f2 100644
--- a/desktop/wmtop/wmtop.info
+++ b/desktop/wmtop/wmtop.info
@@ -3,6 +3,8 @@ VERSION="0.84"
HOMEPAGE="http://wmtop.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/wmtop/wmtop-0.84.tar.bz2"
MD5SUM="2bab22c5bc3a5b887e7c03d6dbfe59d7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Cezary M. Kruk"
EMAIL="c.kruk@bigfoot.com"
APPROVED="dsomero"