Date: Tue, 19 Nov 2002 03:12:12 +0300 From: "Alexandr A.Babaylov" <"."@babolo.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: @cicuta.babolo.ru Subject: ports/45463: [MANTEINER UPDATE] ports/net/flow-tools Message-ID: <1037664732.714951.1103.nullmailer@cicuta.babolo.ru>
next in thread | raw e-mail | index | archive | help
>Number: 45463
>Category: ports
>Synopsis: [MANTEINER UPDATE] ports/net/flow-tools
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 18 16:20:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Alexandr A. Babaylov
>Release: FreeBSD 4.7-STABLE i386
>Organization:
home
>Environment:
System: FreeBSD cicuta.babolo.ru 4.7-STABLE FreeBSD 4.7-STABLE #0: Sat Nov 9 21:54:50 MSK 2002 babolo@cicuta.babolo.ru:/tmp/babolo/usr/src/sys/cicuta i386
>Description:
>How-To-Repeat:
>Fix:
Close PR ports/41603
Delete files/patch-docs_flow-print
files/patch-docs_flow-tag
files/patch-src_Makefile
Add files/patch-Makefile
--- Makefile Wed Nov 6 03:30:48 2002
+++ Makefile Sun Nov 17 06:29:24 2002
@@ -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>
--- distinfo Sun Sep 29 17:48:19 2002
+++ distinfo Sun Nov 17 04:59:44 2002
@@ -1 +1 @@
-MD5 (flow-tools-0.57.tar.gz) = 6b26d229d7fd74bf515b1513b573859a
+MD5 (flow-tools-0.62.tar.gz) = 68ec3cd86903370c019f12593f437f78
--- files/patch-Makefile Thu Jan 1 03:00:00 1970
+++ files/patch-Makefile Sun Nov 17 04:44:24 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/*
--- files/patch-configs_Makefile Mon Jan 14 00:53:22 2002
+++ files/patch-configs_Makefile Sun Nov 17 04:44:24 2002
@@ -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
--- files/patch-configure Mon Jan 14 00:53:22 2002
+++ files/patch-configure Sun Nov 17 05:16:17 2002
@@ -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'
--- files/patch-ftpaths.h Mon Apr 29 03:38:19 2002
+++ files/patch-ftpaths.h Sun Nov 17 04:44:24 2002
@@ -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 */
--- pkg-plist Sun Sep 29 17:48:19 2002
+++ pkg-plist Sun Nov 17 06:19:15 2002
@@ -9,11 +9,10 @@
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
>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?1037664732.714951.1103.nullmailer>