summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/cacti/cacti.SlackBuild19
-rw-r--r--network/cacti/cacti.info8
2 files changed, 19 insertions, 8 deletions
diff --git a/network/cacti/cacti.SlackBuild b/network/cacti/cacti.SlackBuild
index 5d7a4f5401..f313556788 100644
--- a/network/cacti/cacti.SlackBuild
+++ b/network/cacti/cacti.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for cacti:
# a network graphing solution using rrdtool
-# Copyright 2009-2011 Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2009-2012 Niels Horn, Rio de Janeiro, RJ, Brazil
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,14 +23,17 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# revision date 2011/10/03
+# revision date 2012/02/17
PRGNAM=cacti
-VERSION=${VERSION:-0.8.7h}
+VERSION=${VERSION:-0.8.7i_p1}
ARCH=noarch
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PATCHLEVEL=$(echo "${VERSION}p" | cut -f2 -dp)
+[ "x$PATCHLEVEL" = "x" ] && PATCHLEVEL=0
+
# Remove patch-level from $PRGNAM if it exists
SRCVERSION=$(echo "${VERSION}_" | cut -f1 -d_)
@@ -45,7 +48,7 @@ for i in $(echo $DOCROOT | tr "/" " "); do
done
# Current PATCHES (empty if none for now)
-PATCHES=""
+PATCHES="settings_checkbox.patch"
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
@@ -63,9 +66,15 @@ chown -R root:root .
chmod -R u+w,go+r-w,a-s .
# Apply patches from upstream
+patchfound=0
for patch in $PATCHES; do
- patch -p1 < $CWD/$patch
+ patch -p1 < $CWD/$patch && let patchfound=$patchfound+1
done
+# Test if we processed all patches
+if [ $patchfound -ne $PATCHLEVEL ]; then
+ echo "Incorrect number of patches: level = $PATCHLEVEL / found = $patchfound"
+ exit 1
+fi
# "Install" to $DOCROOT/cacti
mkdir -p $PKG/$DOCROOT/$PRGNAM
diff --git a/network/cacti/cacti.info b/network/cacti/cacti.info
index df49e58752..e140c4ce91 100644
--- a/network/cacti/cacti.info
+++ b/network/cacti/cacti.info
@@ -1,8 +1,10 @@
PRGNAM="cacti"
-VERSION="0.8.7h"
+VERSION="0.8.7i_p1"
HOMEPAGE="http://www.cacti.net/"
-DOWNLOAD="http://www.cacti.net/downloads/cacti-0.8.7h.tar.gz"
-MD5SUM="58c9371341f49a190ae11a85118e598d"
+DOWNLOAD="http://www.cacti.net/downloads/cacti-0.8.7i.tar.gz \
+ http://www.cacti.net/downloads/patches/0.8.7i/settings_checkbox.patch"
+MD5SUM="07fd1da6b0ac4912410df3aa4e451a4b \
+ 930e6c18b692fb94a19ddbd95a529a8b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Niels Horn"