12 files changed, 60 insertions, 174 deletions
diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile
index 66d65a5ac031..10b7cedac9e9 100644
--- a/net-mgmt/flow-tools/Makefile
+++ b/net-mgmt/flow-tools/Makefile
@@ -6,19 +6,27 @@
 #
 
 PORTNAME=	flow-tools
-PORTVERSION=	0.34
+PORTVERSION=	0.55
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.net.ohio-state.edu/users/maf/cisco/
+MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/ \
+		ftp://ftp.fu-berlin.de/unix/network/flow-tools/
 
 MAINTAINER=	.@babolo.ru
 
-ALL_TARGET=	i386-fbsd docs
+SCRIPTS=	flow-mirror flow-rsync flow-search
+
 USE_GMAKE=	yes
 
+GNU_CONFIGURE=	yes
+
 MAN1=	flow-capture.1 flow-export.1 flow-stat.1 flow-cat.1 \
 	flow-fanout.1 flow-tools.1 flow-dscan.1 flow-filter.1 \
-	flow-print.1 flow-expire.1 flow-gen.1 flow-profile.1
+	flow-print.1 flow-expire.1 flow-gen.1 flow-profile.1 \
+	flow-mirror.1 flow-search.1
 
-#MANCOMPRESSED=	yes
+post-install:
+.for i in ${SCRIPTS}
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${i} ${PREFIX}/bin
+.endfor
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/flow-tools/distinfo b/net-mgmt/flow-tools/distinfo
index 1a2c4ae48768..cbc8fd4b8e9a 100644
--- a/net-mgmt/flow-tools/distinfo
+++ b/net-mgmt/flow-tools/distinfo
@@ -1 +1 @@
-MD5 (flow-tools-0.34.tar.gz) = 994ba902972cea7497a9fa0f0b927275
+MD5 (flow-tools-0.55.tar.gz) = 22ff761e6c13c10c19d12c12e30c44b7
diff --git a/net-mgmt/flow-tools/files/patch-aa b/net-mgmt/flow-tools/files/patch-aa
deleted file mode 100644
index ab7f5a3e2ff8..000000000000
--- a/net-mgmt/flow-tools/files/patch-aa
+++ /dev/null
@@ -1,8 +0,0 @@
---- asn2c.orig	Fri May  1 19:35:11 1998
-+++ asn2c	Mon Jul 17 19:32:58 2000
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- #
- # converts internic netinfo/asn.txt to C code
diff --git a/net-mgmt/flow-tools/files/patch-ab b/net-mgmt/flow-tools/files/patch-ab
deleted file mode 100644
index a1248d461de8..000000000000
--- a/net-mgmt/flow-tools/files/patch-ab
+++ /dev/null
@@ -1,65 +0,0 @@
---- Makefile.orig	Mon May  1 22:54:20 2000
-+++ Makefile	Tue Jul 25 19:30:16 2000
-@@ -32,22 +32,29 @@
- FL="flow-tools"
- DIST=flow-tools-0.34
- SHELL=/bin/sh
--BINDIR=/usr/local/netflow/bin
-+PREFIX		?= /usr/local
-+BINDIR		?= ${PREFIX}/bin
-+MANDIR		?= ${PREFIX}/man
- 
- LEX=flex
- CC=gcc
--INSTALL=install -c -m0755
-+
-+BINMODE         ?= 0555
-+MANMODE         ?= 0444
-+INSTALL_PROGRAM ?= install -c -s -o root -g wheel -m ${BINMODE}
-+INSTALL_MAN     ?= install -c -o root -g wheel -m ${MANMODE}
-+
- 
- YACC=yacc -t -v
- #YACC=bison -y
- 
- POD2MAN=pod2man
- POD2HTML=pod2html
--P2MFLAGS = --center="OSU FLOW TOOLS" --date="2000-04-26"
-+P2MFLAGS = --center="OSU FLOW TOOLS" --date="2000-04-26" --release="OSU flow tools 0.34"
- 
- 
- #CFLAGS = -g -DPOSIX_SIGNALS -DDEBUG -DLIBWRAP -I/usr/local/include -L/usr/local/lib 
--CFLAGS = -O2 -funroll-all-loops -ffast-math -I/usr/local/include -L/usr/local/lib -DPOSIX_SIGNALS -DLIBWRAP
-+CFLAGS+= -O2 -funroll-all-loops -ffast-math -I/usr/local/include -L/usr/local/lib -DPOSIX_SIGNALS -DLIBWRAP
- 
- LIBS = -L. -lz 
- 
-@@ -94,20 +101,23 @@
- #flow-test
- 
- MAN = flow-capture.1 flow-export.1 flow-stat.1 flow-cat.1 \
--	flow-fanout.1 flow-mirror.1 flow-tools.1 flow-dscan.1 flow-filter.1 \
--	flow-print.1 flow-expire.1 flow-gen.1 flow-search.1 flow-profile.1
-+	flow-fanout.1 flow-tools.1 flow-dscan.1 flow-filter.1 \
-+	flow-print.1 flow-expire.1 flow-gen.1 flow-profile.1
- 
- HTML = flow-capture.html flow-export.html flow-stat.html \
--	flow-cat.html flow-fanout.html flow-mirror.html flow-tools.html \
-+	flow-cat.html flow-fanout.html flow-tools.html \
- 	flow-dscan.html flow-filter.html flow-print.html flow-expire.html \
--	flow-gen.html flow-search.html flow-profile.html
-+	flow-gen.html flow-profile.html
- 
- all: ${BINS}
- 
- install:
- 	mkdir -p ${BINDIR}
--	${INSTALL} ${BINS} flow-mirror ${BINDIR}
-+	${INSTALL_PROGRAM} ${BINS} ${BINDIR}
- 	@echo files installed in ${BINDIR}
-+	mkdir -p ${MANDIR}/man1
-+	${INSTALL_MAN}  ${MAN} ${MANDIR}/man1
-+	@echo files installed in ${MANDIR}/man1
- 
- clean:
- 	/bin/rm -f ${BINS} *.o sym_asn.c *.1 *.html
diff --git a/net-mgmt/flow-tools/pkg-descr b/net-mgmt/flow-tools/pkg-descr
index b5db6104714b..79592e89ea45 100644
--- a/net-mgmt/flow-tools/pkg-descr
+++ b/net-mgmt/flow-tools/pkg-descr
@@ -1,4 +1,4 @@
 Tools to capture, replicate, print, filter, send  and other works
 on Cisco's NetFlow Export.
 
-WWW: http://www.usenix.org/publications/login/1999-9/osu.html
+WWW: http://www.splintered.net/sw/flow-tools/
diff --git a/net-mgmt/flow-tools/pkg-plist b/net-mgmt/flow-tools/pkg-plist
index 5f5b5fc9b122..9c981b82963c 100644
--- a/net-mgmt/flow-tools/pkg-plist
+++ b/net-mgmt/flow-tools/pkg-plist
@@ -1,13 +1,21 @@
 bin/flow-capture
-bin/flow-stat
-bin/flow-print
 bin/flow-cat
 bin/flow-dscan
+bin/flow-expire
 bin/flow-export
-bin/flow-filter
 bin/flow-fanout
-bin/flow-send
-bin/flow-receive
+bin/flow-filter
 bin/flow-gen
-bin/flow-profile
-bin/flow-expire
+bin/flow-header
+bin/flow-import
+bin/flow-merge
+bin/flow-print
+bin/flow-receive
+bin/flow-send
+bin/flow-split
+bin/flow-stat
+bin/flow-xlate
+bin/flow-mirror
+bin/flow-rsync
+bin/flow-search
+@dirrm /var/ft
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index 66d65a5ac031..10b7cedac9e9 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -6,19 +6,27 @@
 #
 
 PORTNAME=	flow-tools
-PORTVERSION=	0.34
+PORTVERSION=	0.55
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.net.ohio-state.edu/users/maf/cisco/
+MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/ \
+		ftp://ftp.fu-berlin.de/unix/network/flow-tools/
 
 MAINTAINER=	.@babolo.ru
 
-ALL_TARGET=	i386-fbsd docs
+SCRIPTS=	flow-mirror flow-rsync flow-search
+
 USE_GMAKE=	yes
 
+GNU_CONFIGURE=	yes
+
 MAN1=	flow-capture.1 flow-export.1 flow-stat.1 flow-cat.1 \
 	flow-fanout.1 flow-tools.1 flow-dscan.1 flow-filter.1 \
-	flow-print.1 flow-expire.1 flow-gen.1 flow-profile.1
+	flow-print.1 flow-expire.1 flow-gen.1 flow-profile.1 \
+	flow-mirror.1 flow-search.1
 
-#MANCOMPRESSED=	yes
+post-install:
+.for i in ${SCRIPTS}
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${i} ${PREFIX}/bin
+.endfor
 
 .include <bsd.port.mk>
diff --git a/net/flow-tools/distinfo b/net/flow-tools/distinfo
index 1a2c4ae48768..cbc8fd4b8e9a 100644
--- a/net/flow-tools/distinfo
+++ b/net/flow-tools/distinfo
@@ -1 +1 @@
-MD5 (flow-tools-0.34.tar.gz) = 994ba902972cea7497a9fa0f0b927275
+MD5 (flow-tools-0.55.tar.gz) = 22ff761e6c13c10c19d12c12e30c44b7
diff --git a/net/flow-tools/files/patch-aa b/net/flow-tools/files/patch-aa
deleted file mode 100644
index ab7f5a3e2ff8..000000000000
--- a/net/flow-tools/files/patch-aa
+++ /dev/null
@@ -1,8 +0,0 @@
---- asn2c.orig	Fri May  1 19:35:11 1998
-+++ asn2c	Mon Jul 17 19:32:58 2000
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- #
- # converts internic netinfo/asn.txt to C code
diff --git a/net/flow-tools/files/patch-ab b/net/flow-tools/files/patch-ab
deleted file mode 100644
index a1248d461de8..000000000000
--- a/net/flow-tools/files/patch-ab
+++ /dev/null
@@ -1,65 +0,0 @@
---- Makefile.orig	Mon May  1 22:54:20 2000
-+++ Makefile	Tue Jul 25 19:30:16 2000
-@@ -32,22 +32,29 @@
- FL="flow-tools"
- DIST=flow-tools-0.34
- SHELL=/bin/sh
--BINDIR=/usr/local/netflow/bin
-+PREFIX		?= /usr/local
-+BINDIR		?= ${PREFIX}/bin
-+MANDIR		?= ${PREFIX}/man
- 
- LEX=flex
- CC=gcc
--INSTALL=install -c -m0755
-+
-+BINMODE         ?= 0555
-+MANMODE         ?= 0444
-+INSTALL_PROGRAM ?= install -c -s -o root -g wheel -m ${BINMODE}
-+INSTALL_MAN     ?= install -c -o root -g wheel -m ${MANMODE}
-+
- 
- YACC=yacc -t -v
- #YACC=bison -y
- 
- POD2MAN=pod2man
- POD2HTML=pod2html
--P2MFLAGS = --center="OSU FLOW TOOLS" --date="2000-04-26"
-+P2MFLAGS = --center="OSU FLOW TOOLS" --date="2000-04-26" --release="OSU flow tools 0.34"
- 
- 
- #CFLAGS = -g -DPOSIX_SIGNALS -DDEBUG -DLIBWRAP -I/usr/local/include -L/usr/local/lib 
--CFLAGS = -O2 -funroll-all-loops -ffast-math -I/usr/local/include -L/usr/local/lib -DPOSIX_SIGNALS -DLIBWRAP
-+CFLAGS+= -O2 -funroll-all-loops -ffast-math -I/usr/local/include -L/usr/local/lib -DPOSIX_SIGNALS -DLIBWRAP
- 
- LIBS = -L. -lz 
- 
-@@ -94,20 +101,23 @@
- #flow-test
- 
- MAN = flow-capture.1 flow-export.1 flow-stat.1 flow-cat.1 \
--	flow-fanout.1 flow-mirror.1 flow-tools.1 flow-dscan.1 flow-filter.1 \
--	flow-print.1 flow-expire.1 flow-gen.1 flow-search.1 flow-profile.1
-+	flow-fanout.1 flow-tools.1 flow-dscan.1 flow-filter.1 \
-+	flow-print.1 flow-expire.1 flow-gen.1 flow-profile.1
- 
- HTML = flow-capture.html flow-export.html flow-stat.html \
--	flow-cat.html flow-fanout.html flow-mirror.html flow-tools.html \
-+	flow-cat.html flow-fanout.html flow-tools.html \
- 	flow-dscan.html flow-filter.html flow-print.html flow-expire.html \
--	flow-gen.html flow-search.html flow-profile.html
-+	flow-gen.html flow-profile.html
- 
- all: ${BINS}
- 
- install:
- 	mkdir -p ${BINDIR}
--	${INSTALL} ${BINS} flow-mirror ${BINDIR}
-+	${INSTALL_PROGRAM} ${BINS} ${BINDIR}
- 	@echo files installed in ${BINDIR}
-+	mkdir -p ${MANDIR}/man1
-+	${INSTALL_MAN}  ${MAN} ${MANDIR}/man1
-+	@echo files installed in ${MANDIR}/man1
- 
- clean:
- 	/bin/rm -f ${BINS} *.o sym_asn.c *.1 *.html
diff --git a/net/flow-tools/pkg-descr b/net/flow-tools/pkg-descr
index b5db6104714b..79592e89ea45 100644
--- a/net/flow-tools/pkg-descr
+++ b/net/flow-tools/pkg-descr
@@ -1,4 +1,4 @@
 Tools to capture, replicate, print, filter, send  and other works
 on Cisco's NetFlow Export.
 
-WWW: http://www.usenix.org/publications/login/1999-9/osu.html
+WWW: http://www.splintered.net/sw/flow-tools/
diff --git a/net/flow-tools/pkg-plist b/net/flow-tools/pkg-plist
index 5f5b5fc9b122..9c981b82963c 100644
--- a/net/flow-tools/pkg-plist
+++ b/net/flow-tools/pkg-plist
@@ -1,13 +1,21 @@
 bin/flow-capture
-bin/flow-stat
-bin/flow-print
 bin/flow-cat
 bin/flow-dscan
+bin/flow-expire
 bin/flow-export
-bin/flow-filter
 bin/flow-fanout
-bin/flow-send
-bin/flow-receive
+bin/flow-filter
 bin/flow-gen
-bin/flow-profile
-bin/flow-expire
+bin/flow-header
+bin/flow-import
+bin/flow-merge
+bin/flow-print
+bin/flow-receive
+bin/flow-send
+bin/flow-split
+bin/flow-stat
+bin/flow-xlate
+bin/flow-mirror
+bin/flow-rsync
+bin/flow-search
+@dirrm /var/ft