libraries/rrdtool: Updated for version 1.4.9 + maintainer and fixes

4 files changed, 30 insertions, 15 deletions

diff --git a/libraries/rrdtool/README b/libraries/rrdtool/README
index c04750783b6dd..cfb0dae0c2011 100644
--- a/libraries/rrdtool/README
+++ b/libraries/rrdtool/README
@@ -1,5 +1,5 @@
 RRDTool is the industry standard data logging and graphing application.
 
-This package makes all bindings that are supported on the system.
-Bindings for lua (optional dependency) will be made automatically
-if it is detected.
+This package makes all bindings that are supported on the system.  Bindings for
+Lua and libdbi (optional dependencies) will be made automatically if they
+are detected, this can be changed with: LUA=no LIBDBI=no ./rrdtool.SlackBuild
diff --git a/libraries/rrdtool/rrdtool.SlackBuild b/libraries/rrdtool/rrdtool.SlackBuild
index e2836af187c62..43b06bb7a347f 100644
--- a/libraries/rrdtool/rrdtool.SlackBuild
+++ b/libraries/rrdtool/rrdtool.SlackBuild
@@ -2,8 +2,9 @@
 
 # Slackware build script for RRDTool
 
-# Copyright 2007-2008  Michael Johnson  <youngmug at animeneko dot net>
-# Copyright 2009-2010,2012  Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2007, 2008  Michael Johnson  <youngmug at animeneko dot net>
+# Copyright 2009, 2010, 2012  Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2014, 2015  Mario Preksavec, Zagreb, HR
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -12,7 +13,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -23,10 +24,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# revision date: 2012/02/22
-
 PRGNAM=rrdtool
-VERSION=${VERSION:-1.4.7}
+VERSION=${VERSION:-1.4.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,6 +59,20 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Use libdbi by default
+LIBDBI=${LIBDBI:-yes}
+case "$LIBDBI" in
+  no) LIBDBI="--disable-libdbi" ;;
+   *) LIBDBI="" ;;
+esac
+
+# Use Lua by default
+LUA=${LUA:-yes}
+case "$LUA" in
+  no) LUA="--disable-lua" ;;
+   *) LUA="" ;;
+esac
+
 set -e
 
 rm -rf $PKG
@@ -86,6 +99,8 @@ RRDDOCDIR=/usr/doc/$PRGNAM-$VERSION \
   --mandir=/usr/man \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --disable-static \
+  $LIBDBI \
+  $LUA \
   --build=$ARCH-slackware-linux \
   --with-perl-options='INSTALLDIRS=vendor' \
   --with-ruby-options="sitedir=\${DESTDIR}/usr/lib${LIBDIRSUFFIX}/ruby/vendor_ruby"
diff --git a/libraries/rrdtool/rrdtool.info b/libraries/rrdtool/rrdtool.info
index 53945f73fdc5f..065a77ebfa02f 100644
--- a/libraries/rrdtool/rrdtool.info
+++ b/libraries/rrdtool/rrdtool.info
@@ -1,10 +1,10 @@
 PRGNAM="rrdtool"
-VERSION="1.4.7"
+VERSION="1.4.9"
 HOMEPAGE="http://www.rrdtool.org/"
-DOWNLOAD="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.7.tar.gz"
-MD5SUM="ffe369d8921b4dfdeaaf43812100c38f"
+DOWNLOAD="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.9.tar.gz"
+MD5SUM="1cea5a9efd6a48ac4035b0f9c7e336cf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/libraries/rrdtool/slack-desc b/libraries/rrdtool/slack-desc
index c34a069323c52..4c4729445ecef 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: http://oss.oetiker.ch/rrdtool/
+rrdtool: Homepage: http://oss.oetiker.ch/rrdtool/
 rrdtool:
 rrdtool:
 rrdtool: