Update to version 0.67.

Package changes: bl3ify, record build options, remove obsolete
AUTOMAKE_POST_PATTERNS, support new PostgreSQL feature.

Changes since last packaged version:
* 12-4-2003 flow-tools 0.67 released.
* flow-export: pgsql support from wyu@ateneo.edu
* docs: flow-report: Added description of reports.
* ftlib: ftfil.c - match_end_time() broken - noted by
  "Joe Loiacono" <jloiacon@csc.com>
* ftlib: fttag.c - better syntax checking for or-src/dst and set-src/dst
* ftlib: ftlib.h FT_TAG_TYPE_MATCH_NEXTHOP duplicated - flow-tag crash
  with next-hop type noted by Maxim Grigoriev <maxim@fnal.gov>
* ftlib: ftstat.c - broken ip-destination-address-source-count.  patch from
  "Shigeki Taniguchi" <staniguchi@csc.com>
* flow-fanout: filters not loaded - noted by RAR@syssrc.com
* ftlib: missing function prototypes for ftstat_*, rename bind to binding
  to prevent shadowing bind().  patch from Bill Fumerola <billf@mu.org>
* flow-fanout, flow-capture.  Process SIGTERM like SIGQUIT so flow-tools
  will work better under daemontools - req by
  Bernhard Weisshuhn <bkw@weisshuhn.de>
* docs: flow-nfilter and flow-cat TIME/DATE parsing section.
* flow-dscan: drp->flags not updated when loading saved state - patch from
  Jon Snyder <jon@pdx.edu>
* flow-dscan: allow concurrent -w and -W, patch from
  Dan Thorson <dan.thorson@seagate.com>
* docs: flow-print -f24 - noted by
  noted by Christian Bauer <Christian.Bauer@NEFkom.de>
* dist: tag.sym and tag.cfg example files reversed - noted by
* ftlib: ftlib.h - FT_TAG_SET and FT_TAG_OR are broken - patch from
  Valtteri Vuorikoski <vuori@geo0-hel-fi.magenta.net>
* ftlib: ftrec.c - add 1005to5 translation - patch from
  Valtteri Vuorikoski <vuori@geo0-hel-fi.magenta.net>
* flow-stat -f0 will try to divide by 0 with an empty flow file
  - noted by Mike Hunter <mhunter@ack.Berkeley.EDU>
* flow-capture: -u preserve unherited umask - patch from
  Everton da Silva Marques <everton@lab.ipaccess.diveo.net.br>
* flow-receive: remove -m and -A.
* flow-capture: remove -m and -A, functionality is now in xlate -x -X.
* flow-xlate: - config file based now.
* docs: flow-report: note which fields are sortable and what the key
  field is.
* flow-capture: accept()'s 3rd arg should be casted to socklen_t*, noted
  by Alistair.McGlinchy@marks-and-spencer.com
* docs: flow-nfilter, port is 0..65535 not 0..255 - noted by
  Mike Hunter <mhunter@ack.Berkeley.EDU>
* ftlib: ftlib.h - set-{dst,src} and or-{dst,src} constants not correct -
  patch from  Valtteri Vuorikoski <vuori@geo0-hel-fi.magenta.net>
* ftlib: ftchash.c - ftchash_sort() should not try to sort 0 entry table -
  noted by "Shane D." <shane.dawalt@wright.edu>
* flow-import: missing !HAVE_STRSEP compatability - patch from
  Alistair.McGlinchy@marks-and-spencer.com
* ftlib: ftstat.c - output path not parsed correctly with leading whitespace
  -- noted by Maxim Grigoriev <maxim@fnal.gov>
* ftlib: fttag.c - src->source dst->destination
* ftlib: fttag.c - ip-address, exporter, interface tag actions, requested by
  Tim Irwin <tim@arch.bellsouth.net>
* ftlib: ftsym.c - ftsym_new() should handle null filename - noted by
  Celso Alves Vieira <celso@telemar.com.br>
* flow-dscan: buf len 64, not 54 - Anil Madhavapeddy <anil@recoil.org>

10 files changed, 91 insertions, 183 deletions

diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index f0dc293cb54..b98147db8b9 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:51:10 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/22 15:33:35 seb Exp $
 
-DISTNAME=	flow-tools-0.66
+DISTNAME=	flow-tools-0.67
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/
 
@@ -9,12 +9,15 @@ HOMEPAGE=	http://www.splintered.net/sw/flow-tools/
 COMMENT=	Collect and store NetFlow data
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
 PKG_SYSCONFSUBDIR=	flow-tools
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+BUILD_DEFS+=	FLOW_TOOLS_USE_MYSQL
+BUILD_DEFS+=	FLOW_TOOLS_USE_POSTGRESQL
+
 EGDIR=		${PREFIX}/share/examples/flow-tools
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/sym
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/cfg
@@ -30,15 +33,16 @@ MESSAGE_SUBST+=	EGDIR=${EGDIR}
 .include "../../mk/bsd.prefs.mk"
 
 # MySQL support
-.if defined(FLOW_TOOLS_USE_MYSQL) && ${FLOW_TOOLS_USE_MYSQL} == "YES"
-.include "../../databases/mysql-client/buildlink2.mk"
+.if defined(FLOW_TOOLS_USE_MYSQL) && !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS])
+.include "../../databases/mysql-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
-LDFLAGS+= -Wl,${_OPSYS_RPATH_NAME}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
 .endif
 
-# Touch these or else config.status being touched the manpages
-# generated by it will be made twice
-AUTOMAKE_POST_PATTERNS+=	*.1
+# Postgresql support
+.if defined(FLOW_TOOLS_USE_POSTGRESQL) && !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS])
+.include "../../databases/postgresql-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
+.endif
 
 # To avoid providing more patch files we do the following...
 # Order is important here or else dependencies requiring docbook-to-man/jade
@@ -56,6 +60,6 @@ post-patch:
 		done;							\
 	done
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../security/tcp_wrappers/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/flow-tools/PLIST b/net/flow-tools/PLIST
index fe4e521755f..c1f447224be 100644
--- a/net/flow-tools/PLIST
+++ b/net/flow-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/05/23 07:19:41 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/22 15:33:35 seb Exp $
 bin/flow-capture
 bin/flow-cat
 bin/flow-dscan
@@ -54,6 +54,7 @@ share/examples/flow-tools/cfg/map.cfg
 share/examples/flow-tools/cfg/mask.cfg
 share/examples/flow-tools/cfg/stat.cfg
 share/examples/flow-tools/cfg/tag.cfg
+share/examples/flow-tools/cfg/xlate.cfg
 share/examples/flow-tools/sym/asn.sym
 share/examples/flow-tools/sym/ip-prot.sym
 share/examples/flow-tools/sym/ip-type.sym
diff --git a/net/flow-tools/distinfo b/net/flow-tools/distinfo
index 0f38f8e784a..96bc763eb0c 100644
--- a/net/flow-tools/distinfo
+++ b/net/flow-tools/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.3 2003/05/23 07:19:42 seb Exp $
+$NetBSD: distinfo,v 1.4 2004/04/22 15:33:35 seb Exp $
 
-SHA1 (flow-tools-0.66.tar.gz) = a4d48a5d2ff9608fe4da3202362ee73774773be7
-Size (flow-tools-0.66.tar.gz) = 967711 bytes
-SHA1 (patch-aa) = 349ffa4f5c61a52d3daf8996ac9085cf30eebd74
-SHA1 (patch-ab) = d39a4086ed7ee3f4e05093cfb3b011230ff388ff
+SHA1 (flow-tools-0.67.tar.gz) = 1896dad27db0c89e3e14d86b30aed15581134335
+Size (flow-tools-0.67.tar.gz) = 983667 bytes
+SHA1 (patch-aa) = dce60b3995ed22fbdf36e8d2e4187e191909cba7
+SHA1 (patch-ab) = a4eebdcb5b265f2c755ef62a73f9e4c6c25ab719
 SHA1 (patch-ac) = 86cd77dc3ede171e45e62fd4a050bac19643252b
-SHA1 (patch-ad) = 4aad20509ced86cab8eb02b089e38ffa9cbb772f
+SHA1 (patch-ad) = f8ece1a38e6024622957e7136923fccabfca041f
 SHA1 (patch-ae) = 1e5f151f3eba795f1ade4c016767bd4cd271565a
-SHA1 (patch-af) = 4a461ee3b83c3eec4539c3244bb41428269b3190
-SHA1 (patch-ag) = 89ea92f1ea9f65cd8910c1500ca665caf34b6c03
-SHA1 (patch-ah) = 9daa1879c8f7fd7f1c00a0cb218bdd368e647a2c
+SHA1 (patch-af) = 4a70681bd221a9d5e2175cfcb5b45fdbbe7f2971
+SHA1 (patch-ag) = 60d7c6d07cc8f102d6281a55c8188d13eca80bdf
+SHA1 (patch-ah) = cd55409fd5781e204f32ffa51a9b39222eadb8c7
 SHA1 (patch-ai) = 5e0a5f3148e80c156198d74036ff2f1bf35ed779
 SHA1 (patch-aj) = d183dc3b360110a1a90165b0094e349d3a964a2e
+SHA1 (patch-ak) = d44f230e0d5a9713268801ff308cbadc3ff4f3ab
diff --git a/net/flow-tools/patches/patch-aa b/net/flow-tools/patches/patch-aa
index fac34985fed..d58510ecea5 100644
--- a/net/flow-tools/patches/patch-aa
+++ b/net/flow-tools/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2003/05/23 07:19:42 seb Exp $
+$NetBSD: patch-aa,v 1.3 2004/04/22 15:33:35 seb Exp $
 
---- configs/Makefile.am.orig	2003-04-03 16:44:53.000000000 +0000
+--- configs/Makefile.am.orig	2003-11-25 07:01:37.000000000 +0000
 +++ configs/Makefile.am
 @@ -1,6 +1,6 @@
 -ftsymdir=$(localstatedir)/sym
@@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.2 2003/05/23 07:19:42 seb Exp $
 +egftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
  
 -ftcfgdir=$(localstatedir)/cfg
--ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg
+-ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
 +egftcfgdir=$(prefix)/share/examples/@PACKAGE@/cfg
-+egftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg
++egftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
  
diff --git a/net/flow-tools/patches/patch-ab b/net/flow-tools/patches/patch-ab
index ff820dbd1d1..9a42aebdf86 100644
--- a/net/flow-tools/patches/patch-ab
+++ b/net/flow-tools/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/05/23 07:19:43 seb Exp $
+$NetBSD: patch-ab,v 1.3 2004/04/22 15:33:35 seb Exp $
 
---- configs/Makefile.in.orig	2003-05-22 14:47:44.000000000 +0000
+--- configs/Makefile.in.orig	2004-04-22 12:14:50.000000000 +0000
 +++ configs/Makefile.in
-@@ -114,17 +114,19 @@ sbindir = @sbindir@
+@@ -117,17 +117,17 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -12,27 +12,20 @@ $NetBSD: patch-ab,v 1.2 2003/05/23 07:19:43 seb Exp $
 +egftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
  
 -ftcfgdir = $(localstatedir)/cfg
--ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg
+-ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
 +egftcfgdir = $(prefix)/share/examples/@PACKAGE@/cfg
-+egftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg
++egftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
  subdir = configs
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/lib/ftconfig.h
  CONFIG_CLEAN_FILES =
-+depcomp =
-+am__depfiles_maybe =
  DIST_SOURCES =
 -DATA = $(ftcfg_DATA) $(ftsym_DATA)
 +DATA = $(egftcfg_DATA) $(egftsym_DATA)
  
  DIST_COMMON = Makefile.am Makefile.in
  all: all-am
-@@ -132,45 +134,45 @@ all: all-am
- .SUFFIXES:
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  configs/Makefile
-+	  $(AUTOMAKE) --foreign  --ignore-deps configs/Makefile
+@@ -139,41 +139,41 @@ $(srcdir)/Makefile.in:  Makefile.am  $(t
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  uninstall-info-am:
@@ -94,7 +87,7 @@ $NetBSD: patch-ab,v 1.2 2003/05/23 07:19:43 seb Exp $
  	done
  tags: TAGS
  TAGS:
-@@ -215,7 +217,7 @@ check: check-am
+@@ -218,7 +218,7 @@ check: check-am
  all-am: Makefile $(DATA)
  
  installdirs:
@@ -103,7 +96,7 @@ $NetBSD: patch-ab,v 1.2 2003/05/23 07:19:43 seb Exp $
  
  install: install-am
  install-exec: install-exec-am
-@@ -257,7 +259,7 @@ info: info-am
+@@ -260,7 +260,7 @@ info: info-am
  
  info-am:
  
@@ -112,7 +105,7 @@ $NetBSD: patch-ab,v 1.2 2003/05/23 07:19:43 seb Exp $
  
  install-exec-am:
  
-@@ -283,17 +285,18 @@ ps: ps-am
+@@ -286,17 +286,18 @@ ps: ps-am
  
  ps-am:
  
diff --git a/net/flow-tools/patches/patch-ad b/net/flow-tools/patches/patch-ad
index db46227c8b2..49d838cc497 100644
--- a/net/flow-tools/patches/patch-ad
+++ b/net/flow-tools/patches/patch-ad
@@ -1,26 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2003/05/23 07:19:43 seb Exp $
+$NetBSD: patch-ad,v 1.3 2004/04/22 15:33:35 seb Exp $
 
---- docs/Makefile.in.orig	2003-05-22 13:31:50.000000000 +0000
+--- docs/Makefile.in.orig	2004-04-22 12:15:03.000000000 +0000
 +++ docs/Makefile.in
-@@ -135,6 +135,8 @@ CONFIG_CLEAN_FILES = flow-capture.1 flow
- 	flow-report.html flow-receive.1 flow-receive.html flow-tag.1 \
- 	flow-tag.html flow-mask.1 flow-mask.html flow-fanout.1 \
- 	flow-fanout.html
-+depcomp =
-+am__depfiles_maybe =
- DIST_SOURCES =
- 
- NROFF = nroff
-@@ -151,7 +153,7 @@ all: all-am
- .SUFFIXES: .sgml .1 .html .1.in .html.in
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  docs/Makefile
-+	  $(AUTOMAKE) --foreign  --ignore-deps docs/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- flow-capture.1: $(top_builddir)/config.status flow-capture.1.in
-@@ -370,8 +372,6 @@ uninstall-man: uninstall-man1
+@@ -378,8 +378,6 @@ uninstall-man: uninstall-man1
  
  .sgml.html.in:
  	jade -V nochunks -c /usr/local/share/sgml/docbook/dsssl/modular/catalog -c /usr/local/share/sgml/docbook/catalog -c /usr/local/share/sgml/jade/catalog -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl -t sgml $*.sgml > $*.html.in
diff --git a/net/flow-tools/patches/patch-af b/net/flow-tools/patches/patch-af
index ed213195c1d..f0c0c8b6915 100644
--- a/net/flow-tools/patches/patch-af
+++ b/net/flow-tools/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2003/05/23 07:19:44 seb Exp $
+$NetBSD: patch-af,v 1.3 2004/04/22 15:33:35 seb Exp $
 
---- lib/Makefile.in.orig	2003-05-22 13:32:03.000000000 +0000
+--- lib/Makefile.in.orig	2004-04-22 12:15:23.000000000 +0000
 +++ lib/Makefile.in
-@@ -120,7 +120,7 @@ target_alias = @target_alias@
+@@ -123,7 +123,7 @@ target_alias = @target_alias@
  #AM_CFLAGS=-O2
  AM_CFLAGS = -g -Wall
  
@@ -11,29 +11,7 @@ $NetBSD: patch-af,v 1.2 2003/05/23 07:19:44 seb Exp $
  lib_LIBRARIES = libft.a
  
  libft_a_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
-@@ -149,30 +149,17 @@ am_libft_a_OBJECTS = ftio.$(OBJEXT) ftsw
- libft_a_OBJECTS = $(am_libft_a_OBJECTS)
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
--depcomp = $(SHELL) $(top_srcdir)/depcomp
--am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/strerror.Po $(DEPDIR)/strsep.Po \
--@AMDEP_TRUE@	$(DEPDIR)/strtoull.Po ./$(DEPDIR)/bit1024.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/fmt.Po ./$(DEPDIR)/ftchash.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ftdecode.Po ./$(DEPDIR)/ftencode.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/fterr.Po ./$(DEPDIR)/ftfil.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ftfile.Po ./$(DEPDIR)/ftio.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ftmap.Po ./$(DEPDIR)/ftmask.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ftprof.Po ./$(DEPDIR)/ftrec.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ftstat.Po ./$(DEPDIR)/ftswap.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ftsym.Po ./$(DEPDIR)/fttag.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/fttlv.Po ./$(DEPDIR)/ftvar.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ftxfield.Po ./$(DEPDIR)/getdate.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/radix.Po ./$(DEPDIR)/support.Po
-+depcomp =
-+am__depfiles_maybe =
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -173,10 +173,10 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
  CCLD = $(CC)
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(libft_a_SOURCES)
@@ -47,72 +25,9 @@ $NetBSD: patch-af,v 1.2 2003/05/23 07:19:44 seb Exp $
  SOURCES = $(libft_a_SOURCES)
  
  all: ftconfig.h
-@@ -182,7 +169,7 @@ all: ftconfig.h
- .SUFFIXES: .c .o .obj
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  lib/Makefile
-+	  $(AUTOMAKE) --foreign  --ignore-deps lib/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- 
-@@ -247,75 +234,29 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strsep.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoull.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit1024.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftchash.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftdecode.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftencode.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fterr.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftfil.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftfile.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftio.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftmap.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftmask.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftprof.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftrec.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftstat.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftswap.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftsym.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fttag.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fttlv.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftvar.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftxfield.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radix.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@
--
--distclean-depend:
--	-rm -rf $(DEPDIR) ./$(DEPDIR)
--
- .c.o:
--@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
--@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
--@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
--@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
--@am__fastdepCC_TRUE@	fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
--@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
--@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
--@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
--@am__fastdepCC_TRUE@	fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@@ -304,23 +304,23 @@ distclean-depend:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
  uninstall-info-am:
 -includeHEADERS_INSTALL = $(INSTALL_HEADER)
 -install-includeHEADERS: $(include_HEADERS)
@@ -144,7 +59,7 @@ $NetBSD: patch-af,v 1.2 2003/05/23 07:19:44 seb Exp $
  	done
  
  ETAGS = etags
-@@ -408,7 +349,7 @@ check: check-am
+@@ -413,7 +413,7 @@ check: check-am
  all-am: Makefile $(LIBRARIES) $(HEADERS) ftconfig.h
  
  installdirs:
@@ -153,18 +68,7 @@ $NetBSD: patch-af,v 1.2 2003/05/23 07:19:44 seb Exp $
  
  install: install-am
  install-exec: install-exec-am
-@@ -440,8 +381,8 @@ clean-am: clean-generic clean-libLIBRARI
- 
- distclean: distclean-am
- 
--distclean-am: clean-am distclean-compile distclean-depend \
--	distclean-generic distclean-hdr distclean-tags
-+distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -451,7 +392,7 @@ info: info-am
+@@ -456,7 +456,7 @@ info: info-am
  
  info-am:
  
@@ -173,7 +77,7 @@ $NetBSD: patch-af,v 1.2 2003/05/23 07:19:44 seb Exp $
  
  install-exec-am: install-libLIBRARIES
  
-@@ -477,21 +418,21 @@ ps: ps-am
+@@ -482,21 +482,21 @@ ps: ps-am
  
  ps-am:
  
@@ -184,13 +88,11 @@ $NetBSD: patch-af,v 1.2 2003/05/23 07:19:44 seb Exp $
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-libLIBRARIES ctags distclean distclean-compile \
--	distclean-depend distclean-generic distclean-hdr distclean-tags \
--	distdir dvi dvi-am info info-am install install-am install-data \
+ 	distclean-depend distclean-generic distclean-hdr distclean-tags \
+ 	distdir dvi dvi-am info info-am install install-am install-data \
 -	install-data-am install-exec install-exec-am \
 -	install-includeHEADERS install-info install-info-am \
 -	install-libLIBRARIES install-man install-strip installcheck \
-+	distclean-generic distclean-hdr distclean-tags distdir dvi \
-+	dvi-am info info-am install install-am install-data \
 +	install-data-am install-exec install-exec-am install-info \
 +	install-info-am install-libLIBRARIES install-man \
 +	install-pkgincludeHEADERS install-strip installcheck \
diff --git a/net/flow-tools/patches/patch-ag b/net/flow-tools/patches/patch-ag
index 944bc789952..440f612d21d 100644
--- a/net/flow-tools/patches/patch-ag
+++ b/net/flow-tools/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2003/05/23 07:19:44 seb Exp $
+$NetBSD: patch-ag,v 1.3 2004/04/22 15:33:35 seb Exp $
 
---- lib/ftpaths.h.in.orig	2003-04-03 16:26:39.000000000 +0000
+--- lib/ftpaths.h.in.orig	2003-11-11 16:49:14.000000000 +0000
 +++ lib/ftpaths.h.in
-@@ -29,16 +29,16 @@
+@@ -29,17 +29,17 @@
  #ifndef FTPATHS_H
  #define FTPATHS_H
  
@@ -11,11 +11,13 @@ $NetBSD: patch-ag,v 1.2 2003/05/23 07:19:44 seb Exp $
 -#define FT_PATH_CFG_FILTER          "@localstatedir@/cfg/filter.cfg"
 -#define FT_PATH_CFG_STAT            "@localstatedir@/cfg/stat.cfg"
 -#define FT_PATH_CFG_MASK            "@localstatedir@/cfg/mask.cfg"
+-#define FT_PATH_CFG_XLATE           "@localstatedir@/cfg/xlate.cfg"
 +#define FT_PATH_CFG_MAP             "@sysconfdir@/cfg/map.cfg"
 +#define FT_PATH_CFG_TAG             "@sysconfdir@/cfg/tag.cfg"
 +#define FT_PATH_CFG_FILTER          "@sysconfdir@/cfg/filter.cfg"
 +#define FT_PATH_CFG_STAT            "@sysconfdir@/cfg/stat.cfg"
 +#define FT_PATH_CFG_MASK            "@sysconfdir@/cfg/mask.cfg"
++#define FT_PATH_CFG_XLATE           "@sysconfdir@/cfg/xlate.cfg"
  
 -#define FT_PATH_SYM_IP_PROT         "@localstatedir@/sym/ip-prot.sym"
 -#define FT_PATH_SYM_IP_TYPE         "@localstatedir@/sym/ip-type.sym"
diff --git a/net/flow-tools/patches/patch-ah b/net/flow-tools/patches/patch-ah
index 893a53e4efd..44f8a06a017 100644
--- a/net/flow-tools/patches/patch-ah
+++ b/net/flow-tools/patches/patch-ah
@@ -1,16 +1,14 @@
-$NetBSD: patch-ah,v 1.2 2003/05/23 07:19:44 seb Exp $
+$NetBSD: patch-ah,v 1.3 2004/04/22 15:33:35 seb Exp $
 
---- src/flow-capture.c.orig	2003-04-02 18:03:01.000000000 +0000
+--- src/flow-capture.c.orig	2003-11-29 06:43:08.000000000 +0000
 +++ src/flow-capture.c
-@@ -431,8 +431,9 @@ char **argv;
-       exit (0); /* parent */
-     }
+@@ -439,7 +439,8 @@ char **argv;
+     if (!preserve_umask)
+       umask(0022);
  
--    umask(0022);
 -    setsid();
-+    /* umask(0022); */
 +    if (setsid() == -1)
 +      fterr_err(1, "setsid()");
+ 
      for (n = 0; n < 16; ++n)
        close (n);
- 
diff --git a/net/flow-tools/patches/patch-ak b/net/flow-tools/patches/patch-ak
new file mode 100644
index 00000000000..7219bd9614c
--- /dev/null
+++ b/net/flow-tools/patches/patch-ak
@@ -0,0 +1,25 @@
+$NetBSD: patch-ak,v 1.1 2004/04/22 15:33:35 seb Exp $
+
+--- src/flow-export.c.orig	2003-12-04 05:55:31.000000000 +0000
++++ src/flow-export.c
+@@ -115,18 +115,18 @@ void usage(void);
+ struct jump format[] = {{format0}, {format1}, {format2}, {format3},
+                         {format4}, {format5}};
+ 
++int debug = 0;
++
+ int main(int argc, char **argv)
+ {
+   int i, format_index, ret, ascii_mask;
+   struct ftio ftio;
+   struct ftprof ftp;
+   struct options opt;
+-  int debug;
+ 
+   /* init fterr */
+   fterr_setid(argv[0]);
+ 
+-  debug = 0;
+   format_index = 0;
+   bzero(&opt, sizeof opt);
+   ascii_mask = 0;