diff options
| -rw-r--r-- | libraries/rrdtool/README | 1 | ||||
| -rw-r--r-- | libraries/rrdtool/rrdtool.SlackBuild | 30 | ||||
| -rw-r--r-- | libraries/rrdtool/rrdtool.info | 14 | ||||
| -rw-r--r-- | libraries/rrdtool/slack-desc | 2 |
4 files changed, 29 insertions, 18 deletions
diff --git a/libraries/rrdtool/README b/libraries/rrdtool/README index d06f163533..a5fc6b24d5 100644 --- a/libraries/rrdtool/README +++ b/libraries/rrdtool/README @@ -1,3 +1,4 @@ RRDTool is the industry standard data logging and graphing application. This package makes all bindings that are supported on the system. + diff --git a/libraries/rrdtool/rrdtool.SlackBuild b/libraries/rrdtool/rrdtool.SlackBuild index ac41a784d6..317131322f 100644 --- a/libraries/rrdtool/rrdtool.SlackBuild +++ b/libraries/rrdtool/rrdtool.SlackBuild @@ -2,14 +2,16 @@ # Slackware build script for RRDTool -# Written by <youngmug@animeneko.net> +# Originally written by <youngmug@animeneko.net> # Modified by the SlackBuilds.org team. +# Versions >= 1.4.2 maintained by Niels Horn <niels.horn@gmail.com> +# revision date: 2009/12/08 # Exit on most errors set -e PRGNAM=rrdtool -VERSION=1.2.19 +VERSION=1.4.2 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -23,8 +25,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 rm -rf $PKG @@ -36,18 +43,17 @@ cd $TMP/$PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+w,go+r-w . -# The python library is not added by default in the linking stage -sed -i -r "s/^(LIBS = .*)/\0 -lpython${PYTHON}/" bindings/python/Makefile.in - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ RRDDOCDIR=/usr/doc/$PRGNAM-$VERSION \ ./configure \ --prefix=/usr \ + --mandir=/usr/man \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --disable-static \ --with-perl-options='INSTALLDIRS=vendor' -make +make # Correct man paths in the Perl bindings. sed -r -i 's|/usr/share/man|/usr/man|g' bindings/perl-piped/Makefile @@ -56,8 +62,10 @@ sed -r -i 's|/usr/share/man|/usr/man|g' bindings/perl-shared/Makefile 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 ) ( cd $PKG/usr/man @@ -76,8 +84,8 @@ make install DESTDIR=$PKG ) # And remove the directory leftovers -rm -rf $PKG/usr/lib/perl5/${PERL} -rm -rf $PKG/usr/lib/perl5/site_perl/${PERL}/i486-linux/auto/RRDp +rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/perl5/${PERL} +rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/perl5/site_perl/${PERL}/$ARCH-linux/auto/RRDp # Set correct permissions (mostly on the Perl bindings) ( cd $PKG @@ -94,4 +102,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/libraries/rrdtool/rrdtool.info b/libraries/rrdtool/rrdtool.info index 69bbb1eedb..138a6ccdfa 100644 --- a/libraries/rrdtool/rrdtool.info +++ b/libraries/rrdtool/rrdtool.info @@ -1,8 +1,10 @@ PRGNAM="rrdtool" -VERSION="1.2.19" +VERSION="1.4.2" HOMEPAGE="http://www.rrdtool.org/" -DOWNLOAD="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.2.19.tar.gz" -MD5SUM="df625d12e0585042a398ff946e32e3e7" -MAINTAINER="Michael Johnson" -EMAIL="youngmug@animeneko.net" -APPROVED="danieldk,alien" +DOWNLOAD="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.2.tar.gz" +DOWNLOAD_x86_64="" +MD5SUM="9318d3b4016dd9dd9897f1eac7548032" +MD5SUM_x86_64="" +MAINTAINER="Niels Horn" +EMAIL="niels.horn@gmail.com" +APPROVED="Erik Hanson" diff --git a/libraries/rrdtool/slack-desc b/libraries/rrdtool/slack-desc index 1b0b0199db..c9ca10a94e 100644 --- a/libraries/rrdtool/slack-desc +++ b/libraries/rrdtool/slack-desc @@ -12,7 +12,7 @@ rrdtool: RRD is the acronym for Round Robin Database. It is a system to rrdtool: store and display time-series data (i.e. network bandwidth, rrdtool: machine-room temperature, server load average). rrdtool: -rrdtool: +rrdtool: http://oss.oetiker.ch/rrdtool/ rrdtool: rrdtool: rrdtool: |