Update net/nfdump to 1.6.12, patch provided from Bartosz Kuzma in PR 49332.

Changes since 1.6.6:

2014-02-16 v1.6.12
- Add NAT pool port allocation
- Modify/fix NAT vrf tags. Add egress vrf ID
- Modify common record due to exporter exhaustion. new common record
  type 10 adds 4 extra bytes. Reads v1 common record transparently
- Fix sflow potential crash

2013-11-13 v1.6.11
- Add ASA/NSEL 9.x protcol changes
- Make it llvm compilable

2013-08-12 v1.6.10p1
- Fix -t +/- n timeslot option
- Fix bug in nfanon - stat record update.
- Fix bug in netflow v5 mudule: extension map size wrong.
- Fix bug nfexport: In some cases could result in wrong flow counter.
- Fix nftrack - could coredump in some cases.

2013-05-16 v1.6.10
- Fix SPARC compile/optimise bug
- Add output packet/bytes counter to global stat - importatnt for NSEL flows ASA
 > 8.5
- Add NSEL filter options xnet
- Modify extension descriptor code for nfdump1.7. Still use 1.6 extension map layout for compatibility
- Add prototype for nfpcapd - pcap -> nfdump collector. Converts traffoc directly to nfdump files.
- Fix bug in ipfix module: uninitialised variable
- Cleanup syslog/LogError calls
- Fix minor non critical bugs and compile issues

2013-03-02 v1.6.9
- Fix some bugs in beta 1.6.9 NSEL code
- Fix bug statistics update with aggreagted flow records
- Fix sflow bug sfcapd stores wrong (ghost) dump by past samples in same sflow datagram

2013-03-02 v1.6.9
- Fix some bugs in beta 1.6.9 NSEL code
- Fix bug statistics update with aggreagted flow records
- Fix sflow bug sfcapd stores wrong (ghost) dump by past samples in same sflow datagram

2012-12-31
- Add time received in csv output
- ICMP should handled better now - somewhat
- Implement ASA NSEL records
- Add definitions in nffile and nx for ASA NSEL extensions

2012-11-09 v1.6.8p1
- Add dynamic source directory tree for multiple exporters
- Fix exporter bug: 'too many exporters' with large time windows
- Fix uninitialised exporter sysid in default sampler record - v9
- Fix v9/ipfix cache initialisation with no templates > 1 in same packet

2012-10-26 v1.6.8
- Add ip list option for 'next ip' in filter syntax
- Accept v9 sampler_id in 2bytes
- Fix IPFIX mac address bug - did not get collected
- Add IPFIX packet/octet TotalCount fields 85/86
- Add received timestamp to sflow collector
- Fix long flow duration calculation - 32bit overflow
- Fix v9 sampling ID: allow 2 byte ID
- Add IPFIX options as rfc5101 section-6.2
- Add exporter records for sflow collector
- Fix bug for MAC address printing %idmc and %odmc.
- Add received time stamp extension
- Add recursive format parser. Allows to extend predefined formats.
- Change flow record sorting to heapsort. remove limit 1000
- Merge -m option to -O tstart. -m now depricated.
- Add -O tend. Print order according to tend of flows ascending
- Apply -O print order for printing flow cache. Applies to -A

2012-07-31 v1.6.7-tc-1
- Special version for TC
- Print exporter and sampling records with nfdump -E
- Added exporter and sampling records to file.

2012-07-30 v1.6.7
- Prepare for file catalog in current file format.
- Fix bug in ReadBlock when reading flow from stdin pipe
- Add new more flexible translation engine for v9
- Add nprobe client/server delay fields
- Prepare for NSEL merging
- Fix memory corruption with double -A flags
- Fix bug in nfreader with compat15 mode files

8 files changed, 58 insertions, 77 deletions

diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index 50625df146a..2f0f24385a6 100644
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2014/05/05 00:48:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2015/04/03 10:18:53 hiramatsu Exp $
 #
 
-DISTNAME=	nfdump-1.6.6
-PKGREVISION=	11
+DISTNAME=	nfdump-1.6.12
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nfdump/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://nfdump.sourceforge.net/
 COMMENT=	Tools to collect and process netflow data
+LICENSE=	modified-bsd
 
 GNU_CONFIGURE=	yes
 TEST_TARGET=	test
diff --git a/net/nfdump/distinfo b/net/nfdump/distinfo
index 09b952ef1f9..0cbae96bee0 100644
--- a/net/nfdump/distinfo
+++ b/net/nfdump/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.8 2013/01/11 13:33:59 joerg Exp $
+$NetBSD: distinfo,v 1.9 2015/04/03 10:18:53 hiramatsu Exp $
 
-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_nf__common.c) = 2460a84a1e778ba46a64208c6d251cce285019e9
-SHA1 (patch-bin_nf__common.h) = ad44825d41b3126d7df21faaf659f5262a7eef03
-SHA1 (patch-bin_nfcapd.c) = d704b76af63547f9365dc56a65931e0df9d788fb
+SHA1 (nfdump-1.6.12.tar.gz) = 46f9e65d81f458c4699e93dac551c5e475a0eb05
+RMD160 (nfdump-1.6.12.tar.gz) = 0701f249ca8851597bcc0b64354db45957e99efe
+Size (nfdump-1.6.12.tar.gz) = 733604 bytes
+SHA1 (patch-bin_exporter.c) = 1cf6542a71a798ece69dcd9ef572093ffbd8c081
+SHA1 (patch-bin_netflow__v1.c) = 712be153222b405bb3e9939c79d413dfa6297c6f
+SHA1 (patch-bin_netflow__v5__v7.c) = 28cfde5f3c649e6ca4a20a13572ba12973a687a8
+SHA1 (patch-bin_nfcapd.c) = 9604827ef1d61727bb8c43dfa9554d777f72d78b
 SHA1 (patch-bin_sfcapd.c) = 14d9cbef9c059629606d38df5a4cfa5aa082942a
 SHA1 (patch-configure) = 02ddab9c6ee4d862b0e8f006ab3432b07923bf0b
 SHA1 (patch-configure.in) = 98d3e0db6f81cfc12b7d719189adf5f7ee8c6594
diff --git a/net/nfdump/patches/patch-bin_exporter.c b/net/nfdump/patches/patch-bin_exporter.c
new file mode 100644
index 00000000000..effc4063446
--- /dev/null
+++ b/net/nfdump/patches/patch-bin_exporter.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-bin_exporter.c,v 1.1 2015/04/03 10:18:53 hiramatsu Exp $
+
+add missing sys/time.h header
+
+--- bin/exporter.c.orig        2014-02-16 12:59:29.000000000 +0000
++++ bin/exporter.c
+@@ -36,6 +36,7 @@
+
+ #include "config.h"
+
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --git a/net/nfdump/patches/patch-bin_netflow__v1.c b/net/nfdump/patches/patch-bin_netflow__v1.c
new file mode 100644
index 00000000000..a5c64f2d088
--- /dev/null
+++ b/net/nfdump/patches/patch-bin_netflow__v1.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-bin_netflow__v1.c,v 1.1 2015/04/03 10:18:53 hiramatsu Exp $
+
+add missing sys/time.h header
+
+--- bin/netflow_v1.c.orig      2014-02-16 12:59:29.000000000 +0000
++++ bin/netflow_v1.c
+@@ -39,6 +39,7 @@
+ #include "config.h"
+
+ #include <stdio.h>
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <unistd.h>
diff --git a/net/nfdump/patches/patch-bin_netflow__v5__v7.c b/net/nfdump/patches/patch-bin_netflow__v5__v7.c
new file mode 100644
index 00000000000..0694a3c716b
--- /dev/null
+++ b/net/nfdump/patches/patch-bin_netflow__v5__v7.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-bin_netflow__v5__v7.c,v 1.1 2015/04/03 10:18:53 hiramatsu Exp $
+
+add missing sys/time.h header
+
+--- bin/netflow_v5_v7.c.orig   2014-02-16 12:59:29.000000000 +0000
++++ bin/netflow_v5_v7.c
+@@ -39,6 +39,7 @@
+ #include "config.h"
+
+ #include <stdio.h>
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <unistd.h>
diff --git a/net/nfdump/patches/patch-bin_nf__common.c b/net/nfdump/patches/patch-bin_nf__common.c
deleted file mode 100644
index e3acdea1571..00000000000
--- a/net/nfdump/patches/patch-bin_nf__common.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-bin_nf__common.c,v 1.2 2013/01/11 13:33:59 joerg Exp $
-
-Fix gcc inline.
-
---- bin/nf_common.c.orig	2012-02-19 10:42:43.000000000 +0000
-+++ bin/nf_common.c
-@@ -487,7 +487,7 @@ int Getv6Mode(void) {
- #ifdef __SUNPRO_C
- extern
- #endif
--inline void Proto_string(uint8_t protonum, char *protostr) {
-+void Proto_string(uint8_t protonum, char *protostr) {
- 
- 	if ( protonum >= NumProtos || no_scale ) {
- 		snprintf(protostr,16,"%-5i", protonum );
-@@ -1440,10 +1440,10 @@ int	i, remaining;
- 
- } // End of ParseOutputFormat
- 
--#ifdef __SUNPRO_C
-+#if !defined(__GNUC__) || !defined(__GNUC_STDC_INLINE__)
- extern
- #endif
--inline void format_number(uint64_t num, char *s, int fixed_width) {
-+void format_number(uint64_t num, char *s, int fixed_width) {
- double f = num;
- 
- 	if ( no_scale ) {
-@@ -1475,7 +1475,7 @@ double f = num;
- 
- } // End of format_number
- 
--inline void condense_v6(char *s) {
-+void condense_v6(char *s) {
- size_t len = strlen(s);
- char	*p, *q;
- 
diff --git a/net/nfdump/patches/patch-bin_nf__common.h b/net/nfdump/patches/patch-bin_nf__common.h
deleted file mode 100644
index e89f0344b85..00000000000
--- a/net/nfdump/patches/patch-bin_nf__common.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-bin_nf__common.h,v 1.1 2013/01/11 13:33:59 joerg Exp $
-
---- bin/nf_common.h.orig	2013-01-11 01:23:53.000000000 +0000
-+++ bin/nf_common.h
-@@ -99,17 +99,17 @@ char *Get_fwd_status_name(uint32_t id);
- #ifdef __SUNPRO_C
- extern 
- #endif
--inline void Proto_string(uint8_t protonum, char *protostr);
-+void Proto_string(uint8_t protonum, char *protostr);
- 
- #ifdef __SUNPRO_C
- extern 
- #endif
--inline void format_number(uint64_t num, char *s, int fixed_width);
-+void format_number(uint64_t num, char *s, int fixed_width);
- 
- #ifdef __SUNPRO_C
- extern 
- #endif
--inline void condense_v6(char *s);
-+void condense_v6(char *s);
- 
- #define TAG_CHAR '
'
- 
diff --git a/net/nfdump/patches/patch-bin_nfcapd.c b/net/nfdump/patches/patch-bin_nfcapd.c
index 72221a7efe1..931147f2450 100644
--- a/net/nfdump/patches/patch-bin_nfcapd.c
+++ b/net/nfdump/patches/patch-bin_nfcapd.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_nfcapd.c,v 1.1 2012/07/25 21:19:30 tez Exp $
+$NetBSD: patch-bin_nfcapd.c,v 1.2 2015/04/03 10:18:53 hiramatsu Exp $
 
 use PATH_MAX instead of MAXPATHLEN if available
 
@@ -16,17 +16,17 @@ use PATH_MAX instead of MAXPATHLEN if available
   
  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;
+-char	*Ident, *dynsrcdir, pidfile[MAXPATHLEN];
++char	*Ident, *dynsrcdir;
 +#ifdef PATH_MAX
 +char pidfile[PATH_MAX];
 +#else
 +char pidfile[MAXPATHLEN];
 +#endif
  struct stat fstat;
- srecord_t	*commbuff;
  packet_function_t receive_packet;
-@@ -853,18 +859,20 @@ int		c;
+ send_peer_t  peer;
+@@ -897,18 +903,20 @@ char     *pcap_file;
  				break;
  			case 'P':
  				if ( optarg[0] == '/' ) { 	// absolute path given