From owner-freebsd-ports Thu Jul 4 4:10:47 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF97A37B400 for ; Thu, 4 Jul 2002 04:10:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC02443E31 for ; Thu, 4 Jul 2002 04:10:24 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g64BAOJU025695 for ; Thu, 4 Jul 2002 04:10:24 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g64BAOCm025694; Thu, 4 Jul 2002 04:10:24 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 543D637B409 for ; Thu, 4 Jul 2002 04:07:52 -0700 (PDT) Received: from news1.macomnet.ru (news1.macomnet.ru [195.128.64.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 390B943E09 for ; Thu, 4 Jul 2002 04:07:51 -0700 (PDT) (envelope-from maxim@news1.macomnet.ru) Received: (from maxim@localhost) by news1.macomnet.ru (8.11.6/8.11.6) id g64B7mx70003; Thu, 4 Jul 2002 15:07:48 +0400 (MSD) (envelope-from maxim) Message-Id: <200207041107.g64B7mx70003@news1.macomnet.ru> Date: Thu, 4 Jul 2002 15:07:48 +0400 (MSD) From: Maxim Konovalov Reply-To: Maxim Konovalov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/40179: port update: net/flow-tools 0.57 -> 0.58 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40179 >Category: ports >Synopsis: port update: net/flow-tools 0.57 -> 0.58 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jul 04 04:10:24 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Maxim Konovalov >Release: FreeBSD 4.5-STABLE i386 >Organization: n/a >Environment: FreeBSD 4.5-STABLE >Description: port update: net/flow-tools 0.57 -> 0.58 Changelog: >How-To-Repeat: n/a >Fix: apply the patch below cvs add files/patch-docs_flow-nfilter cvs rm files/patch-src_Makefile Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/flow-tools/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 2002/04/28 23:38:14 1.5 +++ Makefile 2002/07/04 10:51:50 @@ -6,7 +6,7 @@ # PORTNAME= flow-tools -PORTVERSION= 0.57 +PORTVERSION= 0.58 CATEGORIES= net MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ @@ -18,21 +18,18 @@ 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 post-install: .for i in ${SCRIPTS} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/flow-tools/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 2002/04/28 23:38:14 1.4 +++ distinfo 2002/07/04 10:51:50 @@ -1 +1 @@ -MD5 (flow-tools-0.57.tar.gz) = 6b26d229d7fd74bf515b1513b573859a +MD5 (flow-tools-0.58.tar.gz) = 87514a77abfcde0fabb65cddbc22dad3 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/flow-tools/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- pkg-plist 2002/04/28 23:38:14 1.4 +++ pkg-plist 2002/07/04 10:51:51 @@ -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 @@ -20,7 +21,8 @@ bin/flow-tag bin/flow-xlate etc/flow-tools/map -etc/flow-tools/filter-acl +etc/flow-tools/filter +etc/flow-tools/tag_defs include/ftconfig.h include/ftlib.h include/ftpaths.h @@ -28,7 +30,9 @@ include/radix.h lib/libft.a share/flow-tools/asn +share/flow-tools/ip-class share/flow-tools/ip-prot +share/flow-tools/tag share/flow-tools/tcp-port @dirrm etc/flow-tools @dirrm share/flow-tools Index: files/patch-configs_Makefile =================================================================== RCS file: /home/ncvs/ports/net/flow-tools/files/patch-configs_Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-configs_Makefile --- files/patch-configs_Makefile 2002/01/13 21:53:22 1.1 +++ files/patch-configs_Makefile 2002/07/04 10:51:51 @@ -1,5 +1,5 @@ --- configs/Makefile.am Fri Jul 6 06:28:57 2001 -+++ configs/Makefile.am Sat Jan 12 06:20:07 2002 ++++ configs/Makefile.am Wed Jul 3 13:26:37 2002 @@ -1,6 +1,6 @@ -ftsymdir=$(localstatedir)/sym +ftsymdir=$(localstatedir)/share/flow-tools @@ -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 Sat Jan 12 08:04:39 2002 -@@ -66,10 +66,10 @@ - YACC = @YACC@ - YLIB = @YLIB@ - +--- configs/Makefile.in Wed Jul 3 16:36:20 2002 ++++ configs/Makefile.in Wed Jul 3 16:37:08 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 @@ -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 Index: files/patch-configure =================================================================== RCS file: /home/ncvs/ports/net/flow-tools/files/patch-configure,v retrieving revision 1.1 diff -u -r1.1 patch-configure --- files/patch-configure 2002/01/13 21:53:22 1.1 +++ files/patch-configure 2002/07/04 10:51:51 @@ -1,5 +1,5 @@ ---- configure.in Sat Dec 29 01:02:24 2001 -+++ configure.in Sat Jan 12 08:43:07 2002 +--- configure.in Wed Jun 12 04:36:21 2002 ++++ configure.in Wed Jul 3 13:26:49 2002 @@ -8,7 +8,7 @@ CFLAGS="-g -Wall" @@ -9,8 +9,8 @@ dnl Checks for programs. AC_PROG_CC ---- configure Sat Dec 29 01:05:33 2001 -+++ configure Sat Jan 12 08:42:27 2002 +--- configure Sat Dec 29 01:05:33 2001 ++++ configure Sat Jan 12 08:42:27 2002 @@ -783,7 +783,7 @@ CFLAGS="-g -Wall" Index: files/patch-docs_flow-print =================================================================== RCS file: /home/ncvs/ports/net/flow-tools/files/patch-docs_flow-print,v retrieving revision 1.1 diff -u -r1.1 patch-docs_flow-print --- files/patch-docs_flow-print 2002/01/13 21:53:22 1.1 +++ files/patch-docs_flow-print 2002/07/04 10:51:51 @@ -1,6 +1,6 @@ ---- 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 @@ +--- docs/flow-print.1 Sun Jun 9 07:41:36 2002 ++++ docs/flow-print.1 Wed Jul 3 13:26:56 2002 +@@ -114,7 +114,7 @@ None known\&. .SH "FILES" .PP Index: files/patch-docs_flow-tag =================================================================== RCS file: /home/ncvs/ports/net/flow-tools/files/patch-docs_flow-tag,v retrieving revision 1.1 diff -u -r1.1 patch-docs_flow-tag --- files/patch-docs_flow-tag 2002/04/28 23:38:19 1.1 +++ files/patch-docs_flow-tag 2002/07/04 10:51:51 @@ -1,6 +1,6 @@ ---- 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 @@ +--- docs/flow-tag.1 Sun Jun 9 07:41:38 2002 ++++ docs/flow-tag.1 Wed Jul 3 13:27:01 2002 +@@ -191,7 +191,7 @@ .fi .PP .PP Index: files/patch-ftpaths.h =================================================================== RCS file: /home/ncvs/ports/net/flow-tools/files/patch-ftpaths.h,v retrieving revision 1.2 diff -u -r1.2 patch-ftpaths.h --- files/patch-ftpaths.h 2002/04/28 23:38:19 1.2 +++ files/patch-ftpaths.h 2002/07/04 10:51:51 @@ -1,21 +1,25 @@ ---- 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 @@ +--- lib/ftpaths.h.in Wed Jul 3 13:15:01 2002 ++++ lib/ftpaths.h.in Wed Jul 3 13:17:21 2002 +@@ -29,14 +29,14 @@ #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_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/filter-acl" --#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_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 */ --- /dev/null Thu Jul 4 14:23:00 2002 +++ files/patch-docs_flow-nfilter Thu Jul 4 14:15:05 2002 @@ -0,0 +1,11 @@ +--- docs/flow-nfilter.1 Thu Jul 4 13:43:51 2002 ++++ docs/flow-nfilter.1 Thu Jul 4 13:44:51 2002 +@@ -94,7 +94,7 @@ + .IP "-d\fI debug_level\fP" 10 + Enable debugging\&. + .IP "-f\fI filter_fname\fP" 10 +-Filter list filename\&. Defaults to \fB/var/ft/cfg/filters\fP\&. ++Filter list filename\&. Defaults to \fB/usr/local/etc/flow-tools/filter-acl\fP\&. + .IP "-F\fI filter_definition\fP" 10 + Select the active definition\&. Defaults to default\&. + .IP "-h" 10 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message