- Update to 0.8.6e

6 files changed, 18 insertions, 28 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index ccde1624758a..d8d1d2f06dc9 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cacti
-PORTVERSION=	0.8.6d
-PORTREVISION=	1
+PORTVERSION=	0.8.6e
 CATEGORIES=	net www
 MASTER_SITES=	http://www.cacti.net/downloads/
 
@@ -15,10 +14,8 @@ MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Web-driven graphing interface for RRDTool
 
 # Vendor's patches
-PATCH_SITES=	http://www.cacti.net/downloads/patches/${PORTVERSION}/
-PATCHFILES=	auto_recache_empty_output.patch \
-		poller_output_order_by.patch \
-		rrdtool12_additional_features.patch
+#PATCH_SITES=	http://www.cacti.net/downloads/patches/${PORTVERSION}/
+#PATCHFILES=
 
 PATCH_DIST_STRIP=-p1
 
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index 74ed6411cf24..9e3136644933 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,8 +1,2 @@
-MD5 (cacti-0.8.6d.tar.gz) = f149a874dd06b639a5b6b78cf994b4cb
-SIZE (cacti-0.8.6d.tar.gz) = 1037551
-MD5 (auto_recache_empty_output.patch) = 166b5bb99b722b2c04cb50e5b1af1f23
-SIZE (auto_recache_empty_output.patch) = 2500
-MD5 (poller_output_order_by.patch) = bb59937bfcdef930ef20b5191a1d94e3
-SIZE (poller_output_order_by.patch) = 590
-MD5 (rrdtool12_additional_features.patch) = d7f879664d714fdc737da736b164bb2f
-SIZE (rrdtool12_additional_features.patch) = 6527
+MD5 (cacti-0.8.6e.tar.gz) = be02abac3bb65c9fec089d9e0bbf684d
+SIZE (cacti-0.8.6e.tar.gz) = 1061986
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index 3ce0ab2fc292..e978a042c74d 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -136,6 +136,7 @@
 %%CACTIDIR%%/include/html/inc_data_source_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_view_filter_table.php
 %%CACTIDIR%%/include/html/inc_timespan_selector.php
 %%CACTIDIR%%/include/html/inc_timespan_settings.php
@@ -199,6 +200,7 @@
 %%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_to_0_8_1.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/install_finish.gif
@@ -312,6 +314,7 @@
 %%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
@@ -383,6 +386,7 @@
 @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 ccde1624758a..d8d1d2f06dc9 100644
--- a/net/cacti/Makefile
+++ b/net/cacti/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cacti
-PORTVERSION=	0.8.6d
-PORTREVISION=	1
+PORTVERSION=	0.8.6e
 CATEGORIES=	net www
 MASTER_SITES=	http://www.cacti.net/downloads/
 
@@ -15,10 +14,8 @@ MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Web-driven graphing interface for RRDTool
 
 # Vendor's patches
-PATCH_SITES=	http://www.cacti.net/downloads/patches/${PORTVERSION}/
-PATCHFILES=	auto_recache_empty_output.patch \
-		poller_output_order_by.patch \
-		rrdtool12_additional_features.patch
+#PATCH_SITES=	http://www.cacti.net/downloads/patches/${PORTVERSION}/
+#PATCHFILES=
 
 PATCH_DIST_STRIP=-p1
 
diff --git a/net/cacti/distinfo b/net/cacti/distinfo
index 74ed6411cf24..9e3136644933 100644
--- a/net/cacti/distinfo
+++ b/net/cacti/distinfo
@@ -1,8 +1,2 @@
-MD5 (cacti-0.8.6d.tar.gz) = f149a874dd06b639a5b6b78cf994b4cb
-SIZE (cacti-0.8.6d.tar.gz) = 1037551
-MD5 (auto_recache_empty_output.patch) = 166b5bb99b722b2c04cb50e5b1af1f23
-SIZE (auto_recache_empty_output.patch) = 2500
-MD5 (poller_output_order_by.patch) = bb59937bfcdef930ef20b5191a1d94e3
-SIZE (poller_output_order_by.patch) = 590
-MD5 (rrdtool12_additional_features.patch) = d7f879664d714fdc737da736b164bb2f
-SIZE (rrdtool12_additional_features.patch) = 6527
+MD5 (cacti-0.8.6e.tar.gz) = be02abac3bb65c9fec089d9e0bbf684d
+SIZE (cacti-0.8.6e.tar.gz) = 1061986
diff --git a/net/cacti/pkg-plist b/net/cacti/pkg-plist
index 3ce0ab2fc292..e978a042c74d 100644
--- a/net/cacti/pkg-plist
+++ b/net/cacti/pkg-plist
@@ -136,6 +136,7 @@
 %%CACTIDIR%%/include/html/inc_data_source_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_view_filter_table.php
 %%CACTIDIR%%/include/html/inc_timespan_selector.php
 %%CACTIDIR%%/include/html/inc_timespan_settings.php
@@ -199,6 +200,7 @@
 %%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_to_0_8_1.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/install_finish.gif
@@ -312,6 +314,7 @@
 %%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
@@ -383,6 +386,7 @@
 @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