6 files changed, 20 insertions, 76 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 628c02c06b72..4a502919d85c 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cacti
-PORTVERSION=	0.8.6f
-PORTREVISION=	11
+PORTVERSION=	0.8.6g
+PORTREVISION=	0
 CATEGORIES=	net www
 MASTER_SITES=	http://www.cacti.net/downloads/
 
@@ -16,17 +16,7 @@ COMMENT=	Web-driven graphing interface for RRDTool
 
 # Vendor's patches
 PATCH_SITES=	http://www.cacti.net/downloads/patches/${PORTVERSION}/
-PATCHFILES=	html_mouseover_title.patch \
-		multi_field_output_script_server.patch \
-		old_net_snmp_command_options.patch \
-		poller_invalid_data_sources.patch \
-		script_server_buffer_size.patch \
-		unix_syslog_compatibility.patch \
-		graph_view_preview_mode_filter.patch \
-		poller_reindex_cache_orphans.patch \
-		safari_zoom.patch \
-		ldap_copy_user_problem.patch \
-		script_server_file_header.patch
+PATCHFILES=	
 
 PATCH_DIST_STRIP=-p1
 
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index 54260533878e..bd3df89eddb0 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,24 +1,2 @@
-MD5 (cacti-0.8.6f.tar.gz) = 032b8b22225f137e2a2294e89a2af2ec
-SIZE (cacti-0.8.6f.tar.gz) = 1062562
-MD5 (html_mouseover_title.patch) = 2354e383adff58725077e95ba8584dba
-SIZE (html_mouseover_title.patch) = 2757
-MD5 (multi_field_output_script_server.patch) = c1b8c9d36ff5f4b11f27af8240b6ed42
-SIZE (multi_field_output_script_server.patch) = 2407
-MD5 (old_net_snmp_command_options.patch) = 75f7f8c59591663dd63f91830fcdb1f1
-SIZE (old_net_snmp_command_options.patch) = 1124
-MD5 (poller_invalid_data_sources.patch) = 5bdd1c9e4ef4479fafe73ce32e1f43b8
-SIZE (poller_invalid_data_sources.patch) = 4752
-MD5 (script_server_buffer_size.patch) = 5711e9d5f90397ac8f26c7af55d49d12
-SIZE (script_server_buffer_size.patch) = 1541
-MD5 (unix_syslog_compatibility.patch) = 55c1b16ebe40ea017db8d905de763ce8
-SIZE (unix_syslog_compatibility.patch) = 703
-MD5 (graph_view_preview_mode_filter.patch) = 88a34475132b77112910738a3139c01d
-SIZE (graph_view_preview_mode_filter.patch) = 448
-MD5 (poller_reindex_cache_orphans.patch) = 2afd2acbd1e1b0bf4809996976620c0a
-SIZE (poller_reindex_cache_orphans.patch) = 1054
-MD5 (safari_zoom.patch) = fc5579772103ed98557661866b632997
-SIZE (safari_zoom.patch) = 1274
-MD5 (ldap_copy_user_problem.patch) = fe7d23776d828941fc56f72797903f3e
-SIZE (ldap_copy_user_problem.patch) = 2213
-MD5 (script_server_file_header.patch) = 8598d1419ab589704a79986dd184756c
-SIZE (script_server_file_header.patch) = 264
+MD5 (cacti-0.8.6g.tar.gz) = b3cf31349d2db47d14dcf347b8422bc2
+SIZE (cacti-0.8.6g.tar.gz) = 1076607
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index ee88c5da4def..8d2e27ff7c1a 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -182,6 +182,7 @@
 %%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
@@ -202,6 +203,7 @@
 %%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_to_0_8_1.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/install_finish.gif
@@ -330,6 +332,8 @@
 %%CACTIDIR%%/log/cacti.log
 %%CACTIDIR%%/logout.php
 %%CACTIDIR%%/poller.php
+%%CACTIDIR%%/poller_commands.php
+%%CACTIDIR%%/poller_export.php
 %%CACTIDIR%%/resource/script_queries/host_cpu.xml
 %%CACTIDIR%%/resource/script_queries/host_disk.xml
 %%CACTIDIR%%/resource/script_queries/unix_disk.xml
@@ -356,6 +360,7 @@
 %%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
@@ -387,7 +392,6 @@
 @dirrm %%CACTIDIR%%/include/jscalendar/lang
 @dirrm %%CACTIDIR%%/include/jscalendar
 @dirrm %%CACTIDIR%%/include/html
-@dirrm %%CACTIDIR%%/include/gettext
 @dirrm %%CACTIDIR%%/include
 @dirrm %%CACTIDIR%%/images
 @dirrm %%CACTIDIR%%/docs/text
diff --git a/net/cacti/Makefile b/net/cacti/Makefile
index 628c02c06b72..4a502919d85c 100644
--- a/net/cacti/Makefile
+++ b/net/cacti/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cacti
-PORTVERSION=	0.8.6f
-PORTREVISION=	11
+PORTVERSION=	0.8.6g
+PORTREVISION=	0
 CATEGORIES=	net www
 MASTER_SITES=	http://www.cacti.net/downloads/
 
@@ -16,17 +16,7 @@ COMMENT=	Web-driven graphing interface for RRDTool
 
 # Vendor's patches
 PATCH_SITES=	http://www.cacti.net/downloads/patches/${PORTVERSION}/
-PATCHFILES=	html_mouseover_title.patch \
-		multi_field_output_script_server.patch \
-		old_net_snmp_command_options.patch \
-		poller_invalid_data_sources.patch \
-		script_server_buffer_size.patch \
-		unix_syslog_compatibility.patch \
-		graph_view_preview_mode_filter.patch \
-		poller_reindex_cache_orphans.patch \
-		safari_zoom.patch \
-		ldap_copy_user_problem.patch \
-		script_server_file_header.patch
+PATCHFILES=	
 
 PATCH_DIST_STRIP=-p1
 
diff --git a/net/cacti/distinfo b/net/cacti/distinfo
index 54260533878e..bd3df89eddb0 100644
--- a/net/cacti/distinfo
+++ b/net/cacti/distinfo
@@ -1,24 +1,2 @@
-MD5 (cacti-0.8.6f.tar.gz) = 032b8b22225f137e2a2294e89a2af2ec
-SIZE (cacti-0.8.6f.tar.gz) = 1062562
-MD5 (html_mouseover_title.patch) = 2354e383adff58725077e95ba8584dba
-SIZE (html_mouseover_title.patch) = 2757
-MD5 (multi_field_output_script_server.patch) = c1b8c9d36ff5f4b11f27af8240b6ed42
-SIZE (multi_field_output_script_server.patch) = 2407
-MD5 (old_net_snmp_command_options.patch) = 75f7f8c59591663dd63f91830fcdb1f1
-SIZE (old_net_snmp_command_options.patch) = 1124
-MD5 (poller_invalid_data_sources.patch) = 5bdd1c9e4ef4479fafe73ce32e1f43b8
-SIZE (poller_invalid_data_sources.patch) = 4752
-MD5 (script_server_buffer_size.patch) = 5711e9d5f90397ac8f26c7af55d49d12
-SIZE (script_server_buffer_size.patch) = 1541
-MD5 (unix_syslog_compatibility.patch) = 55c1b16ebe40ea017db8d905de763ce8
-SIZE (unix_syslog_compatibility.patch) = 703
-MD5 (graph_view_preview_mode_filter.patch) = 88a34475132b77112910738a3139c01d
-SIZE (graph_view_preview_mode_filter.patch) = 448
-MD5 (poller_reindex_cache_orphans.patch) = 2afd2acbd1e1b0bf4809996976620c0a
-SIZE (poller_reindex_cache_orphans.patch) = 1054
-MD5 (safari_zoom.patch) = fc5579772103ed98557661866b632997
-SIZE (safari_zoom.patch) = 1274
-MD5 (ldap_copy_user_problem.patch) = fe7d23776d828941fc56f72797903f3e
-SIZE (ldap_copy_user_problem.patch) = 2213
-MD5 (script_server_file_header.patch) = 8598d1419ab589704a79986dd184756c
-SIZE (script_server_file_header.patch) = 264
+MD5 (cacti-0.8.6g.tar.gz) = b3cf31349d2db47d14dcf347b8422bc2
+SIZE (cacti-0.8.6g.tar.gz) = 1076607
diff --git a/net/cacti/pkg-plist b/net/cacti/pkg-plist
index ee88c5da4def..8d2e27ff7c1a 100644
--- a/net/cacti/pkg-plist
+++ b/net/cacti/pkg-plist
@@ -182,6 +182,7 @@
 %%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
@@ -202,6 +203,7 @@
 %%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_to_0_8_1.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/install_finish.gif
@@ -330,6 +332,8 @@
 %%CACTIDIR%%/log/cacti.log
 %%CACTIDIR%%/logout.php
 %%CACTIDIR%%/poller.php
+%%CACTIDIR%%/poller_commands.php
+%%CACTIDIR%%/poller_export.php
 %%CACTIDIR%%/resource/script_queries/host_cpu.xml
 %%CACTIDIR%%/resource/script_queries/host_disk.xml
 %%CACTIDIR%%/resource/script_queries/unix_disk.xml
@@ -356,6 +360,7 @@
 %%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
@@ -387,7 +392,6 @@
 @dirrm %%CACTIDIR%%/include/jscalendar/lang
 @dirrm %%CACTIDIR%%/include/jscalendar
 @dirrm %%CACTIDIR%%/include/html
-@dirrm %%CACTIDIR%%/include/gettext
 @dirrm %%CACTIDIR%%/include
 @dirrm %%CACTIDIR%%/images
 @dirrm %%CACTIDIR%%/docs/text