diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-11-19 08:04:19 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-11-19 08:04:19 +0000 |
commit | bee7e2deef138a7be0de5558564b6e452b003470 (patch) | |
tree | 33f119f33a78e9805e0f8d67155b317494755422 /net-mgmt/flow-tools | |
parent | On request of DougB@, change of USE_PERL5 to USE_PERL5_RUN. (diff) |
upgrade to 0.62
PR: 45463
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=70464
Diffstat (limited to 'net-mgmt/flow-tools')
-rw-r--r-- | net-mgmt/flow-tools/Makefile | 37 | ||||
-rw-r--r-- | net-mgmt/flow-tools/distinfo | 2 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-Makefile | 19 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-configs_Makefile | 12 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-configure | 30 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-docs_flow-print | 11 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-docs_flow-tag | 11 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-ftpaths.h | 36 | ||||
-rw-r--r-- | net-mgmt/flow-tools/files/patch-src_Makefile | 22 | ||||
-rw-r--r-- | net-mgmt/flow-tools/pkg-plist | 5 |
10 files changed, 82 insertions, 103 deletions
diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile index c7e7a7377572..a50cca61883d 100644 --- a/net-mgmt/flow-tools/Makefile +++ b/net-mgmt/flow-tools/Makefile @@ -6,38 +6,35 @@ # PORTNAME= flow-tools -PORTVERSION= 0.57 +PORTVERSION= 0.62 CATEGORIES= net MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ MAINTAINER= .@babolo.ru -SCRIPTS= flow-mirror flow-rsync flow-search - -USE_GMAKE= yes USE_REINPLACE= yes - GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--localstatedir=${PREFIX} -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-report.1 flow-send.1 \ + flow-split.1 flow-stat.1 flow-tag.1 flow-tools.1 \ + flow-tools-examples.1 flow-xlate.1 post-patch: ${TOUCH} -r ${WRKSRC}/configure.in.orig ${WRKSRC}/configure.in ${TOUCH} -r ${WRKSRC}/configure.orig ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ - ${WRKSRC}/docs/flow-print.1 ${WRKSRC}/docs/flow-tag.1 - -pre-build: - ${RM} ${WRKSRC}/src/ftbuild.h - -post-install: -.for i in ${SCRIPTS} - @${INSTALL_SCRIPT} ${WRKSRC}/bin/${i} ${PREFIX}/bin + ${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am + ${REINPLACE_CMD}\ + -e 's|@localstatedir@/sym/|${PREFIX}/share/flow-tools/|' \ + -e 's|@localstatedir@/cfg/|${PREFIX}/etc/flow-tools/|' \ + ${WRKSRC}/docs/flow-*.1.in ${WRKSRC}/docs/flow-*.html.in + +pre-install: +.for I in ${MAN1} + ${INSTALL_MAN} ${WRKSRC}/docs/${I} ${PREFIX}/man/man1/ .endfor .include <bsd.port.mk> diff --git a/net-mgmt/flow-tools/distinfo b/net-mgmt/flow-tools/distinfo index 656764091ff2..ea4567b8d1cc 100644 --- a/net-mgmt/flow-tools/distinfo +++ b/net-mgmt/flow-tools/distinfo @@ -1 +1 @@ -MD5 (flow-tools-0.57.tar.gz) = 6b26d229d7fd74bf515b1513b573859a +MD5 (flow-tools-0.62.tar.gz) = 68ec3cd86903370c019f12593f437f78 diff --git a/net-mgmt/flow-tools/files/patch-Makefile b/net-mgmt/flow-tools/files/patch-Makefile new file mode 100644 index 000000000000..c911be279ee0 --- /dev/null +++ b/net-mgmt/flow-tools/files/patch-Makefile @@ -0,0 +1,19 @@ +--- Makefile.am Thu Aug 8 09:32:32 2002 ++++ Makefile.am Sun Aug 25 02:32:20 2002 +@@ -1,4 +1,4 @@ +-SUBDIRS = lib src docs configs bin ++SUBDIRS = lib src docs configs + + EXTRA_DIST = bin/flow-mirror bin/flow-rsync bin/flow-search utils/* \ + SECURITY contrib/* configs/* +--- Makefile.in Fri Aug 9 05:06:16 2002 ++++ Makefile.in Sun Aug 25 02:44:57 2002 +@@ -81,7 +81,7 @@ + am__include = @am__include@ + am__quote = @am__quote@ + install_sh = @install_sh@ +-SUBDIRS = lib src docs configs bin ++SUBDIRS = lib src docs configs + + EXTRA_DIST = bin/flow-mirror bin/flow-rsync bin/flow-search utils/* \ + SECURITY contrib/* configs/* diff --git a/net-mgmt/flow-tools/files/patch-configs_Makefile b/net-mgmt/flow-tools/files/patch-configs_Makefile index 9d78f6292681..2d81ad21d879 100644 --- a/net-mgmt/flow-tools/files/patch-configs_Makefile +++ b/net-mgmt/flow-tools/files/patch-configs_Makefile @@ -9,12 +9,12 @@ +ftcfgdir=$(localstatedir)/etc/flow-tools ftcfg_DATA = map filter-acl ---- configs/Makefile.in Sat Dec 29 01:05:48 2001 +--- configs/Makefile.in Fri Aug 9 05:06:41 2002 +++ configs/Makefile.in Sat Jan 12 08:04:39 2002 -@@ -66,10 +66,10 @@ - YACC = @YACC@ - YLIB = @YLIB@ - +@@ -81,10 +81,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 @@ -22,5 +22,5 @@ -ftcfgdir = $(localstatedir)/cfg +ftcfgdir = $(localstatedir)/etc/flow-tools ftcfg_DATA = map filter-acl + subdir = configs 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 index 66b890433a2f..e42e912a5f9b 100644 --- a/net-mgmt/flow-tools/files/patch-configure +++ b/net-mgmt/flow-tools/files/patch-configure @@ -1,22 +1,22 @@ ---- configure.in Sat Dec 29 01:02:24 2001 -+++ configure.in Sat Jan 12 08:43:07 2002 -@@ -8,7 +8,7 @@ +--- configure.in.orig Wed Oct 16 01:28:23 2002 ++++ configure.in Sun Nov 17 05:14:42 2002 +@@ -6,7 +6,7 @@ + AM_INIT_AUTOMAKE(flow-tools, 0.62) + AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in) - CFLAGS="-g -Wall" - --localstatedir="/var/ft" -+localstatedir="${prefix}" +-CFLAGS="-g -Wall" ++CFLAGS+="-g -Wall" 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 @@ +--- configure.orig Wed Oct 16 01:28:44 2002 ++++ configure Sun Nov 17 05:13:42 2002 +@@ -1583,7 +1583,7 @@ + - CFLAGS="-g -Wall" --localstatedir="/var/ft" -+localstatedir="${prefix}" +-CFLAGS="-g -Wall" ++CFLAGS+="-g -Wall" - # 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 --git a/net-mgmt/flow-tools/files/patch-docs_flow-print b/net-mgmt/flow-tools/files/patch-docs_flow-print deleted file mode 100644 index 8ba22d84ce37..000000000000 --- a/net-mgmt/flow-tools/files/patch-docs_flow-print +++ /dev/null @@ -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 --git a/net-mgmt/flow-tools/files/patch-docs_flow-tag b/net-mgmt/flow-tools/files/patch-docs_flow-tag deleted file mode 100644 index b184553adbd9..000000000000 --- a/net-mgmt/flow-tools/files/patch-docs_flow-tag +++ /dev/null @@ -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 --git a/net-mgmt/flow-tools/files/patch-ftpaths.h b/net-mgmt/flow-tools/files/patch-ftpaths.h index 10b66b70d0ff..362bf3505a30 100644 --- a/net-mgmt/flow-tools/files/patch-ftpaths.h +++ b/net-mgmt/flow-tools/files/patch-ftpaths.h @@ -1,21 +1,29 @@ ---- lib/ftpaths.h.in Sun Apr 21 04:08:41 2002 +--- lib/ftpaths.h.in Thu Aug 15 17:28:04 2002 +++ lib/ftpaths.h.in Mon Apr 22 11:29:07 2002 -@@ -29,12 +29,12 @@ +@@ -29,16 +29,16 @@ #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_CFG_MAP "@localstatedir@/cfg/map" +-#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag" +-#define FT_PATH_CFG_FILTER "@localstatedir@/cfg/filter" +-#define FT_PATH_CFG_STAT "@localstatedir@/cfg/stat" ++#define FT_PATH_CFG_MAP "@localstatedir@/etc/flow-tools/map" ++#define FT_PATH_CFG_TAG "@localstatedir@/etc/flow-tools/tag" ++#define FT_PATH_CFG_FILTER "@localstatedir@/etc/flow-tools/filter" ++#define FT_PATH_CFG_STAT "@localstatedir@/etc/flow-tools/stat" --#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" +-#define FT_PATH_SYM_IP_PROT "@localstatedir@/sym/ip-prot" +-#define FT_PATH_SYM_IP_CLASS "@localstatedir@/sym/ip-class" +-#define FT_PATH_SYM_IP_TYPE "@localstatedir@/sym/ip-type" +-#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_IP_TYPE "@localstatedir@/share/flow-tools/ip-type" ++#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 --git a/net-mgmt/flow-tools/files/patch-src_Makefile b/net-mgmt/flow-tools/files/patch-src_Makefile deleted file mode 100644 index a031a30d111b..000000000000 --- a/net-mgmt/flow-tools/files/patch-src_Makefile +++ /dev/null @@ -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 --git a/net-mgmt/flow-tools/pkg-plist b/net-mgmt/flow-tools/pkg-plist index cc86af83ba5a..87cb64f40b8c 100644 --- a/net-mgmt/flow-tools/pkg-plist +++ b/net-mgmt/flow-tools/pkg-plist @@ -9,11 +9,10 @@ bin/flow-gen bin/flow-header bin/flow-import bin/flow-merge -bin/flow-mirror +bin/flow-nfilter bin/flow-print bin/flow-receive -bin/flow-rsync -bin/flow-search +bin/flow-report bin/flow-send bin/flow-split bin/flow-stat |