From mohacsi@scone.ki.iif.hu  Tue Jan 25 14:45:07 2005
Return-Path: <mohacsi@scone.ki.iif.hu>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E67B016A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Jan 2005 14:45:07 +0000 (GMT)
Received: from scone.ki.iif.hu (scone.ki.iif.hu [193.6.222.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DA45543D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Jan 2005 14:45:06 +0000 (GMT)
	(envelope-from mohacsi@scone.ki.iif.hu)
Received: (from mohacsi@localhost)
	by scone.ki.iif.hu (8.13.1/8.13.1) id j0PEiCjO042520;
	Tue, 25 Jan 2005 15:44:13 +0100 (CET)
	(envelope-from mohacsi)
Message-Id: <200501251444.j0PEiCjO042520@scone.ki.iif.hu>
Date: Tue, 25 Jan 2005 15:44:13 +0100 (CET)
From: Janos Mohacsi <janos.mohacsi@niif.hu>
Reply-To: Janos Mohacsi <janos.mohacsi@bsd.hu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] net-mgmt/nfdump: update to 1.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         76664
>Category:       ports
>Synopsis:       [MAINTAINER] net-mgmt/nfdump: update to 1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 25 14:50:21 GMT 2005
>Closed-Date:    Wed Jan 26 04:03:00 GMT 2005
>Last-Modified:  Wed Jan 26 04:03:00 GMT 2005
>Originator:     Janos Mohacsi
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
NIIF/HUNGARNET
>Environment:
System: FreeBSD scone.ki.iif.hu 5.3-STABLE FreeBSD 5.3-STABLE #5: Thu Nov 11 05:45:29 CET 2004
>Description:
Maintainer Update to net-mgmt/nfdumo to version 1.2
Original package changes:
- nfcapd handles transparent v5 and v7 flows. v7 gets converted into v5 
- nfcapd can execute any command at the end of interval. New option -x 
- nfdump Extended filter syntax for flags, tos, bytes and packets 
- Rearrange output formats in nfdump: new switch -o, remove switch -E output 
formats: 'line', 'long', 'extended' and 'pipe' 
- More flexible statistic handling in nfdump: cleanup ugly  -s -s -s syntax. 
Replaced by -s <stat> option. New statistics for Port and AS.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:

Apply this diff.

>Fix:

--- nfdump-1.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 Nov  7 00:48:46 2004
+++ /usr/ports/net-mgmt/nfdump/Makefile	Tue Jan 25 14:52:18 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nfdump
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
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 Nov  7 00:48:46 2004
+++ /usr/ports/net-mgmt/nfdump/distinfo	Tue Jan 25 14:56:33 2005
@@ -1,2 +1,2 @@
-MD5 (nfdump-1.1.tar.gz) = b9085f91d64985e856e43200d2869a87
-SIZE (nfdump-1.1.tar.gz) = 92044
+MD5 (nfdump-1.2.tar.gz) = 397bde6d48c41d3818f83d1893c59f69
+SIZE (nfdump-1.2.tar.gz) = 99445
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 Nov  7 00:48:46 2004
+++ /usr/ports/net-mgmt/nfdump/files/patch-Makefile.in	Tue Jan 25 15:29:33 2005
@@ -1,48 +1,35 @@
 
-$FreeBSD: ports/net-mgmt/nfdump/files/patch-Makefile.in,v 1.1 2004/11/06 23:48:46 sergei Exp $
+$FreeBSD$
 
---- Makefile.in.orig	Wed Sep 22 09:23:10 2004
-+++ Makefile.in	Wed Sep 29 16:31:23 2004
+--- Makefile.in.orig
++++ Makefile.in
 @@ -47,7 +47,7 @@
  LFLAGS	 = -i
  LDFLAGS	 = @LIBS@
- PREFIX   = @prefix@
+ prefix   = @prefix@
 -MANDIR 	 = @mandir@
-+MANDIR 	 = @prefix@
- FSRC	 = grammar.c scanner.c nftree.c netflow_v5.c netflow_v7.c nfstat.c util.c 
++MANDIR 	 = @prefix@/man
+ FSRC	 = grammar.c scanner.c nftree.c netflow_v5.c launch.c nfstat.c util.c 
  FOBJ	 = $(FSRC:.c=.o)
  ASRC	 = $(FSRC) nfdump.c nftree_check.c nfreplay.c
-@@ -82,20 +82,20 @@
+@@ -82,15 +82,15 @@
  	$(CC) $(CFLAGS) $(INCS) -o $@ nfreplay.o $(FOBJ) $(LDFLAGS)
  
  install: $(OBJECTS)
--	test -d $(PREFIX) || install -d -o root -g root -m 755 $(PREFIX)
--	test -d $(PREFIX)/bin || install -d -o root -g root -m 755 $(PREFIX)/bin
--	test -d $(MANDIR)/man || install -d -o root -g root -m 755 $(MANDIR)/man
--	test -d $(MANDIR)/man/man1 || install -d -o root -g root -m 755 $(MANDIR)/man/man1
--	$(INSTALL) -o root -g root -m 755 nfcapd $(PREFIX)/bin
--	$(INSTALL) -o root -g root -m 755 nfdump $(PREFIX)/bin 
--	$(INSTALL) -o root -g root -m 755 nfprofile $(PREFIX)/bin
--	$(INSTALL) -o root -g root -m 755 nfreplay $(PREFIX)/bin
--	$(INSTALL) -o root -g root -m 755 nfclean.pl $(PREFIX)/bin
-+	test -d $(PREFIX) || install -d -o root -g wheel -m 755 $(PREFIX)
-+	test -d $(PREFIX)/bin || install -d -o root -g wheel -m 755 $(PREFIX)/bin
-+	test -d $(MANDIR)/man || install -d -o root -g wheel -m 755 $(MANDIR)/man
-+	test -d $(MANDIR)/man/man1 || install -d -o root -g wheel -m 755 $(MANDIR)/man/man1
-+	$(INSTALL) -o root -g wheel -m 755 nfcapd $(PREFIX)/bin
-+	$(INSTALL) -o root -g wheel -m 755 nfdump $(PREFIX)/bin 
-+	$(INSTALL) -o root -g wheel -m 755 nfprofile $(PREFIX)/bin
-+	$(INSTALL) -o root -g wheel -m 755 nfreplay $(PREFIX)/bin
-+	$(INSTALL) -o root -g wheel -m 755 nfclean.pl $(PREFIX)/bin
+-	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
++	test -d $(prefix) || install -d -o root -g wheel -m 755 $(prefix)
++	test -d $(prefix)/bin || install -d -o root -g wheel -m 755 $(prefix)/bin
++	test -d $(MANDIR) || install -d -o root -g wheel -m 755 $(MANDIR)
++	test -d $(MANDIR)/man1 || install -d -o root -g wheel -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
++	$(INSTALL) -o root -g bin -m 755 nfclean.pl $(prefix)/bin
  
--	$(INSTALL) -o root -g root -m 644 nfcapd.1 $(MANDIR)/man/man1
--	$(INSTALL) -o root -g root -m 644 nfdump.1 $(MANDIR)/man/man1
--	$(INSTALL) -o root -g root -m 644 nfprofile.1 $(MANDIR)/man/man1
--	$(INSTALL) -o root -g root -m 644 nfreplay.1 $(MANDIR)/man/man1
-+	$(INSTALL) -o root -g wheel -m 644 nfcapd.1 $(MANDIR)/man/man1
-+	$(INSTALL) -o root -g wheel -m 644 nfdump.1 $(MANDIR)/man/man1
-+	$(INSTALL) -o root -g wheel -m 644 nfprofile.1 $(MANDIR)/man/man1
-+	$(INSTALL) -o root -g wheel -m 644 nfreplay.1 $(MANDIR)/man/man1
- 
- uninstall:
- 	/bin/rm -f  $(PREFIX)/bin/nfcapd
+ 	$(INSTALL) -o root -g bin -m 644 nfcapd.1 $(MANDIR)/man1
+ 	$(INSTALL) -o root -g bin -m 644 nfdump.1 $(MANDIR)/man1
--- nfdump-1.2.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: kevlo 
State-Changed-When: Wed Jan 26 04:02:49 GMT 2005 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76664 
>Unformatted:
