14 files changed, 4 insertions, 689 deletions
diff --git a/MOVED b/MOVED
index 580120a391c3..8d0fea97964a 100644
--- a/MOVED
+++ b/MOVED
@@ -3072,4 +3072,5 @@ lang/ghc5||2007-07-11|Outdated software, removed on upstream's request
 lang/ghc5-doc||2007-07-11|Outdated software, removed on upstream's request
 devel/hs-popenhs||2007-07-11|Remove software depending on outdated lang/ghc5
 databases/p5-DBD-Pg-13||2007-06-14|Has expired: Use databases/p5-DBD-Pg instead
-multimedia/audacious-docklet|multimedia/audacious-plugins||2007-06-15|Functionality folded into plugins package
+multimedia/audacious-docklet|multimedia/audacious-plugins|2007-06-15|Functionality folded into plugins package
+net/cacti|net-mgmt/cacti|2007-06-18|Move to net-mgmt category
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 763c00bfb015..dbbcfde79f44 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -32,6 +32,7 @@
     SUBDIR += bsnmpd
     SUBDIR += bsnmptools
     SUBDIR += bwm-ng
+    SUBDIR += cacti
     SUBDIR += cdpd
     SUBDIR += cdpr
     SUBDIR += cfgstoragemk
diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index efb2c7cb4d6e..8582a440c06d 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	cacti
 PORTVERSION=	0.8.6j${PATCHLEVEL}
 PORTREVISION=	2
-CATEGORIES=	net www
+CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://www.cacti.net/downloads/
 DISTFILES=	${PORTNAME}-${SITEDISTVERSION}${EXTRACT_SUFX}
 
diff --git a/net/Makefile b/net/Makefile
index 671e5ee23611..27922c74856d 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -62,7 +62,6 @@
     SUBDIR += brutecopy
     SUBDIR += bsdproxy
     SUBDIR += c3270
-    SUBDIR += cacti
     SUBDIR += cactid
     SUBDIR += callgen323
     SUBDIR += cap
diff --git a/net/cacti/Makefile b/net/cacti/Makefile
deleted file mode 100644
index efb2c7cb4d6e..000000000000
--- a/net/cacti/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# New ports collection makefile for:	cacti
-# Date created:		6 December 2003
-# Whom:			Vincent Tantardini <vinc@freebsd-fr.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cacti
-PORTVERSION=	0.8.6j${PATCHLEVEL}
-PORTREVISION=	2
-CATEGORIES=	net www
-MASTER_SITES=	http://www.cacti.net/downloads/
-DISTFILES=	${PORTNAME}-${SITEDISTVERSION}${EXTRACT_SUFX}
-
-# Vendor's patches
-PATCH_SITES=	http://www.cacti.net/downloads/patches/${SITEDISTVERSION}/
-PATCHFILES=	ping_php_version4_snmpgetnext.patch \
-		tree_console_missing_hosts.patch \
-		thumbnail_graphs_not_working.patch
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	sem@FreeBSD.org
-COMMENT=	Web-driven graphing interface for RRDTool
-
-RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool
-
-PATCHLEVEL=	.3
-PATCH_STRIP=	-p1
-USE_MYSQL=	yes
-USE_PHP=	mysql pcre session sockets snmp xml
-WANT_PHP_WEB=	yes
-NO_BUILD=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGINSTALL=	${WRKDIR}/pkg-install
-SUB_FILES=	pkg-message pkg-install
-
-CACTIDIR?=	share/cacti
-CACTIUSER?=	cacti
-CACTIGROUP?=	${CACTIUSER}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${SITEDISTVERSION}
-
-OPTIONS=	PLUGIN_ARCH "With plugin architecture" Off
-
-.include <bsd.port.pre.mk>
-
-SITEDISTVERSION=	${PORTVERSION:S/${PATCHLEVEL}$//}
-
-# Extra patches
-.if defined(WITH_PLUGIN_ARCH)
-MASTER_SITES+=	http://cactiusers.net/downloads/plugins/:plugin
-DISTFILES+=	cacti-plugin-arch.tar.gz:plugin
-EXTRA_PATCHES+=	${WRKDIR}/${PORTNAME}-plugin-${SITEDISTVERSION}.diff
-PLIST_SUB+=	PLUGIN=""
-.else
-PLIST_SUB+=	PLUGIN="@comment "
-.endif
-
-PLIST_SUB+=	CACTIDIR=${CACTIDIR}
-SUB_LIST+=	CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \
-		CACTIGROUP=${CACTIGROUP}
-
-.if defined(WITH_PLUGIN_ARCH)
-post-extract:
-	@${CP} ${WRKDIR}/cacti-plugin-arch/${PORTNAME}-plugin-${SITEDISTVERSION}.diff ${WRKDIR}
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name \*.orig -delete; \
-	${MV} ${WRKSRC}/include/db-settings.php ${WRKSRC}/include/db-settings.php.orig
-	${MV} ${WRKSRC}/include/config.php ${WRKSRC}/include/config.php.orig
-
-pre-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	@${MKDIR} ${PREFIX}/${CACTIDIR}; \
-	${CP} -R ${WRKSRC}/* ${PREFIX}/${CACTIDIR}/; \
-	if [ ! -f ${PREFIX}/${CACTIDIR}/include/db-settings.php ]; then \
-		${CP} ${PREFIX}/${CACTIDIR}/include/db-settings.php.orig \
-			${PREFIX}/${CACTIDIR}/include/db-settings.php; \
-	fi
-	@if [ ! -f ${PREFIX}/${CACTIDIR}/include/config.php ]; then \
-		${CP} ${PREFIX}/${CACTIDIR}/include/config.php.orig \
-			${PREFIX}/${CACTIDIR}/include/config.php; \
-	fi
-
-post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/cacti/distinfo b/net/cacti/distinfo
deleted file mode 100644
index 3e906444a90a..000000000000
--- a/net/cacti/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 (cacti-0.8.6j.tar.gz) = 29436be46b289d13dfce48e7618129e2
-SHA256 (cacti-0.8.6j.tar.gz) = 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46
-SIZE (cacti-0.8.6j.tar.gz) = 1126337
-MD5 (cacti-plugin-arch.tar.gz) = baaf01f3a863148d6a76510ffc53986d
-SHA256 (cacti-plugin-arch.tar.gz) = 9d9600912f5bb347cd82a51f966438469676e01748b4b598fd193a1599feed4c
-SIZE (cacti-plugin-arch.tar.gz) = 263447
-MD5 (ping_php_version4_snmpgetnext.patch) = bedf583646e59dd628d4aced7e83fdf3
-SHA256 (ping_php_version4_snmpgetnext.patch) = 1e19110c696eb56c6de68247c926c5ec7a2e7554df222f39a663556241644170
-SIZE (ping_php_version4_snmpgetnext.patch) = 1262
-MD5 (tree_console_missing_hosts.patch) = 109afedcd49dc173da8c27fb23c322fe
-SHA256 (tree_console_missing_hosts.patch) = 5807bb408227b1c9f2ebecf220c048eb7c7148eee41fcd06fdc086124a206180
-SIZE (tree_console_missing_hosts.patch) = 771
-MD5 (thumbnail_graphs_not_working.patch) = 1a3c9580a1f94d991502c8650d18b617
-SHA256 (thumbnail_graphs_not_working.patch) = 3b18602aed1aa8b9773a75a4e89413cd12ce2670fd185eae113de1aa2c1186bd
-SIZE (thumbnail_graphs_not_working.patch) = 1515
diff --git a/net/cacti/files/patch-include-config.php b/net/cacti/files/patch-include-config.php
deleted file mode 100644
index 5f76ecbdd9f2..000000000000
--- a/net/cacti/files/patch-include-config.php
+++ /dev/null
@@ -1,25 +0,0 @@
---- cacti-0.8.6j/include/config.php.orig	Fri Jan  6 00:27:51 2006
-+++ cacti-0.8.6j/include/config.php	Fri Jan  6 00:28:39 2006
-@@ -24,7 +24,11 @@
-  +-------------------------------------------------------------------------+
- */
- 
--/* make sure these values refect your actual database/host/user/password */
-+/*
-+ * these are default values. do not change them. set your actual
-+ * database/host/user/password in db-settings.php file instead.
-+ *
-+ */
- $database_type = "mysql";
- $database_default = "cacti";
- $database_hostname = "localhost";
-@@ -64,6 +68,9 @@
- $config["base_path"] = strtr(ereg_replace("(.*)[\/\\]include", "\\1", dirname(__FILE__)), "\\", "/");
- $config["library_path"] = ereg_replace("(.*[\/\\])include", "\\1lib", dirname(__FILE__));
- $config["include_path"] = dirname(__FILE__);
-+ 
-+/* load user defined DB settings */
-+include($config["include_path"] . "/db-settings.php");
- 
- /* colors */
- $colors["dark_outline"] = "454E53";
diff --git a/net/cacti/files/patch-include-db-settings.php b/net/cacti/files/patch-include-db-settings.php
deleted file mode 100644
index 2d251cdba5d0..000000000000
--- a/net/cacti/files/patch-include-db-settings.php
+++ /dev/null
@@ -1,12 +0,0 @@
---- /dev/null	Tue Jun 21 16:31:36 2005
-+++ cacti-0.8.6j/include/db-settings.php	Tue Jun 21 16:29:15 2005
-@@ -0,0 +1,9 @@
-+<?php
-+/* make sure these values refect your actual database/host/user/password */
-+$database_type = "mysql";
-+$database_default = "cacti";
-+$database_hostname = "localhost";
-+$database_username = "cactiuser";
-+$database_password = "cactiuser";
-+$database_port = "3306";
-+?>
diff --git a/net/cacti/files/patch-scripts-diskfree.pl b/net/cacti/files/patch-scripts-diskfree.pl
deleted file mode 100644
index eeea6e5c971c..000000000000
--- a/net/cacti/files/patch-scripts-diskfree.pl
+++ /dev/null
@@ -1,9 +0,0 @@
---- cacti-0.8.6j/scripts/diskfree.pl.orig	Wed Jan  4 06:08:30 2006
-+++ cacti-0.8.6j/scripts/diskfree.pl	Fri Jan  6 00:16:58 2006
-@@ -1,5 +1,5 @@
- #!/usr/bin/perl
--open(PROCESS,"df --block-size=1024 -P $ARGV[0] | grep -v Filesystem |");
-+open(PROCESS,"df -k $ARGV[0] | grep -v Filesystem |");
- foreach (<PROCESS>) {
- 	if ($_ =~ /($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )/) {
- 		print "megabytes:$7 percent:$9";
diff --git a/net/cacti/files/patch-scripts-ping.pl b/net/cacti/files/patch-scripts-ping.pl
deleted file mode 100644
index b39c35082f9a..000000000000
--- a/net/cacti/files/patch-scripts-ping.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- cacti-0.8.6j/scripts/ping.pl.orig	Sat Apr 15 22:26:44 2006
-+++ cacti-0.8.6j/scripts/ping.pl	Sat Apr 15 22:27:16 2006
-@@ -1,6 +1,6 @@
- #!/usr/bin/perl 
- 
--open(PROCESS, "ping -c 1 $ARGV[0] | grep icmp_seq |");
-+open(PROCESS, "/sbin/ping -c 1 $ARGV[0] | grep icmp_seq |");
- $ping = <PROCESS>;
- close(PROCESS);
- $ping =~ m/(.*time=)(.*) (ms|usec)/; 
diff --git a/net/cacti/files/pkg-install.in b/net/cacti/files/pkg-install.in
deleted file mode 100644
index 4a35abeaeb19..000000000000
--- a/net/cacti/files/pkg-install.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-PW=/usr/sbin/pw
-UID=107
-GID=${UID}
-CACTIUSER="%%CACTIUSER%%"
-CACTIGROUP="%%CACTIGROUP%%"
-CACTIDIR="%%CACTIDIR%%"
-PREFIX="%%PREFIX%%"
-
-case $2 in
-
-PRE-INSTALL)
-
-	if ${PW} group show "${CACTIGROUP}" 2>/dev/null; then
-		echo "You already have a group \"${CACTIGROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${CACTIGROUP} -g ${GID}; then
-			echo "Added group \"${CACTIGROUP}\"."
-		else
-			echo "Adding group \"${CACTIGROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} user show "${CACTIUSER}" 2>/dev/null; then
-		echo "You already have a user \"${CACTIUSER}\", so I will use it."
-	else
-		if ${PW} useradd ${CACTIUSER} -u ${UID} -g ${CACTIGROUP} -h - \
-			-d "/nonexistent" -s /sbin/nologin -c "Cacti Sandbox"
-		then
-			echo "Added user \"${CACTIUSER}\"."
-		else
-			echo "Adding user \"${CACTIUSER}\" failed..."
-			exit 1
-		fi
-	fi
-	;;
-
-POST-INSTALL)
-
-	chown ${CACTIUSER}:${CACTIGROUP} "${PREFIX}/${CACTIDIR}/rra/"
-	[ -d "${PREFIX}/${CACTIDIR}/log/" ] || mkdir -p "${PREFIX}/${CACTIDIR}/log/"
-	chown -R ${CACTIUSER}:${CACTIGROUP} "${PREFIX}/${CACTIDIR}/log/"
-	chmod -R a+r "${PREFIX}/${CACTIDIR}/scripts/"
-	;;
-*)
-	exit 1
-;;
-esac
-exit
diff --git a/net/cacti/files/pkg-message.in b/net/cacti/files/pkg-message.in
deleted file mode 100644
index 66f17da4b148..000000000000
--- a/net/cacti/files/pkg-message.in
+++ /dev/null
@@ -1,35 +0,0 @@
-=======================================================================
-Cacti is now installed. If you intall it for the first time,
-you may have to follow this steps to make it work correctly:
-
-1. Create the MySQL database:
-# mysqladmin --user=root create cacti
-2. Create a mysql user/password for cacti:
-   (change user and/or password if requered)
-# echo "GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'cactiuser'; FLUSH PRIVILEGES;" | mysql
-3. Import the default cacti database:
-# mysql cacti < %%PREFIX%%/%%CACTIDIR%%/cacti.sql
-4. Edit %%PREFIX%%/%%CACTIDIR%%/include/db-settings.php.
-5. Add a line to your /etc/crontab file similar to:
-*/5 * * * * %%CACTIUSER%% %%LOCALBASE%%/bin/php %%PREFIX%%/%%CACTIDIR%%/poller.php > /dev/null 2>&1
-6. Add alias in apache config for the cacti dir:
-Alias /cacti "%%PREFIX%%/%%CACTIDIR%%/"
-7. Be sure apache gives an access to the directory ('Allow from' keywords).
-8. Open a cacti login page in your web browser and login with admin/admin.
-
-If you update cacti, open a login page, an updating process
-will start automatically.
-
-If you are using PLUGIN option set, in file
-%%PREFIX%%/%%CACTIDIR%%/include/config.php
-change the follow line
-
-$config["url_path"] = '/';
-
-with location where your cacti is available. E.g.:
-
-$config["url_path"] = '/cacti/';
-
-if your URL is http://yoursite.com/cacti
-
-=======================================================================
diff --git a/net/cacti/pkg-descr b/net/cacti/pkg-descr
deleted file mode 100644
index fe8fa4325341..000000000000
--- a/net/cacti/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Cacti is a complete frontend to RRDTool, it stores all of the necessary
-information to create graphs and populate them with data in a MySQL database.
-The frontend is completely PHP driven. Along with being able to maintain
-Graphs, Data Sources, and Round Robin Archives in a database, cacti handles
-the data gathering. There is also SNMP support for those used to creating
-traffic graphs with MRTG.
-
-WWW: http://www.cacti.net
diff --git a/net/cacti/pkg-plist b/net/cacti/pkg-plist
deleted file mode 100644
index 46c4c1fb88a1..000000000000
--- a/net/cacti/pkg-plist
+++ /dev/null
@@ -1,430 +0,0 @@
-%%CACTIDIR%%/LICENSE
-%%CACTIDIR%%/README
-%%CACTIDIR%%/about.php
-%%CACTIDIR%%/auth_changepassword.php
-%%CACTIDIR%%/auth_login.php
-%%CACTIDIR%%/cacti.sql
-%%CACTIDIR%%/cdef.php
-%%CACTIDIR%%/cmd.php
-%%CACTIDIR%%/color.php
-%%CACTIDIR%%/copy_cacti_user.php
-%%CACTIDIR%%/data_input.php
-%%CACTIDIR%%/data_queries.php
-%%CACTIDIR%%/data_sources.php
-%%CACTIDIR%%/data_templates.php
-%%CACTIDIR%%/docs/CHANGELOG
-%%CACTIDIR%%/docs/CONTRIB
-%%CACTIDIR%%/docs/INSTALL
-%%CACTIDIR%%/docs/README
-%%CACTIDIR%%/docs/REQUIREMENTS
-%%CACTIDIR%%/docs/UPGRADE
-%%CACTIDIR%%/docs/html/LICENSE.html
-%%CACTIDIR%%/docs/html/advanced_topics.html
-%%CACTIDIR%%/docs/html/basics.html
-%%CACTIDIR%%/docs/html/cdefs.html
-%%CACTIDIR%%/docs/html/data_input_methods.html
-%%CACTIDIR%%/docs/html/data_queries.html
-%%CACTIDIR%%/docs/html/data_templates.html
-%%CACTIDIR%%/docs/html/faq.html
-%%CACTIDIR%%/docs/html/graph_howto.html
-%%CACTIDIR%%/docs/html/graph_overview.html
-%%CACTIDIR%%/docs/html/graph_permissions.html
-%%CACTIDIR%%/docs/html/graph_settings.html
-%%CACTIDIR%%/docs/html/graph_viewing.html
-%%CACTIDIR%%/docs/html/host_templates.html
-%%CACTIDIR%%/docs/html/host_variables.html
-%%CACTIDIR%%/docs/html/how_to.html
-%%CACTIDIR%%/docs/html/images/data_template.png
-%%CACTIDIR%%/docs/html/images/graph_template.png
-%%CACTIDIR%%/docs/html/images/graph_tree.png
-%%CACTIDIR%%/docs/html/images/host_template.png
-%%CACTIDIR%%/docs/html/images/new_device.png
-%%CACTIDIR%%/docs/html/images/new_graphs.png
-%%CACTIDIR%%/docs/html/images/user_management.png
-%%CACTIDIR%%/docs/html/index.html
-%%CACTIDIR%%/docs/html/install_unix.html
-%%CACTIDIR%%/docs/html/install_windows.html
-%%CACTIDIR%%/docs/html/installation.html
-%%CACTIDIR%%/docs/html/making_scripts_work_with_cacti.html
-%%CACTIDIR%%/docs/html/manual.css
-%%CACTIDIR%%/docs/html/migration_php_scripts_to_script_server.html
-%%CACTIDIR%%/docs/html/new_graphs.html
-%%CACTIDIR%%/docs/html/php_script_server.html
-%%CACTIDIR%%/docs/html/realm_permissions.html
-%%CACTIDIR%%/docs/html/reference.html
-%%CACTIDIR%%/docs/html/requirements.html
-%%CACTIDIR%%/docs/html/rrdtool_features.html
-%%CACTIDIR%%/docs/html/script_query_xml.html
-%%CACTIDIR%%/docs/html/script_to_graph.html
-%%CACTIDIR%%/docs/html/snmp_query_xml.html
-%%CACTIDIR%%/docs/html/templates.html
-%%CACTIDIR%%/docs/html/testing_script_in_script_server.html
-%%CACTIDIR%%/docs/html/upgrade.html
-%%CACTIDIR%%/docs/html/upgrade_using_hostmib_data_queries.html
-%%CACTIDIR%%/docs/html/user_management.html
-%%CACTIDIR%%/docs/html/using_cacti.html
-%%CACTIDIR%%/docs/html/variables.html
-%%CACTIDIR%%/docs/pdf/README
-%%CACTIDIR%%/docs/text/manual.txt
-%%CACTIDIR%%/gprint_presets.php
-%%CACTIDIR%%/graph.php
-%%CACTIDIR%%/graph_image.php
-%%CACTIDIR%%/graph_settings.php
-%%CACTIDIR%%/graph_templates.php
-%%CACTIDIR%%/graph_templates_inputs.php
-%%CACTIDIR%%/graph_templates_items.php
-%%CACTIDIR%%/graph_view.php
-%%CACTIDIR%%/graphs.php
-%%CACTIDIR%%/graphs_items.php
-%%CACTIDIR%%/graphs_new.php
-%%CACTIDIR%%/host.php
-%%CACTIDIR%%/host_templates.php
-%%CACTIDIR%%/images/arrow.gif
-%%CACTIDIR%%/images/auth_deny.gif
-%%CACTIDIR%%/images/auth_login.gif
-%%CACTIDIR%%/images/button_add.gif
-%%CACTIDIR%%/images/button_cancel.gif
-%%CACTIDIR%%/images/button_cancel2.gif
-%%CACTIDIR%%/images/button_clear.gif
-%%CACTIDIR%%/images/button_colapse_all.gif
-%%CACTIDIR%%/images/button_create.gif
-%%CACTIDIR%%/images/button_default.gif
-%%CACTIDIR%%/images/button_delete.gif
-%%CACTIDIR%%/images/button_expand_all.gif
-%%CACTIDIR%%/images/button_export.gif
-%%CACTIDIR%%/images/button_go.gif
-%%CACTIDIR%%/images/button_help.gif
-%%CACTIDIR%%/images/button_import.gif
-%%CACTIDIR%%/images/button_no.gif
-%%CACTIDIR%%/images/button_purge.gif
-%%CACTIDIR%%/images/button_refresh.gif
-%%CACTIDIR%%/images/button_save.gif
-%%CACTIDIR%%/images/button_view.gif
-%%CACTIDIR%%/images/button_yes.gif
-%%CACTIDIR%%/images/cacti_about_logo.gif
-%%CACTIDIR%%/images/cacti_backdrop.gif
-%%CACTIDIR%%/images/cacti_backdrop2.gif
-%%CACTIDIR%%/images/cacti_logo.gif
-%%CACTIDIR%%/images/calendar.gif
-%%CACTIDIR%%/images/delete_icon.gif
-%%CACTIDIR%%/images/delete_icon_large.gif
-%%CACTIDIR%%/images/graph_properties.gif
-%%CACTIDIR%%/images/graph_zoom.gif
-%%CACTIDIR%%/images/hide.gif
-%%CACTIDIR%%/images/left_border.gif
-%%CACTIDIR%%/images/menu_line.gif
-%%CACTIDIR%%/images/menuarrow.gif
-%%CACTIDIR%%/images/move_down.gif
-%%CACTIDIR%%/images/move_up.gif
-%%CACTIDIR%%/images/reload_icon_small.gif
-%%CACTIDIR%%/images/shadow.gif
-%%CACTIDIR%%/images/shadow_gray.gif
-%%CACTIDIR%%/images/show.gif
-%%CACTIDIR%%/images/tab_cacti.gif
-%%CACTIDIR%%/images/tab_console.gif
-%%CACTIDIR%%/images/tab_graphs.gif
-%%CACTIDIR%%/images/tab_mode_list.gif
-%%CACTIDIR%%/images/tab_mode_list_down.gif
-%%CACTIDIR%%/images/tab_mode_preview.gif
-%%CACTIDIR%%/images/tab_mode_preview_down.gif
-%%CACTIDIR%%/images/tab_mode_tree.gif
-%%CACTIDIR%%/images/tab_mode_tree_down.gif
-%%CACTIDIR%%/images/tab_settings.gif
-%%CACTIDIR%%/images/tab_settings_down.gif
-%%CACTIDIR%%/images/transparent_line.gif
-%%CACTIDIR%%/include/auth.php
-%%CACTIDIR%%/include/bottom_footer.php
-@unexec cmp -s %D/%%CACTIDIR%%/include/config.php.orig %D/%%CACTIDIR%%/include/config.php && rm -f %D/%%CACTIDIR%%/include/config.php || true
-%%CACTIDIR%%/include/config.php.orig
-@exec [ -f %D/%%CACTIDIR%%/include/config.php ] || cp %D/%%CACTIDIR%%/include/config.php.orig %D/%%CACTIDIR%%/include/config.php
-%%CACTIDIR%%/include/config_arrays.php
-%%CACTIDIR%%/include/config_constants.php
-%%CACTIDIR%%/include/config_form.php
-%%CACTIDIR%%/include/config_settings.php
-@unexec cmp -s %D/%%CACTIDIR%%/include/db-settings.php.orig %D/%%CACTIDIR%%/include/db-settings.php && rm -f %D/%%CACTIDIR%%/include/db-settings.php || true
-%%CACTIDIR%%/include/db-settings.php.orig
-@exec [ -f %D/%%CACTIDIR%%/include/db-settings.php ] || cp %D/%%CACTIDIR%%/include/db-settings.php.orig %D/%%CACTIDIR%%/include/db-settings.php
-%%PLUGIN%%%%CACTIDIR%%/include/plugins.php
-%%PLUGIN%%%%CACTIDIR%%/plugins/index.php
-%%CACTIDIR%%/include/html/inc_data_source_filter_table.php
-%%CACTIDIR%%/include/html/inc_data_template_filter_table.php
-%%CACTIDIR%%/include/html/inc_device_filter_table.php
-%%CACTIDIR%%/include/html/inc_graph_filter_table.php
-%%CACTIDIR%%/include/html/inc_graph_items_filter_table.php
-%%CACTIDIR%%/include/html/inc_graph_template_filter_table.php
-%%CACTIDIR%%/include/html/inc_graph_view_filter_table.php
-%%CACTIDIR%%/include/html/inc_poller_item_filter_table.php
-%%CACTIDIR%%/include/html/inc_snmp_cache_filter_table.php
-%%CACTIDIR%%/include/html/inc_timespan_selector.php
-%%CACTIDIR%%/include/html/inc_timespan_settings.php
-%%CACTIDIR%%/include/html/inc_user_log_filter_table.php
-%%CACTIDIR%%/include/html/inc_view_logfile_table.php
-%%CACTIDIR%%/include/jscalendar/calendar-setup.js
-%%CACTIDIR%%/include/jscalendar/calendar.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-af.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-al.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-bg.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-big5-utf8.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-big5.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-br.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-ca.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-cs-utf8.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-cs-win.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-da.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-de.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-du.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-el.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-en.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-es.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-fi.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-fr.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-he-utf8.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-hr-utf8.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-hr.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-hu.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-it.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-jp.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-ko-utf8.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-ko.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-lt-utf8.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-lt.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-lv.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-nl.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-no.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-pl-utf8.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-pl.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-pt.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-ro.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-ru.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-ru_win_.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-si.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-sk.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-sp.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-sv.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-tr.js
-%%CACTIDIR%%/include/jscalendar/lang/calendar-zh.js
-%%CACTIDIR%%/include/jscalendar/lang/cn_utf8.js
-%%CACTIDIR%%/include/layout.js
-%%CACTIDIR%%/include/main.css
-%%CACTIDIR%%/include/top_graph_header.php
-%%CACTIDIR%%/include/top_header.php
-%%CACTIDIR%%/include/treeview/ftiens4.js
-%%CACTIDIR%%/include/treeview/ftiens4_export.js
-%%CACTIDIR%%/include/treeview/ftv2blank.gif
-%%CACTIDIR%%/include/treeview/ftv2lastnode.gif
-%%CACTIDIR%%/include/treeview/ftv2mlastnode.gif
-%%CACTIDIR%%/include/treeview/ftv2mnode.gif
-%%CACTIDIR%%/include/treeview/ftv2node.gif
-%%CACTIDIR%%/include/treeview/ftv2plastnode.gif
-%%CACTIDIR%%/include/treeview/ftv2pnode.gif
-%%CACTIDIR%%/include/treeview/ftv2vertline.gif
-%%CACTIDIR%%/include/treeview/ua.js
-%%CACTIDIR%%/include/zoom.js
-%%CACTIDIR%%/index.php
-%%CACTIDIR%%/install/0_8_1_to_0_8_2.php
-%%CACTIDIR%%/install/0_8_2_to_0_8_2a.php
-%%CACTIDIR%%/install/0_8_2a_to_0_8_3.php
-%%CACTIDIR%%/install/0_8_3_to_0_8_4.php
-%%CACTIDIR%%/install/0_8_4_to_0_8_5.php
-%%CACTIDIR%%/install/0_8_5a_to_0_8_6.php
-%%CACTIDIR%%/install/0_8_6_to_0_8_6a.php
-%%CACTIDIR%%/install/0_8_6c_to_0_8_6d.php
-%%CACTIDIR%%/install/0_8_6d_to_0_8_6e.php
-%%CACTIDIR%%/install/0_8_6f_to_0_8_6g.php
-%%CACTIDIR%%/install/0_8_6g_to_0_8_6h.php
-%%CACTIDIR%%/install/0_8_6h_to_0_8_6i.php
-%%CACTIDIR%%/install/0_8_to_0_8_1.php
-%%CACTIDIR%%/install/index.php
-%%CACTIDIR%%/install/install_finish.gif
-%%CACTIDIR%%/install/install_next.gif
-%%CACTIDIR%%/lib/adodb/adodb-csvlib.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-datadict.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-error.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-errorhandler.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-errorpear.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-exceptions.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-iterator.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-lib.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-pear.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-perf.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-php4.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-time.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-xmlschema.inc.php
-%%CACTIDIR%%/lib/adodb/adodb.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-access.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-db2.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-firebird.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-generic.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-ibase.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-informix.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-mssql.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-mysql.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-oci8.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-postgres.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-sapdb.inc.php
-%%CACTIDIR%%/lib/adodb/datadict/datadict-sybase.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-access.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-ado.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-ado5.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-ado_access.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-ado_mssql.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-borland_ibase.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-csv.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-db2.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-fbsql.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-firebird.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-ibase.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-informix.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-informix72.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-ldap.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-mssql.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-mssqlpo.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-mysql.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-mysqli.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-mysqlt.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-netezza.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-oci8.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-oci805.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-oci8po.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-odbc.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-odbc_mssql.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-odbc_oracle.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-odbtp.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-odbtp_unicode.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-oracle.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-pdo.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-postgres.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-postgres64.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-postgres7.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-proxy.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-sapdb.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-sqlanywhere.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-sqlite.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-sqlitepo.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-sybase.inc.php
-%%CACTIDIR%%/lib/adodb/drivers/adodb-vfp.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-ar.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-bg.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-bgutf8.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-ca.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-cn.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-cz.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-de.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-en.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-es.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-fr.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-hu.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-it.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-nl.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-pl.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-pt-br.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-ro.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-ru1251.inc.php
-%%CACTIDIR%%/lib/adodb/lang/adodb-sv.inc.php
-%%CACTIDIR%%/lib/adodb/license.txt
-%%CACTIDIR%%/lib/adodb/toexport.inc.php
-%%CACTIDIR%%/lib/adodb/tohtml.inc.php
-%%CACTIDIR%%/lib/api_data_source.php
-%%CACTIDIR%%/lib/api_device.php
-%%CACTIDIR%%/lib/api_graph.php
-%%CACTIDIR%%/lib/api_poller.php
-%%CACTIDIR%%/lib/api_tree.php
-%%CACTIDIR%%/lib/auth.php
-%%CACTIDIR%%/lib/cdef.php
-%%CACTIDIR%%/lib/data_query.php
-%%CACTIDIR%%/lib/database.php
-%%CACTIDIR%%/lib/export.php
-%%CACTIDIR%%/lib/functions.php
-%%CACTIDIR%%/lib/graph_export.php
-%%CACTIDIR%%/lib/graph_variables.php
-%%CACTIDIR%%/lib/html.php
-%%CACTIDIR%%/lib/html_form.php
-%%CACTIDIR%%/lib/html_form_template.php
-%%CACTIDIR%%/lib/html_tree.php
-%%CACTIDIR%%/lib/html_utility.php
-%%CACTIDIR%%/lib/html_validate.php
-%%CACTIDIR%%/lib/import.php
-%%CACTIDIR%%/lib/ping.php
-%%CACTIDIR%%/lib/poller.php
-%%CACTIDIR%%/lib/rrd.php
-%%CACTIDIR%%/lib/snmp.php
-%%CACTIDIR%%/lib/sort.php
-%%CACTIDIR%%/lib/template.php
-%%CACTIDIR%%/lib/tree.php
-%%CACTIDIR%%/lib/utility.php
-%%CACTIDIR%%/lib/variables.php
-%%CACTIDIR%%/lib/xml.php
-@unexec [ ! -s %%PREFIX%%/%%CACTIDIR%%/log/cacti.log ] && rm -f %%PREFIX%%/%%CACTIDIR%%/log/cacti.log
-%%CACTIDIR%%/logout.php
-%%CACTIDIR%%/poller.php
-%%CACTIDIR%%/poller_commands.php
-%%CACTIDIR%%/poller_export.php
-%%CACTIDIR%%/poller_reindex_hosts.php
-%%CACTIDIR%%/rebuild_poller_cache.php
-%%CACTIDIR%%/resource/script_queries/host_cpu.xml
-%%CACTIDIR%%/resource/script_queries/host_disk.xml
-%%CACTIDIR%%/resource/script_queries/unix_disk.xml
-%%CACTIDIR%%/resource/script_server/host_cpu.xml
-%%CACTIDIR%%/resource/script_server/host_disk.xml
-%%CACTIDIR%%/resource/snmp_queries/host_disk.xml
-%%CACTIDIR%%/resource/snmp_queries/interface.xml
-%%CACTIDIR%%/resource/snmp_queries/kbridge.xml
-%%CACTIDIR%%/resource/snmp_queries/net-snmp_disk.xml
-%%CACTIDIR%%/resource/snmp_queries/netware_cpu.xml
-%%CACTIDIR%%/resource/snmp_queries/netware_disk.xml
-%%CACTIDIR%%/rra.php
-%%CACTIDIR%%/rra/.placeholder
-%%CACTIDIR%%/script_server.php
-%%CACTIDIR%%/script_server.pl
-%%CACTIDIR%%/scripts/3com_cable_modem.pl
-%%CACTIDIR%%/scripts/diskfree.pl
-%%CACTIDIR%%/scripts/diskfree.sh
-%%CACTIDIR%%/scripts/linux_memory.pl
-%%CACTIDIR%%/scripts/loadavg.pl
-%%CACTIDIR%%/scripts/loadavg_multi.pl
-%%CACTIDIR%%/scripts/ping.pl
-%%CACTIDIR%%/scripts/query_host_cpu.php
-%%CACTIDIR%%/scripts/query_host_partitions.php
-%%CACTIDIR%%/scripts/query_unix_partitions.pl
-%%CACTIDIR%%/scripts/sql.php
-%%CACTIDIR%%/scripts/ss_fping.php
-%%CACTIDIR%%/scripts/ss_host_cpu.php
-%%CACTIDIR%%/scripts/ss_host_disk.php
-%%CACTIDIR%%/scripts/ss_sql.php
-%%CACTIDIR%%/scripts/unix_processes.pl
-%%CACTIDIR%%/scripts/unix_tcp_connections.pl
-%%CACTIDIR%%/scripts/unix_users.pl
-%%CACTIDIR%%/scripts/weatherbug.pl
-%%CACTIDIR%%/scripts/webhits.pl
-%%CACTIDIR%%/settings.php
-%%CACTIDIR%%/templates_export.php
-%%CACTIDIR%%/templates_import.php
-%%CACTIDIR%%/tree.php
-%%CACTIDIR%%/user_admin.php
-%%CACTIDIR%%/utilities.php
-@dirrm %%CACTIDIR%%/scripts
-@dirrmtry %%CACTIDIR%%/rra
-@dirrm %%CACTIDIR%%/resource/snmp_queries
-@dirrm %%CACTIDIR%%/resource/script_server
-@dirrm %%CACTIDIR%%/resource/script_queries
-@dirrm %%CACTIDIR%%/resource
-@dirrmtry %%CACTIDIR%%/log
-@dirrm %%CACTIDIR%%/lib/adodb/lang
-@dirrm %%CACTIDIR%%/lib/adodb/drivers
-@dirrm %%CACTIDIR%%/lib/adodb/datadict
-@dirrm %%CACTIDIR%%/lib/adodb
-@dirrm %%CACTIDIR%%/lib
-@dirrm %%CACTIDIR%%/install
-@dirrm %%CACTIDIR%%/include/treeview
-@dirrm %%CACTIDIR%%/include/jscalendar/lang
-@dirrm %%CACTIDIR%%/include/jscalendar
-@dirrm %%CACTIDIR%%/include/html
-@dirrmtry %%CACTIDIR%%/include
-%%PLUGIN%%@dirrmtry %%CACTIDIR%%/plugins
-@dirrm %%CACTIDIR%%/images
-@dirrm %%CACTIDIR%%/docs/text
-@dirrm %%CACTIDIR%%/docs/pdf
-@dirrm %%CACTIDIR%%/docs/html/images
-@dirrm %%CACTIDIR%%/docs/html
-@dirrm %%CACTIDIR%%/docs
-@dirrmtry %%CACTIDIR%%