7 files changed, 0 insertions, 164 deletions
diff --git a/net-mgmt/cacti88/files/patch-include__global.php b/net-mgmt/cacti88/files/patch-include__global.php
deleted file mode 100644
index ae0aa711e549..000000000000
--- a/net-mgmt/cacti88/files/patch-include__global.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/global.php.orig	2016-03-06 23:26:59 UTC
-+++ include/global.php
-@@ -116,7 +116,7 @@ if ($config["cacti_server_os"] == "win32
- 	$config["library_path"] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
- }
- $config["include_path"] = dirname(__FILE__);
--$config["rra_path"] = $config["base_path"] . '/rra';
-+$config["rra_path"] = '/var/db/cacti/rra';
- 
- /* colors */
- $colors["dark_outline"] = "454E53";
diff --git a/net-mgmt/cacti88/files/patch-include__global_settings.php b/net-mgmt/cacti88/files/patch-include__global_settings.php
deleted file mode 100644
index 97d60b669527..000000000000
--- a/net-mgmt/cacti88/files/patch-include__global_settings.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/global_settings.php.orig	2016-02-07 19:26:54 UTC
-+++ include/global_settings.php
-@@ -96,7 +96,7 @@ $settings = array(
- 			),
- 		"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",
- 			"max_length" => "255"
diff --git a/net-mgmt/cacti88/files/patch-install__index.php b/net-mgmt/cacti88/files/patch-install__index.php
deleted file mode 100644
index b62991d71c0c..000000000000
--- a/net-mgmt/cacti88/files/patch-install__index.php
+++ /dev/null
@@ -1,20 +0,0 @@
---- install/index.php.orig	2016-03-06 23:26:59 UTC
-+++ install/index.php
-@@ -63,7 +63,7 @@ if ($old_cacti_version == $config["cacti
- }
- 
- function verify_php_extensions() {
--	$extensions = array("session", "sockets", "mysql", "xml");
-+	$extensions = array("session", "sockets", "mysqli", "xml");
- 	$ok = true;
- 	$missing_extension = "	<p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p>
- 							<p style='font-family: Verdana, Arial; font-size: 12px;'>The following PHP extensions are missing:</p><ul>";
-@@ -267,7 +267,7 @@ $input["path_cactilog"]["description"] =
- if (config_value_exists("path_cactilog")) {
- 	$input["path_cactilog"]["default"] = read_config_option("path_cactilog");
- } else {
--	$input["path_cactilog"]["default"] = $config["base_path"] . "/log/cacti.log";
-+	$input["path_cactilog"]["default"] = "/var/log/cacti/log";
- }
- 
- /* SNMP Version */
diff --git a/net-mgmt/cacti88/files/patch-lib__functions.php b/net-mgmt/cacti88/files/patch-lib__functions.php
deleted file mode 100644
index 7fd717018708..000000000000
--- a/net-mgmt/cacti88/files/patch-lib__functions.php
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/functions.php.orig	2016-05-08 14:46:52 UTC
-+++ lib/functions.php
-@@ -670,8 +670,10 @@ function update_host_status($status, $ho
- 	$issue_log_message   = false;
- 	$ping_failure_count  = read_config_option("ping_failure_count");
- 	$ping_recovery_count = read_config_option("ping_recovery_count");
--	$hosts[$host_id]["status_fail_date"] = '0000-00-00 00:00:00';
--	$hosts[$host_id]["status_rec_date"] = '0000-00-00 00:00:00';
-+	if ((!isset($hosts[$host_id]["status_fail_date"])) || ($hosts[$host_id]["status_fail_date"] == ""))
-+		$hosts[$host_id]["status_fail_date"] = '0000-00-00 00:00:00';
-+	if ((!isset($hosts[$host_id]["status_rec_date"])) || ($hosts[$host_id]["status_rec_date"] == ""))
-+		$hosts[$host_id]["status_rec_date"] = '0000-00-00 00:00:00';
- 
- 	if ($status == HOST_DOWN) {
- 		/* update total polls, failed polls and availability */
diff --git a/net-mgmt/cacti88/files/patch-scripts__diskfree.pl b/net-mgmt/cacti88/files/patch-scripts__diskfree.pl
deleted file mode 100644
index 9e8517401141..000000000000
--- a/net-mgmt/cacti88/files/patch-scripts__diskfree.pl
+++ /dev/null
@@ -1,9 +0,0 @@
---- scripts/diskfree.pl.orig	2017-06-01 00:09:48 UTC
-+++ scripts/diskfree.pl
-@@ -1,5 +1,5 @@
- #!/usr/local/bin/perl
--open(PROCESS,"df --block-size=1024 -P $ARGV[0] | grep -v Filesystem |");
-+open(PROCESS,"df -k $ARGV[0] | grep -v Filesystem |");
- foreach (<PROCESS>) {
- 	if ($_ =~ /($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )/) {
- 		print "megabytes:$7 percent:$9";
diff --git a/net-mgmt/cacti88/files/patch-scripts__ping.pl b/net-mgmt/cacti88/files/patch-scripts__ping.pl
deleted file mode 100644
index 931472cd53b9..000000000000
--- a/net-mgmt/cacti88/files/patch-scripts__ping.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/ping.pl.orig	2017-06-01 00:09:48 UTC
-+++ scripts/ping.pl
-@@ -7,7 +7,7 @@ $host =~ s/:[0-9]{1,5}/$1/gis;
- 
- # old linux version use "icmp_seq"
- # newer use "icmp_req" instead
--open(PROCESS, "ping -c 1 $host | grep 'icmp_[s|r]eq' | grep time |");
-+open(PROCESS, "/sbin/ping -c 1 $host | grep 'icmp_[s|r]eq' | grep time |");
- $ping = <PROCESS>;
- close(PROCESS);
- $ping =~ m/(.*time=)(.*) (ms|usec)/;
diff --git a/net-mgmt/cacti88/files/pkg-message.in b/net-mgmt/cacti88/files/pkg-message.in
deleted file mode 100644
index 0a16e3c5fca8..000000000000
--- a/net-mgmt/cacti88/files/pkg-message.in
+++ /dev/null
@@ -1,87 +0,0 @@
-=======================================================================
-Cacti is now installed. If you intall it for the first time,
-you may have to follow this steps to make it work correctly:
-
-1. Create the MySQL database, a cacti user, and initialize:
-   a) CREATE DATABASE cacti;
-   b) Create a mysql user/password for cacti:
-      CREATE USER 'cacti'@'localhost' IDENTIFIED BY 'password';
-      FLUSH PRIVILEGES;
-   c) Add GRANTS:
-      GRANT ALL ON cacti.* TO 'cacti'@'localhost';
-      FLUSH PRIVILEGES;
-   d) Import the default cacti database:
-      mysql --database=cacti -ucacti -p < %%PREFIX%%/%%CACTIDIR%%/cacti.sql
-
- NOTE:
-   * Cacti does not LOCK TABLES.
-
-2. Edit %%PREFIX%%/%%CACTIDIR%%/include/config.php from the template
-   config.php.orig.
-
-   PHP requires the time zone to be explicitly set rather that rely on
-   the system time zone, otherwise poller complains. I added the
-   following line to my config.php:
-
-   date_default_timezone_set('America/Los_Angeles');
-
-3. Add the following line to cron for %%CACTIUSER%%:
-*/5 * * * * %%LOCALBASE%%/bin/php %%PREFIX%%/%%CACTIDIR%%/poller.php > /dev/null 2>&1
-
-4. Example Apache 2.4 configuration:
-
-   LoadModule php5_module  libexec/apache22/libphp5.so
-
-   <FilesMatch "\.php$">
-       SetHandler application/x-httpd-php
-   </FilesMatch>
-   <FilesMatch "\.phps$">
-       SetHandler application/x-httpd-php-source
-   </FilesMatch>
-
-   DirectoryIndex index.php
-
-   DocumentRoot "/usr/local/share/cacti"
-
-   Alias /cacti "/usr/local/share/cacti/"
-   Alias /Cacti "/usr/local/share/cacti/"
-
-   <Directory "/usr/local/share/cacti">
-      Require all granted
-      AllowOverride None
-      Order Allow,deny
-      Allow from all
-   </Directory>
-
-5. Open a Cacti login page in your web browser and login with
-   admin/admin.
-
-If you update cacti, open a login page and an updating process will
-start automatically.
-
-NOTEs as of 10Aug2014:
-
-1) Cacti now better supports hier(7)
-
-   a) Cacti log files are now found under /var/log/cacti where you can
-      manage them using newsyslog.
-   b) Cacti RRD files are now found under /var/db/cacti/rra.
-
-   If you have an existing Cacti installation these paths are also
-   found in Cacti's SQL database and MUST be updated. These two SQL
-   commands should do the trick:
-
-   UPDATE settings SET value='/var/log/cacti/log' \
-     WHERE name='path_cactilog';
-
-   UPDATE poller_item SET rrd_path=\
-     REPLACE(rrd_path,'/usr/local/share/cacti/rra','/var/db/cacti/rra') \
-     WHERE rrd_path REGEXP '^/usr/local/share/cacti/rra';
-
-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.
-
-=======================================================================