8 files changed, 1 insertions, 149 deletions

diff --git a/MOVED b/MOVED
index 7609cad81030..7a756b2b4703 100644
--- a/MOVED
+++ b/MOVED
@@ -4004,3 +4004,4 @@ devel/titano||2013-01-13|Has expired: Dead upstream since 2001
 games/py-anki|games/anki|2013-01-16|Project was merged
 mail/claws-mail-synce||2013-01-16|Has expired: No longer supported by Claws Mail team
 databases/postgresql-plpython|databases/postgresql90-plpython|2013-01-20|This port was splitted out to several versioned ports
+net-mgmt/nfdump-devel||2013-01-22|Has expired: use nfdump instead
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 3fbbe821b95b..e76bb4d5f194 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -177,7 +177,6 @@
     SUBDIR += netwox
     SUBDIR += netxms
     SUBDIR += nfdump
-    SUBDIR += nfdump-devel
     SUBDIR += nfsen
     SUBDIR += ng_ipacct
     SUBDIR += nitpicker
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
deleted file mode 100644
index 0a00f61cb252..000000000000
--- a/net-mgmt/nfdump-devel/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# Created by: Janos.Mohacsi@bsd.hu
-# $FreeBSD$
-
-PORTNAME=	nfdump-devel
-PORTVERSION=	20070808
-PORTREVISION=	4
-CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/nfdump/snapshot/nfdump-snapshot-${PORTVERSION}
-DISTNAME=	nfdump-snapshot-${PORTVERSION}
-
-MAINTAINER=	jmohacsi@bsd.hu
-COMMENT=	Development version of tools to collect and process NetFlow data
-
-BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-nfprofile --with-rrdpath=${LOCALBASE}
-
-DEPRECATED=	Use net-mgmt/nfdump instead.
-EXPIRATION_DATE=	2013-01-17
-
-#flow-tools support
-OPTIONS_DEFINE=		FT2NFDUMP SFLOW NFDUMP14
-OPTIONS_DEFAULT=	
-
-FT2NFDUMP_DESC=		With Flow-tools to nfdump converter
-SFLOW_DESC=		Build sflow collector daemon also
-NFDUMP14_DESC=		Enable compatbility with version 1.4
-
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.X
-.endif
-
-#for compatibility
-#
-.if ${PORT_OPTIONS:MNFDUMP14}
-CONFIGURE_ARGS+=	--enable-compat14
-.else
-CONFIGURE_ARGS+=	--disable-compat14
-.endif
-
-PLIST_FILES=	bin/nfcapd bin/nfdump bin/nfreplay bin/nfexpire bin/nfprofile
-MAN1=		nfcapd.1 nfdump.1 nfexpire.1 nfprofile.1 nfreplay.1
-PORTDOCS=	AUTHORS ChangeLog INSTALL README
-
-#flow-tools support
-.if ${PORT_OPTIONS:MFT2NFDUMP}
-BUILD_DEPENDS+=		flow-cat:${PORTSDIR}/net-mgmt/flow-tools
-CONFIGURE_ARGS+=	--enable-ftconv --with-ftpath=${LOCALBASE}
-PLIST_FILES+=	bin/ft2nfdump
-MAN1+=		ft2nfdump.1
-.endif
-
-#sflow capture support
-.if ${PORT_OPTIONS:MSFLOW}
-CONFIGURE_ARGS+=	--enable-sflow
-PLIST_FILES+=	bin/sfcapd
-MAN1+=		sfcapd.1
-.else
-CONFIGURE_ARGS+=	--disable-sflow
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/net-mgmt/nfdump-devel/distinfo b/net-mgmt/nfdump-devel/distinfo
deleted file mode 100644
index 1bb056f240f9..000000000000
--- a/net-mgmt/nfdump-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (nfdump-snapshot-20070808.tar.gz) = f46e632bb6c65f70a6750e33e2798ccded3fcdaba0fab08a54a9a1a66ff38813
-SIZE (nfdump-snapshot-20070808.tar.gz) = 282657
diff --git a/net-mgmt/nfdump-devel/files/patch-Makefile.in b/net-mgmt/nfdump-devel/files/patch-Makefile.in
deleted file mode 100644
index 29a56d6b2279..000000000000
--- a/net-mgmt/nfdump-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -108,8 +108,8 @@
- 	test -d $(MANDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
- 	for file in $(OBJECTS); do \
- 		if [ -f $$file.1 ]; then \
--			$(INSTALL) -o root -g bin -m 755 $$file $(PREFIX)/bin ; \
--			$(INSTALL) -o root -g bin -m 644 $$file.1 $(MANDIR)/man1 ; \
-+			$(BSD_INSTALL_PROGRAM) $$file $(PREFIX)/bin ; \
-+			$(BSD_INSTALL_MAN) $$file.1 $(MANDIR)/man1 ; \
- 		fi \
- 	done;
- 
diff --git a/net-mgmt/nfdump-devel/files/patch-configure b/net-mgmt/nfdump-devel/files/patch-configure
deleted file mode 100644
index 28286602f934..000000000000
--- a/net-mgmt/nfdump-devel/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -2843,7 +2843,7 @@
- fi
- 
- if test -d "$WHERE_FTPATH"; then
--	if test ! -f "$WHERE_FTPATH/lib/ftlib.h"; then
-+	if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then
- 		{ { echo "$as_me:$LINENO: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&5
- echo "$as_me: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -2853,7 +2853,7 @@
- echo "$as_me: error: libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
--	FT_INCLUDES="-I$WHERE_FTPATH/src -I$WHERE_FTPATH/lib"
-+	FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib"
- 	FT_LDFLAGS="-L$WHERE_FTPATH/lib"
- else
- 	{ { echo "$as_me:$LINENO: error: flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH" >&5
diff --git a/net-mgmt/nfdump-devel/files/patch-ft2nfdump.c b/net-mgmt/nfdump-devel/files/patch-ft2nfdump.c
deleted file mode 100644
index ed82a48c45c0..000000000000
--- a/net-mgmt/nfdump-devel/files/patch-ft2nfdump.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ft2nfdump.c.orig
-+++ ft2nfdump.c
-@@ -66,7 +66,7 @@
- #include "nffile.h"
- #include "launch.h"
- 
--#include "ftbuild.h"
-+/*#include "ftbuild.h" */
- 
- /* Global defines */
- #define MAXRECORDS 30
diff --git a/net-mgmt/nfdump-devel/pkg-descr b/net-mgmt/nfdump-devel/pkg-descr
deleted file mode 100644
index 88341fca512e..000000000000
--- a/net-mgmt/nfdump-devel/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-NFDUMP tools support netflow v5,  v7  and v9 capturing and processing.
-
-nfcapd - netflow capture daemon.
-Reads the netflow data from the network and stores the data into files.
-
-nfdump - netflow dump.
-Reads the netflow data from the files stored by nfcapd. It's syntax is similar
-to tcpdump. If you like tcpdump you will like nfdump.
-
-nfprofile - netflow profiler.
-Reads the netflow data from the files stored by nfcapd. Filters the netflow
-data according to the specified filter sets ( profiles ) and stores the
-filtered data into files for later use.
-
-nfreplay - netflow replay
-Reads the netflow data from the files stored by nfcapd and sends it over
-the network to another host.
-
-ft2nfdump - flow-tools to nfdump - optional component
-
-WWW: http://nfdump.sourceforge.net