3 files changed, 84 insertions, 45 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index fc9765d7e77f..55aa363817c5 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cacti
-PORTVERSION=	0.8.4
+PORTVERSION=	0.8.5
 CATEGORIES=	net
-MASTER_SITES=	http://www.raxnet.net/downloads/
+MASTER_SITES=	http://www.raxnet.net/downloads/cacti/
 
-MAINTAINER=	vinc@freebsd-fr.org
+MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Web-driven graphing interface for RRDTool
 
 RUN_DEPENDS=	php:${PORTSDIR}/lang/php4 \
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index 29e5cf5a93ce..8eb826dc2f54 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1 +1 @@
-MD5 (cacti-0.8.4.tar.gz) = afa100acd57db792dd65f4443268a64d
+MD5 (cacti-0.8.5.tar.gz) = 72d5710d404d7d2d9ab8f14ee19f91ea
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index 0e8a7afc8a43..f7cacd3971b8 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -4,13 +4,6 @@
 %%CACTIDIR%%/auth_changepassword.php
 %%CACTIDIR%%/auth_login.php
 %%CACTIDIR%%/cacti.sql
-%%CACTIDIR%%/cactid/.deps/cactid.Po
-%%CACTIDIR%%/cactid/.deps/locks.Po
-%%CACTIDIR%%/cactid/.deps/poller.Po
-%%CACTIDIR%%/cactid/.deps/rrd.Po
-%%CACTIDIR%%/cactid/.deps/snmp.Po
-%%CACTIDIR%%/cactid/.deps/sql.Po
-%%CACTIDIR%%/cactid/.deps/util.Po
 %%CACTIDIR%%/cactid/AUTHORS
 %%CACTIDIR%%/cactid/COPYING
 %%CACTIDIR%%/cactid/ChangeLog
@@ -19,6 +12,7 @@
 %%CACTIDIR%%/cactid/Makefile.in
 %%CACTIDIR%%/cactid/NEWS
 %%CACTIDIR%%/cactid/README
+%%CACTIDIR%%/cactid/README-WINDOWS
 %%CACTIDIR%%/cactid/aclocal.m4
 %%CACTIDIR%%/cactid/cactid.c
 %%CACTIDIR%%/cactid/cactid.conf
@@ -57,34 +51,54 @@
 %%CACTIDIR%%/data_templates.php
 %%CACTIDIR%%/docs/CHANGELOG
 %%CACTIDIR%%/docs/CONTRIB
-%%CACTIDIR%%/docs/FAQ.htm
-%%CACTIDIR%%/docs/INSTALL-WIN32.htm
-%%CACTIDIR%%/docs/INSTALL.htm
+%%CACTIDIR%%/docs/INSTALL
 %%CACTIDIR%%/docs/README
-%%CACTIDIR%%/docs/UPGRADE.htm
-%%CACTIDIR%%/docs/manual/cacti.gif
-%%CACTIDIR%%/docs/manual/index.htm
-%%CACTIDIR%%/docs/manual/main.css
-%%CACTIDIR%%/docs/manual/section1.htm
-%%CACTIDIR%%/docs/manual/section2.htm
-%%CACTIDIR%%/docs/manual/section2_1.htm
-%%CACTIDIR%%/docs/manual/section2_2.htm
-%%CACTIDIR%%/docs/manual/section3.htm
-%%CACTIDIR%%/docs/manual/section4.htm
-%%CACTIDIR%%/docs/manual/section4_1.htm
-%%CACTIDIR%%/docs/manual/section4_2.htm
-%%CACTIDIR%%/docs/manual/section4_3.htm
-%%CACTIDIR%%/docs/manual/section5.htm
-%%CACTIDIR%%/docs/manual/section5_1.htm
-%%CACTIDIR%%/docs/manual/section5_2.htm
-%%CACTIDIR%%/docs/manual/section6.htm
-%%CACTIDIR%%/docs/manual/section6_1.htm
-%%CACTIDIR%%/docs/manual/section6_2.htm
-%%CACTIDIR%%/docs/manual/section7.htm
-%%CACTIDIR%%/docs/manual/section8.htm
-%%CACTIDIR%%/docs/manual/section8_1.htm
-%%CACTIDIR%%/docs/manual/section8_2.htm
-%%CACTIDIR%%/docs/manual/section8_3.htm
+%%CACTIDIR%%/docs/REQUIREMENTS
+%%CACTIDIR%%/docs/UPGRADE
+%%CACTIDIR%%/docs/html/LICENSE.html
+%%CACTIDIR%%/docs/html/advanced_topics.html
+%%CACTIDIR%%/docs/html/basics.html
+%%CACTIDIR%%/docs/html/cdefs.html
+%%CACTIDIR%%/docs/html/data_input_methods.html
+%%CACTIDIR%%/docs/html/data_queries.html
+%%CACTIDIR%%/docs/html/data_templates.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_viewing.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/graph_template.png
+%%CACTIDIR%%/docs/html/images/graph_tree.png
+%%CACTIDIR%%/docs/html/images/host_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/index.html
+%%CACTIDIR%%/docs/html/install_unix.html
+%%CACTIDIR%%/docs/html/install_windows.html
+%%CACTIDIR%%/docs/html/installation.html
+%%CACTIDIR%%/docs/html/making_scripts_work_with_cacti.html
+%%CACTIDIR%%/docs/html/manual.css
+%%CACTIDIR%%/docs/html/new_graphs.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/snmp_query_xml.html
+%%CACTIDIR%%/docs/html/templates.html
+%%CACTIDIR%%/docs/html/upgrade.html
+%%CACTIDIR%%/docs/html/user_management.html
+%%CACTIDIR%%/docs/html/using_cacti.html
+%%CACTIDIR%%/docs/html/variables.html
+%%CACTIDIR%%/docs/pdf/README
+%%CACTIDIR%%/docs/text/manual.txt
 %%CACTIDIR%%/gprint_presets.php
 %%CACTIDIR%%/graph.php
 %%CACTIDIR%%/graph_image.php
@@ -164,28 +178,36 @@
 %%CACTIDIR%%/install/0_8_2_to_0_8_2a.php
 %%CACTIDIR%%/install/0_8_2a_to_0_8_3.php
 %%CACTIDIR%%/install/0_8_3_to_0_8_4.php
+%%CACTIDIR%%/install/0_8_4_to_0_8_5.php
 %%CACTIDIR%%/install/0_8_to_0_8_1.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/install_finish.gif
 %%CACTIDIR%%/install/install_next.gif
-%%CACTIDIR%%/lib/adodb/adodb-connection.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-cryptsession.php
 %%CACTIDIR%%/lib/adodb/adodb-csvlib.inc.php
 %%CACTIDIR%%/lib/adodb/adodb-datadict.inc.php
+%%CACTIDIR%%/lib/adodb/adodb-error.inc.php
 %%CACTIDIR%%/lib/adodb/adodb-errorhandler.inc.php
 %%CACTIDIR%%/lib/adodb/adodb-errorpear.inc.php
+%%CACTIDIR%%/lib/adodb/adodb-exceptions.inc.php
+%%CACTIDIR%%/lib/adodb/adodb-iterator.inc.php
 %%CACTIDIR%%/lib/adodb/adodb-lib.inc.php
 %%CACTIDIR%%/lib/adodb/adodb-pager.inc.php
 %%CACTIDIR%%/lib/adodb/adodb-pear.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-recordset.inc.php
-%%CACTIDIR%%/lib/adodb/adodb-session.php
+%%CACTIDIR%%/lib/adodb/adodb-perf.inc.php
+%%CACTIDIR%%/lib/adodb/adodb-php4.inc.php
 %%CACTIDIR%%/lib/adodb/adodb-time.inc.php
+%%CACTIDIR%%/lib/adodb/adodb-xmlschema.inc.php
 %%CACTIDIR%%/lib/adodb/adodb.inc.php
-%%CACTIDIR%%/lib/adodb/crypt.inc.php
+%%CACTIDIR%%/lib/adodb/datadict/datadict-access.inc.php
+%%CACTIDIR%%/lib/adodb/datadict/datadict-db2.inc.php
+%%CACTIDIR%%/lib/adodb/datadict/datadict-generic.inc.php
+%%CACTIDIR%%/lib/adodb/datadict/datadict-ibase.inc.php
+%%CACTIDIR%%/lib/adodb/datadict/datadict-informix.inc.php
 %%CACTIDIR%%/lib/adodb/datadict/datadict-mssql.inc.php
 %%CACTIDIR%%/lib/adodb/datadict/datadict-mysql.inc.php
 %%CACTIDIR%%/lib/adodb/datadict/datadict-oci8.inc.php
 %%CACTIDIR%%/lib/adodb/datadict/datadict-postgres.inc.php
+%%CACTIDIR%%/lib/adodb/datadict/datadict-sybase.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-access.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-ado.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-ado_access.inc.php
@@ -201,6 +223,7 @@
 %%CACTIDIR%%/lib/adodb/drivers/adodb-mssql.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-mssqlpo.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-mysql.inc.php
+%%CACTIDIR%%/lib/adodb/drivers/adodb-mysqli.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-mysqlt.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-oci8.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-oci805.inc.php
@@ -213,9 +236,20 @@
 %%CACTIDIR%%/lib/adodb/drivers/adodb-postgres64.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-postgres7.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-proxy.inc.php
+%%CACTIDIR%%/lib/adodb/drivers/adodb-sapdb.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-sqlanywhere.inc.php
+%%CACTIDIR%%/lib/adodb/drivers/adodb-sqlite.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-sybase.inc.php
 %%CACTIDIR%%/lib/adodb/drivers/adodb-vfp.inc.php
+%%CACTIDIR%%/lib/adodb/lang/adodb-cz.inc.php
+%%CACTIDIR%%/lib/adodb/lang/adodb-de.inc.php
+%%CACTIDIR%%/lib/adodb/lang/adodb-en.inc.php
+%%CACTIDIR%%/lib/adodb/lang/adodb-es.inc.php
+%%CACTIDIR%%/lib/adodb/lang/adodb-fr.inc.php
+%%CACTIDIR%%/lib/adodb/lang/adodb-it.inc.php
+%%CACTIDIR%%/lib/adodb/lang/adodb-pt-br.inc.php
+%%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
@@ -224,6 +258,7 @@
 %%CACTIDIR%%/lib/adodb/tohtml.inc.php
 %%CACTIDIR%%/lib/auth.php
 %%CACTIDIR%%/lib/cdef.php
+%%CACTIDIR%%/lib/data_query.php
 %%CACTIDIR%%/lib/database.php
 %%CACTIDIR%%/lib/export.php
 %%CACTIDIR%%/lib/form.php
@@ -236,6 +271,7 @@
 %%CACTIDIR%%/lib/tree.php
 %%CACTIDIR%%/lib/tree_view.php
 %%CACTIDIR%%/lib/utility.php
+%%CACTIDIR%%/lib/variables.php
 %%CACTIDIR%%/lib/xml.php
 %%CACTIDIR%%/log/rrd.log
 %%CACTIDIR%%/logout.php
@@ -278,6 +314,7 @@
 @dirrm %%CACTIDIR%%/resource/script_queries
 @dirrm %%CACTIDIR%%/resource
 @dirrm %%CACTIDIR%%/log
+@dirrm %%CACTIDIR%%/lib/adodb/lang
 @dirrm %%CACTIDIR%%/lib/adodb/drivers
 @dirrm %%CACTIDIR%%/lib/adodb/datadict
 @dirrm %%CACTIDIR%%/lib/adodb
@@ -286,9 +323,11 @@
 @dirrm %%CACTIDIR%%/include/treeview
 @dirrm %%CACTIDIR%%/include
 @dirrm %%CACTIDIR%%/images
-@dirrm %%CACTIDIR%%/docs/manual
+@dirrm %%CACTIDIR%%/docs/text
+@dirrm %%CACTIDIR%%/docs/pdf
+@dirrm %%CACTIDIR%%/docs/html/images
+@dirrm %%CACTIDIR%%/docs/html
 @dirrm %%CACTIDIR%%/docs
 @dirrm %%CACTIDIR%%/cactid/config
-@dirrm %%CACTIDIR%%/cactid/.deps
 @dirrm %%CACTIDIR%%/cactid
 @dirrm %%CACTIDIR%%