Update to 1.1.5

- Regenerate patch files with makepatch:

Changes:	http://www.cacti.net/changelog.php
PR:		218949
Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)

11 files changed, 31 insertions, 30 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 1af449d24e84..30d620f5077a 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cacti
-PORTVERSION=	1.1.4
+PORTVERSION=	1.1.5
 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 9f360833d5da..2f7edf4d8769 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493106955
-SHA256 (cacti-1.1.4.tar.gz) = a8eb7f8bec3e5950d91740305cd03ab4100ee5f0ef51758a24b0452153a1a6e4
-SIZE (cacti-1.1.4.tar.gz) = 7845591
+TIMESTAMP = 1493454208
+SHA256 (cacti-1.1.5.tar.gz) = 47d47ec7fa64615dae15d292a9879535e74a9a684718dc65dbe0c755d4e2cc4d
+SIZE (cacti-1.1.5.tar.gz) = 7845954
diff --git a/net-mgmt/cacti/files/patch-include__global.php b/net-mgmt/cacti/files/patch-include__global.php
index 956c25387f5d..3119849553a9 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	2017-02-04 14:12:12.747287000 +0000
-+++ include/global.php	2017-02-04 14:12:32.931726000 +0000
-@@ -126,7 +126,7 @@
+--- include/global.php.orig	2017-04-26 00:30:09 UTC
++++ include/global.php
+@@ -131,7 +131,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-include__global_settings.php b/net-mgmt/cacti/files/patch-include__global_settings.php
index 5bb942b4c8ca..d1422d03c5d7 100644
--- a/net-mgmt/cacti/files/patch-include__global_settings.php
+++ b/net-mgmt/cacti/files/patch-include__global_settings.php
@@ -1,6 +1,6 @@
---- include/global_settings.php.orig	2017-02-04 14:13:42.140386000 +0000
-+++ include/global_settings.php	2017-02-04 14:20:35.592474000 +0000
-@@ -135,9 +135,9 @@
+--- include/global_settings.php.orig	2017-04-26 00:30:09 UTC
++++ include/global_settings.php
+@@ -135,9 +135,9 @@ $settings = array(
  			),
  		'path_cactilog' => array(
  			'friendly_name' => __('Cacti Log Path'),
diff --git a/net-mgmt/cacti/files/patch-install__functions.php b/net-mgmt/cacti/files/patch-install__functions.php
index deb2dbedc9ac..90a6c7fa7440 100644
--- a/net-mgmt/cacti/files/patch-install__functions.php
+++ b/net-mgmt/cacti/files/patch-install__functions.php
@@ -1,6 +1,6 @@
---- install/functions.php.orig	2017-02-04 14:21:02.093580000 +0000
-+++ install/functions.php	2017-02-04 14:21:31.615575000 +0000
-@@ -365,7 +365,7 @@
+--- install/functions.php.orig	2017-04-26 00:30:09 UTC
++++ install/functions.php
+@@ -421,7 +421,7 @@ function install_file_paths () {
  	if (config_value_exists('path_cactilog')) {
  		$input['path_cactilog']['default'] = read_config_option('path_cactilog');
  	} else {
diff --git a/net-mgmt/cacti/files/patch-lib__clog_webapi.php b/net-mgmt/cacti/files/patch-lib__clog_webapi.php
index 2153d69dbc9f..ee21474ba9aa 100644
--- a/net-mgmt/cacti/files/patch-lib__clog_webapi.php
+++ b/net-mgmt/cacti/files/patch-lib__clog_webapi.php
@@ -1,6 +1,6 @@
---- lib/clog_webapi.php.orig	2017-02-04 14:22:42.713430000 +0000
-+++ lib/clog_webapi.php	2017-02-04 14:23:10.949163000 +0000
-@@ -40,7 +40,7 @@
+--- lib/clog_webapi.php.orig	2017-04-26 00:30:09 UTC
++++ lib/clog_webapi.php
+@@ -40,7 +40,7 @@ function clog_purge_logfile() {
  	$logfile = read_config_option('path_cactilog');
  
  	if ($logfile == '') {
@@ -9,7 +9,7 @@
  	}
  
  	if (file_exists($logfile)) {
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ function clog_view_logfile() {
  	$logfile = read_config_option('path_cactilog');
  
  	if ($logfile == '') {
diff --git a/net-mgmt/cacti/files/patch-lib__functions.php b/net-mgmt/cacti/files/patch-lib__functions.php
index 677acd08afe7..6fd755a70429 100644
--- a/net-mgmt/cacti/files/patch-lib__functions.php
+++ b/net-mgmt/cacti/files/patch-lib__functions.php
@@ -1,8 +1,8 @@
---- lib/functions.php.orig	2017-02-04 14:16:43.886716000 +0000
-+++ lib/functions.php	2017-02-04 14:22:18.219392000 +0000
-@@ -649,7 +649,7 @@
+--- lib/functions.php.orig	2017-04-26 00:30:09 UTC
++++ lib/functions.php
+@@ -594,7 +594,7 @@ function cacti_log($string, $output = fa
  	/* Log to Logfile */
- 	if ((($logdestination == 1) || ($logdestination == 2)) && (read_config_option('log_verbosity') != POLLER_VERBOSITY_NONE)) {
+ 	if (($logdestination == 1 || $logdestination == 2) && read_config_option('log_verbosity') != POLLER_VERBOSITY_NONE) {
  		if ($logfile == '') {
 -			$logfile = $config['base_path'] . '/log/cacti.log';
 +			$logfile = '/var/log/cacti/log';
diff --git a/net-mgmt/cacti/files/patch-poller_maintenance.php b/net-mgmt/cacti/files/patch-poller_maintenance.php
index 76df88017ebd..8d49da71226a 100644
--- a/net-mgmt/cacti/files/patch-poller_maintenance.php
+++ b/net-mgmt/cacti/files/patch-poller_maintenance.php
@@ -1,6 +1,6 @@
---- poller_maintenance.php.orig	2017-04-24 03:25:50.000000000 +0100
-+++ poller_maintenance.php	2017-04-25 14:27:06.327800000 +0100
-@@ -175,13 +175,13 @@
+--- poller_maintenance.php.orig	2017-04-26 00:30:09 UTC
++++ poller_maintenance.php
+@@ -175,13 +175,13 @@ function logrotate_rotatenow () {
  
  	$log = read_config_option('path_cactilog');
  	if ($log == '') {
diff --git a/net-mgmt/cacti/files/patch-scripts__diskfree.pl b/net-mgmt/cacti/files/patch-scripts__diskfree.pl
index 9d0465e31c57..ff923d580503 100644
--- a/net-mgmt/cacti/files/patch-scripts__diskfree.pl
+++ b/net-mgmt/cacti/files/patch-scripts__diskfree.pl
@@ -1,5 +1,5 @@
---- ./scripts/diskfree.pl.orig	2014-08-15 15:39:51.000000000 +0200
-+++ ./scripts/diskfree.pl	2014-08-15 15:40:16.000000000 +0200
+--- scripts/diskfree.pl.orig	2017-04-26 00:30:09 UTC
++++ scripts/diskfree.pl
 @@ -1,5 +1,5 @@
  #!/usr/bin/perl
 -open(PROCESS,"df --block-size=1024 -P $ARGV[0] | grep -v Filesystem |");
diff --git a/net-mgmt/cacti/files/patch-utilities.php b/net-mgmt/cacti/files/patch-utilities.php
index ce85642faccc..8ae2fcb90db3 100644
--- a/net-mgmt/cacti/files/patch-utilities.php
+++ b/net-mgmt/cacti/files/patch-utilities.php
@@ -1,6 +1,6 @@
---- utilities.php.orig	2017-02-04 14:25:11.346062000 +0000
-+++ utilities.php	2017-02-04 14:25:39.435371000 +0000
-@@ -869,7 +869,7 @@
+--- utilities.php.orig	2017-04-26 00:30:09 UTC
++++ utilities.php
+@@ -872,7 +872,7 @@ function utilities_view_logfile() {
  	$logfile = read_config_option('path_cactilog');
  
  	if ($logfile == '') {
@@ -9,7 +9,7 @@
  	}
  
  	/* helps determine output color */
-@@ -1149,7 +1149,7 @@
+@@ -1155,7 +1155,7 @@ function utilities_clear_logfile() {
  	$logfile = read_config_option('path_cactilog');
  
  	if ($logfile == '') {
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index f52c6b417474..222515a4ffa1 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -1047,6 +1047,7 @@
 %%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