Update to 0.56

PR:		33296
Submitted by:	maxim@macomnet.ru, MAINTAINER
Reviewed by:	maintainer

9 files changed, 127 insertions, 13 deletions

diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile
index 10b7cedac9e9..f42c9b5b8758 100644
--- a/net-mgmt/flow-tools/Makefile
+++ b/net-mgmt/flow-tools/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	flow-tools
-PORTVERSION=	0.55
+PORTVERSION=	0.56
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/ \
-		ftp://ftp.fu-berlin.de/unix/network/flow-tools/
+MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/
 
 MAINTAINER=	.@babolo.ru
 
@@ -19,10 +18,18 @@ 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-mirror.1 flow-search.1
+MAN1=	flow-capture.1 flow-gen.1 flow-split.1 flow-cat.1	\
+	flow-header.1 flow-stat.1 flow-dscan.1 flow-import.1	\
+	flow-tools-examples.1 flow-expire.1 flow-merge.1	\
+	flow-tools.1 flow-export.1 flow-print.1 flow-xlate.1	\
+	flow-fanout.1 flow-receive.1 flow-filter.1 flow-send.1
+
+post-patch:
+	${TOUCH} -r ${WRKSRC}/configure.in.orig ${WRKSRC}/configure.in
+	${TOUCH} -r ${WRKSRC}/configure.orig ${WRKSRC}/configure
+
+pre-build:
+	${RM} ${WRKSRC}/src/ftbuild.h
 
 post-install:
 .for i in ${SCRIPTS}
diff --git a/net-mgmt/flow-tools/distinfo b/net-mgmt/flow-tools/distinfo
index cbc8fd4b8e9a..36614e151034 100644
--- a/net-mgmt/flow-tools/distinfo
+++ b/net-mgmt/flow-tools/distinfo
@@ -1 +1 @@
-MD5 (flow-tools-0.55.tar.gz) = 22ff761e6c13c10c19d12c12e30c44b7
+MD5 (flow-tools-0.56.tar.gz) = 86565c23d4bf145630fff881ba1ce78c
diff --git a/net-mgmt/flow-tools/files/patch-configs_Makefile b/net-mgmt/flow-tools/files/patch-configs_Makefile
new file mode 100644
index 000000000000..9d78f6292681
--- /dev/null
+++ b/net-mgmt/flow-tools/files/patch-configs_Makefile
@@ -0,0 +1,26 @@
+--- configs/Makefile.am	Fri Jul  6 06:28:57 2001
++++ configs/Makefile.am	Sat Jan 12 06:20:07 2002
+@@ -1,6 +1,6 @@
+-ftsymdir=$(localstatedir)/sym
++ftsymdir=$(localstatedir)/share/flow-tools
+ ftsym_DATA = asn ip-prot tcp-port
+ 
+-ftcfgdir=$(localstatedir)/cfg
++ftcfgdir=$(localstatedir)/etc/flow-tools
+ ftcfg_DATA = map filter-acl
+ 
+--- configs/Makefile.in	Sat Dec 29 01:05:48 2001
++++ configs/Makefile.in	Sat Jan 12 08:04:39 2002
+@@ -66,10 +66,10 @@
+ YACC = @YACC@
+ YLIB = @YLIB@
+ 
+-ftsymdir = $(localstatedir)/sym
++ftsymdir = $(localstatedir)/share/flow-tools
+ ftsym_DATA = asn ip-prot tcp-port
+ 
+-ftcfgdir = $(localstatedir)/cfg
++ftcfgdir = $(localstatedir)/etc/flow-tools
+ ftcfg_DATA = map filter-acl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/net-mgmt/flow-tools/files/patch-configure b/net-mgmt/flow-tools/files/patch-configure
new file mode 100644
index 000000000000..66b890433a2f
--- /dev/null
+++ b/net-mgmt/flow-tools/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.in	Sat Dec 29 01:02:24 2001
++++ configure.in	Sat Jan 12 08:43:07 2002
+@@ -8,7 +8,7 @@
+ 
+ CFLAGS="-g -Wall"
+ 
+-localstatedir="/var/ft"
++localstatedir="${prefix}"
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+--- configure	Sat Dec 29 01:05:33 2001
++++ configure	Sat Jan 12 08:42:27 2002
+@@ -783,7 +783,7 @@
+ 
+ CFLAGS="-g -Wall"
+ 
+-localstatedir="/var/ft"
++localstatedir="${prefix}"
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
diff --git a/net-mgmt/flow-tools/files/patch-docs_flow-print b/net-mgmt/flow-tools/files/patch-docs_flow-print
new file mode 100644
index 000000000000..8ba22d84ce37
--- /dev/null
+++ b/net-mgmt/flow-tools/files/patch-docs_flow-print
@@ -0,0 +1,11 @@
+--- docs/flow-print.1	Sun Dec 23 06:06:02 2001
++++ docs/flow-print.1	Sat Jan 12 07:43:42 2002
+@@ -102,7 +102,7 @@
+ None known\&.
+ .SH "FILES"
+ .PP
+-Symbols are located in \fB/var/ft/sym/*\fP
++Symbols are located in \fB/usr/local/share/flow-tools/*\fP
+ .SH "AUTHOR"
+ .PP
+ Mark Fullmer maf@splintered\&.net
diff --git a/net-mgmt/flow-tools/files/patch-ftpaths.h b/net-mgmt/flow-tools/files/patch-ftpaths.h
new file mode 100644
index 000000000000..e3619a6d6828
--- /dev/null
+++ b/net-mgmt/flow-tools/files/patch-ftpaths.h
@@ -0,0 +1,19 @@
+--- lib/ftpaths.h.in	Tue Jul 17 09:51:05 2001
++++ lib/ftpaths.h.in	Sat Jan 12 06:28:15 2002
+@@ -29,11 +29,11 @@
+ #ifndef FTPATHS_H
+ #define FTPATHS_H
+ 
+-#define FT_FILE_MAP             "@localstatedir@/cfg/map"
++#define FT_FILE_MAP             "@localstatedir@/etc/flow-tools/map"
+ 
+-#define FT_FILE_IP_PROT         "@localstatedir@/sym/ip-prot"
+-#define FT_FILE_IP_CLASS        "@localstatedir@/sym/ip-class"
+-#define FT_FILE_TCP_PORT        "@localstatedir@/sym/tcp-port"
+-#define FT_FILE_ASN             "@localstatedir@/sym/asn"
++#define FT_FILE_IP_PROT         "@localstatedir@/share/flow-tools/ip-prot"
++#define FT_FILE_IP_CLASS        "@localstatedir@/share/flow-tools/ip-class"
++#define FT_FILE_TCP_PORT        "@localstatedir@/share/flow-tools/tcp-port"
++#define FT_FILE_ASN             "@localstatedir@/share/flow-tools/asn"
+ 
+ #endif /* FTPATHS_H */
diff --git a/net-mgmt/flow-tools/files/patch-src_Makefile b/net-mgmt/flow-tools/files/patch-src_Makefile
new file mode 100644
index 000000000000..a031a30d111b
--- /dev/null
+++ b/net-mgmt/flow-tools/files/patch-src_Makefile
@@ -0,0 +1,22 @@
+--- src/Makefile.am	Sat Dec 29 01:23:03 2001
++++ src/Makefile.am	Sat Jan 12 09:42:38 2002
+@@ -12,7 +12,7 @@
+ 
+ force_build:
+ 
+-ftbuild.h: ftbuild.sh force_build
++ftbuild.h: ftbuild.sh
+ 	./ftbuild.sh
+ 
+ flow_import_SOURCES = flow-import.c ftbuild.h
+--- src/Makefile.in	Sat Dec 29 01:27:29 2001
++++ src/Makefile.in	Sat Jan 12 09:43:42 2002
+@@ -531,7 +531,7 @@
+ 
+ force_build:
+ 
+-ftbuild.h: ftbuild.sh force_build
++ftbuild.h: ftbuild.sh
+ 	./ftbuild.sh
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net-mgmt/flow-tools/pkg-descr b/net-mgmt/flow-tools/pkg-descr
index 79592e89ea45..f22fa6444a6f 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
+Tools to capture, replicate, print, filter, send and other works
 on Cisco's NetFlow Export.
 
 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 9c981b82963c..5cad13f112c8 100644
--- a/net-mgmt/flow-tools/pkg-plist
+++ b/net-mgmt/flow-tools/pkg-plist
@@ -9,13 +9,20 @@ bin/flow-gen
 bin/flow-header
 bin/flow-import
 bin/flow-merge
+bin/flow-mirror
 bin/flow-print
 bin/flow-receive
+bin/flow-rsync
+bin/flow-search
 bin/flow-send
 bin/flow-split
 bin/flow-stat
+bin/flow-tag
 bin/flow-xlate
-bin/flow-mirror
-bin/flow-rsync
-bin/flow-search
-@dirrm /var/ft
+etc/flow-tools/map
+etc/flow-tools/filter-acl
+share/flow-tools/asn
+share/flow-tools/ip-prot
+share/flow-tools/tcp-port
+@dirrm etc/flow-tools
+@dirrm share/flow-tools