diff options
| -rw-r--r-- | system/conky/conky.SlackBuild | 19 | ||||
| -rw-r--r-- | system/conky/conky.info | 8 | ||||
| -rw-r--r-- | system/conky/slack-desc | 12 |
3 files changed, 22 insertions, 17 deletions
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild index 391fa23ef5d6..2a2d52b4fd89 100644 --- a/system/conky/conky.SlackBuild +++ b/system/conky/conky.SlackBuild @@ -3,16 +3,12 @@ # Slackware build script for conky # Written by eroc <eroc@linuxmail.org> -# Modified by the SlackBuilds.org project - -set -e - PRGNAM=conky -VERSION=1.4.5 +VERSION=1.4.7 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -CWD=`pwd` +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -23,12 +19,13 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar jxvf $CWD/$PRGNAM-$VERSION.tar.bz2 - +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+rw,go-w . @@ -42,9 +39,9 @@ CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG -if [ -d $PKG/usr/man ]; then - gzip -9 $PKG/usr/man/man?/* -fi +mv $PKG/usr/share/man $PKG/usr/ +gzip -9 $PKG/usr/man/man?/* +rmdir $PKG/usr/share mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO doc/* $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/conky/conky.info b/system/conky/conky.info index 7b1a8ab1282c..1141d07e1755 100644 --- a/system/conky/conky.info +++ b/system/conky/conky.info @@ -1,8 +1,8 @@ PRGNAM="conky" -VERSION="1.4.5" +VERSION="1.4.7" HOMEPAGE="http://conky.sourceforge.net" -DOWNLOAD="http://umn.dl.sourceforge.net/sourceforge/conky/conky-1.4.5.tar.bz2" -MD5SUM="4625c052852f2919a5e7ce2eb7c31189" +DOWNLOAD="http://downloads.sourceforge.net/conky/conky-1.4.7.tar.bz2" +MD5SUM="40b929889da5f237c5f2af4a70d7f765" MAINTAINER="eroc" EMAIL="eroc@linuxmail.org" -APPROVED="Alan_Hicks" +APPROVED="rworkman" diff --git a/system/conky/slack-desc b/system/conky/slack-desc index c1faa057c98a..ab02c19d5761 100644 --- a/system/conky/slack-desc +++ b/system/conky/slack-desc @@ -1,4 +1,12 @@ -conky: conky - A light-weight system monitor for X +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +conky: conky (light-weight system monitor for X) conky: conky: Conky is a system monitor for X originally based on the torsmo code. conky: Since it's original conception, Conky has changed a fair bit from @@ -7,5 +15,5 @@ conky: your root desktop or in it's own window. Conky has many built-in conky: objects, as well as the ability to execute programs and scripts, then conky: display the output from stdout. conky: -conky: +conky: Homepage: http://conky.sourceforge.net conky: |