Update to version 0.68.

Package changes:
Use PKG_OPTIONS_GROUP framework
Add package option 'python' to support the new python scripts flow-rpt2rrd,
flow-log2rrd and flow-rptfmt.

Changes since last packaged version (0.67):

* 5-11-2005 flow-tools 0.68 released.
* added flow-rpt2rrd - post process flow-report into RRD's.
* added flow-log2rrd - post process logs from
* added flow-rptfmt - post process flow-report into readable and HTML.
* ftstat.c s/psizr256/psize256/ - uebelacker@tuhh.de
* rec_v5->engine_id not set properly in ftdecode.c
  - baldwinL@mynetwatchman.com
* --enable-lfs set flags for large file support - alexbrennen@gmail.com
* Added CryptoPAn support to flow-xlate
  req by Abilene
* mailing list archive is available at mail-archive.com
  req by spork@bway.net
* flow-cat.c: progress debug output - weinhold@berbee.com
* portability: gcc no longer supports goto label which label is at the
  end of a compound statement - Andreas Jochens <aj@andaco.de>
* flow-stat.c: protect from divize by zero - should only happen on invalid
  flows - - Espen.Breivik@uninett.no
* flow-filter.c: exaddr filter - Espen.Breivik@uninett.no
* ftxlate.c: tag-mask eval_tag_mask() not using correct offsets
  - Cougar <cougar@random.ee> & kgraham@valueclick.com
* flow-send: default tx_delay to 0 like flow-fanout - rjd@merit.edu
* flow-export: debug should be global - dwatanab@uci.edu
* flow-report: path will accept spaces, ie |flow-rpt2rrd -p rrd -k 25
* flow-report: records is in rec1
* flow-fanout: did not set address family for receive fd - noted by
  fingers@fingers.co.za
* docs: add FILES section to man pages
* flow-report: -hh to list available reports
* flow-report, flow-tag, flow-xlate, flow-nfilter.  Run-time variable
  expansion of the form @VAR or @{VAR:default} for config files.
* flow-receive: dropped inline tagging and nfilter support

10 files changed, 166 insertions, 85 deletions

diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index 0e5b6ed64b4..e14d6eaf056 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/23 14:20:56 seb Exp $
 
-DISTNAME=	flow-tools-0.67
-PKGREVISION=	2
+DISTNAME=	flow-tools-0.68
+#PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/
 
@@ -28,7 +28,9 @@ SUPPORT_FILES+=	${EGDIR}/sym/${_f_} ${PKG_SYSCONFDIR}/sym/${_f_}
 MESSAGE_SUBST+=	EGDIR=${EGDIR}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.flow-tools
-PKG_SUPPORTED_OPTIONS=	mysql postgresql
+PKG_OPTIONS_OPTIONAL_GROUPS=	database
+PKG_SUPPORTED_OPTIONS=		python
+PKG_OPTIONS_GROUP.database=	mysql postgresql
 PKG_OPTIONS_LEGACY_VARS+=	FLOW_TOOLS_USE_MYSQL:mysql
 PKG_OPTIONS_LEGACY_VARS+=	FLOW_TOOLS_USE_POSTGRESQL:postgresql
 
@@ -46,6 +48,22 @@ CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
 CONFIGURE_ARGS+=	--with-pgsql=${PGSQL_PREFIX}
 .endif
 
+# Python scripts support.
+.if !empty(PKG_OPTIONS:Mpython)
+.  include "../../lang/python/application.mk"
+
+PYTHON_PATCH_SCRIPTS=	bin/flow-rpt2rrd bin/flow-log2rrd bin/flow-rptfmt
+PLIST_SUBST+=	PYTHON_OPT=""
+
+post-install:
+.   for s in flow-rpt2rrd flow-log2rrd flow-rptfmt
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${s} ${PREFIX}/bin/${s}
+	${INSTALL_MAN} ${WRKSRC}/docs/${s}.1 ${PREFIX}/man/man1/${s}.1
+.  endfor
+.else
+PLIST_SUBST+=	PYTHON_OPT="@comment "
+.endif
+
 # To avoid providing more patch files we do the following...
 # Order is important here or else dependencies requiring docbook-to-man/jade
 # will be triggered
diff --git a/net/flow-tools/PLIST b/net/flow-tools/PLIST
index c1f447224be..8897acec3ab 100644
--- a/net/flow-tools/PLIST
+++ b/net/flow-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/04/22 15:33:35 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/06/23 14:20:56 seb Exp $
 bin/flow-capture
 bin/flow-cat
 bin/flow-dscan
@@ -9,12 +9,15 @@ bin/flow-filter
 bin/flow-gen
 bin/flow-header
 bin/flow-import
+${PYTHON_OPT}bin/flow-log2rrd
 bin/flow-mask
 bin/flow-merge
 bin/flow-nfilter
 bin/flow-print
 bin/flow-receive
 bin/flow-report
+${PYTHON_OPT}bin/flow-rpt2rrd
+${PYTHON_OPT}bin/flow-rptfmt
 bin/flow-send
 bin/flow-split
 bin/flow-stat
@@ -36,12 +39,15 @@ man/man1/flow-filter.1
 man/man1/flow-gen.1
 man/man1/flow-header.1
 man/man1/flow-import.1
+${PYTHON_OPT}man/man1/flow-log2rrd.1
 man/man1/flow-mask.1
 man/man1/flow-merge.1
 man/man1/flow-nfilter.1
 man/man1/flow-print.1
 man/man1/flow-receive.1
 man/man1/flow-report.1
+${PYTHON_OPT}man/man1/flow-rpt2rrd.1
+${PYTHON_OPT}man/man1/flow-rptfmt.1
 man/man1/flow-send.1
 man/man1/flow-split.1
 man/man1/flow-stat.1
diff --git a/net/flow-tools/distinfo b/net/flow-tools/distinfo
index fcb411756d8..b44ebbc10b1 100644
--- a/net/flow-tools/distinfo
+++ b/net/flow-tools/distinfo
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:13:46 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/06/23 14:20:56 seb Exp $
 
-SHA1 (flow-tools-0.67.tar.gz) = 1896dad27db0c89e3e14d86b30aed15581134335
-RMD160 (flow-tools-0.67.tar.gz) = 5a681e642cd1fb1b00d8a0389b628db3b96e076d
-Size (flow-tools-0.67.tar.gz) = 983667 bytes
+SHA1 (flow-tools-0.68.tar.gz) = 6259263ac4fbf8a9394224e4053393fa756473c7
+RMD160 (flow-tools-0.68.tar.gz) = 71bfd1a40cb34fae55b2769d93208d13b3b0a927
+Size (flow-tools-0.68.tar.gz) = 987151 bytes
 SHA1 (patch-aa) = dce60b3995ed22fbdf36e8d2e4187e191909cba7
-SHA1 (patch-ab) = a4eebdcb5b265f2c755ef62a73f9e4c6c25ab719
-SHA1 (patch-ac) = 86cd77dc3ede171e45e62fd4a050bac19643252b
-SHA1 (patch-ad) = f8ece1a38e6024622957e7136923fccabfca041f
+SHA1 (patch-ab) = 0f9c4d5dfe9ead14eb2a56c725639653cb89d369
+SHA1 (patch-ac) = 105781f2d108e34c4ed635b969a6cd795a77b916
+SHA1 (patch-ad) = 89bc60cffe754822e1bf3b1b665a955d2625174b
 SHA1 (patch-ae) = 1e5f151f3eba795f1ade4c016767bd4cd271565a
-SHA1 (patch-af) = 4a70681bd221a9d5e2175cfcb5b45fdbbe7f2971
+SHA1 (patch-af) = 7f5d045954b998a30616dedac0069c817b665031
 SHA1 (patch-ag) = 60d7c6d07cc8f102d6281a55c8188d13eca80bdf
 SHA1 (patch-ah) = cd55409fd5781e204f32ffa51a9b39222eadb8c7
 SHA1 (patch-ai) = 5e0a5f3148e80c156198d74036ff2f1bf35ed779
 SHA1 (patch-aj) = d183dc3b360110a1a90165b0094e349d3a964a2e
-SHA1 (patch-ak) = 0ae5fa523263fa9be836846b46b7f87b52557156
+SHA1 (patch-ak) = f5d13e165b7fac689bcea7e9d7ad07b17a79b7de
+SHA1 (patch-al) = 941cc23ea527624d21d40d3a73aa94f947f02552
+SHA1 (patch-am) = d0c096c0710fe8b41a6bb55528f9098d50cda378
diff --git a/net/flow-tools/patches/patch-ab b/net/flow-tools/patches/patch-ab
index 9a42aebdf86..06b079721a4 100644
--- a/net/flow-tools/patches/patch-ab
+++ b/net/flow-tools/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2004/04/22 15:33:35 seb Exp $
+$NetBSD: patch-ab,v 1.4 2005/06/23 14:20:56 seb Exp $
 
---- configs/Makefile.in.orig	2004-04-22 12:14:50.000000000 +0000
+--- configs/Makefile.in.orig	2005-06-21 23:24:13.000000000 +0000
 +++ configs/Makefile.in
-@@ -117,17 +117,17 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -88,17 +88,17 @@ YLIB = @YLIB@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
 -ftsymdir = $(localstatedir)/sym
 -ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
 +egftsymdir = $(prefix)/share/examples/@PACKAGE@/sym
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.3 2004/04/22 15:33:35 seb Exp $
  
  DIST_COMMON = Makefile.am Makefile.in
  all: all-am
-@@ -139,41 +139,41 @@ $(srcdir)/Makefile.in:  Makefile.am  $(t
+@@ -110,41 +110,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:
@@ -87,7 +87,7 @@ $NetBSD: patch-ab,v 1.3 2004/04/22 15:33:35 seb Exp $
  	done
  tags: TAGS
  TAGS:
-@@ -218,7 +218,7 @@ check: check-am
+@@ -180,7 +180,7 @@ check: check-am
  all-am: Makefile $(DATA)
  
  installdirs:
@@ -96,7 +96,7 @@ $NetBSD: patch-ab,v 1.3 2004/04/22 15:33:35 seb Exp $
  
  install: install-am
  install-exec: install-exec-am
-@@ -260,7 +260,7 @@ info: info-am
+@@ -222,7 +222,7 @@ info: info-am
  
  info-am:
  
@@ -105,9 +105,9 @@ $NetBSD: patch-ab,v 1.3 2004/04/22 15:33:35 seb Exp $
  
  install-exec-am:
  
-@@ -286,17 +286,18 @@ ps: ps-am
+@@ -240,17 +240,18 @@ mostlyclean: mostlyclean-am
  
- ps-am:
+ mostlyclean-am: mostlyclean-generic
  
 -uninstall-am: uninstall-ftcfgDATA uninstall-ftsymDATA uninstall-info-am
 +uninstall-am: uninstall-egftcfgDATA uninstall-egftsymDATA \
@@ -123,10 +123,10 @@ $NetBSD: patch-ab,v 1.3 2004/04/22 15:33:35 seb Exp $
 +	install-egftsymDATA install-exec install-exec-am install-info \
 +	install-info-am install-man install-strip installcheck \
 +	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
--	pdf-am ps ps-am uninstall uninstall-am uninstall-ftcfgDATA \
--	uninstall-ftsymDATA uninstall-info-am
-+	pdf-am ps ps-am uninstall uninstall-am uninstall-egftcfgDATA \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	uninstall uninstall-am uninstall-ftcfgDATA uninstall-ftsymDATA \
+-	uninstall-info-am
++	uninstall uninstall-am uninstall-egftcfgDATA \
 +	uninstall-egftsymDATA uninstall-info-am
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/flow-tools/patches/patch-ac b/net/flow-tools/patches/patch-ac
index f5429de296a..9dad514ae0a 100644
--- a/net/flow-tools/patches/patch-ac
+++ b/net/flow-tools/patches/patch-ac
@@ -1,11 +1,19 @@
-$NetBSD: patch-ac,v 1.2 2003/05/23 07:19:43 seb Exp $
+$NetBSD: patch-ac,v 1.3 2005/06/23 14:20:56 seb Exp $
 
---- docs/Makefile.am.orig	2003-02-23 23:58:11.000000000 +0000
+--- docs/Makefile.am.orig	2005-05-11 00:26:20.000000000 +0000
 +++ docs/Makefile.am
+@@ -1,6 +1,6 @@
+ man_MANSIN = flow-capture.1.in flow-cat.1 flow-dscan.1 flow-expire.1 flow-export.1 flow-fanout.1.in flow-filter.1 flow-gen.1 flow-header.1 flow-import.1 flow-merge.1 flow-print.1.in flow-receive.1.in flow-send.1 flow-split.1 flow-stat.1 flow-tools-examples.1 flow-tools.1 flow-tag.1.in flow-nfilter.1.in flow-report.1.in flow-mask.1.in flow-xlate.1.in flow-rptfmt.1.in flow-log2rrd.1.in flow-rpt2rrd.1.in
+ 
+-man_MANS = 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-print.1 flow-receive.1 flow-send.1 flow-split.1 flow-stat.1 flow-tools-examples.1 flow-tools.1 flow-tag.1 flow-nfilter.1 flow-report.1 flow-mask.1 flow-xlate.1 flow-rptfmt.1 flow-log2rrd.1 flow-rpt2rrd.1
++man_MANS = 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-print.1 flow-receive.1 flow-send.1 flow-split.1 flow-stat.1 flow-tools-examples.1 flow-tools.1 flow-tag.1 flow-nfilter.1 flow-report.1 flow-mask.1 flow-xlate.1
+ 
+ man_SGMLS = flow-capture.sgml flow-cat.sgml flow-dscan.sgml flow-expire.sgml flow-export.sgml flow-fanout.sgml flow-filter.sgml flow-gen.sgml flow-header.sgml flow-import.sgml flow-merge.sgml flow-print.sgml flow-receive.sgml flow-send.sgml flow-split.sgml flow-stat.sgml flow-tools-examples.sgml flow-tools.sgml flow-xlate.sgml flow-tag.sgml flow-nfilter.sgml flow-report.sgml flow-mask.sgml flow-rptfmt.sgml flow-log2rrd.sgml flow-rpt2rrd.sgml
+ 
 @@ -23,6 +23,3 @@ SUFFIXES = .sgml .1 .html .1.in .html.in
  
  .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
+ 	openjade -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
 -
 -all-am: Makefile $(man_MANSIN) $(man_HTMLS)
 -
diff --git a/net/flow-tools/patches/patch-ad b/net/flow-tools/patches/patch-ad
index 49d838cc497..eae10028d1c 100644
--- a/net/flow-tools/patches/patch-ad
+++ b/net/flow-tools/patches/patch-ad
@@ -1,11 +1,38 @@
-$NetBSD: patch-ad,v 1.3 2004/04/22 15:33:35 seb Exp $
+$NetBSD: patch-ad,v 1.4 2005/06/23 14:20:56 seb Exp $
 
---- docs/Makefile.in.orig	2004-04-22 12:15:03.000000000 +0000
+--- docs/Makefile.in.orig	2005-05-11 14:20:18.000000000 +0000
 +++ docs/Makefile.in
-@@ -378,8 +378,6 @@ uninstall-man: uninstall-man1
+@@ -90,7 +90,7 @@ am__quote = @am__quote@
+ install_sh = @install_sh@
+ man_MANSIN = flow-capture.1.in flow-cat.1 flow-dscan.1 flow-expire.1 flow-export.1 flow-fanout.1.in flow-filter.1 flow-gen.1 flow-header.1 flow-import.1 flow-merge.1 flow-print.1.in flow-receive.1.in flow-send.1 flow-split.1 flow-stat.1 flow-tools-examples.1 flow-tools.1 flow-tag.1.in flow-nfilter.1.in flow-report.1.in flow-mask.1.in flow-xlate.1.in flow-rptfmt.1.in flow-log2rrd.1.in flow-rpt2rrd.1.in
+ 
+-man_MANS = 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-print.1 flow-receive.1 flow-send.1 flow-split.1 flow-stat.1 flow-tools-examples.1 flow-tools.1 flow-tag.1 flow-nfilter.1 flow-report.1 flow-mask.1 flow-xlate.1 flow-rptfmt.1 flow-log2rrd.1 flow-rpt2rrd.1
++man_MANS = 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-print.1 flow-receive.1 flow-send.1 flow-split.1 flow-stat.1 flow-tools-examples.1 flow-tools.1 flow-tag.1 flow-nfilter.1 flow-report.1 flow-mask.1 flow-xlate.1
+ 
+ man_SGMLS = flow-capture.sgml flow-cat.sgml flow-dscan.sgml flow-expire.sgml flow-export.sgml flow-fanout.sgml flow-filter.sgml flow-gen.sgml flow-header.sgml flow-import.sgml flow-merge.sgml flow-print.sgml flow-receive.sgml flow-send.sgml flow-split.sgml flow-stat.sgml flow-tools-examples.sgml flow-tools.sgml flow-xlate.sgml flow-tag.sgml flow-nfilter.sgml flow-report.sgml flow-mask.sgml flow-rptfmt.sgml flow-log2rrd.sgml flow-rpt2rrd.sgml
+ 
+@@ -111,6 +111,8 @@ CONFIG_CLEAN_FILES = flow-capture.1 flow
+ 	flow-fanout.html flow-xlate.1 flow-xlate.html flow-rpt2rrd.1 \
+ 	flow-rpt2rrd.html flow-rptfmt.1 flow-rptfmt.html flow-log2rrd.1 \
+ 	flow-log2rrd.html
++depcomp =
++am__depfiles_maybe =
+ DIST_SOURCES =
+ 
+ NROFF = nroff
+@@ -130,7 +132,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
+@@ -344,8 +346,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
+ 	openjade -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
 -
 -all-am: Makefile $(man_MANSIN) $(man_HTMLS)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/flow-tools/patches/patch-af b/net/flow-tools/patches/patch-af
index f0c0c8b6915..2690a466394 100644
--- a/net/flow-tools/patches/patch-af
+++ b/net/flow-tools/patches/patch-af
@@ -1,19 +1,19 @@
-$NetBSD: patch-af,v 1.3 2004/04/22 15:33:35 seb Exp $
+$NetBSD: patch-af,v 1.4 2005/06/23 14:20:56 seb Exp $
 
---- lib/Makefile.in.orig	2004-04-22 12:15:23.000000000 +0000
+--- lib/Makefile.in.orig	2005-06-21 23:24:04.000000000 +0000
 +++ lib/Makefile.in
-@@ -123,7 +123,7 @@ target_alias = @target_alias@
- #AM_CFLAGS=-O2
- AM_CFLAGS = -g -Wall
+@@ -95,7 +95,7 @@ AM_CFLAGS = -g -Wall
+ 
+ DEFS = -I. -I$(srcdir)/lib
  
 -include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
 +pkginclude_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
  lib_LIBRARIES = libft.a
  
  libft_a_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
-@@ -173,10 +173,10 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
- CCLD = $(CC)
+@@ -148,10 +148,10 @@ CCLD = $(CC)
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CFLAGS = @CFLAGS@
  DIST_SOURCES = $(libft_a_SOURCES)
 -HEADERS = $(include_HEADERS)
 +HEADERS = $(pkginclude_HEADERS)
@@ -25,9 +25,9 @@ $NetBSD: patch-af,v 1.3 2004/04/22 15:33:35 seb Exp $
  SOURCES = $(libft_a_SOURCES)
  
  all: ftconfig.h
-@@ -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`
+@@ -270,23 +270,23 @@ distclean-depend:
+ 	$(COMPILE) -c `cygpath -w $<`
+ CCDEPMODE = @CCDEPMODE@
  uninstall-info-am:
 -includeHEADERS_INSTALL = $(INSTALL_HEADER)
 -install-includeHEADERS: $(include_HEADERS)
@@ -59,7 +59,7 @@ $NetBSD: patch-af,v 1.3 2004/04/22 15:33:35 seb Exp $
  	done
  
  ETAGS = etags
-@@ -413,7 +413,7 @@ check: check-am
+@@ -355,7 +355,7 @@ check: check-am
  all-am: Makefile $(LIBRARIES) $(HEADERS) ftconfig.h
  
  installdirs:
@@ -68,7 +68,7 @@ $NetBSD: patch-af,v 1.3 2004/04/22 15:33:35 seb Exp $
  
  install: install-am
  install-exec: install-exec-am
-@@ -456,7 +456,7 @@ info: info-am
+@@ -398,7 +398,7 @@ info: info-am
  
  info-am:
  
@@ -77,19 +77,19 @@ $NetBSD: patch-af,v 1.3 2004/04/22 15:33:35 seb Exp $
  
  install-exec-am: install-libLIBRARIES
  
-@@ -482,21 +482,21 @@ ps: ps-am
+@@ -416,21 +416,21 @@ mostlyclean: mostlyclean-am
  
- ps-am:
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic
  
 -uninstall-am: uninstall-includeHEADERS uninstall-info-am \
 -	uninstall-libLIBRARIES
 +uninstall-am: uninstall-info-am uninstall-libLIBRARIES \
 +	uninstall-pkgincludeHEADERS
  
- .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 \
+ .PHONY: GTAGS all all-am check check-am clean clean-generic \
+ 	clean-libLIBRARIES distclean distclean-compile 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 \
@@ -98,10 +98,10 @@ $NetBSD: patch-af,v 1.3 2004/04/22 15:33:35 seb Exp $
 +	install-pkgincludeHEADERS install-strip installcheck \
  	installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
--	uninstall-am uninstall-includeHEADERS uninstall-info-am \
+ 	mostlyclean-generic tags uninstall uninstall-am \
+-	uninstall-includeHEADERS uninstall-info-am \
 -	uninstall-libLIBRARIES
-+	uninstall-am uninstall-info-am uninstall-libLIBRARIES \
++	uninstall-info-am uninstall-libLIBRARIES \
 +	uninstall-pkgincludeHEADERS
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/flow-tools/patches/patch-ak b/net/flow-tools/patches/patch-ak
index 2f173e4b3fb..bde431ca5df 100644
--- a/net/flow-tools/patches/patch-ak
+++ b/net/flow-tools/patches/patch-ak
@@ -1,29 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2005/02/18 10:08:33 seb Exp $
+$NetBSD: patch-ak,v 1.3 2005/06/23 14:20:56 seb Exp $
 
---- src/flow-export.c.orig	2003-12-04 05:55:31.000000000 +0000
+--- src/flow-export.c.orig	2004-03-31 03:11:14.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;
-@@ -864,7 +864,7 @@ int format5(struct ftio *ftio, struct op
+@@ -865,7 +865,7 @@ int format5(struct ftio *ftio, struct op
    struct ftver ftv;
    char fields[1024], values[1024], query[3*1024];
    char *rec;
@@ -32,7 +11,7 @@ $NetBSD: patch-ak,v 1.2 2005/02/18 10:08:33 seb Exp $
    char *db_port;
    int len;
  
-@@ -891,7 +891,7 @@ int format5(struct ftio *ftio, struct op
+@@ -892,7 +892,7 @@ int format5(struct ftio *ftio, struct op
      db_name = strsep(&tmp, ":");
      db_table = strsep(&tmp, ":");
  
@@ -41,7 +20,7 @@ $NetBSD: patch-ak,v 1.2 2005/02/18 10:08:33 seb Exp $
        fterr_warnx("Missing field in dbaseURI, expecting user:pwd:host:port:name:table.");
        return -1;
      }
-@@ -1199,10 +1199,10 @@ int fmt_xfields_val(char *fmt_buf, char 
+@@ -1200,10 +1200,10 @@ int fmt_xfields_val(char *fmt_buf, char 
  
    if (xfields & FT_XFIELD_EXADDR) {
      if (comma) fmt_buf[len++] = ',';
@@ -54,7 +33,7 @@ $NetBSD: patch-ak,v 1.2 2005/02/18 10:08:33 seb Exp $
      comma = 1;
    }
  
-@@ -1257,28 +1257,28 @@ int fmt_xfields_val(char *fmt_buf, char 
+@@ -1258,28 +1258,28 @@ int fmt_xfields_val(char *fmt_buf, char 
  
    if (xfields & FT_XFIELD_SRCADDR) {
      if (comma) fmt_buf[len++] = ',';
@@ -89,7 +68,7 @@ $NetBSD: patch-ak,v 1.2 2005/02/18 10:08:33 seb Exp $
      comma = 1;
    }
  
-@@ -1375,19 +1375,19 @@ int fmt_xfields_val(char *fmt_buf, char 
+@@ -1376,19 +1376,19 @@ int fmt_xfields_val(char *fmt_buf, char 
  
    if (xfields & FT_XFIELD_PEER_NEXTHOP) {
      if (comma) fmt_buf[len++] = ',';
diff --git a/net/flow-tools/patches/patch-al b/net/flow-tools/patches/patch-al
new file mode 100644
index 00000000000..f0929ae0e5b
--- /dev/null
+++ b/net/flow-tools/patches/patch-al
@@ -0,0 +1,10 @@
+$NetBSD: patch-al,v 1.1 2005/06/23 14:20:56 seb Exp $
+
+--- Makefile.am.orig	2005-05-11 14:13:44.000000000 +0000
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = lib src bin configs docs
++SUBDIRS = lib src configs docs
+ 
+ EXTRA_DIST = utils/* \
+  SECURITY contrib/* configs/*
diff --git a/net/flow-tools/patches/patch-am b/net/flow-tools/patches/patch-am
new file mode 100644
index 00000000000..4ed7d1d50eb
--- /dev/null
+++ b/net/flow-tools/patches/patch-am
@@ -0,0 +1,31 @@
+$NetBSD: patch-am,v 1.1 2005/06/23 14:20:56 seb Exp $
+
+--- Makefile.in.orig	2005-06-23 12:43:35.000000000 +0000
++++ Makefile.in
+@@ -88,7 +88,7 @@ YLIB = @YLIB@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+-SUBDIRS = lib src bin configs docs
++SUBDIRS = lib src configs docs
+ 
+ EXTRA_DIST = utils/* \
+  SECURITY contrib/* configs/*
+@@ -98,6 +98,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/lib/ftconfig.h
+ CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
+ DIST_SOURCES =
+ 
+ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+@@ -116,7 +118,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+  configure.lineno
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+