diff options
Diffstat (limited to 'desktop/wmdl')
| -rw-r--r-- | desktop/wmdl/README | 6 | ||||
| -rw-r--r-- | desktop/wmdl/slack-desc | 6 | ||||
| -rw-r--r-- | desktop/wmdl/wmdl.SlackBuild | 22 | ||||
| -rw-r--r-- | desktop/wmdl/wmdl.info | 2 |
4 files changed, 20 insertions, 16 deletions
diff --git a/desktop/wmdl/README b/desktop/wmdl/README index d7289d0b12..810539e027 100644 --- a/desktop/wmdl/README +++ b/desktop/wmdl/README @@ -1,4 +1,4 @@ -Window Maker DOOM load meter +wmdl (WindowMaker DOOM load meter) -A simple LOAD or CPU meter using ID Software's DOOM faces. -( More Bloody = more system load or CPU usage ). +A simple load or CPU meter using ID Software's DOOM faces. +More Bloody = more system load or CPU usage. diff --git a/desktop/wmdl/slack-desc b/desktop/wmdl/slack-desc index 2d1c50f56d..dc8d3d812e 100644 --- a/desktop/wmdl/slack-desc +++ b/desktop/wmdl/slack-desc @@ -6,10 +6,10 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -wmdl: wmdl (Window Maker DOOM load meter) +wmdl: wmdl (WindowMaker DOOM load meter) wmdl: -wmdl: A simple LOAD or CPU meter using ID Software's DOOM faces. -wmdl: ( More Bloody = more system load or CPU usage ). +wmdl: A simple load or CPU meter using ID Software's DOOM faces. +wmdl: More Bloody = more system load or CPU usage. wmdl: wmdl: wmdl: diff --git a/desktop/wmdl/wmdl.SlackBuild b/desktop/wmdl/wmdl.SlackBuild index bee823c14f..d5d801a86d 100644 --- a/desktop/wmdl/wmdl.SlackBuild +++ b/desktop/wmdl/wmdl.SlackBuild @@ -1,10 +1,10 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for wmdl # Originally written by Pablo Santamaria (email removed) -# Now maintained by B. Watson <yalhcru@gmail.com>. Original version +# Now maintained by B. Watson <urchlay@slackware.uk>. Original version # had no license, modified version released under the WTFPL. See # http://www.wtfpl.net/txt/copying/ for details. @@ -14,10 +14,13 @@ # - add man page # - BUILD=2 +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=wmdl VERSION=${VERSION:-1.4.1} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -27,7 +30,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -55,11 +62,8 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ make CFLAGS="$SLKCFLAGS" mkdir -p $PKG/usr/bin @@ -77,4 +81,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.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/wmdl/wmdl.info b/desktop/wmdl/wmdl.info index db079d7285..8aac273900 100644 --- a/desktop/wmdl/wmdl.info +++ b/desktop/wmdl/wmdl.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" +EMAIL="urchlay@slackware.uk" |