Date: Tue, 13 Aug 2002 15:04:04 +0800 (CST) From: Gea-Suan Lin <gslin@Infomath.math.NCTU.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gslin@Infomath.math.NCTU.edu.tw, "."@babolo.ru Subject: ports/41603: Upgrade port: net/flow-tools Message-ID: <20020813070404.6D1285825@Infomath.math.NCTU.edu.tw>
next in thread | raw e-mail | index | archive | help
>Number: 41603 >Category: ports >Synopsis: Upgrade port: net/flow-tools >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 13 00:10:00 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Gea-Suan Lin >Release: FreeBSD 4.6.1-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD Infomath.math.NCTU.edu.tw 4.6.1-RELEASE-p5 FreeBSD 4.6.1-RELEASE-p5 #3: Thu Aug 1 05:45:45 CST 2002 root@Infomath.math.NCTU.edu.tw:/usr/obj/usr/src/sys/INFOMATH i386 >Description: Upgrade to 0.59 >How-To-Repeat: >Fix: diff -ruN /usr/ports/net/flow-tools/Makefile flow-tools/Makefile --- /usr/ports/net/flow-tools/Makefile Mon Apr 29 07:38:14 2002 +++ flow-tools/Makefile Tue Aug 13 15:00:09 2002 @@ -6,7 +6,7 @@ # PORTNAME= flow-tools -PORTVERSION= 0.57 +PORTVERSION= 0.59 CATEGORIES= net MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ @@ -15,24 +15,20 @@ SCRIPTS= flow-mirror flow-rsync flow-search USE_GMAKE= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes -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 \ - flow-tag.1 +MAN1= flow-capture.1 flow-cat.1 flow-dscan.1 flow-expire.1 \ + flow-export.1 flow-fanout.1 flow-filter.1 flow-gen.1 \ + flow-header.1 flow-import.1 flow-merge.1 flow-nfilter.1 \ + flow-print.1 flow-receive.1 flow-send.1 flow-split.1 \ + flow-stat.1 flow-tag.1 flow-tools-examples.1 \ + flow-tools.1 flow-xlate.1 post-patch: - ${TOUCH} -r ${WRKSRC}/configure.in.orig ${WRKSRC}/configure.in - ${TOUCH} -r ${WRKSRC}/configure.orig ${WRKSRC}/configure - ${PERL} -pi -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/docs/flow-print.1 \ - ${WRKSRC}/docs/flow-tag.1 - -pre-build: - ${RM} ${WRKSRC}/src/ftbuild.h + ${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \ + ${WRKSRC}/docs/flow-print.1 ${WRKSRC}/docs/flow-tag.1 post-install: .for i in ${SCRIPTS} diff -ruN /usr/ports/net/flow-tools/distinfo flow-tools/distinfo --- /usr/ports/net/flow-tools/distinfo Mon Apr 29 07:38:14 2002 +++ flow-tools/distinfo Mon Aug 12 22:57:25 2002 @@ -1 +1 @@ -MD5 (flow-tools-0.57.tar.gz) = 6b26d229d7fd74bf515b1513b573859a +MD5 (flow-tools-0.59.tar.gz) = 992c4a3b177fe7c8733bc1512fb27137 diff -ruN /usr/ports/net/flow-tools/files/patch-configs_Makefile flow-tools/files/patch-configs_Makefile --- /usr/ports/net/flow-tools/files/patch-configs_Makefile Mon Jan 14 05:53:22 2002 +++ flow-tools/files/patch-configs_Makefile Thu Jan 1 08:00:00 1970 @@ -1,26 +0,0 @@ ---- 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 -ruN /usr/ports/net/flow-tools/files/patch-configs_Makefile.am flow-tools/files/patch-configs_Makefile.am --- /usr/ports/net/flow-tools/files/patch-configs_Makefile.am Thu Jan 1 08:00:00 1970 +++ flow-tools/files/patch-configs_Makefile.am Mon Aug 12 23:01:06 2002 @@ -0,0 +1,11 @@ +--- configs/Makefile.am.orig Mon Aug 12 22:59:07 2002 ++++ configs/Makefile.am Mon Aug 12 22:59:22 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 + diff -ruN /usr/ports/net/flow-tools/files/patch-configs_Makefile.in flow-tools/files/patch-configs_Makefile.in --- /usr/ports/net/flow-tools/files/patch-configs_Makefile.in Thu Jan 1 08:00:00 1970 +++ flow-tools/files/patch-configs_Makefile.in Mon Aug 12 23:01:12 2002 @@ -0,0 +1,15 @@ +--- configs/Makefile.in.orig Mon Aug 12 22:59:40 2002 ++++ configs/Makefile.in Mon Aug 12 23:00:01 2002 +@@ -79,10 +79,10 @@ + am__include = @am__include@ + am__quote = @am__quote@ + install_sh = @install_sh@ +-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 + subdir = configs + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -ruN /usr/ports/net/flow-tools/files/patch-configure flow-tools/files/patch-configure --- /usr/ports/net/flow-tools/files/patch-configure Mon Jan 14 05:53:22 2002 +++ flow-tools/files/patch-configure Mon Aug 12 23:03:18 2002 @@ -1,22 +1,11 @@ ---- configure.in Sat Dec 29 01:02:24 2001 -+++ configure.in Sat Jan 12 08:43:07 2002 -@@ -8,7 +8,7 @@ +--- configure.orig Mon Aug 12 23:01:55 2002 ++++ configure Mon Aug 12 23:02:21 2002 +@@ -1580,7 +1580,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 + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' diff -ruN /usr/ports/net/flow-tools/files/patch-configure.in flow-tools/files/patch-configure.in --- /usr/ports/net/flow-tools/files/patch-configure.in Thu Jan 1 08:00:00 1970 +++ flow-tools/files/patch-configure.in Mon Aug 12 23:03:23 2002 @@ -0,0 +1,11 @@ +--- configure.in.orig Mon Aug 12 23:02:06 2002 ++++ configure.in Mon Aug 12 23:02:34 2002 +@@ -8,7 +8,7 @@ + + CFLAGS="-g -Wall" + +-localstatedir="/var/ft" ++localstatedir="${prefix}" + + dnl Checks for programs. + AC_PROG_CC diff -ruN /usr/ports/net/flow-tools/files/patch-docs_flow-print flow-tools/files/patch-docs_flow-print --- /usr/ports/net/flow-tools/files/patch-docs_flow-print Mon Jan 14 05:53:22 2002 +++ flow-tools/files/patch-docs_flow-print Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- 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 -ruN /usr/ports/net/flow-tools/files/patch-docs_flow-print.1 flow-tools/files/patch-docs_flow-print.1 --- /usr/ports/net/flow-tools/files/patch-docs_flow-print.1 Thu Jan 1 08:00:00 1970 +++ flow-tools/files/patch-docs_flow-print.1 Tue Aug 13 14:47:16 2002 @@ -0,0 +1,11 @@ +--- docs/flow-print.1.orig Tue Aug 13 14:46:11 2002 ++++ docs/flow-print.1 Tue Aug 13 14:46:26 2002 +@@ -114,7 +114,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 -ruN /usr/ports/net/flow-tools/files/patch-docs_flow-tag flow-tools/files/patch-docs_flow-tag --- /usr/ports/net/flow-tools/files/patch-docs_flow-tag Mon Apr 29 07:38:19 2002 +++ flow-tools/files/patch-docs_flow-tag Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- docs/flow-tag.1 Mon Apr 22 11:42:06 2002 -+++ docs/flow-tag.1 Mon Apr 22 11:42:43 2002 -@@ -189,7 +189,7 @@ - .fi - .PP - .PP --First populate \fB/var/ft/sym/tags\fP for \fBflow-stat\fP to use as symbols\&. -+First populate \fB/usr/local/etc/flow-tools/tag_defs\fP for \fBflow-stat\fP to use as symbols\&. - .PP - .nf - \f(CW0x0001 OSU diff -ruN /usr/ports/net/flow-tools/files/patch-docs_flow-tag.1 flow-tools/files/patch-docs_flow-tag.1 --- /usr/ports/net/flow-tools/files/patch-docs_flow-tag.1 Thu Jan 1 08:00:00 1970 +++ flow-tools/files/patch-docs_flow-tag.1 Tue Aug 13 14:40:17 2002 @@ -0,0 +1,11 @@ +--- docs/flow-tag.1.orig Tue Aug 13 14:38:51 2002 ++++ docs/flow-tag.1 Tue Aug 13 14:39:45 2002 +@@ -191,7 +191,7 @@ + .fi + .PP + .PP +-First populate \fB/var/ft/sym/tags\fP for \fBflow-stat\fP to use as symbols\&. ++First populate \fB/usr/local/etc/flow-tools/tags\fP for \fBflow-stat\fP to use as symbols\&. + .PP + .nf + \f(CW0x0001 OSU diff -ruN /usr/ports/net/flow-tools/files/patch-ftpaths.h flow-tools/files/patch-ftpaths.h --- /usr/ports/net/flow-tools/files/patch-ftpaths.h Mon Apr 29 07:38:19 2002 +++ flow-tools/files/patch-ftpaths.h Thu Jan 1 08:00:00 1970 @@ -1,21 +0,0 @@ ---- lib/ftpaths.h.in Sun Apr 21 04:08:41 2002 -+++ lib/ftpaths.h.in Mon Apr 22 11:29:07 2002 -@@ -29,12 +29,12 @@ - #ifndef FTPATHS_H - #define FTPATHS_H - --#define FT_PATH_MAP "@localstatedir@/cfg/map" -+#define FT_FILE_MAP "@localstatedir@/etc/flow-tools/map" - --#define FT_PATH_IP_PROT "@localstatedir@/sym/ip-prot" --#define FT_PATH_IP_CLASS "@localstatedir@/sym/ip-class" --#define FT_PATH_TCP_PORT "@localstatedir@/sym/tcp-port" --#define FT_PATH_ASN "@localstatedir@/sym/asn" --#define FT_PATH_TAG "@localstatedir@/cfg/tag_defs" -+#define FT_PATH_IP_PROT "@localstatedir@/share/flow-tools/ip-prot" -+#define FT_PATH_IP_CLASS "@localstatedir@/share/flow-tools/ip-class" -+#define FT_PATH_TCP_PORT "@localstatedir@/share/flow-tools/tcp-port" -+#define FT_PATH_ASN "@localstatedir@/share/flow-tools/asn" -+#define FT_PATH_TAG "@localstatedir@/etc/flow-tools/tag_defs" - - #endif /* FTPATHS_H */ diff -ruN /usr/ports/net/flow-tools/files/patch-lib_ftpaths.h flow-tools/files/patch-lib_ftpaths.h --- /usr/ports/net/flow-tools/files/patch-lib_ftpaths.h Thu Jan 1 08:00:00 1970 +++ flow-tools/files/patch-lib_ftpaths.h Tue Aug 13 14:42:57 2002 @@ -0,0 +1,25 @@ +--- lib/ftpaths.h.in.orig Tue Aug 13 14:41:16 2002 ++++ lib/ftpaths.h.in Tue Aug 13 14:42:20 2002 +@@ -29,14 +29,14 @@ + #ifndef FTPATHS_H + #define FTPATHS_H + +-#define FT_PATH_CFG_MAP "@localstatedir@/cfg/map" +-#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag_defs" +-#define FT_PATH_CFG_FILTER "@localstatedir@/cfg/filters" ++#define FT_PATH_CFG_MAP "@localstatedir@/etc/flow-tools/map" ++#define FT_PATH_CFG_TAG "@localstatedir@/etc/flow-tools/tag_defs" ++#define FT_PATH_CFG_FILTER "@localstatedir@/etc/flow-tools/filters" + +-#define FT_PATH_SYM_IP_PROT "@localstatedir@/sym/ip-prot" +-#define FT_PATH_SYM_IP_CLASS "@localstatedir@/sym/ip-class" +-#define FT_PATH_SYM_TCP_PORT "@localstatedir@/sym/tcp-port" +-#define FT_PATH_SYM_ASN "@localstatedir@/sym/asn" +-#define FT_PATH_SYM_TAG "@localstatedir@/sym/tag" ++#define FT_PATH_SYM_IP_PROT "@localstatedir@/share/flow-tools/ip-prot" ++#define FT_PATH_SYM_IP_CLASS "@localstatedir@/share/flow-tools/ip-class" ++#define FT_PATH_SYM_TCP_PORT "@localstatedir@/share/flow-tools/tcp-port" ++#define FT_PATH_SYM_ASN "@localstatedir@/share/flow-tools/asn" ++#define FT_PATH_SYM_TAG "@localstatedir@/share/flow-tools/tag" + + #endif /* FTPATHS_H */ diff -ruN /usr/ports/net/flow-tools/files/patch-src_Makefile flow-tools/files/patch-src_Makefile --- /usr/ports/net/flow-tools/files/patch-src_Makefile Mon Jan 14 05:53:22 2002 +++ flow-tools/files/patch-src_Makefile Thu Jan 1 08:00:00 1970 @@ -1,22 +0,0 @@ ---- 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 -ruN /usr/ports/net/flow-tools/pkg-plist flow-tools/pkg-plist --- /usr/ports/net/flow-tools/pkg-plist Mon Apr 29 07:38:14 2002 +++ flow-tools/pkg-plist Tue Aug 13 14:54:19 2002 @@ -10,6 +10,7 @@ bin/flow-import bin/flow-merge bin/flow-mirror +bin/flow-nfilter bin/flow-print bin/flow-receive bin/flow-rsync >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020813070404.6D1285825>