Update net/cacti to 0.8.8h - see the changelog at

<http://www.cacti.net/changelog.php>.

The log and rrd database directories have been moved under VARBASE.

4 files changed, 34 insertions, 39 deletions

diff --git a/net/cacti/MESSAGE b/net/cacti/MESSAGE
index d3cacadf8a7..208d5f6a07a 100644
--- a/net/cacti/MESSAGE
+++ b/net/cacti/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2014/01/16 21:10:00 tron Exp $
+$NetBSD: MESSAGE,v 1.3 2016/06/02 09:36:33 hauke Exp $
 
 cacti is now installed.
 
@@ -38,4 +38,8 @@ To get cacti up and running asap, you have to complete these steps:
 Please read the included README (${CACTIDIR}/docs/README) file,
 for more information about configuring and starting cacti.
 
+If you have updated from a version older than 0.8.8h, note that the
+rrd and log directories are now under ${VARBASE}. Old logs and
+database files will have to be moved manually.
+
 ===========================================================================
diff --git a/net/cacti/Makefile b/net/cacti/Makefile
index 52b0c8cb139..28139bbfe61 100644
--- a/net/cacti/Makefile
+++ b/net/cacti/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2015/12/06 12:13:12 taca Exp $
+# $NetBSD: Makefile,v 1.29 2016/06/02 09:36:33 hauke Exp $
 
-DISTNAME=	cacti-0.8.8c
-PKGREVISION=	1
+DISTNAME=	cacti-0.8.8h
+#PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.cacti.net/downloads/
 
@@ -33,14 +33,14 @@ PKG_SHELL.${CACTI_USER}=	${SH}
 PKG_USERS_VARS+=	CACTI_USER
 PKG_GROUPS_VARS+=	CACTI_GROUP
 
-BUILD_DEFS+=		PKG_SYSCONFBASE
+BUILD_DEFS+=		PKG_SYSCONFBASE VARBASE
 PKG_SYSCONFSUBDIR?=	httpd
 EGDIR=			${PREFIX}/share/examples/cacti
 CONF_FILES+=		${EGDIR}/httpd-cacti.conf ${PKG_SYSCONFDIR}/httpd-cacti.conf
 CONF_FILES+=		${EGDIR}/config.php ${CACTIDIR}/include/config.php
 CACTIDIR=		${PREFIX}/share/cacti
-CACTI_LOGDIR?=		${CACTIDIR}/log
-CACTI_RRADIR?=		${CACTIDIR}/rra
+CACTI_LOGDIR?=		${VARBASE}/log/cacti
+CACTI_RRADIR?=		${VARBASE}/db/cacti-rra
 
 REPLACE_INTERPRETER+=	php
 REPLACE.php.old=	.*php[^ ]*
@@ -53,6 +53,7 @@ MESSAGE_SUBST+=		CACTIDIR=${CACTIDIR}
 MESSAGE_SUBST+=		CACTI_USER=${CACTI_USER}
 MESSAGE_SUBST+=		EGDIR=${EGDIR}
 MESSAGE_SUBST+=		PREFIX=${PREFIX}
+MESSAGE_SUBST+=		VARBASE=${VARBASE}
 MESSAGE_SUBST+=		PKG_SYSCONFBASE=${PKG_SYSCONFBASE}
 FILES_SUBST+=		CACTIDIR=${CACTIDIR}
 FILES_SUBST+=		CACTI_GROUP=${CACTI_GROUP}
@@ -74,6 +75,10 @@ SUBST_SED.docs=		-e 's,/var/www/html/cacti,${CACTIDIR},g'
 
 OWN_DIRS_PERMS+=	${CACTI_LOGDIR} ${CACTI_USER} ${CACTI_GROUP} 755
 OWN_DIRS_PERMS+=	${CACTI_RRADIR} ${CACTI_USER} ${CACTI_GROUP} 755
+REQD_FILES_PERMS+=	${CACTIDIR}/log/.htaccess ${CACTI_LOGDIR}/.htaccess \
+			${CACTI_USER} ${CACTI_GROUP} 644
+REQD_FILES_PERMS+=	${CACTIDIR}/rra/.htaccess ${CACTI_RRADIR}/.htaccess \
+			${CACTI_USER} ${CACTI_GROUP} 644
 
 INSTALLATION_DIRS=	bin
 INSTALLATION_DIRS+=	share/examples/cacti
@@ -97,10 +102,13 @@ post-extract:
 	fi
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/httpd-cacti.conf ${DESTDIR}${EGDIR}/httpd-cacti.conf
-	${INSTALL_DATA} ${WRKSRC}/include/config.php ${DESTDIR}${EGDIR}/config.php
+	${INSTALL_DATA} ${WRKDIR}/httpd-cacti.conf \
+		${DESTDIR}${EGDIR}/httpd-cacti.conf
+	${INSTALL_DATA} ${WRKSRC}/include/config.php \
+		${DESTDIR}${EGDIR}/config.php
 	${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} \;
-	cd ${WRKSRC} && ${PAX} -rw -s ',\./include/config\.php,,' . ${DESTDIR}${CACTIDIR}
+	cd ${WRKSRC} && ${PAX} -rw -s ',\./include/config\.php,,' \
+		. ${DESTDIR}${CACTIDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/cacti-poller ${DESTDIR}${PREFIX}/bin
 
 .include "../../databases/rrdtool/buildlink3.mk"
diff --git a/net/cacti/PLIST b/net/cacti/PLIST
index 0e82dadd2b4..eaa514ddd68 100644
--- a/net/cacti/PLIST
+++ b/net/cacti/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2015/03/11 13:56:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/06/02 09:36:33 hauke Exp $
 bin/cacti-poller
 share/cacti/LICENSE
 share/cacti/README
@@ -20,6 +20,7 @@ share/cacti/cli/copy_user.php
 share/cacti/cli/data_template_associate_rra.php
 share/cacti/cli/host_update_template.php
 share/cacti/cli/import_template.php
+share/cacti/cli/index.php
 share/cacti/cli/poller_data_sources_reapply_names.php
 share/cacti/cli/poller_graphs_reapply_names.php
 share/cacti/cli/poller_output_empty.php
@@ -138,7 +139,6 @@ share/cacti/docs/html/upgrade_using_hostmib_data_queries.html
 share/cacti/docs/html/user_management.html
 share/cacti/docs/html/using_spine.html
 share/cacti/docs/html/variables.html
-share/cacti/docs/pdf/README
 share/cacti/docs/txt/manual.txt
 share/cacti/gprint_presets.php
 share/cacti/graph.php
@@ -236,7 +236,6 @@ share/cacti/include/global_arrays.php
 share/cacti/include/global_constants.php
 share/cacti/include/global_form.php
 share/cacti/include/global_settings.php
-share/cacti/include/js/colorpicker.js
 share/cacti/include/js/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 share/cacti/include/js/images/ui-bg_diagonals-thick_20_666666_40x40.png
 share/cacti/include/js/images/ui-bg_flat_10_000000_40x100.png
@@ -254,12 +253,8 @@ share/cacti/include/js/images/ui-icons_ffffff_256x240.png
 share/cacti/include/js/jquery-ui.css
 share/cacti/include/js/jquery-ui.js
 share/cacti/include/js/jquery.cookie.js
-share/cacti/include/js/jquery.dd.js
 share/cacti/include/js/jquery.dropdown.js
-share/cacti/include/js/jquery.easytabs.js
 share/cacti/include/js/jquery.js
-share/cacti/include/js/jquery.tablednd.js
-share/cacti/include/js/jquery.timepicker.js
 share/cacti/include/js/jquery.zoom.css
 share/cacti/include/js/jquery.zoom.js
 share/cacti/include/js/jstree.js
@@ -273,23 +268,6 @@ share/cacti/include/js/themes/default/40px.png
 share/cacti/include/js/themes/default/style.css
 share/cacti/include/js/themes/default/style.min.css
 share/cacti/include/js/themes/default/throbber.gif
-share/cacti/include/js/themes/proton/30px.png
-share/cacti/include/js/themes/proton/32px.png
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.eot
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.svg
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.ttf
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.woff
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.eot
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.svg
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.ttf
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.woff
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.eot
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.svg
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.ttf
-share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.woff
-share/cacti/include/js/themes/proton/style.css
-share/cacti/include/js/themes/proton/style.min.css
-share/cacti/include/js/themes/proton/throbber.gif
 share/cacti/include/jscalendar/calendar-setup.js
 share/cacti/include/jscalendar/calendar.js
 share/cacti/include/jscalendar/lang/calendar-af.js
@@ -367,6 +345,11 @@ share/cacti/install/0_8_7i_to_0_8_8.php
 share/cacti/install/0_8_8_to_0_8_8a.php
 share/cacti/install/0_8_8a_to_0_8_8b.php
 share/cacti/install/0_8_8b_to_0_8_8c.php
+share/cacti/install/0_8_8c_to_0_8_8d.php
+share/cacti/install/0_8_8d_to_0_8_8e.php
+share/cacti/install/0_8_8e_to_0_8_8f.php
+share/cacti/install/0_8_8f_to_0_8_8g.php
+share/cacti/install/0_8_8g_to_0_8_8h.php
 share/cacti/install/0_8_to_0_8_1.php
 share/cacti/install/index.php
 share/cacti/install/install_finish.gif
diff --git a/net/cacti/distinfo b/net/cacti/distinfo
index 37ade141c62..688d9013e50 100644
--- a/net/cacti/distinfo
+++ b/net/cacti/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 00:34:54 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/06/02 09:36:33 hauke Exp $
 
-SHA1 (cacti-0.8.8c.tar.gz) = 6fdcaf59a7467ac593d4940e5a65338bdea5475b
-RMD160 (cacti-0.8.8c.tar.gz) = 591d08d27824444b68e4f517eb52be8bd08fc5f4
-SHA512 (cacti-0.8.8c.tar.gz) = dd4533a7fc739b6112ba65084bb711fb28022b097a9a0d49f31c30c3689ae4e18a32a0e161ac1a24f373e63135ef26859c90c0aa4eb4001784cd9c6037aadb76
-Size (cacti-0.8.8c.tar.gz) = 2908451 bytes
+SHA1 (cacti-0.8.8h.tar.gz) = ecc4cbe411dd7f6f812533fab2eb7006f0ffa40d
+RMD160 (cacti-0.8.8h.tar.gz) = 1798505cf698eccf1db87564bb927931e124ee3b
+SHA512 (cacti-0.8.8h.tar.gz) = 11bb0682a7220af5581f42579cf9c38d94aae202425ce15b824849684b1a6778d6f14e6a62ec94c608b7ba06562a825be7fd6d812d0800daa5eb56e640ac1c5f
+Size (cacti-0.8.8h.tar.gz) = 2585226 bytes
 SHA1 (patch-cacti.sql) = 37e18026c4136630d939ab5a7a4d6336bf166282
 SHA1 (patch-include_global.php) = fb0d2f15596b051c60ed6032ecb9038315b7c663
 SHA1 (patch-include_global__settings.php) = 54ffd0c3fc9d927595b1568a874c45a4a6033f7b