8 files changed, 1 insertions, 74 deletions

diff --git a/MOVED b/MOVED
index dc57bd13f1b0..b7b7bf54df40 100644
--- a/MOVED
+++ b/MOVED
@@ -3358,3 +3358,4 @@ net/freeradius-devel|net/freeradius2|2008-01-18|Development version no longer ne
 devel/p5-gearmand|devel/p5-Gearman-Server|2008-01-20|Replaced by p5-Gearman-Server
 database/mysqltoolkit|database/maatkit|2008-01-21|project was renamed
 games/sturmbahnfahrer|games/stormbaancoureur|2008-01-27|project was renamed
+net/cactid|net-mgmt/cacti-spine|2008-01-27|project was renamed
diff --git a/net/Makefile b/net/Makefile
index af081454bd3c..d7bf2b42145b 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -69,7 +69,6 @@
     SUBDIR += brutecopy
     SUBDIR += bsdproxy
     SUBDIR += c3270
-    SUBDIR += cactid
     SUBDIR += callgen323
     SUBDIR += cap
     SUBDIR += ccxstream
diff --git a/net/cactid/Makefile b/net/cactid/Makefile
deleted file mode 100644
index 81b100415735..000000000000
--- a/net/cactid/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:   cactid
-# Date created:        Feb 26 2005
-# Whom:                clement@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cactid
-PORTVERSION=	0.8.6.i
-PORTREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	http://www.cacti.net/downloads/cactid/
-DISTNAME=	cacti-${PORTNAME}-0.8.6i
-
-MAINTAINER=	clement@FreeBSD.org
-COMMENT=	A multithreaded poller for Cacti written in C
-
-LIB_DEPENDS=	netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE}
-USE_MYSQL=	YES
-USE_OPENSSL=	YES
-
-post-patch:
-	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' \
-		${WRKSRC}/cactid.h
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/cactid ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/cactid.conf ${EXAMPLESDIR}
-	@[ -e ${PREFIX}/etc/cactid.conf ] || \
-		${INSTALL_DATA} ${EXAMPLESDIR}/cactid.conf ${PREFIX}/etc/
-.include <bsd.port.mk>
diff --git a/net/cactid/distinfo b/net/cactid/distinfo
deleted file mode 100644
index e8f66d3eff3d..000000000000
--- a/net/cactid/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (cacti-cactid-0.8.6i.tar.gz) = 303c7533656c075cb695a1a8c54537b6
-SHA256 (cacti-cactid-0.8.6i.tar.gz) = 6024ee5083a296ef3815ffa2294a9d0c1605aa8501e7114716675101db8bd841
-SIZE (cacti-cactid-0.8.6i.tar.gz) = 153534
diff --git a/net/cactid/files/patch-Makefile.in b/net/cactid/files/patch-Makefile.in
deleted file mode 100644
index 118986738fff..000000000000
--- a/net/cactid/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Nov  3 11:06:55 2006
-+++ Makefile.in	Fri Nov  3 11:09:33 2006
-@@ -83,7 +83,7 @@
- 
- cactid_SOURCES = sql.c cactid.c util.c snmp.c locks.c poller.c nft_popen.c php.c ping.c keywords.c error.c
- 
--configdir = /etc
-+configdir = ${PREFIX}/etc
- config_DATA = cactid.conf
- 
- bin_PROGRAMS = cactid
diff --git a/net/cactid/files/patch-cactid.h b/net/cactid/files/patch-cactid.h
deleted file mode 100644
index d0c0743ebc19..000000000000
--- a/net/cactid/files/patch-cactid.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cactid.h.orig	Tue Oct 11 23:13:48 2005
-+++ cactid.h	Sun Oct 30 14:15:22 2005
-@@ -55,7 +55,7 @@
- /* locations to search for the config file */
- #define CONFIG_PATHS 2
- #define CONFIG_PATH_1 ""
--#define CONFIG_PATH_2 "/etc/"
-+#define CONFIG_PATH_2 "%%PREFIX%%/etc/"
- 
- /* config file defaults */
- #define DEFAULT_CONF_FILE "cactid.conf"
diff --git a/net/cactid/pkg-descr b/net/cactid/pkg-descr
deleted file mode 100644
index bf46eb143990..000000000000
--- a/net/cactid/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-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.
-
-WWW: http://www.cacti.net/cactid_info.php
diff --git a/net/cactid/pkg-plist b/net/cactid/pkg-plist
deleted file mode 100644
index 1a7ecbe064f2..000000000000
--- a/net/cactid/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/cactid
-@unexec if cmp -s %D/etc/cactid.conf %D/%%EXAMPLESDIR%%/cactid.conf; then rm -f %D/etc/cactid.conf; fi
-%%EXAMPLESDIR%%/cactid.conf
-@exec [ -f %D/etc/cactid.conf ] || cp %D/%%EXAMPLESDIR%%/cactid.conf %D/etc/cactid.conf
-@dirrm %%EXAMPLESDIR%%