net-mgmt/cacti: Update to 1.2.3

PR:		236927
Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)

5 files changed, 25 insertions, 16 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index dbf95496c2f8..47d8a0a323b7 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cacti
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.3
 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 6d018ed68cd8..5776142473f6 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548269224
-SHA256 (cacti-1.2.1.tar.gz) = c1cd7c2417253c72e499c97a01123b1561de67aa6406dd2b687f05b7ce05309a
-SIZE (cacti-1.2.1.tar.gz) = 23775742
+TIMESTAMP = 1554040180
+SHA256 (cacti-1.2.3.tar.gz) = 3bd711cb425d51defbcc6d7f5761f886822fd3d004977bb74eca202431cdf51c
+SIZE (cacti-1.2.3.tar.gz) = 23977004
diff --git a/net-mgmt/cacti/files/patch-include__global.php b/net-mgmt/cacti/files/patch-include__global.php
index 1f3b18d8de97..e14956c5c8e3 100644
--- a/net-mgmt/cacti/files/patch-include__global.php
+++ b/net-mgmt/cacti/files/patch-include__global.php
@@ -1,6 +1,6 @@
---- include/global.php.orig	2019-01-03 02:14:26 UTC
+--- include/global.php.orig	2019-03-30 23:40:22 UTC
 +++ include/global.php
-@@ -173,7 +173,7 @@ if ($config['cacti_server_os'] == 'win32') {
+@@ -216,7 +216,7 @@ if ($config['cacti_server_os'] == 'win32') {
  	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
  }
  $config['include_path'] = dirname(__FILE__);
diff --git a/net-mgmt/cacti/files/patch-install__functions.php b/net-mgmt/cacti/files/patch-install__functions.php
index 59a76dbe1494..e43e6c593053 100644
--- a/net-mgmt/cacti/files/patch-install__functions.php
+++ b/net-mgmt/cacti/files/patch-install__functions.php
@@ -1,11 +1,11 @@
---- install/functions.php.orig	2019-01-03 02:14:26 UTC
+--- install/functions.php.orig	2019-03-30 23:40:23 UTC
 +++ install/functions.php
-@@ -528,7 +528,7 @@ function install_file_paths() {
- 	/* log file path */
- 	$input['path_cactilog'] = $settings['path']['path_cactilog'];
- 	if (empty($input['path_cactilog']['default'])) {
--		$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
-+		$input['path_cactilog']['default'] = '/var/log/cacti/log';
- 	}
- 
- 	/* stderr log file path */
+@@ -533,7 +533,7 @@ function install_file_paths() {
+ 	if (!config_value_exists('path_cactilog')) {
+ 		$input['path_cactilog'] = $settings['path']['path_cactilog'];
+ 		if (empty($input['path_cactilog']['default'])) {
+-			$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
++			$input['path_cactilog']['default'] = '/var/log/cacti/log';
+ 		}
+ 	} else {
+ 		$input['path_cactilog'] = $settings['path']['path_cactilog'];
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index 257f3eddf3d7..d91fffe3eb4a 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -1635,10 +1635,13 @@
 %%CACTIDIR%%/include/vendor/index.php
 %%CACTIDIR%%/include/vendor/phpgettext/gettext.php
 %%CACTIDIR%%/include/vendor/phpgettext/streams.php
+%%CACTIDIR%%/include/vendor/phpmailer/COMMITMENT
 %%CACTIDIR%%/include/vendor/phpmailer/LICENSE
 %%CACTIDIR%%/include/vendor/phpmailer/README.md
 %%CACTIDIR%%/include/vendor/phpmailer/SECURITY.md
 %%CACTIDIR%%/include/vendor/phpmailer/VERSION
+%%CACTIDIR%%/include/vendor/phpmailer/composer.json
+%%CACTIDIR%%/include/vendor/phpmailer/get_oauth_token.php
 %%CACTIDIR%%/include/vendor/phpmailer/index.php
 %%CACTIDIR%%/include/vendor/phpmailer/language/index.php
 %%CACTIDIR%%/include/vendor/phpmailer/language/phpmailer.lang-am.php
@@ -1738,6 +1741,7 @@
 %%CACTIDIR%%/install/install.js
 %%CACTIDIR%%/install/install.php
 %%CACTIDIR%%/install/step_json.php
+%%CACTIDIR%%/install/templates/Cacti_Stats.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
@@ -1782,6 +1786,8 @@
 %%CACTIDIR%%/install/upgrades/1_1_37.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/index.php
 %%CACTIDIR%%/lib/aggregate.php
 %%CACTIDIR%%/lib/api_aggregate.php
@@ -1803,6 +1809,7 @@
 %%CACTIDIR%%/lib/export.php
 %%CACTIDIR%%/lib/functions.php
 %%CACTIDIR%%/lib/graph_variables.php
+%%CACTIDIR%%/lib/graphs.php
 %%CACTIDIR%%/lib/html.php
 %%CACTIDIR%%/lib/html_filter.php
 %%CACTIDIR%%/lib/html_form.php
@@ -1882,6 +1889,7 @@
 %%CACTIDIR%%/locales/po/vi-VN.po
 %%CACTIDIR%%/locales/po/zh-CN.po
 %%CACTIDIR%%/locales/po/zh-TW.po
+%%CACTIDIR%%/locales/update-pot.sh
 %%CACTIDIR%%/logout.php
 %%CACTIDIR%%/managers.php
 %%CACTIDIR%%/mibs/CACTI-BOOST-MIB
@@ -1936,6 +1944,7 @@
 %%CACTIDIR%%/scripts/ss_fping.php
 %%CACTIDIR%%/scripts/ss_host_cpu.php
 %%CACTIDIR%%/scripts/ss_host_disk.php
+%%CACTIDIR%%/scripts/ss_hstats.php
 %%CACTIDIR%%/scripts/ss_net_snmp_disk_bytes.php
 %%CACTIDIR%%/scripts/ss_net_snmp_disk_io.php
 %%CACTIDIR%%/scripts/ss_sql.php