Index: net-mgmt/Makefile
===================================================================
--- net-mgmt/Makefile
+++ net-mgmt/Makefile
@@ -27,6 +27,7 @@
     SUBDIR += bwm-ng
     SUBDIR += cacti
     SUBDIR += cacti-spine
+    SUBDIR += cacti88
     SUBDIR += ccnet-client
     SUBDIR += ccnet-server
     SUBDIR += cdpd
Index: net-mgmt/cacti/Makefile
===================================================================
--- net-mgmt/cacti/Makefile
+++ net-mgmt/cacti/Makefile
@@ -44,6 +44,8 @@
 SUB_LIST+=	CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \
 		CACTIGROUP=${CACTIGROUP}
 
+CONFLICTS_INSTALL=	cacti88
+
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete; \
 	${MV} ${WRKSRC}/include/config.php ${WRKSRC}/include/config.php.sample
Index: net-mgmt/cacti88/Makefile
===================================================================
--- net-mgmt/cacti88/Makefile
+++ net-mgmt/cacti88/Makefile
@@ -1,26 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	cacti
-PORTVERSION=	0.8.8h${PATCHLEVEL}
+PORTVERSION=	0.8.8h
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	http://www.cacti.net/downloads/ \
-		ftp://ftpmirror.uk/freebsd-ports/cacti/
+MASTER_SITES=	http://www.cacti.net/downloads/
+PKGNAMESUFFIX=	88
 
-MAINTAINER=	freebsd-ports@dan.me.uk
-COMMENT=	Web-driven graphing interface for RRDTool
+MAINTAINER=	egypcio@googlemail.com
+COMMENT=	Graphing interface for RRDTool (Old version of net-mgmt/cacti)
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rrdtool:databases/rrdtool
 
-USES=		cpe mysql shebangfix
+USES=		cpe mysql php:web shebangfix
 USE_PHP=	mysqli pcre session sockets snmp xml
-WANT_PHP_WEB=	yes
+
 NO_ARCH=	yes
 NO_BUILD=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
+
+IGNORE_WITH_PHP=	70 71
+
 SUB_FILES=	pkg-message
+
 SHEBANG_FILES=	scripts/3com_cable_modem.pl \
 		scripts/diskfree.pl \
 		scripts/linux_memory.pl \
@@ -34,21 +37,17 @@
 		scripts/weatherbug.pl \
 		scripts/webhits.pl
 
-CACTIDIR?=	share/cacti
-CACTIUSER?=	cacti
-CACTIGROUP?=	cacti
+CACTIDIR=	share/cacti
 
-USERS?=		${CACTIUSER}
-GROUPS?=	${CACTIGROUP}
+USERS=		cacti
+GROUPS=		cacti
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${SITEDISTVERSION}
+PLIST_SUB+=	CACTIDIR=${CACTIDIR}
+SUB_LIST+=	CACTIDIR=${CACTIDIR}
 
-SITEDISTVERSION=	${PORTVERSION:S/${PATCHLEVEL}$//}
+CONFLICTS_INSTALL=	cacti-
 
-PLIST_SUB+=	CACTIDIR=${CACTIDIR}  CACTIUSER=${CACTIUSER} \
-		CACTIGROUP=${CACTIGROUP}
-SUB_LIST+=	CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \
-		CACTIGROUP=${CACTIGROUP}
+PORTSCOUT=	limit:^0.*
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete; \
Index: net-mgmt/cacti88/files/patch-include__global.php
===================================================================
--- net-mgmt/cacti88/files/patch-include__global.php
+++ net-mgmt/cacti88/files/patch-include__global.php
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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__);
Index: net-mgmt/cacti88/files/patch-include__global_settings.php
===================================================================
--- net-mgmt/cacti88/files/patch-include__global_settings.php
+++ net-mgmt/cacti88/files/patch-include__global_settings.php
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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",
Index: net-mgmt/cacti88/files/patch-install__index.php
===================================================================
--- net-mgmt/cacti88/files/patch-install__index.php
+++ net-mgmt/cacti88/files/patch-install__index.php
@@ -1,6 +1,6 @@
---- install/index.php.orig	2016-05-28 10:54:08.124059773 +0100
-+++ install/index.php	2016-05-28 10:54:34.252057818 +0100
-@@ -63,7 +63,7 @@
+--- 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() {
@@ -9,7 +9,7 @@
  	$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 @@
+@@ -267,7 +267,7 @@ $input["path_cactilog"]["description"] =
  if (config_value_exists("path_cactilog")) {
  	$input["path_cactilog"]["default"] = read_config_option("path_cactilog");
  } else {
Index: net-mgmt/cacti88/files/patch-lib__functions.php
===================================================================
--- net-mgmt/cacti88/files/patch-lib__functions.php
+++ net-mgmt/cacti88/files/patch-lib__functions.php
@@ -1,6 +1,6 @@
---- lib/functions.php.orig	2016-05-28 10:58:17.522042409 +0100
-+++ lib/functions.php	2016-05-28 11:00:31.399032747 +0100
-@@ -670,8 +670,10 @@
+--- 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");
Index: net-mgmt/cacti88/files/patch-scripts__diskfree.pl
===================================================================
--- net-mgmt/cacti88/files/patch-scripts__diskfree.pl
+++ net-mgmt/cacti88/files/patch-scripts__diskfree.pl
@@ -1,7 +1,7 @@
---- ./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-06-01 00:09:48 UTC
++++ scripts/diskfree.pl
 @@ -1,5 +1,5 @@
- #!/usr/bin/perl
+ #!/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>) {
Index: net-mgmt/cacti88/files/patch-scripts__ping.pl
===================================================================
--- net-mgmt/cacti88/files/patch-scripts__ping.pl
+++ net-mgmt/cacti88/files/patch-scripts__ping.pl
@@ -1,6 +1,6 @@
---- ./scripts/ping.pl.orig	2014-08-15 15:39:56.000000000 +0200
-+++ ./scripts/ping.pl	2014-08-15 15:40:35.000000000 +0200
-@@ -6,7 +6,7 @@
+--- 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
Index: net-mgmt/cacti88/files/pkg-message.in
===================================================================
--- net-mgmt/cacti88/files/pkg-message.in
+++ net-mgmt/cacti88/files/pkg-message.in
@@ -25,7 +25,7 @@
 
    date_default_timezone_set('America/Los_Angeles');
 
-3. Add the following line to cron for %%CACTIUSER%%:
+3. Add the following line to cron for cacti:
 */5 * * * * %%LOCALBASE%%/bin/php %%PREFIX%%/%%CACTIDIR%%/poller.php > /dev/null 2>&1
 
 4. Example Apache 2.4 configuration:
Index: net-mgmt/cacti88/pkg-plist
===================================================================
--- net-mgmt/cacti88/pkg-plist
+++ net-mgmt/cacti88/pkg-plist
@@ -3,7 +3,7 @@
 %%CACTIDIR%%/about.php
 %%CACTIDIR%%/auth_changepassword.php
 %%CACTIDIR%%/auth_login.php
-%%CACTIDIR%%/%%CACTIUSER%%.sql
+%%CACTIDIR%%/cacti.sql
 %%CACTIDIR%%/cdef.php
 %%CACTIDIR%%/cli/.htaccess
 %%CACTIDIR%%/cli/index.php
@@ -43,9 +43,9 @@
 %%CACTIDIR%%/docs/html/basics.html
 %%CACTIDIR%%/docs/html/batch_copy_users.html
 %%CACTIDIR%%/docs/html/bsd_ports.html
-%%CACTIDIR%%/docs/html/%%CACTIUSER%%_help.html
+%%CACTIDIR%%/docs/html/cacti_help.html
 %%CACTIDIR%%/docs/html/cdefs.html
-%%CACTIDIR%%/docs/html/check_%%CACTIUSER%%_poller.html
+%%CACTIDIR%%/docs/html/check_cacti_poller.html
 %%CACTIDIR%%/docs/html/check_data_gathering.html
 %%CACTIDIR%%/docs/html/check_mysql_updating.html
 %%CACTIDIR%%/docs/html/check_rrd_graph.html
@@ -111,7 +111,7 @@
 %%CACTIDIR%%/docs/html/install_unix.html
 %%CACTIDIR%%/docs/html/install_windows.html
 %%CACTIDIR%%/docs/html/installation.html
-%%CACTIDIR%%/docs/html/making_scripts_work_with_%%CACTIUSER%%.html
+%%CACTIDIR%%/docs/html/making_scripts_work_with_cacti.html
 %%CACTIDIR%%/docs/html/migration_php_scripts_to_script_server.html
 %%CACTIDIR%%/docs/html/new_graphs.html
 %%CACTIDIR%%/docs/html/operating_principles.html
@@ -127,7 +127,7 @@
 %%CACTIDIR%%/docs/html/templates.html
 %%CACTIDIR%%/docs/html/testing_script_in_script_server.html
 %%CACTIDIR%%/docs/html/unix_apply_patches.html
-%%CACTIDIR%%/docs/html/unix_configure_%%CACTIUSER%%.html
+%%CACTIDIR%%/docs/html/unix_configure_cacti.html
 %%CACTIDIR%%/docs/html/unix_configure_httpd.html
 %%CACTIDIR%%/docs/html/unix_configure_mysql.html
 %%CACTIDIR%%/docs/html/unix_configure_php.html
@@ -175,10 +175,10 @@
 %%CACTIDIR%%/images/button_save.gif
 %%CACTIDIR%%/images/button_view.gif
 %%CACTIDIR%%/images/button_yes.gif
-%%CACTIDIR%%/images/%%CACTIUSER%%_about_logo.gif
-%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop.gif
-%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop2.gif
-%%CACTIDIR%%/images/%%CACTIUSER%%_logo.gif
+%%CACTIDIR%%/images/cacti_about_logo.gif
+%%CACTIDIR%%/images/cacti_backdrop.gif
+%%CACTIDIR%%/images/cacti_backdrop2.gif
+%%CACTIDIR%%/images/cacti_logo.gif
 %%CACTIDIR%%/images/calendar.gif
 %%CACTIDIR%%/images/delete_icon.gif
 %%CACTIDIR%%/images/delete_icon_large.gif
@@ -208,7 +208,7 @@
 %%CACTIDIR%%/images/shadow.gif
 %%CACTIDIR%%/images/shadow_gray.gif
 %%CACTIDIR%%/images/show.gif
-%%CACTIDIR%%/images/tab_%%CACTIUSER%%.gif
+%%CACTIDIR%%/images/tab_cacti.gif
 %%CACTIDIR%%/images/tab_console.gif
 %%CACTIDIR%%/images/tab_console_down.gif
 %%CACTIDIR%%/images/tab_graphs.gif
@@ -524,11 +524,11 @@
 @comment
 @comment Manage the new Cacti dirs from their prior default location.
 @comment
-@owner %%CACTIUSER%%
-@group %%CACTIGROUP%%
+@owner cacti
+@group cacti
 @dir /var/log/cacti
 @dir /var/db/cacti/rra
 @dir /var/db/cacti/scripts
 @dir /var/db/cacti
-@group wheel
-@owner root
+@group
+@owner