From owner-svn-ports-branches@FreeBSD.ORG Tue Jun 23 18:07:02 2015 Return-Path: Delivered-To: svn-ports-branches@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A88EA10; Tue, 23 Jun 2015 18:07:02 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 821A6CDB; Tue, 23 Jun 2015 18:07:02 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NI72It071117; Tue, 23 Jun 2015 18:07:02 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5NI718a071112; Tue, 23 Jun 2015 18:07:01 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506231807.t5NI718a071112@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 23 Jun 2015 18:07:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r390437 - branches/2015Q2/net-mgmt/cacti/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 18:07:02 -0000 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 /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. + =======================================================================