- Update to 0.8.7d

4 files changed, 30 insertions, 38 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index f04f98d5e90e..d70f4ea532bd 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	cacti
-PORTVERSION=	0.8.7b${PATCHLEVEL}
-PORTREVISION=	2
+PORTVERSION=	0.8.7d${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=	snmp_auth_none_notice.patch reset_each_patch.patch
+PATCHFILES=
 
 PATCH_DIST_STRIP=	-p1
 
@@ -23,7 +22,7 @@ COMMENT=	Web-driven graphing interface for RRDTool
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 
-PATCHLEVEL=	.2
+PATCHLEVEL=
 PATCH_STRIP=	-p1
 USE_MYSQL=	yes
 USE_PHP=	mysql pcre session sockets snmp xml
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index a17b4b501e3e..767df08bbe6a 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,9 +1,3 @@
-MD5 (cacti-0.8.7b.tar.gz) = 63ffca5735b60bc33c68bc880f0e8042
-SHA256 (cacti-0.8.7b.tar.gz) = f248e858879868d7bba2d53c459a3d61f0a9c19ee4843e3983cfe7a9d7fcaef9
-SIZE (cacti-0.8.7b.tar.gz) = 2005650
-MD5 (snmp_auth_none_notice.patch) = 696606f4b6e32067e230c640002c5875
-SHA256 (snmp_auth_none_notice.patch) = 03d8d7a38c343b346a0ca76005e79d5b939cff4144da853cbd4b6199f3786fb9
-SIZE (snmp_auth_none_notice.patch) = 527
-MD5 (reset_each_patch.patch) = b11131800e961416fe0dc9416176156d
-SHA256 (reset_each_patch.patch) = b42d70a33a91794fd1f253ad103999138f31d59fe75e91cef7eb27549aa53d7f
-SIZE (reset_each_patch.patch) = 1291
+MD5 (cacti-0.8.7d.tar.gz) = 0822068bfa547278e94d3143ef9279e0
+SHA256 (cacti-0.8.7d.tar.gz) = a8ae8b9e50658b4e46b9f60c1373e4cc3f4cc9d72266ce09540e14d71ee57e8e
+SIZE (cacti-0.8.7d.tar.gz) = 2221142
diff --git a/net-mgmt/cacti/files/patch-scripts-ping.pl b/net-mgmt/cacti/files/patch-scripts-ping.pl
index b39c35082f9a..f1a257f64976 100644
--- a/net-mgmt/cacti/files/patch-scripts-ping.pl
+++ b/net-mgmt/cacti/files/patch-scripts-ping.pl
@@ -1,10 +1,11 @@
---- 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 
+--- cacti-0.8.7d/scripts/ping.pl.orig	2009-02-12 05:55:50.000000000 +0300
++++ cacti-0.8.7d/scripts/ping.pl	2009-02-16 17:01:59.000000000 +0300
+@@ -4,7 +4,7 @@
+ $host = $ARGV[0];
+ $host =~ s/tcp:/$1/gis;
  
--open(PROCESS, "ping -c 1 $ARGV[0] | grep icmp_seq |");
-+open(PROCESS, "/sbin/ping -c 1 $ARGV[0] | grep icmp_seq |");
+-open(PROCESS, "ping -c 1 $host | grep icmp_seq | grep time |");
++open(PROCESS, "/sbin/ping -c 1 $host | grep icmp_seq | grep time |");
  $ping = <PROCESS>;
  close(PROCESS);
- $ping =~ m/(.*time=)(.*) (ms|usec)/; 
+ $ping =~ m/(.*time=)(.*) (ms|usec)/;
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index d8371ed2e1f1..3bcef3514914 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -6,16 +6,22 @@
 %%CACTIDIR%%/cacti.sql
 %%CACTIDIR%%/cdef.php
 %%CACTIDIR%%/cli/.htaccess
+%%CACTIDIR%%/cli/add_data_query.php
 %%CACTIDIR%%/cli/add_device.php
+%%CACTIDIR%%/cli/add_graph_template.php
 %%CACTIDIR%%/cli/add_graphs.php
 %%CACTIDIR%%/cli/add_perms.php
 %%CACTIDIR%%/cli/add_tree.php
 %%CACTIDIR%%/cli/copy_user.php
+%%CACTIDIR%%/cli/host_update_template.php
+%%CACTIDIR%%/cli/poller_data_sources_reapply_names.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%%/cli/repair_database.php
+%%CACTIDIR%%/cli/structure_rra_paths.php
+%%CACTIDIR%%/cli/upgrade_database.php
 %%CACTIDIR%%/cmd.php
 %%CACTIDIR%%/color.php
 %%CACTIDIR%%/data_input.php
@@ -43,7 +49,9 @@
 %%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_data_query.html
 %%CACTIDIR%%/docs/html/cli_add_device.html
+%%CACTIDIR%%/docs/html/cli_add_graph_template.html
 %%CACTIDIR%%/docs/html/cli_add_graphs.html
 %%CACTIDIR%%/docs/html/cli_add_perms.html
 %%CACTIDIR%%/docs/html/cli_add_tree.html
@@ -72,6 +80,9 @@
 %%CACTIDIR%%/docs/html/host_templates.html
 %%CACTIDIR%%/docs/html/host_variables.html
 %%CACTIDIR%%/docs/html/how_to.html
+%%CACTIDIR%%/docs/html/images/data_source_title_example1.png
+%%CACTIDIR%%/docs/html/images/data_source_title_example2.png
+%%CACTIDIR%%/docs/html/images/data_source_title_template.png
 %%CACTIDIR%%/docs/html/images/data_template.png
 %%CACTIDIR%%/docs/html/images/export_template.png
 %%CACTIDIR%%/docs/html/images/graph_template.png
@@ -123,6 +134,7 @@
 %%CACTIDIR%%/docs/html/user_management.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
@@ -209,23 +221,6 @@
 %%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
 %%CACTIDIR%%/include/jscalendar/calendar.js
 %%CACTIDIR%%/include/jscalendar/lang/calendar-af.js
@@ -303,6 +298,8 @@
 %%CACTIDIR%%/install/0_8_6j_to_0_8_7.php
 %%CACTIDIR%%/install/0_8_7_to_0_8_7a.php
 %%CACTIDIR%%/install/0_8_7a_to_0_8_7b.php
+%%CACTIDIR%%/install/0_8_7b_to_0_8_7c.php
+%%CACTIDIR%%/install/0_8_7c_to_0_8_7d.php
 %%CACTIDIR%%/install/0_8_to_0_8_1.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/install_finish.gif
@@ -423,6 +420,7 @@
 %%CACTIDIR%%/lib/sort.php
 %%CACTIDIR%%/lib/template.php
 %%CACTIDIR%%/lib/time.php
+%%CACTIDIR%%/lib/timespan_settings.php
 %%CACTIDIR%%/lib/tree.php
 %%CACTIDIR%%/lib/utility.php
 %%CACTIDIR%%/lib/variables.php
@@ -490,10 +488,10 @@
 @dirrm %%CACTIDIR%%/include/treeview
 @dirrm %%CACTIDIR%%/include/jscalendar/lang
 @dirrm %%CACTIDIR%%/include/jscalendar
-@dirrm %%CACTIDIR%%/include/html
 @dirrmtry %%CACTIDIR%%/include
 @dirrm %%CACTIDIR%%/images
 @dirrm %%CACTIDIR%%/docs/text
+@dirrm %%CACTIDIR%%/docs/pdf
 @dirrm %%CACTIDIR%%/docs/html/images
 @dirrm %%CACTIDIR%%/docs/html
 @dirrm %%CACTIDIR%%/docs