Date: Mon, 26 Aug 2002 13:40:04 -0700 (PDT) From: "."@babolo.ru To: freebsd-ports@FreeBSD.org Subject: Re: ports/41603: [MANTAINER] Upgrade port: net/flow-tools Message-ID: <200208262040.g7QKe441017410@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/41603; it has been noted by GNATS. From: "."@babolo.ru To: bug-followup@FreeBSD.org Cc: freebsd-ports@FreeBSD.org Subject: Re: ports/41603: [MANTAINER] Upgrade port: net/flow-tools Date: Tue, 27 Aug 2002 00:36:36 +0400 (MSD) rm files/patch-docs_flow-print rm files/patch-docs_flow-tag rm files/patch-src_Makefile add files/patch-Makefile --- files/patch-Makefile Sun Aug 25 03:37:03 2002 +++ files/patch-Makefile Sun Aug 25 03:37:03 2002 @@ -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/* Index: Makefile =================================================================== RCS file: /home/CVShome/FreeBSD/ports/net/flow-tools/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 28 Apr 2002 23:38:14 -0000 1.5 +++ Makefile 25 Aug 2002 00:38:58 -0000 @@ -6,7 +6,7 @@ # PORTNAME= flow-tools -PORTVERSION= 0.57 +PORTVERSION= 0.60 CATEGORIES= net MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ @@ -14,7 +14,7 @@ SCRIPTS= flow-mirror flow-rsync flow-search -USE_GMAKE= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes @@ -23,16 +23,16 @@ 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 + flow-tag.1 flow-nfilter.1 flow-report.1 +# No automake-1.6 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 + ${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am + ${REINPLACE_CMD} -e 's|/var/ft/sym/|${PREFIX}/share/flow-tools/|' \ + -e 's|/var/ft/cfg/|${PREFIX}/etc/flow-tools/|' \ + ${WRKSRC}/docs/flow-*.1 post-install: .for i in ${SCRIPTS} Index: distinfo =================================================================== RCS file: /home/CVShome/FreeBSD/ports/net/flow-tools/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 28 Apr 2002 23:38:14 -0000 1.4 +++ distinfo 24 Aug 2002 20:59:47 -0000 @@ -1 +1 @@ -MD5 (flow-tools-0.57.tar.gz) = 6b26d229d7fd74bf515b1513b573859a +MD5 (flow-tools-0.60.tar.gz) = f380481ded74e39643150997468ca6aa Index: pkg-plist =================================================================== RCS file: /home/CVShome/FreeBSD/ports/net/flow-tools/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- pkg-plist 28 Apr 2002 23:38:14 -0000 1.4 +++ pkg-plist 24 Aug 2002 23:47:04 -0000 @@ -10,8 +10,10 @@ bin/flow-import bin/flow-merge bin/flow-mirror +bin/flow-nfilter bin/flow-print bin/flow-receive +bin/flow-report bin/flow-rsync bin/flow-search bin/flow-send Index: files/patch-configs_Makefile =================================================================== RCS file: /home/CVShome/FreeBSD/ports/net/flow-tools/files/patch-configs_Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-configs_Makefile --- files/patch-configs_Makefile 13 Jan 2002 21:53:22 -0000 1.1 +++ files/patch-configs_Makefile 25 Aug 2002 00:42:34 -0000 @@ -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 Index: files/patch-configure =================================================================== RCS file: /home/CVShome/FreeBSD/ports/net/flow-tools/files/patch-configure,v retrieving revision 1.1 diff -u -r1.1 patch-configure --- files/patch-configure 13 Jan 2002 21:53:22 -0000 1.1 +++ files/patch-configure 25 Aug 2002 00:44:20 -0000 @@ -1,22 +1,28 @@ ---- configure.in Sat Dec 29 01:02:24 2001 +--- configure.in Thu Aug 8 09:32:32 2002 +++ configure.in Sat Jan 12 08:43:07 2002 -@@ -8,7 +8,7 @@ +@@ -6,9 +6,9 @@ + AM_INIT_AUTOMAKE(flow-tools, 0.60) + AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in) - CFLAGS="-g -Wall" +-CFLAGS="-g -Wall" ++CFLAGS+="-g -Wall" -localstatedir="/var/ft" +localstatedir="${prefix}" dnl Checks for programs. AC_PROG_CC ---- configure Sat Dec 29 01:05:33 2001 +--- configure Fri Aug 9 05:06:19 2002 +++ configure Sat Jan 12 08:42:27 2002 -@@ -783,7 +783,7 @@ +@@ -1583,9 +1583,9 @@ - CFLAGS="-g -Wall" + + +-CFLAGS="-g -Wall" ++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' Index: files/patch-ftpaths.h =================================================================== RCS file: /home/CVShome/FreeBSD/ports/net/flow-tools/files/patch-ftpaths.h,v retrieving revision 1.2 diff -u -r1.2 patch-ftpaths.h --- files/patch-ftpaths.h 28 Apr 2002 23:38:19 -0000 1.2 +++ files/patch-ftpaths.h 25 Aug 2002 00:45:39 -0000 @@ -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 */ -- @BABOLO http://links.ru/ 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?200208262040.g7QKe441017410>