7 files changed, 54 insertions, 81 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 131c4b2df5bc..8b45ed405163 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cacti
-PORTVERSION=	0.8.6g
-PORTREVISION=	41
+PORTVERSION=	0.8.6h
+PORTREVISION=	0
 CATEGORIES=	net www
 MASTER_SITES=	http://www.cacti.net/downloads/
 
@@ -16,10 +16,7 @@ COMMENT=	Web-driven graphing interface for RRDTool
 
 # Vendor's patches
 PATCH_SITES=	http://www.cacti.net/downloads/patches/${PORTVERSION}/
-PATCHFILES=	short_open_tag_parse_error.patch \
-		graph_properties_zoom.patch \
-		script_server_snmp_auth.patch \
-		mib_file_loading.patch
+PATCHFILES=	
 
 PATCH_DIST_STRIP=-p1
 
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index 8aa326684d4a..03c9a655a42d 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,15 +1,3 @@
-MD5 (cacti-0.8.6g.tar.gz) = b3cf31349d2db47d14dcf347b8422bc2
-SHA256 (cacti-0.8.6g.tar.gz) = 1cea5747215c9efc2925dc9764e567a32534d67385811bf70d76ad766e6a32b6
-SIZE (cacti-0.8.6g.tar.gz) = 1076607
-MD5 (short_open_tag_parse_error.patch) = a68318191df3363e3f591bebdb08d238
-SHA256 (short_open_tag_parse_error.patch) = 0366553335371e946e0cbf97e77125ffa8d96dc81fe12fc997aeb53f06576497
-SIZE (short_open_tag_parse_error.patch) = 1818
-MD5 (graph_properties_zoom.patch) = 1c50c7167e118ca55ddd13cbece373a9
-SHA256 (graph_properties_zoom.patch) = b48d50acc6f30fb083dd3790f2452106e5535de68e82dca37a0fc1c5258493e1
-SIZE (graph_properties_zoom.patch) = 1387
-MD5 (script_server_snmp_auth.patch) = 09fbc74b3867b1bb6196d195f5fa57ac
-SHA256 (script_server_snmp_auth.patch) = 6c966a144721a17929c8895da3d612289be17f94933cce3917c658ce5cc1977c
-SIZE (script_server_snmp_auth.patch) = 4911
-MD5 (mib_file_loading.patch) = 826201b2d96415f81d800aa32e31ee4c
-SHA256 (mib_file_loading.patch) = 1e017785e6bba0ca367db8dc2b6bdad06e0f597a95b7ecffa172220ef1817b74
-SIZE (mib_file_loading.patch) = 477
+MD5 (cacti-0.8.6h.tar.gz) = 5f6100b525b5b29e81f43cc7c55f4000
+SHA256 (cacti-0.8.6h.tar.gz) = 69b6ad51ee21c5367dc67a752a3745804531280356eb261d81f9636a647ca17e
+SIZE (cacti-0.8.6h.tar.gz) = 1096877
diff --git a/net-mgmt/cacti/files/patch-fix_df_output b/net-mgmt/cacti/files/patch-fix_df_output
index 705f16930164..8df567b2255f 100644
--- a/net-mgmt/cacti/files/patch-fix_df_output
+++ b/net-mgmt/cacti/files/patch-fix_df_output
@@ -1,27 +1,9 @@
---- scripts/diskfree.pl.orig	Fri Apr 29 17:32:01 2005
-+++ scripts/diskfree.pl	Wed Mar 23 02:19:37 2005
-@@ -1,6 +1,6 @@
+--- scripts/diskfree.pl.orig	Wed Jan  4 06:08:30 2006
++++ scripts/diskfree.pl	Fri Jan  6 00:16:58 2006
+@@ -1,5 +1,5 @@
  #!/usr/bin/perl
- 
--$ret = `df --block-size=1024 -P $ARGV[0] | grep -v Filesystem`;
-+$ret = `df -k $ARGV[0] | grep -v Filesystem`;
- $ret =~ s/($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )//;
- 
- print "megabytes:$7 percent:$9";
---- scripts/diskfree.sh.orig	Fri Apr 29 17:32:01 2005
-+++ scripts/diskfree.sh	Wed Mar 23 02:19:47 2005
-@@ -1,2 +1,2 @@
- #!/bin/sh
--df --block-size=1024 -P $1 | perl -ape '$F[4]=~tr/%//d;}{print "megabytes:$F[3] percent:$F[4]"';
-+df -k $1 | perl -ape '$F[4]=~tr/%//d;}{print "megabytes:$F[3] percent:$F[4]"';
---- scripts/query_unix_partitions.pl.orig	Sat Apr 30 01:50:01 2005
-+++ scripts/query_unix_partitions.pl	Sat Apr 30 01:50:13 2005
-@@ -5,7 +5,7 @@
- 	exit;
- }
- 
--open(DF, "/bin/df -P|");
-+open(DF, "/bin/df -k|");
- 
- while (<DF>) {
- 	#/dev/hda2             20157744  18553884    579860  97% /var
+-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-mgmt/cacti/files/patch-include-config.php b/net-mgmt/cacti/files/patch-include-config.php
index d79c0d4e20c8..39dd30e734c1 100644
--- a/net-mgmt/cacti/files/patch-include-config.php
+++ b/net-mgmt/cacti/files/patch-include-config.php
@@ -1,24 +1,23 @@
---- include/config.php.orig	Tue Jun 21 04:46:46 2005
-+++ include/config.php	Tue Jun 21 16:27:29 2005
-@@ -24,13 +24,6 @@
+--- include/config.php.orig	Fri Jan  6 00:27:51 2006
++++ 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 */
--$database_type = "mysql";
--$database_default = "cacti";
--$database_hostname = "localhost";
--$database_username = "cactiuser";
--$database_password = "cactiuser";
--
- /* ----- you probably do not need to change anything below this line ----- */
- $config = array();
- 
-@@ -44,6 +37,9 @@
- $config["base_path"] = ereg_replace("(.*)[\/\\]include", "\\1", dirname(__FILE__));
++/*
++ * 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");
  
diff --git a/net-mgmt/cacti/files/patch-include-db-settings.php b/net-mgmt/cacti/files/patch-include-db-settings.php
index f2fd9fc01d42..7552ac99e4fd 100644
--- a/net-mgmt/cacti/files/patch-include-db-settings.php
+++ b/net-mgmt/cacti/files/patch-include-db-settings.php
@@ -1,6 +1,6 @@
---- include/db-settings.php.orig	Tue Jun 21 16:31:36 2005
+--- /dev/null	Tue Jun 21 16:31:36 2005
 +++ include/db-settings.php	Tue Jun 21 16:29:15 2005
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,9 @@
 +<?php
 +/* make sure these values refect your actual database/host/user/password */
 +$database_type = "mysql";
@@ -8,4 +8,5 @@
 +$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 419234575460..c52202cf44bd 100644
--- a/net-mgmt/cacti/files/pkg-message.in
+++ b/net-mgmt/cacti/files/pkg-message.in
@@ -1,21 +1,21 @@
-==================================================================
+=======================================================================
 Cacti is now installed. If you intall it for the first time,
-you may have to follow this steps to make it work correctly.
+you may have to follow this steps to make it work correctly:
 
-1: Create the MySQL database:
+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 at localhost IDENTIFIED BY 'cactiuser'; FLUSH PRIVILEGES;" | mysql
-3: Import the default cacti database:
+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 %%CACTIDIR%%/include/db-settings.php:
-Specify the MySQL user, password and database for your cacti configuration.
-5: Add a line to your /etc/crontab file similar to:
+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:
+6. Add alias in apache config for the cacti dir:
 Alias /cacti "%%PREFIX%%/%%CACTIDIR%%/"
-7: Open cacti login page in your web browser and login with admin/admin
+7. Open a cacti login page in your web browser and login with admin/admin.
 
-Have fun!
-==================================================================
+If you update cacti, open a login page right now. An updating process
+will run automatically.
+=======================================================================
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index 8d2e27ff7c1a..0edc78c49fa4 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -7,6 +7,7 @@
 %%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
@@ -88,7 +89,10 @@
 %%CACTIDIR%%/images/button_create.gif
 %%CACTIDIR%%/images/button_default.gif
 %%CACTIDIR%%/images/button_delete.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_refresh.gif
 %%CACTIDIR%%/images/button_save.gif
@@ -135,9 +139,11 @@
 %%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
 %%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_timespan_selector.php
 %%CACTIDIR%%/include/html/inc_timespan_settings.php
@@ -204,6 +210,7 @@
 %%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_to_0_8_1.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/install_finish.gif
@@ -294,9 +301,6 @@
 %%CACTIDIR%%/lib/adodb/lang/adodb-ru1251.inc.php
 %%CACTIDIR%%/lib/adodb/lang/adodb-sv.inc.php
 %%CACTIDIR%%/lib/adodb/license.txt
-%%CACTIDIR%%/lib/adodb/pivottable.inc.php
-%%CACTIDIR%%/lib/adodb/rsfilter.inc.php
-%%CACTIDIR%%/lib/adodb/server.php
 %%CACTIDIR%%/lib/adodb/toexport.inc.php
 %%CACTIDIR%%/lib/adodb/tohtml.inc.php
 %%CACTIDIR%%/lib/api_data_source.php
@@ -334,6 +338,8 @@
 %%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