Date: Wed, 25 Oct 2006 19:26:41 +0200 (CEST) From: Janos Mohacsi <janos.mohacsi@bsd.hu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/104811: [MAINTAINER] net-mgmt/nfdump: update to 1.5.2 Message-ID: <200610251726.k9PHQf15031948@scone.ki.iif.hu> Resent-Message-ID: <200610251730.k9PHULnV053714@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104811 >Category: ports >Synopsis: [MAINTAINER] net-mgmt/nfdump: update to 1.5.2 >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: Wed Oct 25 17:30:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Janos Mohacsi >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: NIIF/HUNGARNET >Environment: System: FreeBSD scone.ki.iif.hu 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #17: Fri Oct 20 01:04:28 CEST 2006 >Description: - Update to 1.5.2 Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- nfdump-1.5.2.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 Sun Apr 2 19:25:37 2006 +++ /usr/ports/net-mgmt/nfdump/Makefile Wed Oct 25 19:22:00 2006 @@ -6,7 +6,7 @@ # PORTNAME= nfdump -PORTVERSION= 1.5 +PORTVERSION= 1.5.2 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,15 +16,18 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} + +#flow-tools support +OPTIONS= FT2NFDUMP "With Flow-tools to nfdump converter" off \ + SFLOW "Build sflow collector daemon also" off + +.include <bsd.port.pre.mk> + #for compatibility # .ifndef(WITHOUT_NFDUMP14_SUPPORT) CONFIGURE_ARGS= --enable-compat14 .endif -#flow-tools support -OPTIONS= FT2NFDUMP "With Flow-tools to nfdump converter" off - -.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 @@ -36,6 +39,13 @@ CONFIGURE_ARGS+= --enable-ftconv --with-ftpath=${LOCALBASE} PLIST_FILES+= bin/ft2nfdump MAN1+= ft2nfdump.1 +.endif + +#sflow capture support +.if defined(WITH_SFLOW) +CONFIGURE_ARGS+= --enable-sflow +PLIST_FILES+= bin/sfcapd +MAN1+= sfcapd.1 .endif .if !defined(NOPORTDOCS) diff -ruN --exclude=CVS /usr/ports/net-mgmt/nfdump.orig/distinfo /usr/ports/net-mgmt/nfdump/distinfo --- /usr/ports/net-mgmt/nfdump.orig/distinfo Sun Apr 2 19:25:37 2006 +++ /usr/ports/net-mgmt/nfdump/distinfo Wed Oct 25 18:11:07 2006 @@ -1,3 +1,3 @@ -MD5 (nfdump-1.5.tar.gz) = 47a823b88210d979ad36a55bc4eebcae -SHA256 (nfdump-1.5.tar.gz) = d1c70b0f7340d1c1bdc016132310a7656f085d3c84f20eb9a6eff646344fb48d -SIZE (nfdump-1.5.tar.gz) = 187689 +MD5 (nfdump-1.5.2.tar.gz) = 4447c3338cc7eae6eee5288889f27d28 +SHA256 (nfdump-1.5.2.tar.gz) = d86d5ce09a67913fba93ca19321d1c20edcbbd4139b2b87d79b663d983dd1ee5 +SIZE (nfdump-1.5.2.tar.gz) = 224287 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 Sun Apr 2 19:25:37 2006 +++ /usr/ports/net-mgmt/nfdump/files/patch-Makefile.in Wed Oct 25 19:09:50 2006 @@ -1,40 +1,20 @@ -$FreeBSD: ports/net-mgmt/nfdump/files/patch-Makefile.in,v 1.5 2006/04/01 22:57:30 pav Exp $ +$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 +@@ -100,11 +100,11 @@ + 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; - 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; ++ 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 Sun Apr 2 00:57:30 2006 +++ /usr/ports/net-mgmt/nfdump/files/patch-ft2nfdump.c Wed Oct 25 19:12:02 2006 @@ -1,14 +1,14 @@ -$FreeBSD: ports/net-mgmt/nfdump/files/patch-ft2nfdump.c,v 1.1 2006/04/01 22:57:30 pav Exp $ +$FreeBSD$ --- ft2nfdump.c.orig +++ ft2nfdump.c -@@ -54,7 +54,7 @@ +@@ -64,7 +64,7 @@ + #endif - #include <string.h> - #include <errno.h> + #include "version.h" -#include "ftbuild.h" -+/*#include "ftbuild.h" */ - - #include <sys/stat.h> - ++/*#include "ftbuild.h"*/ + #include "nf_common.h" + #include "nffile.h" + #include "launch.h" --- nfdump-1.5.2.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?200610251726.k9PHQf15031948>