2 files changed, 21 insertions, 55 deletions
diff --git a/network/cacti/cacti.SlackBuild b/network/cacti/cacti.SlackBuild
index 3d85e789aa6e..81d3d19708de 100644
--- a/network/cacti/cacti.SlackBuild
+++ b/network/cacti/cacti.SlackBuild
@@ -1,10 +1,9 @@
 #!/bin/sh
 
 # Slackware build script for cacti:
-# a network graphing solution using rrdtool
 
-# Copyright 2009-2012  Niels Horn, Rio de Janeiro, RJ, Brazil
-# Copyright 2015-2016 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2009-2012 Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2015-2017 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,30 +24,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cacti
-VERSION=${VERSION:-0.8.8h}
+VERSION=${VERSION:-1.1.0}
 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_)
-
 DOCROOT=${DOCROOT:-/var/www/htdocs}
 PHPUSER=${PHPUSER:-root}
 PHPGROUP=${PHPGROUP:-apache}
 
-# To create valid symlinks, we need a relative path from DOCROOT
-RELPATH=""
-for i in $(echo $DOCROOT | tr "/" " "); do
-  RELPATH="${RELPATH}../"
-done
-
-# Current PATCHES (empty if none for now)
-PATCHES=""
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -56,11 +40,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-rm -rf $TMP/$PRGNAM-$SRCVERSION $PKG
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,50 +53,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Apply patches from upstream
-patchfound=0
-for patch in $PATCHES; do
-  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
 cp -a \
-  *.php *.pl \
-  include resource lib rra images cli scripts install \
-    $PKG/$DOCROOT/$PRGNAM/
+  *.php include resource lib rra images cli scripts install \
+  $PKG/$DOCROOT/$PRGNAM/
 chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT/$PRGNAM
 
 # Move configuration & create symbolic link
 mkdir -p $PKG/etc/$PRGNAM
-cd $PKG/$DOCROOT/$PRGNAM/include/
-  mv config.php $PKG/etc/$PRGNAM/config.php
-  ln -sf ../../$RELPATH/etc/$PRGNAM/config.php config.php
-cd -
-
-# Rename config file and set permissions to hide passwords
-mv $PKG/etc/$PRGNAM/config.php $PKG/etc/$PRGNAM/config.php.new
+mv $PKG/$DOCROOT/$PRGNAM/include/config.php $PKG/etc/$PRGNAM/config.php.new
+ln -sf /etc/$PRGNAM/config.php $PKG/$DOCROOT/$PRGNAM/include/config.php
 chmod 640 $PKG/etc/$PRGNAM/config.php.new
 
-# Create empty log file
-mkdir -p $PKG/var/log/cacti
-touch $PKG/var/log/cacti/cacti.log.new
+# Move log file & create symbolic link
+mkdir -p $PKG/var/log/$PRGNAM
+mv log/cacti.log $PKG/var/log/$PRGNAM/cacti.log.new
+ln -sf /var/log/$PRGNAM $PKG/$DOCROOT/$PRGNAM/log
 
 # Copy docs & create symbolic link
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  LICENSE docs/* \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+  LICENSE README.md docs/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/$DOCROOT/$PRGNAM/docs
-cd $PKG/$DOCROOT/$PRGNAM/docs
-  ln -sf ../../$RELPATH/usr/doc/$PRGNAM-$VERSION/html html
-cd -
+ln -sf /usr/doc/$PRGNAM-$VERSION/html $PKG/$DOCROOT/$PRGNAM/docs/html
 
 # Copy post-installation scripts to /usr/share/cacti
 mkdir -p $PKG/usr/share/$PRGNAM
diff --git a/network/cacti/cacti.info b/network/cacti/cacti.info
index 75c4afb68bd2..d815a4d2c60d 100644
--- a/network/cacti/cacti.info
+++ b/network/cacti/cacti.info
@@ -1,8 +1,8 @@
 PRGNAM="cacti"
-VERSION="0.8.8h"
+VERSION="1.1.0"
 HOMEPAGE="http://www.cacti.net/"
-DOWNLOAD="http://www.cacti.net/downloads/cacti-0.8.8h.tar.gz"
-MD5SUM="e5a2eb9e1b187a92284f46e7d4cd6505"
+DOWNLOAD="http://www.cacti.net/downloads/cacti-1.1.0.tar.gz"
+MD5SUM="49a87b067c0a1e9e6e2b290f6e92b829"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="rrdtool"