svn commit: r390437 - branches/2015Q2/net-mgmt/cacti/files

[Xin LI]

Author: delphij
Date: Tue Jun 23 18:07:00 2015
New Revision: 390437
URL: https://svnweb.freebsd.org/changeset/ports/390437

Log:
  MFH: r384620 (partially).
  
  There were some patches that was changed and/or removed
  and this also applies for 0.8.8d.
  
  PR:		200963
  Approved by:	ports-secteam

Deleted:
  branches/2015Q2/net-mgmt/cacti/files/patch-lib__rrd.php
Modified:
  branches/2015Q2/net-mgmt/cacti/files/patch-include__global.php
  branches/2015Q2/net-mgmt/cacti/files/patch-include__global_settings.php
  branches/2015Q2/net-mgmt/cacti/files/patch-install__index.php
  branches/2015Q2/net-mgmt/cacti/files/pkg-message.in
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/net-mgmt/cacti/files/patch-include__global.php
==============================================================================
--- branches/2015Q2/net-mgmt/cacti/files/patch-include__global.php	Tue Jun 23 17:45:39 2015	(r390436)
+++ branches/2015Q2/net-mgmt/cacti/files/patch-include__global.php	Tue Jun 23 18:07:00 2015	(r390437)
@@ -1,5 +1,5 @@
---- ./include/global.php.orig	2013-08-06 19:31:19.000000000 -0700
-+++ ./include/global.php	2014-08-11 18:37:08.000000000 -0700
+--- include/global.php.bak	2015-03-12 03:07:05.768314249 -0700
++++ include/global.php	2015-03-12 03:08:04.171320391 -0700
 @@ -113,7 +113,7 @@
  	$config["library_path"] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
  }

Modified: branches/2015Q2/net-mgmt/cacti/files/patch-include__global_settings.php
==============================================================================
--- branches/2015Q2/net-mgmt/cacti/files/patch-include__global_settings.php	Tue Jun 23 17:45:39 2015	(r390436)
+++ branches/2015Q2/net-mgmt/cacti/files/patch-include__global_settings.php	Tue Jun 23 18:07:00 2015	(r390437)
@@ -1,14 +1,11 @@
---- ./include/global_settings.php.orig	2013-08-06 19:31:19.000000000 -0700
-+++ ./include/global_settings.php	2014-08-11 18:37:08.000000000 -0700
-@@ -96,9 +96,9 @@
+--- include/global_settings.php.bak	2015-03-12 03:08:59.333297709 -0700
++++ include/global_settings.php	2015-03-12 03:10:47.532302704 -0700
+@@ -96,7 +96,7 @@
  			),
  		"path_cactilog" => array(
  			"friendly_name" => "Cacti Log File Path",
 -			"description" => "The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)",
 +			"description" => "The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)",
  			"method" => "filepath",
--			"default" => $config["base_path"] . "/log/cacti.log",
-+			"default" => "/var/log/cacti/log",
+ 			"default" => $config["base_path"] . "/log/cacti.log",
  			"max_length" => "255"
- 			),
- 		"pollerpaths_header" => array(

Modified: branches/2015Q2/net-mgmt/cacti/files/patch-install__index.php
==============================================================================
--- branches/2015Q2/net-mgmt/cacti/files/patch-install__index.php	Tue Jun 23 17:45:39 2015	(r390436)
+++ branches/2015Q2/net-mgmt/cacti/files/patch-install__index.php	Tue Jun 23 18:07:00 2015	(r390437)
@@ -1,5 +1,5 @@
---- ./install/index.php.orig	2013-08-06 19:31:19.000000000 -0700
-+++ ./install/index.php	2014-08-11 18:45:19.000000000 -0700
+--- install/index.php.bak	2015-03-12 03:12:05.409276443 -0700
++++ install/index.php	2015-03-12 03:14:17.596295374 -0700
 @@ -267,7 +267,7 @@
  if (config_value_exists("path_cactilog")) {
  	$input["path_cactilog"]["default"] = read_config_option("path_cactilog");

Modified: branches/2015Q2/net-mgmt/cacti/files/pkg-message.in
==============================================================================
--- branches/2015Q2/net-mgmt/cacti/files/pkg-message.in	Tue Jun 23 17:45:39 2015	(r390436)
+++ branches/2015Q2/net-mgmt/cacti/files/pkg-message.in	Tue Jun 23 18:07:00 2015	(r390437)
@@ -81,4 +81,7 @@ NOTEs as of 10Aug2014:
 2) The PERL paths in the Cacti PERL scripts have been updated to
    /usr/local/bin.
 
+Other Erratas:
+Mount linprocfs in /compat/linux/proc will alow most scripts to work.
+
 =======================================================================