Date: Mon, 27 Mar 2006 18:42:34 +0200 (CEST) From: Janos Mohacsi <janos.mohacsi@bsd.hu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95006: [MAINTAINER] net-mgmt/nfdump: update to 1.5 Message-ID: <200603271642.k2RGgYc7048438@scone.ki.iif.hu> Resent-Message-ID: <200603271650.k2RGoKrJ000239@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95006
>Category: ports
>Synopsis: [MAINTAINER] net-mgmt/nfdump: update to 1.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 27 16:50:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
NIIF/HUNGARNET
>Environment:
System: FreeBSD scone.ki.iif.hu 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #11: Fri Mar 24 09:10:25 CET 2006
>Description:
Maintainer Update to net-mgmt/nfdump to version 1.5
Please remove nfdump-devel also: nfdump version 1.5 basically the stable
nfdump-devel
Added file(s):
- files/patch-configure
- files/patch-ft2nfdump.c
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- nfdump-1.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/Makefile /usr/ports/net-mgmt/nfdump/Makefile
--- /usr/ports/net-mgmt/nfdump.orig/Makefile Thu Sep 8 10:14:25 2005
+++ /usr/ports/net-mgmt/nfdump/Makefile Mon Mar 27 18:30:28 2006
@@ -1,12 +1,12 @@
-# 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: ports/net-mgmt/nfdump/Makefile,v 1.9 2005/09/08 08:14:25 krion Exp $
+# $FreeBSD: ports/net-mgmt/nfdump-devel/Makefile,v 1.10 2006/01/15 23:56:26 pav Exp $
#
PORTNAME= nfdump
-PORTVERSION= 1.4
+PORTVERSION= 1.5
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,12 +16,29 @@
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 -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/distinfo /usr/ports/net-mgmt/nfdump/distinfo
--- /usr/ports/net-mgmt/nfdump.orig/distinfo Tue Jan 24 09:19:55 2006
+++ /usr/ports/net-mgmt/nfdump/distinfo Mon Mar 27 18:30:36 2006
@@ -1,3 +1,3 @@
-MD5 (nfdump-1.4.tar.gz) = f86527c65d4c0fa7a60d14dc34d32a6f
-SHA256 (nfdump-1.4.tar.gz) = 0a580f4ed0adc4d6ce722089554d5d89a7e4cbb157e91cbf1c98a0bf62496e53
-SIZE (nfdump-1.4.tar.gz) = 147000
+MD5 (nfdump-1.5.tar.gz) = 47a823b88210d979ad36a55bc4eebcae
+SHA256 (nfdump-1.5.tar.gz) = d1c70b0f7340d1c1bdc016132310a7656f085d3c84f20eb9a6eff646344fb48d
+SIZE (nfdump-1.5.tar.gz) = 187689
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/files/patch-Makefile.in /usr/ports/net-mgmt/nfdump/files/patch-Makefile.in
--- /usr/ports/net-mgmt/nfdump.orig/files/patch-Makefile.in Thu Sep 8 10:14:26 2005
+++ /usr/ports/net-mgmt/nfdump/files/patch-Makefile.in Mon Jan 16 00:56:27 2006
@@ -1,9 +1,9 @@
-$FreeBSD: ports/net-mgmt/nfdump/files/patch-Makefile.in,v 1.4 2005/09/08 08:14:26 krion Exp $
+$FreeBSD: ports/net-mgmt/nfdump-devel/files/patch-Makefile.in,v 1.5 2006/01/15 23:56:27 pav Exp $
--- 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 @@
+ $(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 -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/files/patch-configure /usr/ports/net-mgmt/nfdump/files/patch-configure
--- /usr/ports/net-mgmt/nfdump.orig/files/patch-configure Thu Jan 1 01:00:00 1970
+++ /usr/ports/net-mgmt/nfdump/files/patch-configure Mon Jan 16 00:56:27 2006
@@ -0,0 +1,23 @@
+
+$FreeBSD: ports/net-mgmt/nfdump-devel/files/patch-configure,v 1.1 2006/01/15 23:56:27 pav Exp $
+
+--- 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 -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/files/patch-ft2nfdump.c /usr/ports/net-mgmt/nfdump/files/patch-ft2nfdump.c
--- /usr/ports/net-mgmt/nfdump.orig/files/patch-ft2nfdump.c Thu Jan 1 01:00:00 1970
+++ /usr/ports/net-mgmt/nfdump/files/patch-ft2nfdump.c Mon Jan 16 00:56:27 2006
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/net-mgmt/nfdump-devel/files/patch-ft2nfdump.c,v 1.1 2006/01/15 23:56:27 pav Exp $
+
+--- 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 -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/pkg-descr /usr/ports/net-mgmt/nfdump/pkg-descr
--- /usr/ports/net-mgmt/nfdump.orig/pkg-descr Sun Nov 7 00:48:46 2004
+++ /usr/ports/net-mgmt/nfdump/pkg-descr Mon Jan 16 00:56:26 2006
@@ -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 @@
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
--- nfdump-1.5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603271642.k2RGgYc7048438>