3 files changed, 126 insertions, 113 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 30d620f5077a..98113d3a464b 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cacti
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://www.cacti.net/downloads/ \
 		ftp://ftpmirror.uk/freebsd-ports/cacti/
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index 2f7edf4d8769..ccfed981e453 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493454208
-SHA256 (cacti-1.1.5.tar.gz) = 47d47ec7fa64615dae15d292a9879535e74a9a684718dc65dbe0c755d4e2cc4d
-SIZE (cacti-1.1.5.tar.gz) = 7845954
+TIMESTAMP = 1494230624
+SHA256 (cacti-1.1.6.tar.gz) = af7e569a7234b1bf12c124262eacecde3fb3ebd68af4318de19c6d0aaf2ef7e1
+SIZE (cacti-1.1.6.tar.gz) = 8548365
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index 222515a4ffa1..bf78e747f31e 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -66,51 +66,51 @@
 %%CACTIDIR%%/data_templates.php
 %%CACTIDIR%%/docs/CHANGELOG
 %%CACTIDIR%%/docs/html/LICENSE.html
-%%CACTIDIR%%/docs/html/advanced_topics.html
+%%CACTIDIR%%/docs/html/advanced-topics.html
 %%CACTIDIR%%/docs/html/basics.html
-%%CACTIDIR%%/docs/html/batch_copy_users.html
-%%CACTIDIR%%/docs/html/bsd_ports.html
-%%CACTIDIR%%/docs/html/%%CACTIUSER%%_help.html
+%%CACTIDIR%%/docs/html/batch-copy-users.html
+%%CACTIDIR%%/docs/html/bsd-ports.html
+%%CACTIDIR%%/docs/html/%%CACTIUSER%%-help.html
 %%CACTIDIR%%/docs/html/cdefs.html
-%%CACTIDIR%%/docs/html/check_%%CACTIUSER%%_poller.html
-%%CACTIDIR%%/docs/html/check_data_gathering.html
-%%CACTIDIR%%/docs/html/check_mysql_updating.html
-%%CACTIDIR%%/docs/html/check_rrd_graph.html
-%%CACTIDIR%%/docs/html/check_rrd_numbers.html
-%%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
-%%CACTIDIR%%/docs/html/cli_copy_user.html
-%%CACTIDIR%%/docs/html/cli_poller_graphs_reapply_names.html
-%%CACTIDIR%%/docs/html/cli_poller_output_empty.html
-%%CACTIDIR%%/docs/html/cli_poller_reindex_hosts.html
-%%CACTIDIR%%/docs/html/copying_user.html
-%%CACTIDIR%%/docs/html/create_new_user.html
-%%CACTIDIR%%/docs/html/data_input_methods.html
-%%CACTIDIR%%/docs/html/data_presentation.html
-%%CACTIDIR%%/docs/html/data_queries.html
-%%CACTIDIR%%/docs/html/data_storage.html
-%%CACTIDIR%%/docs/html/debug_miscellaneous.html
-%%CACTIDIR%%/docs/html/debug_rpm_installation.html
+%%CACTIDIR%%/docs/html/check-%%CACTIUSER%%-poller.html
+%%CACTIDIR%%/docs/html/check-data-gathering.html
+%%CACTIDIR%%/docs/html/check-mysql-updating.html
+%%CACTIDIR%%/docs/html/check-rrd-graph.html
+%%CACTIDIR%%/docs/html/check-rrd-numbers.html
+%%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
+%%CACTIDIR%%/docs/html/cli-copy-user.html
+%%CACTIDIR%%/docs/html/cli-poller-graphs-reapply-names.html
+%%CACTIDIR%%/docs/html/cli-poller-output-empty.html
+%%CACTIDIR%%/docs/html/cli-poller-reindex-hosts.html
+%%CACTIDIR%%/docs/html/copying-user.html
+%%CACTIDIR%%/docs/html/create-new-user.html
+%%CACTIDIR%%/docs/html/data-input-methods.html
+%%CACTIDIR%%/docs/html/data-presentation.html
+%%CACTIDIR%%/docs/html/data-queries.html
+%%CACTIDIR%%/docs/html/data-storage.html
+%%CACTIDIR%%/docs/html/debug-miscellaneous.html
+%%CACTIDIR%%/docs/html/debug-rpm-installation.html
 %%CACTIDIR%%/docs/html/debugging.html
-%%CACTIDIR%%/docs/html/delete_users.html
-%%CACTIDIR%%/docs/html/enable_disable_users.html
+%%CACTIDIR%%/docs/html/delete-users.html
+%%CACTIDIR%%/docs/html/enable-disable-users.html
 %%CACTIDIR%%/docs/html/faq.html
-%%CACTIDIR%%/docs/html/graph_howto.html
-%%CACTIDIR%%/docs/html/graph_overview.html
-%%CACTIDIR%%/docs/html/graph_snmp_oid.html
-%%CACTIDIR%%/docs/html/graph_templates.html
-%%CACTIDIR%%/docs/html/graph_viewing.html
-%%CACTIDIR%%/docs/html/guest_access.html
-%%CACTIDIR%%/docs/html/host_templates.html
-%%CACTIDIR%%/docs/html/host_variables.html
-%%CACTIDIR%%/docs/html/how_to.html
+%%CACTIDIR%%/docs/html/graph-howto.html
+%%CACTIDIR%%/docs/html/graph-overview.html
+%%CACTIDIR%%/docs/html/graph-snmp-oid.html
+%%CACTIDIR%%/docs/html/graph-templates.html
+%%CACTIDIR%%/docs/html/graph-viewing.html
+%%CACTIDIR%%/docs/html/guest-access.html
+%%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
@@ -135,34 +135,34 @@
 %%CACTIDIR%%/docs/html/images/user_management_list.png
 %%CACTIDIR%%/docs/html/images/user_management_new.png
 %%CACTIDIR%%/docs/html/index.html
-%%CACTIDIR%%/docs/html/install_unix.html
-%%CACTIDIR%%/docs/html/install_windows.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_%%CACTIUSER%%.html
-%%CACTIDIR%%/docs/html/migration_php_scripts_to_script_server.html
-%%CACTIDIR%%/docs/html/new_graphs.html
-%%CACTIDIR%%/docs/html/operating_principles.html
-%%CACTIDIR%%/docs/html/php_script_server.html
+%%CACTIDIR%%/docs/html/making-scripts-work-with-%%CACTIUSER%%.html
+%%CACTIDIR%%/docs/html/migration-php-scripts-to-script-server.html
+%%CACTIDIR%%/docs/html/new-graphs.html
+%%CACTIDIR%%/docs/html/operating-principles.html
+%%CACTIDIR%%/docs/html/php-script-server.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/rrdtool-features.html
+%%CACTIDIR%%/docs/html/script-query-xml.html
 %%CACTIDIR%%/docs/html/scripts.html
-%%CACTIDIR%%/docs/html/snmp_query_xml.html
-%%CACTIDIR%%/docs/html/template_export.html
-%%CACTIDIR%%/docs/html/template_import.html
+%%CACTIDIR%%/docs/html/snmp-query-xml.html
+%%CACTIDIR%%/docs/html/template-export.html
+%%CACTIDIR%%/docs/html/template-import.html
 %%CACTIDIR%%/docs/html/templates.html
-%%CACTIDIR%%/docs/html/testing_script_in_script_server.html
-%%CACTIDIR%%/docs/html/unix_apply_patches.html
-%%CACTIDIR%%/docs/html/unix_configure_%%CACTIUSER%%.html
-%%CACTIDIR%%/docs/html/unix_configure_httpd.html
-%%CACTIDIR%%/docs/html/unix_configure_mysql.html
-%%CACTIDIR%%/docs/html/unix_configure_php.html
-%%CACTIDIR%%/docs/html/unix_configure_spine.html
+%%CACTIDIR%%/docs/html/testing-script-in-script-server.html
+%%CACTIDIR%%/docs/html/unix-apply-patches.html
+%%CACTIDIR%%/docs/html/unix-configure-%%CACTIUSER%%.html
+%%CACTIDIR%%/docs/html/unix-configure-httpd.html
+%%CACTIDIR%%/docs/html/unix-configure-mysql.html
+%%CACTIDIR%%/docs/html/unix-configure-php.html
+%%CACTIDIR%%/docs/html/unix-configure-spine.html
+%%CACTIDIR%%/docs/html/upgrade-using-hostmib-data-queries.html
 %%CACTIDIR%%/docs/html/upgrade.html
-%%CACTIDIR%%/docs/html/upgrade_using_hostmib_data_queries.html
-%%CACTIDIR%%/docs/html/user_management.html
-%%CACTIDIR%%/docs/html/using_spine.html
+%%CACTIDIR%%/docs/html/user-management.html
+%%CACTIDIR%%/docs/html/using-spine.html
 %%CACTIDIR%%/docs/html/variables.html
 %%CACTIDIR%%/docs/index.php
 %%CACTIDIR%%/docs/pdf/manual.pdf
@@ -269,6 +269,7 @@
 %%CACTIDIR%%/images/view_page.png
 %%CACTIDIR%%/include/auth.php
 %%CACTIDIR%%/include/bottom_footer.php
+%%CACTIDIR%%/include/%%CACTIUSER%%_version
 %%CACTIDIR%%/include/config.php.sample
 %%CACTIDIR%%/include/content/README
 %%CACTIDIR%%/include/content/basic-example.html
@@ -316,6 +317,7 @@
 %%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-czech_czech_republic.js
 %%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-danish_denmark.js
 %%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-de-CH.js
+%%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-dutch_netherlands.js
 %%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-en-GB.js
 %%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-english_usa.js
 %%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-eo.js
@@ -375,6 +377,8 @@
 %%CACTIDIR%%/include/js/jquery.storageapi.js
 %%CACTIDIR%%/include/js/jquery.tablednd.js
 %%CACTIDIR%%/include/js/jquery.tablesorter.js
+%%CACTIDIR%%/include/js/jquery.tablesorter.pager.js
+%%CACTIDIR%%/include/js/jquery.tablesorter.widgets.js
 %%CACTIDIR%%/include/js/jquery.timepicker.js
 %%CACTIDIR%%/include/js/jquery.ui.touch.punch.js
 %%CACTIDIR%%/include/js/jquery.zoom.js
@@ -1003,60 +1007,60 @@
 %%CACTIDIR%%/include/top_graph_header.php
 %%CACTIDIR%%/include/top_header.php
 %%CACTIDIR%%/index.php
-%%CACTIDIR%%/install/0_8_1_to_0_8_2.php
-%%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_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_6f_to_0_8_6g.php
-%%CACTIDIR%%/install/0_8_6g_to_0_8_6h.php
-%%CACTIDIR%%/install/0_8_6h_to_0_8_6i.php
-%%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_7d_to_0_8_7e.php
-%%CACTIDIR%%/install/0_8_7e_to_0_8_7f.php
-%%CACTIDIR%%/install/0_8_7f_to_0_8_7g.php
-%%CACTIDIR%%/install/0_8_7g_to_0_8_7h.php
-%%CACTIDIR%%/install/0_8_7h_to_0_8_7i.php
-%%CACTIDIR%%/install/0_8_7i_to_0_8_8.php
-%%CACTIDIR%%/install/0_8_8_to_0_8_8a.php
-%%CACTIDIR%%/install/0_8_8a_to_0_8_8b.php
-%%CACTIDIR%%/install/0_8_8b_to_0_8_8c.php
-%%CACTIDIR%%/install/0_8_8c_to_0_8_8d.php
-%%CACTIDIR%%/install/0_8_8d_to_0_8_8e.php
-%%CACTIDIR%%/install/0_8_8e_to_0_8_8f.php
-%%CACTIDIR%%/install/0_8_8f_to_0_8_8g.php
-%%CACTIDIR%%/install/0_8_8g_to_0_8_8h.php
-%%CACTIDIR%%/install/0_8_8h_to_1_0_0.php
-%%CACTIDIR%%/install/0_8_to_0_8_1.php
-%%CACTIDIR%%/install/1_0_0_to_1_0_1.php
-%%CACTIDIR%%/install/1_0_1_to_1_0_2.php
-%%CACTIDIR%%/install/1_0_2_to_1_0_3.php
-%%CACTIDIR%%/install/1_0_3_to_1_0_4.php
-%%CACTIDIR%%/install/1_0_4_to_1_0_5.php
-%%CACTIDIR%%/install/1_0_5_to_1_0_6.php
-%%CACTIDIR%%/install/1_0_6_to_1_1_0.php
-%%CACTIDIR%%/install/1_1_0_to_1_1_1.php
-%%CACTIDIR%%/install/1_1_1_to_1_1_2.php
-%%CACTIDIR%%/install/1_1_2_to_1_1_3.php
-%%CACTIDIR%%/install/1_1_3_to_1_1_4.php
-%%CACTIDIR%%/install/1_1_4_to_1_1_5.php
 %%CACTIDIR%%/install/colors.csv
 %%CACTIDIR%%/install/functions.php
-%%CACTIDIR%%/install/import_colors.php
 %%CACTIDIR%%/install/index.php
 %%CACTIDIR%%/install/templates/Cisco_Router.xml.gz
 %%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz
 %%CACTIDIR%%/install/templates/Local_Linux_Machine.xml.gz
 %%CACTIDIR%%/install/templates/NetSNMP_Device.xml.gz
 %%CACTIDIR%%/install/templates/Windows_Device.xml.gz
+%%CACTIDIR%%/install/upgrades/0_8_1.php
+%%CACTIDIR%%/install/upgrades/0_8_2.php
+%%CACTIDIR%%/install/upgrades/0_8_2a.php
+%%CACTIDIR%%/install/upgrades/0_8_3.php
+%%CACTIDIR%%/install/upgrades/0_8_4.php
+%%CACTIDIR%%/install/upgrades/0_8_5.php
+%%CACTIDIR%%/install/upgrades/0_8_6.php
+%%CACTIDIR%%/install/upgrades/0_8_6a.php
+%%CACTIDIR%%/install/upgrades/0_8_6d.php
+%%CACTIDIR%%/install/upgrades/0_8_6e.php
+%%CACTIDIR%%/install/upgrades/0_8_6g.php
+%%CACTIDIR%%/install/upgrades/0_8_6h.php
+%%CACTIDIR%%/install/upgrades/0_8_6i.php
+%%CACTIDIR%%/install/upgrades/0_8_7.php
+%%CACTIDIR%%/install/upgrades/0_8_7a.php
+%%CACTIDIR%%/install/upgrades/0_8_7b.php
+%%CACTIDIR%%/install/upgrades/0_8_7c.php
+%%CACTIDIR%%/install/upgrades/0_8_7d.php
+%%CACTIDIR%%/install/upgrades/0_8_7e.php
+%%CACTIDIR%%/install/upgrades/0_8_7f.php
+%%CACTIDIR%%/install/upgrades/0_8_7g.php
+%%CACTIDIR%%/install/upgrades/0_8_7h.php
+%%CACTIDIR%%/install/upgrades/0_8_7i.php
+%%CACTIDIR%%/install/upgrades/0_8_8.php
+%%CACTIDIR%%/install/upgrades/0_8_8a.php
+%%CACTIDIR%%/install/upgrades/0_8_8b.php
+%%CACTIDIR%%/install/upgrades/0_8_8c.php
+%%CACTIDIR%%/install/upgrades/0_8_8d.php
+%%CACTIDIR%%/install/upgrades/0_8_8e.php
+%%CACTIDIR%%/install/upgrades/0_8_8f.php
+%%CACTIDIR%%/install/upgrades/0_8_8g.php
+%%CACTIDIR%%/install/upgrades/0_8_8h.php
+%%CACTIDIR%%/install/upgrades/1_0_0.php
+%%CACTIDIR%%/install/upgrades/1_0_1.php
+%%CACTIDIR%%/install/upgrades/1_0_2.php
+%%CACTIDIR%%/install/upgrades/1_0_3.php
+%%CACTIDIR%%/install/upgrades/1_0_4.php
+%%CACTIDIR%%/install/upgrades/1_0_5.php
+%%CACTIDIR%%/install/upgrades/1_0_6.php
+%%CACTIDIR%%/install/upgrades/1_1_0.php
+%%CACTIDIR%%/install/upgrades/1_1_1.php
+%%CACTIDIR%%/install/upgrades/1_1_2.php
+%%CACTIDIR%%/install/upgrades/1_1_3.php
+%%CACTIDIR%%/install/upgrades/1_1_4.php
+%%CACTIDIR%%/install/upgrades/1_1_5.php
+%%CACTIDIR%%/install/upgrades/1_1_6.php
 %%CACTIDIR%%/lib/aggregate.php
 %%CACTIDIR%%/lib/api_aggregate.php
 %%CACTIDIR%%/lib/api_automation.php
@@ -1077,6 +1081,7 @@
 %%CACTIDIR%%/lib/functions.php
 %%CACTIDIR%%/lib/graph_variables.php
 %%CACTIDIR%%/lib/html.php
+%%CACTIDIR%%/lib/html_filter.php
 %%CACTIDIR%%/lib/html_form.php
 %%CACTIDIR%%/lib/html_form_template.php
 %%CACTIDIR%%/lib/html_graph.php
@@ -1108,15 +1113,23 @@
 %%CACTIDIR%%/links.php
 %%CACTIDIR%%/locales/LC_MESSAGES/bulgarian_bulgaria.mo
 %%CACTIDIR%%/locales/LC_MESSAGES/chinese_china_simplified.mo
+%%CACTIDIR%%/locales/LC_MESSAGES/dutch_netherlands.mo
 %%CACTIDIR%%/locales/LC_MESSAGES/french_france.mo
 %%CACTIDIR%%/locales/LC_MESSAGES/german_germany.mo
 %%CACTIDIR%%/locales/LC_MESSAGES/japanese_japan.mo
 %%CACTIDIR%%/locales/LC_MESSAGES/russian_russia.mo
 %%CACTIDIR%%/locales/LC_MESSAGES/spanish_spain.mo
 %%CACTIDIR%%/locales/LC_MESSAGES/swedish_sweden.mo
+%%CACTIDIR%%/locales/po/bulgarian_bulgaria.po
 %%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot
+%%CACTIDIR%%/locales/po/chinese_china_simplified.po
+%%CACTIDIR%%/locales/po/dutch_netherlands.po
+%%CACTIDIR%%/locales/po/french_france.po
 %%CACTIDIR%%/locales/po/german_germany.po
+%%CACTIDIR%%/locales/po/japanese_japan.po
 %%CACTIDIR%%/locales/po/russian_russia.po
+%%CACTIDIR%%/locales/po/spanish_spain.po
+%%CACTIDIR%%/locales/po/swedish_sweden.po
 %%CACTIDIR%%/logout.php
 %%CACTIDIR%%/managers.php
 %%CACTIDIR%%/mibs/CACTI-BOOST-MIB