aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--net-mgmt/Makefile1
-rw-r--r--net-mgmt/nfdump-devel/Makefile51
-rw-r--r--net-mgmt/nfdump-devel/distinfo3
-rw-r--r--net-mgmt/nfdump-devel/files/patch-Makefile.in40
-rw-r--r--net-mgmt/nfdump-devel/files/patch-configure23
-rw-r--r--net-mgmt/nfdump-devel/files/patch-ft2nfdump.c14
-rw-r--r--net-mgmt/nfdump-devel/pkg-descr23
8 files changed, 1 insertions, 155 deletions
diff --git a/MOVED b/MOVED
index 3567b4e54e89..defa4fd7a9f4 100644
--- a/MOVED
+++ b/MOVED
@@ -2232,3 +2232,4 @@ math/xwpl||2006-03-31|Has expired: source not available and no recent binary
sysutils/nwclient||2006-03-31|Removed due to security problems
sysutils/nwclient602||2006-03-31|Removed due to security problems
lang/ruby18-nopthreads||2006-03-31|Removed since pthread support of ruby18 is disabled by default.
+net-mgmt/nfdump-devel|net-mgmt/nfdump|2006-04-02|Development port no longer needed
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 704956762bf4..3ad0f001c359 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -104,7 +104,6 @@
SUBDIR += netwag
SUBDIR += netwox
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 3a21ed472051..000000000000
--- a/net-mgmt/nfdump-devel/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for: nfdump-devel
-# Date created: 2006-01-12
-# Whom: Janos.Mohacsi@bsd.hu
-#
-# $FreeBSD$
-#
-
-PORTNAME= nfdump
-PORTVERSION= 1.5
-CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
-PKGNAMESUFFIX= -devel
-DISTNAME= ${PORTNAME}-${PORTVERSION}-beta-3
-
-MAINTAINER= janos.mohacsi@bsd.hu
-COMMENT= Command-line tools to collect and process NetFlow data
-
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-#for compatibility
-#
-.ifndef(WITHOUT_NFDUMP14_SUPPORT)
-CONFIGURE_ARGS= --enable-compat14
-.endif
-#flow-tools support
-OPTIONS= FT2NFDUMP "With Flow-tools to nfdump converter" off
-
-NO_LATEST_LINK= yes
-
-.include <bsd.port.pre.mk>
-
-PLIST_FILES= bin/nfcapd bin/nfdump bin/nfprofile bin/nfreplay bin/nfclean.pl
-MAN1= nfcapd.1 nfdump.1 nfprofile.1 nfreplay.1
-PORTDOCS= AUTHORS ChangeLog INSTALL README
-
-#flow-tools support
-.if defined(WITH_FT2NFDUMP)
-BUILD_DEPENDS+= flow-cat:${PORTSDIR}/net-mgmt/flow-tools
-CONFIGURE_ARGS+= --enable-ftconv --with-ftpath=${LOCALBASE}
-PLIST_FILES+= bin/ft2nfdump
-MAN1+= ft2nfdump.1
-.endif
-
-.if !defined(NOPORTDOCS)
-post-install:
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net-mgmt/nfdump-devel/distinfo b/net-mgmt/nfdump-devel/distinfo
deleted file mode 100644
index 586d933ce4aa..000000000000
--- a/net-mgmt/nfdump-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (nfdump-1.5-beta-3.tar.gz) = 9e8fed7097d809d11afdf6c3e3003720
-SHA256 (nfdump-1.5-beta-3.tar.gz) = 6768f8a360475daf7d011bc6d6536fcb2462b876c7fa3f208106a8b3678f38ea
-SIZE (nfdump-1.5-beta-3.tar.gz) = 186927
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 b0be54630a35..000000000000
--- a/net-mgmt/nfdump-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -90,23 +90,19 @@
- $(CC) $(CFLAGS) -o $@ $(FT2NF_OBJ) $(FT_LDFLAGS) $(FT_LIBS)
-
- install: $(OBJECTS)
-- test -d $(PREFIX) || install -d -o root -g bin -m 755 $(PREFIX)
-- test -d $(PREFIX)/bin || install -d -o root -g bin -m 755 $(PREFIX)/bin
-- test -d $(MANDIR) || install -d -o root -g bin -m 755 $(MANDIR)
-- test -d $(MANDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
-- $(INSTALL) -o root -g bin -m 755 nfcapd $(PREFIX)/bin
-- $(INSTALL) -o root -g bin -m 755 nfdump $(PREFIX)/bin
-- $(INSTALL) -o root -g bin -m 755 nfprofile $(PREFIX)/bin
-- $(INSTALL) -o root -g bin -m 755 nfreplay $(PREFIX)/bin
-- test -f $(PREFIX)/bin/nfclean.pl || $(INSTALL) -o root -g bin -m 755 nfclean.pl $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) nfcapd $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) nfdump $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) nfprofile $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) nfreplay $(PREFIX)/bin
-+ $(BSD_INSTALL_SCRIPT) nfclean.pl $(PREFIX)/bin
-
-- $(INSTALL) -o root -g bin -m 644 nfcapd.1 $(MANDIR)/man1
-- $(INSTALL) -o root -g bin -m 644 nfdump.1 $(MANDIR)/man1
-- $(INSTALL) -o root -g bin -m 644 nfprofile.1 $(MANDIR)/man1
-- $(INSTALL) -o root -g bin -m 644 nfreplay.1 $(MANDIR)/man1
-+ $(BSD_INSTALL_MAN) nfcapd.1 $(MANDIR)/man1
-+ $(BSD_INSTALL_MAN) nfdump.1 $(MANDIR)/man1
-+ $(BSD_INSTALL_MAN) nfprofile.1 $(MANDIR)/man1
-+ $(BSD_INSTALL_MAN) nfreplay.1 $(MANDIR)/man1
- if test -f ft2nfdump; then \
-- $(INSTALL) -o root -g bin -m 755 ft2nfdump $(PREFIX)/bin; \
-- $(INSTALL) -o root -g bin -m 644 ft2nfdump.1 $(MANDIR)/man1; \
-+ $(BSD_INSTALL_PROGRAM) ft2nfdump $(PREFIX)/bin; \
-+ $(BSD_INSTALL_MAN) ft2nfdump.1 $(MANDIR)/man1; \
- fi;
-
- uninstall:
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 3a229331dd4b..000000000000
--- a/net-mgmt/nfdump-devel/files/patch-ft2nfdump.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ft2nfdump.c.orig
-+++ ft2nfdump.c
-@@ -54,7 +54,7 @@
-
- #include <string.h>
- #include <errno.h>
--#include "ftbuild.h"
-+/*#include "ftbuild.h" */
-
- #include <sys/stat.h>
-
diff --git a/net-mgmt/nfdump-devel/pkg-descr b/net-mgmt/nfdump-devel/pkg-descr
deleted file mode 100644
index eea45e9018ec..000000000000
--- a/net-mgmt/nfdump-devel/pkg-descr
+++ /dev/null
@@ -1,23 +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
-
-Janos Mohacsi <janos.mohacsi@bsd.hu>