Update to 1.6.6

2011-03-12 1.6.6
- Minor IPFIX bug.
- IPFIX implement template withdraw
- For IPFIX, check packet sequence per template and observation domain
- Fix time window, when no flows collected or no flows matched
  while processing
- Fixed typos
- Fix seg fault bug - test for EMPTY_LIST was missing at several places.

2011-02-19 1.6.6b1
- Fix bps/pps. make it uint64_t, as bps/pps > 4Gb/s overflows.
- In record raw print mode: decode ICMP instead of src/dst ports
- sflow use announced exporter IP instead of sending IP for router ID
- sflow: Ignore extra fill bytes. Do not complain.
- sflow: fix packet length issue.
- Add IPFIX protokoll support

2011-12-31 1.6.5
- Fix 64bit bug when using byte/packet limits
- for v5 and sampling use 64bit counters to prevent overflow for large sampled flows.
- Fixed Ident printig bug

2011-07-11 1.6.4
- some code restructuring - prepare for IPFIX module
- Add netflow v1 module. Some routers still use that
- Add %sn, %dn output tags for src/dst networks
- Fix buffer length check in v5.
- Fix export bug: include last flow cache bucket, when exporting
- number in all filter expressions accept hex values
- fix an sflow colletor bug. Missing extension maps in rotated files
- implement extended statistics. Currently ports and bpp distribution
  vectors can be collected automatically be nfcapd. Still experimental

2011-02-26 1.6.3p1
- Fix timebug fix :(, make it a compile time option
- fix v7 sequence errors

2011-02-15
- Zero out unused fields after aggregation

2011-02-05
- Fix SysUptime 32bit overflow in v5 header
- Add fix for strange first/last swap reported by some users.

2011-01-09 v1.6.3
- Fix extension size bug
- Move IP anonymisation to separate binary nfanon
- Fix initialise bug of -o fmt: and not available fields

2010-09-09 v1.6.2
- released
- fixes some sflow bugs in sfcapd
2010-04-28 v1.6.1p0
- Update flow tools converter to build with Google-Code version 0.68.5
- Fix sflow bugs

2010-03-05 v1.6.1
- Fix bug in man page for -t
- Test sampler infos before using them ( nfcapd startup )
- Add sampling tags #34, #35 used by JunOS
- nfexpire: Fix empty .nfsat, when setting limits on an empty directory
- Fix coredump for -B -m (-w) combination
- Optimise some extension map code

2009-12-28 stable v1.6
- Few bug fixes in release candidates rc1, rc2 and rc3

2009-11-16 snapshot-1.6b-20091116
- Update sflow collector with new tags
- Add router IP extension
- Add router ID (engine type/ID) extension

2009-09-30 snapshot-1.6b-20090930
- snapshot bugfix release

2009-11-0801 snapshot-1.6b-20090806
- Add srcmask and dstmask aggregation
- Add csv output mode. -o csv
- Fix some bugs of previous beta
- Add bidirectional aggregation of flows ( -b, -B )
- Add possibility to save aggregated flows into file ( -w )
  Note: This results in a behaviour change for -w in combination
  with aggragation )
- Extend -N ( do not scale numbers ) to all text output not just summary
- Make extension handling more robust for some moody IOSes.
- Remove header lines of -s stat, when using -q ( quiet )
  Note: This results in a behaviour change for -N
- Remove -S option from nfdump ( legacy 1.4 compatibility )
- Make use of log (syslog) functions for nfprofile.
- Move log functions to util.c

2009-06-19 snapshot-1.6b-20090717
- Flow-tools converter updated - supports more common elements.
- Sflow collector updated. Supports more common elements.
- Add sampling to nfdump. Sampling is automatically recognised
  in v5 undocumented header fields and in v9 option templates.
  see nfcapd.1(1)
- Add @include option for filter to include more filter files.
- Add flexible aggregation comparable to Flexible Netflow (FNF)
- All new tags can be selected in -o fmt:... see nfdump(1)
- topN stat for all new tags is implemented
- Integrate developer code to read from pcap files into stable
- Update filter syntax for new tags
- Added more v9 tags for netflow v9.
  The detailed tags are listed in nfcapd(1)
  Adding new tags also extended the binary file format with
  data block format 2, which is extension based. File format
  for version <= 1.5.* ( Data block format 1 ) is read
  transparently. Data block 2 are skipped by nfdump 1.5.7.
  32bit but AS and interface numbers are supported.
- Add flexible storage option for nfcapd. To save disk space, the
  data extensions to be stored in the data file are user selectable.
- Added option for multiple netflow stream to same port.
  -n <Ident,IP,base_directory>
  Example: -n router1,192.168.100.1,/var/nfdump/router1
  So multiple -n options may be given at the command line
  Old style syntax still works for compatibility, ( -I .. -l ... )
  but then only one source is supported.
- Move to automake for building nfdump
- Switch scaling factor ( k, M, G ) from 1024 to 1000.
- Make nfdump fully 64bit compliant. ( 8bit data alignments and access )

2009-04-17 stable 1.5.8
- Fix daylight summer time bug, when guessing sub dirs. file access ( -M, -r )
- Bug fixes for 64bits CPUs

15 files changed, 84 insertions, 179 deletions

diff --git a/net/nfdump/DESCR b/net/nfdump/DESCR
index 100060a710a..66864bceafe 100644
--- a/net/nfdump/DESCR
+++ b/net/nfdump/DESCR
@@ -5,5 +5,6 @@ nfdump     - netflow dump
 nfprofile  - netflow profiler - optional tool
 nfreplay   - netflow replay
 nfexpire   - expire old netflow data
+nfanon     - netflow anonymisation
 ft2nfdump  - read flow-tools format - optional tool
 sfcapd     - sflow collector daemon - optional tool
diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index 66342569e33..0e081957d4d 100644
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2012/06/14 07:44:39 sbd Exp $
+# $NetBSD: Makefile,v 1.17 2012/07/25 21:19:30 tez Exp $
 #
 
-DISTNAME=	nfdump-1.5.7
-PKGREVISION=	8
+DISTNAME=	nfdump-1.6.6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nfdump/}
 
diff --git a/net/nfdump/PLIST b/net/nfdump/PLIST
index 94b6429011d..a0baf4da02b 100644
--- a/net/nfdump/PLIST
+++ b/net/nfdump/PLIST
@@ -1,9 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2007/09/12 07:33:31 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/07/25 21:19:30 tez Exp $
+bin/nfanon
 bin/nfcapd
 bin/nfdump
 bin/nfexpire
 bin/nfreplay
+man/man1/ft2nfdump.1
+man/man1/nfanon.1
 man/man1/nfcapd.1
 man/man1/nfdump.1
 man/man1/nfexpire.1
+man/man1/nfprofile.1
 man/man1/nfreplay.1
+man/man1/sfcapd.1
diff --git a/net/nfdump/PLIST.ftconv b/net/nfdump/PLIST.ftconv
index d282f30b65f..41e50f81940 100644
--- a/net/nfdump/PLIST.ftconv
+++ b/net/nfdump/PLIST.ftconv
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.ftconv,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+@comment $NetBSD: PLIST.ftconv,v 1.2 2012/07/25 21:19:30 tez Exp $
 bin/ft2nfdump
-man/man1/ft2nfdump.1
diff --git a/net/nfdump/PLIST.nfprofile b/net/nfdump/PLIST.nfprofile
index 14cfcade8ba..1ea2e17910d 100644
--- a/net/nfdump/PLIST.nfprofile
+++ b/net/nfdump/PLIST.nfprofile
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.nfprofile,v 1.1 2007/09/12 07:33:32 seb Exp $
+@comment $NetBSD: PLIST.nfprofile,v 1.2 2012/07/25 21:19:30 tez Exp $
 bin/nfprofile
-man/man1/nfprofile.1
diff --git a/net/nfdump/PLIST.sflow b/net/nfdump/PLIST.sflow
index d3fa60cb56a..1337f3dfb3b 100644
--- a/net/nfdump/PLIST.sflow
+++ b/net/nfdump/PLIST.sflow
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.sflow,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+@comment $NetBSD: PLIST.sflow,v 1.2 2012/07/25 21:19:30 tez Exp $
 bin/sfcapd
-man/man1/sfcapd.1
diff --git a/net/nfdump/distinfo b/net/nfdump/distinfo
index 8547790606d..5a236ef6d20 100644
--- a/net/nfdump/distinfo
+++ b/net/nfdump/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.5 2010/02/15 14:30:40 joerg Exp $
+$NetBSD: distinfo,v 1.6 2012/07/25 21:19:30 tez Exp $
 
-SHA1 (nfdump-1.5.7.tar.gz) = 74965ba1b0bdb8e789ec8fb3d546d0520b2e9774
-RMD160 (nfdump-1.5.7.tar.gz) = c0a3fb6f0692e891a1f98a2779ef19146dffced7
-Size (nfdump-1.5.7.tar.gz) = 324603 bytes
-SHA1 (patch-aa) = 71fecf3da59ba91c23d13843bd511738873b0dba
-SHA1 (patch-ab) = 7bbba645159b1d47445a618af4c73ef57889d212
-SHA1 (patch-ac) = bba19ce3e28b0d74d06ae694790e7aaeb73bfc6b
-SHA1 (patch-ae) = fad625c83fc7fad601252236d246286d04eff43d
-SHA1 (patch-af) = 06f045e735b689cd05c140c87753329cf6962d5c
-SHA1 (patch-ag) = 7ec59c455e51d6b8d5f2154b45bbb051f325bb7e
-SHA1 (patch-ah) = 2ffff479256c127fdb9f677f3b6872a8dd7f84b8
+SHA1 (nfdump-1.6.6.tar.gz) = f7a30c69419222f1527684fb46f02ae757b3dac0
+RMD160 (nfdump-1.6.6.tar.gz) = 63d5aec9e7f6d2ee151a88451e52ac86263996e4
+Size (nfdump-1.6.6.tar.gz) = 651348 bytes
+SHA1 (patch-bin_nfcapd.c) = d704b76af63547f9365dc56a65931e0df9d788fb
+SHA1 (patch-bin_sfcapd.c) = 14d9cbef9c059629606d38df5a4cfa5aa082942a
+SHA1 (patch-configure) = 02ddab9c6ee4d862b0e8f006ab3432b07923bf0b
+SHA1 (patch-configure.in) = 98d3e0db6f81cfc12b7d719189adf5f7ee8c6594
diff --git a/net/nfdump/patches/patch-ab b/net/nfdump/patches/patch-ab
deleted file mode 100644
index a1c53579148..00000000000
--- a/net/nfdump/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/09/12 07:33:37 seb Exp $
-
-There is nothing really useful in flow-tools' ftbuild.h.
-
---- ft2nfdump.c.orig	2007-08-24 12:32:34.000000000 +0000
-+++ ft2nfdump.c
-@@ -66,7 +66,7 @@
- #include "nffile.h"
- #include "launch.h"
- 
--#include "ftbuild.h"
-+/* #include "ftbuild.h" */
- 
- /* Global defines */
- #define MAXRECORDS 30
diff --git a/net/nfdump/patches/patch-ac b/net/nfdump/patches/patch-ac
deleted file mode 100644
index c2a444a6d70..00000000000
--- a/net/nfdump/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
-
---- test.sh.orig	2006-05-21 16:30:10.000000000 +0000
-+++ test.sh
-@@ -38,6 +38,8 @@
- 
- set -e
- 
-+export TZ=CET
-+
- # run filter and type tests
- ./nftest
- 
diff --git a/net/nfdump/patches/patch-ag b/net/nfdump/patches/patch-ag
deleted file mode 100644
index 1ef04096e31..00000000000
--- a/net/nfdump/patches/patch-ag
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2008/02/24 20:38:49 seb Exp $
-
---- configure.orig	2008-02-24 19:52:42.000000000 +0000
-+++ configure
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 95 .
-+# From configure.in Revision: 97 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59 for nfdump 1.5.5.
- #
-@@ -3971,7 +3971,7 @@ echo "$as_me: error: Link with \"-lz\" f
- fi
- 
- if test -d "$WHERE_FTPATH"; then
--	if test ! -f "$WHERE_FTPATH/lib/ftlib.h"; then
-+	if test ! -f "$WHERE_FTPATH/include/flow-tools/ftlib.h"; then
- 		{ { echo "$as_me:$LINENO: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&5
- echo "$as_me: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -3981,7 +3981,7 @@ echo "$as_me: error: ftlib.h file not fo
- echo "$as_me: error: libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
--	FT_INCLUDES="-I$WHERE_FTPATH/src -I$WHERE_FTPATH/lib"
-+	FT_INCLUDES="-I$WHERE_FTPATH/include/flow-tools"
- 	FT_LDFLAGS="-L$WHERE_FTPATH/lib"
- else
- 	{ { echo "$as_me:$LINENO: error: flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH" >&5
-@@ -3990,9 +3990,6 @@ echo "$as_me: error: flow-tools director
- fi
- opt_objects=ft2nfdump
- 
--else
--  opt_objects=
--
- fi;
- 
- ac_ext=c
-@@ -4777,9 +4774,7 @@ rm -f core *.core gmon.out bb.out confte
- fi
- 
- 
--
--else
--  opt_objects=
-+opt_objects="$opt_objects nfprofile"
- 
- fi;
- 
diff --git a/net/nfdump/patches/patch-ah b/net/nfdump/patches/patch-ah
deleted file mode 100644
index 31727729bf6..00000000000
--- a/net/nfdump/patches/patch-ah
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2010/02/15 14:30:41 joerg Exp $
-
---- Makefile.in.orig	2010-02-15 14:07:30.000000000 +0000
-+++ Makefile.in
-@@ -47,8 +47,8 @@ YFLAGS	 = -d -v
- LFLAGS	 = @LFLAGS@
- LDFLAGS	 = @LDFLAGS@
- prefix   = @prefix@
--PREFIX	 = $(DESTDIR)/$(prefix)
--MANDIR 	 = $(DESTDIR)/@mandir@
-+PREFIX	 = $(prefix)
-+MANDIR 	 = @mandir@
- COMMON_OBJ	= minilzo.o nffile.o nf_common.o util.o flist.o panonymizer.o rijndael.o @FTS_OBJ@
- FILTER_OBJ	= grammar.o scanner.o nftree.o ipconv.o 
- NFDUMP_OBJ	= nfdump.o $(COMMON_OBJ) $(FILTER_OBJ) nfstat.o nfprof.o
-@@ -103,14 +103,12 @@ nfreader: $(NFRDR_OBJ)
- 	$(CC) $(CFLAGS) -o $@ $(NFRDR_OBJ) $(LDFLAGS)
- 
- install: $(OBJECTS)
--	test -d $(PREFIX) || install -d -o root -g bin -m 755 $(PREFIX)
--	test -d $(PREFIX)/bin || install -d -o root -g bin -m 755 $(PREFIX)/bin
--	test -d $(MANDIR) || install -d -o root -g bin -m 755 $(MANDIR)
--	test -d $(MANDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
-+	test -d ${DESTDIR}$(PREFIX)/bin || ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}$(PREFIX)/bin
-+	test -d ${DESTDIR}$(MANDIR)/man1 || ${BSD_INSTALL_MAN_DIR} ${DESTDIR}$(MANDIR)/man1
- 	for file in $(OBJECTS); do \
- 		if [ -f $$file.1 ]; then \
--			$(INSTALL) -o root -g bin -m 755 $$file $(PREFIX)/bin ; \
--			$(INSTALL) -o root -g bin -m 644 $$file.1 $(MANDIR)/man1 ; \
-+			${BSD_INSTALL_PROGRAM} $$file ${DESTDIR}$(PREFIX)/bin ; \
-+			${BSD_INSTALL_MAN} $$file.1 ${DESTDIR}$(MANDIR)/man1 ; \
- 		fi \
- 	done;
- 
diff --git a/net/nfdump/patches/patch-ae b/net/nfdump/patches/patch-bin_nfcapd.c
index c0c8cf328e0..72221a7efe1 100644
--- a/net/nfdump/patches/patch-ae
+++ b/net/nfdump/patches/patch-bin_nfcapd.c
@@ -1,28 +1,32 @@
-$NetBSD: patch-ae,v 1.2 2007/09/12 07:33:41 seb Exp $
+$NetBSD: patch-bin_nfcapd.c,v 1.1 2012/07/25 21:19:30 tez Exp $
 
---- nfcapd.c.orig	2007-08-24 12:32:34.000000000 +0000
-+++ nfcapd.c
-@@ -74,6 +74,7 @@
+use PATH_MAX instead of MAXPATHLEN if available
+
+--- bin/nfcapd.c.orig	2012-03-09 18:25:51.000000000 +0000
++++ bin/nfcapd.c
+@@ -72,6 +72,7 @@
  #include <sys/mman.h>
  #include <string.h>
  #include <dirent.h>
 +#include <limits.h>
  
- #if 0
+ #ifdef PCAP
  #include "pcap_reader.h"
-@@ -688,7 +689,11 @@ int main(int argc, char **argv) {
+@@ -743,7 +744,12 @@ int main(int argc, char **argv) {
   
- char	*bindhost, *filter, *datadir, pidstr[32], *lauch_process;
- char	*userid, *groupid, *checkptr, *listenport, *mcastgroup;
+ char	*bindhost, *filter, *datadir, pidstr[32], *launch_process;
+ char	*userid, *groupid, *checkptr, *listenport, *mcastgroup, *extension_tags;
+-char	*Ident, *pcap_file, pidfile[MAXPATHLEN];
++char	*Ident, *pcap_file;
 +#ifdef PATH_MAX
-+char	pidfile[PATH_MAX];
++char pidfile[PATH_MAX];
 +#else
- char	pidfile[MAXPATHLEN];
++char pidfile[MAXPATHLEN];
 +#endif
  struct stat fstat;
  srecord_t	*commbuff;
- dirstat_t 	*dirstat;
-@@ -776,18 +781,20 @@ char	c;
+ packet_function_t receive_packet;
+@@ -853,18 +859,20 @@ int		c;
  				break;
  			case 'P':
  				if ( optarg[0] == '/' ) { 	// absolute path given
diff --git a/net/nfdump/patches/patch-af b/net/nfdump/patches/patch-bin_sfcapd.c
index 4c78cd1d53d..69b97a77ac7 100644
--- a/net/nfdump/patches/patch-af
+++ b/net/nfdump/patches/patch-bin_sfcapd.c
@@ -1,28 +1,32 @@
-$NetBSD: patch-af,v 1.2 2007/09/12 07:33:42 seb Exp $
+$NetBSD: patch-bin_sfcapd.c,v 1.1 2012/07/25 21:19:30 tez Exp $
 
---- sfcapd.c.orig	2007-08-24 12:32:34.000000000 +0000
-+++ sfcapd.c
-@@ -63,6 +63,7 @@
+use PATH_MAX instead of MAXPATHLEN if available
+
+--- bin/sfcapd.c.orig	2011-12-29 15:24:14.000000000 +0000
++++ bin/sfcapd.c
+@@ -61,6 +61,7 @@
  #include <sys/mman.h>
  #include <string.h>
  #include <dirent.h>
 +#include <limits.h>
  
- #if 0
+ #ifdef PCAP
  #include "pcap_reader.h"
-@@ -626,7 +627,11 @@ int main(int argc, char **argv) {
+@@ -666,7 +667,12 @@ int main(int argc, char **argv) {
   
- char	*bindhost, *filter, *datadir, pidstr[32], *lauch_process;
- char	*userid, *groupid, *checkptr, *listenport, *mcastgroup;
+ char	*bindhost, *filter, *datadir, pidstr[32], *launch_process;
+ char	*userid, *groupid, *checkptr, *listenport, *mcastgroup, *extension_tags;
+-char	*Ident, *pcap_file, pidfile[MAXPATHLEN];
++char	*Ident, *pcap_file;
 +#ifdef PATH_MAX
-+char	pidfile[PATH_MAX];
++char pidfile[PATH_MAX];
 +#else
- char	pidfile[MAXPATHLEN];
++char pidfile[MAXPATHLEN];
 +#endif
  struct stat fstat;
  srecord_t	*commbuff;
- dirstat_t 	*dirstat;
-@@ -712,18 +717,21 @@ char	c;
+ packet_function_t receive_packet;
+@@ -777,18 +783,21 @@ int	c;
  				break;
  			case 'P':
  				if ( optarg[0] == '/' ) { 	// absolute path given
diff --git a/net/nfdump/patches/patch-configure b/net/nfdump/patches/patch-configure
new file mode 100644
index 00000000000..baa29f74cf7
--- /dev/null
+++ b/net/nfdump/patches/patch-configure
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure,v 1.1 2012/07/25 21:19:30 tez Exp $
+
+find ftlib.h where the net/flow-tools package puts it
+
+--- configure.orig	2012-03-11 11:07:20.000000000 +0000
++++ configure
+@@ -4448,13 +4448,13 @@ else
+ fi
+ 
+ if test -d "$WHERE_FTPATH"; then
+-	if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then
++	if test ! -f "$WHERE_FTPATH/include/flow-tools/ftlib.h"; then
+ 		as_fn_error $? "ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" "$LINENO" 5
+ 	fi
+ 	if test ! -f "$WHERE_FTPATH/lib/libft.a"; then
+ 		as_fn_error $? "libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first" "$LINENO" 5
+ 	fi
+-	FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib"
++	FT_INCLUDES="-I$WHERE_FTPATH/include/flow-tools"
+ 	FT_LDFLAGS="-L$WHERE_FTPATH/lib"
+ else
+ 	as_fn_error $? "flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH" "$LINENO" 5
diff --git a/net/nfdump/patches/patch-aa b/net/nfdump/patches/patch-configure.in
index a0cf7434dc7..2a57e0cb699 100644
--- a/net/nfdump/patches/patch-aa
+++ b/net/nfdump/patches/patch-configure.in
@@ -1,37 +1,25 @@
-$NetBSD: patch-aa,v 1.2 2007/09/12 07:33:37 seb Exp $
+$NetBSD: patch-configure.in,v 1.1 2012/07/25 21:19:30 tez Exp $
 
---- configure.in.orig	2007-08-24 12:32:34.000000000 +0000
+patch-configure does the real changes since configure is not
+regenerated... this patch just for completeness.
+
+find ftlib.h where the net/flow-tools package puts it
+
+--- configure.in.orig	2012-07-25 20:10:30.489044500 +0000
 +++ configure.in
-@@ -84,20 +84,19 @@ AC_CHECK_LIB(z, zlibVersion,,
+@@ -107,13 +107,13 @@ AC_CHECK_LIB(z, zlibVersion,,
  AC_MSG_ERROR(Link with "-lz" failed! (Need zlib >= 1.0.2))
  )
  if test -d "$WHERE_FTPATH"; then
--	if test ! -f "$WHERE_FTPATH/lib/ftlib.h"; then
+-	if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then
 +	if test ! -f "$WHERE_FTPATH/include/flow-tools/ftlib.h"; then
  		AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH)
  	fi
  	if test ! -f "$WHERE_FTPATH/lib/libft.a"; then
  		AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)
  	fi
--	FT_INCLUDES="-I$WHERE_FTPATH/src -I$WHERE_FTPATH/lib"
+-	FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib"
 +	FT_INCLUDES="-I$WHERE_FTPATH/include/flow-tools"
  	FT_LDFLAGS="-L$WHERE_FTPATH/lib"
  else
  	AC_MSG_ERROR(flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH)
- fi
- opt_objects=ft2nfdump
- ,
--opt_objects=
- )
- 
- AC_ARG_ENABLE(nfprofile,
-@@ -122,8 +121,8 @@ AC_ARG_ENABLE(nfprofile,
- 		],, AC_MSG_ERROR(Can not load rrd library. Not in loader search path! ))
- 
- ]
-+opt_objects="$opt_objects nfprofile"
- ,
--opt_objects=
- )
- 
- AC_ARG_ENABLE(sflow,