Index: net-mgmt/Makefile
===================================================================
--- net-mgmt/Makefile
+++ net-mgmt/Makefile
@@ -27,6 +27,7 @@
     SUBDIR += bwm-ng
     SUBDIR += cacti
     SUBDIR += cacti-spine
+    SUBDIR += cacti88-spine
     SUBDIR += ccnet-client
     SUBDIR += ccnet-server
     SUBDIR += cdpd
Index: net-mgmt/cacti-spine/Makefile
===================================================================
--- net-mgmt/cacti-spine/Makefile
+++ net-mgmt/cacti-spine/Makefile
@@ -22,6 +22,8 @@
 LDFLAGS+=	`net-snmp-config --libs`
 USES=		libtool mysql ssl
 
+CONFLICTS_INSTALL=	cacti88
+
 post-patch:
 	@${REINPLACE_CMD} 's,#define\ *DEFAULT_CONF_FILE .*,#define DEFAULT_CONF_FILE "${PREFIX}/etc/spine.conf",' ${WRKSRC}/spine.h
 
Index: net-mgmt/cacti88-spine/Makefile
===================================================================
--- net-mgmt/cacti88-spine/Makefile
+++ net-mgmt/cacti88-spine/Makefile
@@ -5,15 +5,18 @@
 PORTVERSION=	0.8.8h
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.cacti.net/downloads/${PORTNAME}/
+PKGNAMEPREFIX=	cacti88-
 DISTNAME=	cacti-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	skreuzer@FreeBSD.org
+MAINTAINER=	egypcio@googlemail.com
 COMMENT=	Multithreaded poller for Cacti written in C
 
-LICENSE=	GPLv2
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	help2man:misc/help2man
-LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp \
+		libpkg.so:ports-mgmt/pkg
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE}
@@ -21,6 +24,10 @@
 LDFLAGS+=	`net-snmp-config --libs`
 USES=		libtool mysql ssl
 
+CONFLICTS_INSTALL=	cacti spine
+
+PORTSCOUT=	limit:^0.*
+
 post-patch:
 	@${REINPLACE_CMD} 's,#define\ *DEFAULT_CONF_FILE .*,#define DEFAULT_CONF_FILE "${PREFIX}/etc/spine.conf",' ${WRKSRC}/spine.h
 
Index: net-mgmt/cacti88-spine/pkg-descr
===================================================================
--- net-mgmt/cacti88-spine/pkg-descr
+++ net-mgmt/cacti88-spine/pkg-descr
@@ -1,8 +1,7 @@
-Cactid is a poller for Cacti that primarily strives to be as fast as
-possible. For this reason it is written in native C, makes use of POSIX
-threads, and is linked directly against the net-snmp library for
-minmumal SNMP polling overhead. Cactid is a replacement for the default
-cmd.php poller so you must decide if using Cactid makes sense for your
-installation.
+Spine, formerly Cactid, is a poller for Cacti that primarily strives to be as
+fast as possible. For this reason it is written in native C, makes use of POSIX
+threads, and is linked directly against the net-snmp library for minmumal SNMP
+polling overhead. Spine is a replacement for the default cmd.php poller so you
+must decide if using Spine makes sense for your installation.
 
-WWW: http://www.cacti.net/cactid_info.php
+WWW: http://cacti.net/spine_info.php