diff options
| -rw-r--r-- | desktop/xfce4-genmon-plugin/slack-desc | 6 | ||||
| -rw-r--r-- | desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild | 29 | ||||
| -rw-r--r-- | desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.info | 8 |
3 files changed, 28 insertions, 15 deletions
diff --git a/desktop/xfce4-genmon-plugin/slack-desc b/desktop/xfce4-genmon-plugin/slack-desc index 03c8bd7e7cae3..143e83a888b70 100644 --- a/desktop/xfce4-genmon-plugin/slack-desc +++ b/desktop/xfce4-genmon-plugin/slack-desc @@ -7,7 +7,7 @@ |-----handy-ruler------------------------------------------------------| xfce4-genmon-plugin: xfce4-genmon-plugin (genmon plugin for the Xfce panel) -xfce4-genmon-plugin: +xfce4-genmon-plugin: xfce4-genmon-plugin: The genmon plugin is a 'generic monitor' plugin that xfce4-genmon-plugin: cyclically spawns a script or program and captures its xfce4-genmon-plugin: output, then displays the resulting string in the panel. @@ -15,5 +15,5 @@ xfce4-genmon-plugin: It can be used to display a picture, a bar, a tooltip, xfce4-genmon-plugin: and/or a button, so it can be used to display various xfce4-genmon-plugin: information about the system, such as temperature, xfce4-genmon-plugin: processor speed, battery level, etcetera... -xfce4-genmon-plugin: -xfce4-genmon-plugin: +xfce4-genmon-plugin: +xfce4-genmon-plugin: diff --git a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild index 9ac9228445bc7..dd4d42bba457b 100644 --- a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild +++ b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfce4-genmon-plugin -# Copyright 2006-2007 Robby Workman (http://rlworkman.net) +# Copyright 2006-2009 Robby Workman, Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-genmon-plugin -VERSION=3.1 +VERSION=3.2 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,8 +35,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 @@ -56,28 +61,34 @@ find . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/xfce \ + --mandir=/usr/man \ --enable-shared=yes \ --enable-static=no \ - --enable-debug=no + --enable-debug=no \ + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL NEWS 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/xfce4-genmon-plugin/xfce4-genmon-plugin.info b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.info index 79f939da6e77b..78b33b34f11cf 100644 --- a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.info +++ b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.info @@ -1,8 +1,10 @@ PRGNAM="xfce4-genmon-plugin" -VERSION="3.1" +VERSION="3.2" HOMEPAGE="http://goodies.xfce.org/" -DOWNLOAD="http://goodies.xfce.org/releases/xfce4-genmon-plugin/xfce4-genmon-plugin-3.1.tar.bz2" -MD5SUM="b9d44aaf1d2d3da7e2cceb80fb486f4b" +DOWNLOAD="http://goodies.xfce.org/releases/xfce4-genmon-plugin/xfce4-genmon-plugin-3.2.tar.bz2" +DOWNLOAD_x86_64="" +MD5SUM="5f292aa102a87d45207b6a373939a35d" +MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" APPROVED="Erik Hanson" |