summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2006-01-15 23:56:27 +0000
committerpav <pav@FreeBSD.org>2006-01-15 23:56:27 +0000
commit99cc090d072a59ea191f2af5c495d893da72bd0f (patch)
tree7dbd5600120baadc28bf9f9727d2d7a29c15c653
parentdcc90e3b9a995ebce2ab939bd434e05583be3481 (diff)
downloadFreeBSD-ports-99cc090d072a59ea191f2af5c495d893da72bd0f.zip
FreeBSD-ports-99cc090d072a59ea191f2af5c495d893da72bd0f.tar.gz
- After repocopy, add development version of nfdump at 1.5
PR: ports/91725 Submitted by: Janos Mohacsi <janos.mohacsi@bsd.hu> (maintainer) Repocopied by: marcus
-rw-r--r--net-mgmt/Makefile1
-rw-r--r--net-mgmt/nfdump-devel/Makefile27
-rw-r--r--net-mgmt/nfdump-devel/distinfo5
-rw-r--r--net-mgmt/nfdump-devel/files/patch-Makefile.in11
-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-descr3
7 files changed, 74 insertions, 10 deletions
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 69a2a86..52e60d4 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -102,6 +102,7 @@
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
index 0bee8a8..3a21ed4 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -1,27 +1,46 @@
-# New ports collection makefile for: nfdump
-# Date created: 2004-09-29
+# New ports collection makefile for: nfdump-devel
+# Date created: 2006-01-12
# Whom: Janos.Mohacsi@bsd.hu
#
# $FreeBSD$
#
PORTNAME= nfdump
-PORTVERSION= 1.4
+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
-.include <bsd.port.pre.mk>
+#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:
diff --git a/net-mgmt/nfdump-devel/distinfo b/net-mgmt/nfdump-devel/distinfo
index e5a914e..586d933 100644
--- a/net-mgmt/nfdump-devel/distinfo
+++ b/net-mgmt/nfdump-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (nfdump-1.4.tar.gz) = f86527c65d4c0fa7a60d14dc34d32a6f
-SIZE (nfdump-1.4.tar.gz) = 147000
+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
index 9ad6def..b0be546 100644
--- a/net-mgmt/nfdump-devel/files/patch-Makefile.in
+++ b/net-mgmt/nfdump-devel/files/patch-Makefile.in
@@ -3,7 +3,7 @@ $FreeBSD$
--- Makefile.in.orig
+++ Makefile.in
-@@ -89,20 +89,16 @@
+@@ -90,23 +90,19 @@
$(CC) $(CFLAGS) -o $@ $(FT2NF_OBJ) $(FT_LDFLAGS) $(FT_LIBS)
install: $(OBJECTS)
@@ -31,5 +31,10 @@ $FreeBSD$
+ $(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; \
+- $(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
new file mode 100644
index 0000000..2828660
--- /dev/null
+++ b/net-mgmt/nfdump-devel/files/patch-configure
@@ -0,0 +1,23 @@
+
+$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
new file mode 100644
index 0000000..3a22933
--- /dev/null
+++ b/net-mgmt/nfdump-devel/files/patch-ft2nfdump.c
@@ -0,0 +1,14 @@
+
+$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
index 553f2ef..eea45e9 100644
--- a/net-mgmt/nfdump-devel/pkg-descr
+++ b/net-mgmt/nfdump-devel/pkg-descr
@@ -1,4 +1,4 @@
-NFDUMP tools support netflow v5 and v7 capturing and processing.
+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.
@@ -16,6 +16,7 @@ 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
OpenPOWER on IntegriCloud