MFH: r522267

net-mgmt/cacti: Update to 1.2.8

* Sort pkg-plist to make future patching/comparing easier.

While I'm here:

* Use ${COPYTREE_SHARE} to correctly install a whole set of files instead of
  using "cp -R".

* Also remove a very outdated test was required when updating to the 0.8.7a
  release of net-mgmt/cacti.  It was introduced +12 years ago in r203859 and
  is no longer required nowadays.

Changelog:

https://github.com/Cacti/cacti/releases/tag/release%2F1.2.8

PR:		242834
Submitted by:	Michael Muenz <m.muenz@gmail.com> (based on)
Approved by:	maintainer timeout (14 days)
Security:	86224a04-26de-11ea-97f2-001a8c5c04b6

Approved by:	ports-secteam (joneum)

3 files changed, 20 insertions, 23 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 7fe6f051ee74..86fed65052e8 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cacti
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.8
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://www.cacti.net/downloads/ \
 		ftp://ftpmirror.uk/freebsd-ports/cacti/
@@ -55,12 +55,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}/var/log/cacti
 	${MKDIR} ${STAGEDIR}/var/db/cacti/rra
 	${MKDIR} ${STAGEDIR}/var/db/cacti/scripts
-	${CP} -R ${WRKSRC}/* ${STAGEDIR}/${PREFIX}/${CACTIDIR}
-	if [ -f ${PREFIX}/${CACTIDIR}/include/db-settings.php ]; then \
-		${ECHO_CMD} "======================================================================="; \
-		${ECHO_CMD} "WARNING! You have to move DB settings from"; \
-		${ECHO_CMD} "${PREFIX}/${CACTIDIR}/include/db-settings.php file to"; \
-		${ECHO_CMD} "${PREFIX}/${CACTIDIR}/include/config.php and remove db-settings.php"; \
-	fi
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CACTIDIR} "! -name '.git\*'"
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index c3fc0cef6dbc..7b6a57e3a422 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569956243
-SHA256 (cacti-1.2.7.tar.gz) = 45b4d57964aa2e11176f03f866be9c4e5850eaa5abe83137b61b3fe9d7ddce34
-SIZE (cacti-1.2.7.tar.gz) = 24819135
+TIMESTAMP = 1577112723
+SHA256 (cacti-1.2.8.tar.gz) = ca4b83d1963a358c9ab60276becc46553fa0125d1ad906c2d26278a485615a29
+SIZE (cacti-1.2.8.tar.gz) = 24881361
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index c84746c109a8..30c73e3a04ab 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -27,7 +27,6 @@
 %%CACTIDIR%%/cacti.sql
 %%CACTIDIR%%/cdef.php
 %%CACTIDIR%%/cli/.htaccess
-%%CACTIDIR%%/cli/index.php
 %%CACTIDIR%%/cli/add_data_query.php
 %%CACTIDIR%%/cli/add_datasource.php
 %%CACTIDIR%%/cli/add_device.php
@@ -42,10 +41,11 @@
 %%CACTIDIR%%/cli/copy_user.php
 %%CACTIDIR%%/cli/host_update_template.php
 %%CACTIDIR%%/cli/import_package.php
+%%CACTIDIR%%/cli/import_template.php
+%%CACTIDIR%%/cli/index.php
 %%CACTIDIR%%/cli/input_whitelist.php
 %%CACTIDIR%%/cli/install_cacti.php
 %%CACTIDIR%%/cli/md5sum.php
-%%CACTIDIR%%/cli/import_template.php
 %%CACTIDIR%%/cli/poller_data_sources_reapply_names.php
 %%CACTIDIR%%/cli/poller_graphs_reapply_names.php
 %%CACTIDIR%%/cli/poller_output_empty.php
@@ -73,8 +73,8 @@
 %%CACTIDIR%%/data_debug.php
 %%CACTIDIR%%/data_input.php
 %%CACTIDIR%%/data_queries.php
-%%CACTIDIR%%/data_sources.php
 %%CACTIDIR%%/data_source_profiles.php
+%%CACTIDIR%%/data_sources.php
 %%CACTIDIR%%/data_templates.php
 %%CACTIDIR%%/docs/Aggregate-Templates.html
 %%CACTIDIR%%/docs/Aggregates.html
@@ -111,6 +111,7 @@
 %%CACTIDIR%%/docs/How-To-Data-Query-Templates.html
 %%CACTIDIR%%/docs/How-To-Determine-Template-Version.html
 %%CACTIDIR%%/docs/How-To-SSH-Tunnels.html
+%%CACTIDIR%%/docs/How-To-Setup-Remote-Pollers.html
 %%CACTIDIR%%/docs/How-to-Graph-Your-Network.html
 %%CACTIDIR%%/docs/How-to-Graph-a-Custom-Collection-Script.html
 %%CACTIDIR%%/docs/Import-Template.html
@@ -128,6 +129,7 @@
 %%CACTIDIR%%/docs/Plugins.html
 %%CACTIDIR%%/docs/Principles-of-Operation.html
 %%CACTIDIR%%/docs/RRDTool-Specific-Features.html
+%%CACTIDIR%%/docs/RRDproxy.html
 %%CACTIDIR%%/docs/Requirements.html
 %%CACTIDIR%%/docs/SNMP-Data-Queries-Walkthrough.html
 %%CACTIDIR%%/docs/SNMP-New-Data-Query-Walkthrough.html
@@ -510,8 +512,8 @@
 %%CACTIDIR%%/images/cacti_backdrop2.gif
 %%CACTIDIR%%/images/cacti_error_image.png
 %%CACTIDIR%%/images/cacti_logo.gif
-%%CACTIDIR%%/images/cacti_logo_new.gif
 %%CACTIDIR%%/images/cacti_logo.svg
+%%CACTIDIR%%/images/cacti_logo_new.gif
 %%CACTIDIR%%/images/calendar.gif
 %%CACTIDIR%%/images/chart_curve_go.png
 %%CACTIDIR%%/images/cog.png
@@ -782,6 +784,7 @@
 %%CACTIDIR%%/include/js/d3.js
 %%CACTIDIR%%/include/js/dygraph-combined.js
 %%CACTIDIR%%/include/js/index.php
+%%CACTIDIR%%/include/js/jquery-ui.js
 %%CACTIDIR%%/include/js/jquery.colorpicker.js
 %%CACTIDIR%%/include/js/jquery.cookie.js
 %%CACTIDIR%%/include/js/jquery.dropdown.js
@@ -798,7 +801,6 @@
 %%CACTIDIR%%/include/js/jquery.timepicker.js
 %%CACTIDIR%%/include/js/jquery.ui.touch.punch.js
 %%CACTIDIR%%/include/js/jquery.zoom.js
-%%CACTIDIR%%/include/js/jquery-ui.js
 %%CACTIDIR%%/include/js/js.storage.js
 %%CACTIDIR%%/include/js/jstree.js
 %%CACTIDIR%%/include/js/pace.js
@@ -2038,12 +2040,12 @@
 %%CACTIDIR%%/install/colors.csv
 %%CACTIDIR%%/install/functions.php
 %%CACTIDIR%%/install/index.php
-%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz
 %%CACTIDIR%%/install/install.css
 %%CACTIDIR%%/install/install.js
 %%CACTIDIR%%/install/install.php
 %%CACTIDIR%%/install/step_json.php
 %%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz
+%%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
@@ -2070,14 +2072,10 @@
 %%CACTIDIR%%/install/upgrades/1_0_0.php
 %%CACTIDIR%%/install/upgrades/1_0_4.php
 %%CACTIDIR%%/install/upgrades/1_0_5.php
-%%CACTIDIR%%/install/upgrades/1_1_2.php
-%%CACTIDIR%%/install/upgrades/1_1_4.php
-%%CACTIDIR%%/install/upgrades/1_1_6.php
-%%CACTIDIR%%/install/upgrades/1_1_7.php
-%%CACTIDIR%%/install/upgrades/1_1_8.php
 %%CACTIDIR%%/install/upgrades/1_1_11.php
 %%CACTIDIR%%/install/upgrades/1_1_14.php
 %%CACTIDIR%%/install/upgrades/1_1_17.php
+%%CACTIDIR%%/install/upgrades/1_1_2.php
 %%CACTIDIR%%/install/upgrades/1_1_20.php
 %%CACTIDIR%%/install/upgrades/1_1_26.php
 %%CACTIDIR%%/install/upgrades/1_1_28.php
@@ -2086,12 +2084,17 @@
 %%CACTIDIR%%/install/upgrades/1_1_35.php
 %%CACTIDIR%%/install/upgrades/1_1_36.php
 %%CACTIDIR%%/install/upgrades/1_1_37.php
+%%CACTIDIR%%/install/upgrades/1_1_4.php
+%%CACTIDIR%%/install/upgrades/1_1_6.php
+%%CACTIDIR%%/install/upgrades/1_1_7.php
+%%CACTIDIR%%/install/upgrades/1_1_8.php
 %%CACTIDIR%%/install/upgrades/1_2_0.php
 %%CACTIDIR%%/install/upgrades/1_2_1.php
 %%CACTIDIR%%/install/upgrades/1_2_2.php
 %%CACTIDIR%%/install/upgrades/1_2_3.php
 %%CACTIDIR%%/install/upgrades/1_2_5.php
 %%CACTIDIR%%/install/upgrades/1_2_7.php
+%%CACTIDIR%%/install/upgrades/1_2_8.php
 %%CACTIDIR%%/install/upgrades/index.php
 %%CACTIDIR%%/lib/aggregate.php
 %%CACTIDIR%%/lib/api_aggregate.php
@@ -2283,9 +2286,9 @@
 @comment
 @owner %%CACTIUSER%%
 @group %%CACTIGROUP%%
-@dir /var/log/cacti
 @dir /var/db/cacti/rra
 @dir /var/db/cacti/scripts
 @dir /var/db/cacti
+@dir /var/log/cacti
 @group wheel
 @owner root