Date: Sun, 7 Oct 2007 00:03:51 +0200 (CEST) From: Janos Mohacsi <janos.mohacsi@bsd.hu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/116985: [MAINTAINER] net-mgmt/nfdump: update to 1.5.5 Message-ID: <200710062203.l96M3poG042665@scone.ki.iif.hu> Resent-Message-ID: <200710062220.l96MK1hS049423@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116985
>Category: ports
>Synopsis: [MAINTAINER] net-mgmt/nfdump: update to 1.5.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: Sat Oct 06 22:20:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
NIIF/HUNGARNET
>Environment:
System: FreeBSD scone.ki.iif.hu 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Wed Jun 27 18:22:17 CEST 2007
>Description:
- Update to 1.5.5
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- nfdump-1.5.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 2006-11-01 10:09:35.000000000 +0100
+++ /usr/ports/net-mgmt/nfdump/Makefile 2007-10-06 23:53:21.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= nfdump
-PORTVERSION= 1.5.2
+PORTVERSION= 1.5.5
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,8 +14,11 @@
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Command-line tools to collect and process NetFlow data
+BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} --enable-nfprofile --with-rrdpath=${LOCALBASE}
#flow-tools support
OPTIONS= FT2NFDUMP "With Flow-tools to nfdump converter" off \
@@ -29,8 +32,8 @@
CONFIGURE_ARGS= --enable-compat14
.endif
-PLIST_FILES= bin/nfcapd bin/nfdump bin/nfprofile bin/nfreplay bin/nfclean.pl
-MAN1= nfcapd.1 nfdump.1 nfprofile.1 nfreplay.1
+PLIST_FILES= bin/nfcapd bin/nfdump bin/nfprofile bin/nfreplay bin/nfexpire
+MAN1= nfcapd.1 nfdump.1 nfprofile.1 nfreplay.1 nfexpire.1
PORTDOCS= AUTHORS ChangeLog INSTALL README
#flow-tools support
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/distinfo /usr/ports/net-mgmt/nfdump/distinfo
--- /usr/ports/net-mgmt/nfdump.orig/distinfo 2006-11-01 10:09:36.000000000 +0100
+++ /usr/ports/net-mgmt/nfdump/distinfo 2007-10-06 23:36:45.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (nfdump-1.5.2.tar.gz) = 4447c3338cc7eae6eee5288889f27d28
-SHA256 (nfdump-1.5.2.tar.gz) = d86d5ce09a67913fba93ca19321d1c20edcbbd4139b2b87d79b663d983dd1ee5
-SIZE (nfdump-1.5.2.tar.gz) = 224287
+MD5 (nfdump-1.5.5.tar.gz) = b421b1b95ab649d886e1fafe51fc5fe8
+SHA256 (nfdump-1.5.5.tar.gz) = 564ed3490fa5062e1435f59e9fe8e5e1fcf38fd74a50001cd905444eae7b2551
+SIZE (nfdump-1.5.5.tar.gz) = 281546
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 2006-11-01 10:09:36.000000000 +0100
+++ /usr/ports/net-mgmt/nfdump/files/patch-Makefile.in 2007-10-06 23:41:27.000000000 +0200
@@ -1,9 +1,9 @@
-$FreeBSD: ports/net-mgmt/nfdump/files/patch-Makefile.in,v 1.6 2006/11/01 09:09:36 miwi Exp $
+$FreeBSD$
--- Makefile.in.orig
+++ Makefile.in
-@@ -100,11 +100,11 @@
+@@ -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 \
@@ -13,8 +13,4 @@
+ $(BSD_INSTALL_MAN) $$file.1 $(MANDIR)/man1 ; \
fi \
done;
-- test -f $(PREFIX)/bin/nfclean.pl || $(INSTALL) -o root -g bin -m 755 nfclean.pl $(PREFIX)/bin
-+ test -f $(PREFIX)/bin/nfclean.pl || $(BSD_INSTALL_SCRIPT) nfclean.pl $(PREFIX)/bin
- uninstall:
- for file in $(OBJECTS); do \
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 2006-11-01 10:09:36.000000000 +0100
+++ /usr/ports/net-mgmt/nfdump/files/patch-ft2nfdump.c 2007-10-06 23:44:13.000000000 +0200
@@ -1,14 +1,14 @@
-$FreeBSD: ports/net-mgmt/nfdump/files/patch-ft2nfdump.c,v 1.2 2006/11/01 09:09:36 miwi Exp $
+$FreeBSD$
--- ft2nfdump.c.orig
+++ ft2nfdump.c
-@@ -64,7 +64,7 @@
- #endif
+@@ -66,7 +66,7 @@
+ #include "nffile.h"
+ #include "launch.h"
- #include "version.h"
-#include "ftbuild.h"
+/*#include "ftbuild.h"*/
- #include "nf_common.h"
- #include "nffile.h"
- #include "launch.h"
+
+ /* Global defines */
+ #define MAXRECORDS 30
--- nfdump-1.5.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?200710062203.l96M3poG042665>