- Update to 0.8.7a.

  Please note, the version has some issues that require you do some actions
  after update. Read UPDATING file for details.

6 files changed, 112 insertions, 117 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 4fb901a99bbd..99de0d5e25a8 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	cacti
-PORTVERSION=	0.8.6j${PATCHLEVEL}
-PORTREVISION=	2
+PORTVERSION=	0.8.7a${PATCHLEVEL}
 CATEGORIES=	net-mgmt 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 \
-		sec_sql_injection-0.8.6j.patch
+PATCHFILES=
+
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	sem@FreeBSD.org
@@ -25,7 +22,7 @@ COMMENT=	Web-driven graphing interface for RRDTool
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 
-PATCHLEVEL=	.4
+#PATCHLEVEL=	.0
 PATCH_STRIP=	-p1
 USE_MYSQL=	yes
 USE_PHP=	mysql pcre session sockets snmp xml
@@ -40,34 +37,23 @@ 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}
+	@${ECHO_CMD} "*************************************************************"
+	@${ECHO_CMD} "WARNING! Plugin support is dropped!"
+	@${ECHO_CMD} "Remove ${PORT_DBDIR}/${PORTNAME}/options file and try again"
+	@${ECHO_CMD} "*************************************************************"
+	@exit 1
 .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:
@@ -76,17 +62,19 @@ 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 \
+	if [ ! -f ${PREFIX}/${CACTIDIR}/include/config.php ]; then \
 		${CP} ${PREFIX}/${CACTIDIR}/include/config.php.orig \
 			${PREFIX}/${CACTIDIR}/include/config.php; \
+	fi; \
+	if [ -f ${PREFIX}/${CACTIDIR}/include/db-settings.php ]; then \
+		${ECHO_CMD} "======================================================================="; \
+		${ECHO_CMD} "WARNING! You have to move DB settings from"; \
+		${ECHO_CMD} "${PREFIX}/${CACTIDIR}/include/db-settings.php file to"; \
+		${ECHO_CMD} "${PREFIX}/${CACTIDIR}/include/config.php and remove db-settings.php"; \
 	fi
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index 17d0ba7e322d..f9c2edec3351 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,18 +1,6 @@
-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-0.8.7a.tar.gz) = 7d298e496058ec91f6d1ecdc97e0cca5
+SHA256 (cacti-0.8.7a.tar.gz) = 5e75b0058bb6dc755221f540845699fb383a18f8f3011f0f81bf321db09bf623
+SIZE (cacti-0.8.7a.tar.gz) = 2002270
 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
-MD5 (sec_sql_injection-0.8.6j.patch) = ebf8ce0e11845ebcd838847e7cc2912d
-SHA256 (sec_sql_injection-0.8.6j.patch) = 0f05946e598ce34b9507b8eeaa431c45280c2f6e07003cf583a11735fc01d245
-SIZE (sec_sql_injection-0.8.6j.patch) = 749
diff --git a/net-mgmt/cacti/files/patch-include-config.php b/net-mgmt/cacti/files/patch-include-config.php
deleted file mode 100644
index 5f76ecbdd9f2..000000000000
--- a/net-mgmt/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-mgmt/cacti/files/patch-include-db-settings.php b/net-mgmt/cacti/files/patch-include-db-settings.php
deleted file mode 100644
index 2d251cdba5d0..000000000000
--- a/net-mgmt/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-mgmt/cacti/files/pkg-message.in b/net-mgmt/cacti/files/pkg-message.in
index 66f17da4b148..6f3ff63034e6 100644
--- a/net-mgmt/cacti/files/pkg-message.in
+++ b/net-mgmt/cacti/files/pkg-message.in
@@ -9,7 +9,7 @@ you may have to follow this steps to make it work correctly:
 # 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.
+4. Edit %%PREFIX%%/%%CACTIDIR%%/include/config.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:
@@ -19,17 +19,4 @@ Alias /cacti "%%PREFIX%%/%%CACTIDIR%%/"
 
 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-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index 46c4c1fb88a1..ce45212fb865 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -5,9 +5,18 @@
 %%CACTIDIR%%/auth_login.php
 %%CACTIDIR%%/cacti.sql
 %%CACTIDIR%%/cdef.php
+%%CACTIDIR%%/cli/.htaccess
+%%CACTIDIR%%/cli/add_device.php
+%%CACTIDIR%%/cli/add_graphs.php
+%%CACTIDIR%%/cli/add_perms.php
+%%CACTIDIR%%/cli/add_tree.php
+%%CACTIDIR%%/cli/copy_user.php
+%%CACTIDIR%%/cli/poller_graphs_reapply_names.php
+%%CACTIDIR%%/cli/poller_output_empty.php
+%%CACTIDIR%%/cli/poller_reindex_hosts.php
+%%CACTIDIR%%/cli/rebuild_poller_cache.php
 %%CACTIDIR%%/cmd.php
 %%CACTIDIR%%/color.php
-%%CACTIDIR%%/copy_cacti_user.php
 %%CACTIDIR%%/data_input.php
 %%CACTIDIR%%/data_queries.php
 %%CACTIDIR%%/data_sources.php
@@ -21,26 +30,67 @@
 %%CACTIDIR%%/docs/html/LICENSE.html
 %%CACTIDIR%%/docs/html/advanced_topics.html
 %%CACTIDIR%%/docs/html/basics.html
+%%CACTIDIR%%/docs/html/batch_copy_users.html
+%%CACTIDIR%%/docs/html/bsd_ports.html
+%%CACTIDIR%%/docs/html/cacti_help.html
 %%CACTIDIR%%/docs/html/cdefs.html
+%%CACTIDIR%%/docs/html/check_cacti_poller.html
+%%CACTIDIR%%/docs/html/check_data_gathering.html
+%%CACTIDIR%%/docs/html/check_mysql_updating.html
+%%CACTIDIR%%/docs/html/check_rrd_graph.html
+%%CACTIDIR%%/docs/html/check_rrd_numbers.html
+%%CACTIDIR%%/docs/html/check_rrd_owner.html
+%%CACTIDIR%%/docs/html/check_rrd_updating.html
+%%CACTIDIR%%/docs/html/check_zero_values.html
+%%CACTIDIR%%/docs/html/cli_add_device.html
+%%CACTIDIR%%/docs/html/cli_add_graphs.html
+%%CACTIDIR%%/docs/html/cli_add_perms.html
+%%CACTIDIR%%/docs/html/cli_add_tree.html
+%%CACTIDIR%%/docs/html/cli_copy_user.html
+%%CACTIDIR%%/docs/html/cli_poller_graphs_reapply_names.html
+%%CACTIDIR%%/docs/html/cli_poller_output_empty.html
+%%CACTIDIR%%/docs/html/cli_poller_reindex_hosts.html
+%%CACTIDIR%%/docs/html/copying_user.html
+%%CACTIDIR%%/docs/html/create_new_user.html
 %%CACTIDIR%%/docs/html/data_input_methods.html
+%%CACTIDIR%%/docs/html/data_presentation.html
 %%CACTIDIR%%/docs/html/data_queries.html
-%%CACTIDIR%%/docs/html/data_templates.html
+%%CACTIDIR%%/docs/html/data_storage.html
+%%CACTIDIR%%/docs/html/debug_miscellaneous.html
+%%CACTIDIR%%/docs/html/debug_rpm_installation.html
+%%CACTIDIR%%/docs/html/debugging.html
+%%CACTIDIR%%/docs/html/delete_users.html
+%%CACTIDIR%%/docs/html/enable_disable_users.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_snmp_oid.html
+%%CACTIDIR%%/docs/html/graph_templates.html
 %%CACTIDIR%%/docs/html/graph_viewing.html
+%%CACTIDIR%%/docs/html/guest_access.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/export_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/import_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/images/principles_of_operation.png
+%%CACTIDIR%%/docs/html/images/user_management_batch_copy_1.png
+%%CACTIDIR%%/docs/html/images/user_management_batch_copy_2.png
+%%CACTIDIR%%/docs/html/images/user_management_copy_1.png
+%%CACTIDIR%%/docs/html/images/user_management_copy_2.png
+%%CACTIDIR%%/docs/html/images/user_management_delete_1.png
+%%CACTIDIR%%/docs/html/images/user_management_delete_2.png
+%%CACTIDIR%%/docs/html/images/user_management_edit.png
+%%CACTIDIR%%/docs/html/images/user_management_enable_disable_1.png
+%%CACTIDIR%%/docs/html/images/user_management_enable_disable_2.png
+%%CACTIDIR%%/docs/html/images/user_management_list.png
+%%CACTIDIR%%/docs/html/images/user_management_new.png
 %%CACTIDIR%%/docs/html/index.html
 %%CACTIDIR%%/docs/html/install_unix.html
 %%CACTIDIR%%/docs/html/install_windows.html
@@ -49,22 +99,29 @@
 %%CACTIDIR%%/docs/html/manual.css
 %%CACTIDIR%%/docs/html/migration_php_scripts_to_script_server.html
 %%CACTIDIR%%/docs/html/new_graphs.html
+%%CACTIDIR%%/docs/html/operating_principles.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/scripts.html
 %%CACTIDIR%%/docs/html/snmp_query_xml.html
+%%CACTIDIR%%/docs/html/template_export.html
+%%CACTIDIR%%/docs/html/template_import.html
 %%CACTIDIR%%/docs/html/templates.html
 %%CACTIDIR%%/docs/html/testing_script_in_script_server.html
+%%CACTIDIR%%/docs/html/unix_apply_patches.html
+%%CACTIDIR%%/docs/html/unix_configure_cacti.html
+%%CACTIDIR%%/docs/html/unix_configure_httpd.html
+%%CACTIDIR%%/docs/html/unix_configure_mysql.html
+%%CACTIDIR%%/docs/html/unix_configure_php.html
+%%CACTIDIR%%/docs/html/unix_configure_spine.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/using_spine.html
 %%CACTIDIR%%/docs/html/variables.html
-%%CACTIDIR%%/docs/pdf/README
 %%CACTIDIR%%/docs/text/manual.txt
 %%CACTIDIR%%/gprint_presets.php
 %%CACTIDIR%%/graph.php
@@ -74,6 +131,7 @@
 %%CACTIDIR%%/graph_templates_inputs.php
 %%CACTIDIR%%/graph_templates_items.php
 %%CACTIDIR%%/graph_view.php
+%%CACTIDIR%%/graph_xport.php
 %%CACTIDIR%%/graphs.php
 %%CACTIDIR%%/graphs_items.php
 %%CACTIDIR%%/graphs_new.php
@@ -82,6 +140,7 @@
 %%CACTIDIR%%/images/arrow.gif
 %%CACTIDIR%%/images/auth_deny.gif
 %%CACTIDIR%%/images/auth_login.gif
+%%CACTIDIR%%/images/auth_logout.gif
 %%CACTIDIR%%/images/button_add.gif
 %%CACTIDIR%%/images/button_cancel.gif
 %%CACTIDIR%%/images/button_cancel2.gif
@@ -108,13 +167,18 @@
 %%CACTIDIR%%/images/calendar.gif
 %%CACTIDIR%%/images/delete_icon.gif
 %%CACTIDIR%%/images/delete_icon_large.gif
+%%CACTIDIR%%/images/favicon.ico
+%%CACTIDIR%%/images/graph_page_top.gif
 %%CACTIDIR%%/images/graph_properties.gif
+%%CACTIDIR%%/images/graph_query.png
 %%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_left.gif
+%%CACTIDIR%%/images/move_right.gif
 %%CACTIDIR%%/images/move_up.gif
 %%CACTIDIR%%/images/reload_icon_small.gif
 %%CACTIDIR%%/images/shadow.gif
@@ -122,7 +186,9 @@
 %%CACTIDIR%%/images/show.gif
 %%CACTIDIR%%/images/tab_cacti.gif
 %%CACTIDIR%%/images/tab_console.gif
+%%CACTIDIR%%/images/tab_console_down.gif
 %%CACTIDIR%%/images/tab_graphs.gif
+%%CACTIDIR%%/images/tab_graphs_down.gif
 %%CACTIDIR%%/images/tab_mode_list.gif
 %%CACTIDIR%%/images/tab_mode_list_down.gif
 %%CACTIDIR%%/images/tab_mode_preview.gif
@@ -137,26 +203,26 @@
 @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/global_form.php
+%%CACTIDIR%%/include/global.php
+%%CACTIDIR%%/include/global_arrays.php
+%%CACTIDIR%%/include/global_settings.php
+%%CACTIDIR%%/include/global_constants.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_dq_view_filter_table.php
+%%CACTIDIR%%/include/html/inc_dt_view_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_host_template_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_admin_filter_table.php
 %%CACTIDIR%%/include/html/inc_user_log_filter_table.php
 %%CACTIDIR%%/include/html/inc_view_logfile_table.php
 %%CACTIDIR%%/include/jscalendar/calendar-setup.js
@@ -233,6 +299,8 @@
 %%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_6j_to_0_8_7.php
+%%CACTIDIR%%/install/0_8_7_to_0_8_7a.php
 %%CACTIDIR%%/install/0_8_to_0_8_1.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/install_finish.gif
@@ -324,6 +392,7 @@
 %%CACTIDIR%%/lib/adodb/license.txt
 %%CACTIDIR%%/lib/adodb/toexport.inc.php
 %%CACTIDIR%%/lib/adodb/tohtml.inc.php
+%%CACTIDIR%%/lib/api_automation_tools.php
 %%CACTIDIR%%/lib/api_data_source.php
 %%CACTIDIR%%/lib/api_device.php
 %%CACTIDIR%%/lib/api_graph.php
@@ -344,23 +413,24 @@
 %%CACTIDIR%%/lib/html_utility.php
 %%CACTIDIR%%/lib/html_validate.php
 %%CACTIDIR%%/lib/import.php
+%%CACTIDIR%%/lib/ldap.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/time.php
 %%CACTIDIR%%/lib/tree.php
 %%CACTIDIR%%/lib/utility.php
 %%CACTIDIR%%/lib/variables.php
 %%CACTIDIR%%/lib/xml.php
+%%CACTIDIR%%/log/.htaccess
 @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
@@ -420,11 +490,10 @@
 @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
+@dirrm %%CACTIDIR%%/cli
 @dirrmtry %%CACTIDIR%%