use time_t instead of uint32_t. Fixes package for NetBSD 6

4 files changed, 72 insertions, 5 deletions

diff --git a/net/flow-tools/distinfo b/net/flow-tools/distinfo
index 6183a426088..0f2a22a6dfb 100644
--- a/net/flow-tools/distinfo
+++ b/net/flow-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/11/19 02:58:12 joerg Exp $
+$NetBSD: distinfo,v 1.12 2013/02/03 17:48:45 kefren Exp $
 
 SHA1 (flow-tools-0.68.tar.gz) = 6259263ac4fbf8a9394224e4053393fa756473c7
 RMD160 (flow-tools-0.68.tar.gz) = 71bfd1a40cb34fae55b2769d93208d13b3b0a927
@@ -10,13 +10,15 @@ SHA1 (patch-ad) = 89bc60cffe754822e1bf3b1b665a955d2625174b
 SHA1 (patch-ae) = 1e5f151f3eba795f1ade4c016767bd4cd271565a
 SHA1 (patch-af) = 7f5d045954b998a30616dedac0069c817b665031
 SHA1 (patch-ag) = 60d7c6d07cc8f102d6281a55c8188d13eca80bdf
-SHA1 (patch-ah) = d8e0de371325e34b44a83dae5ea68f193f8aaeb0
+SHA1 (patch-ah) = 0553764799fd696ea5799bfbfb974219bc62d3fd
 SHA1 (patch-ai) = 5e0a5f3148e80c156198d74036ff2f1bf35ed779
 SHA1 (patch-aj) = d183dc3b360110a1a90165b0094e349d3a964a2e
 SHA1 (patch-ak) = f5d13e165b7fac689bcea7e9d7ad07b17a79b7de
 SHA1 (patch-al) = 941cc23ea527624d21d40d3a73aa94f947f02552
 SHA1 (patch-am) = d0c096c0710fe8b41a6bb55528f9098d50cda378
 SHA1 (patch-an) = db119ec8b12eb2b2a064fe8d1af77157311132ce
+SHA1 (patch-ao) = 8fe5cec93201334e18560df9ec7b5348f9a478f4
+SHA1 (patch-ap) = 65b770be063e7047813ad465a471ec6a85e214f6
 SHA1 (patch-ar) = 36db7e4c656bf083ff773d3bebffcf9118b81050
 SHA1 (patch-as) = 1c73317a2347f47fffb66f68a891cc78c93c644f
 SHA1 (patch-at) = 488e6d5f90a76e2f97f93cee20097adead550f7b
diff --git a/net/flow-tools/patches/patch-ah b/net/flow-tools/patches/patch-ah
index d1dd8217baf..3521074e8de 100644
--- a/net/flow-tools/patches/patch-ah
+++ b/net/flow-tools/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.4 2005/07/21 12:54:03 seb Exp $
+$NetBSD: patch-ah,v 1.5 2013/02/03 17:48:45 kefren Exp $
 
---- src/flow-capture.c.orig	2004-01-05 18:56:50.000000000 +0100
-+++ src/flow-capture.c
+--- src/flow-capture.c.orig	2004-01-05 19:56:50.000000000 +0200
++++ src/flow-capture.c	2013-02-03 18:33:26.000000000 +0200
 @@ -350,7 +350,7 @@ char **argv;
        ftv.set = 1;
        break;
@@ -21,3 +21,12 @@ $NetBSD: patch-ah,v 1.4 2005/07/21 12:54:03 seb Exp $
  
      for (n = 0; n < 16; ++n)
        close (n);
+@@ -998,7 +999,7 @@ skip_pdu_decode:
+         fterr_errx(1, "calc_rotate(): failed");
+ 
+       /* remember when file was created */
+-      cap_file.time = (u_int32)tt_now;
++      cap_file.time = tt_now;
+ 
+       /* remember the version encoded in the filename */
+       bcopy(&ftv, &cap_file.ftv, sizeof cap_file.ftv);
diff --git a/net/flow-tools/patches/patch-ao b/net/flow-tools/patches/patch-ao
new file mode 100644
index 00000000000..9ea39523069
--- /dev/null
+++ b/net/flow-tools/patches/patch-ao
@@ -0,0 +1,16 @@
+$NetBSD: patch-ao,v 1.1 2013/02/03 17:48:45 kefren Exp $
+
+--- lib/ftlib.h.orig	2013-02-03 18:49:10.000000000 +0200
++++ lib/ftlib.h	2013-02-03 18:32:09.000000000 +0200
+@@ -2710,9 +2710,9 @@ int ftfile_expire (struct ftfile_entries
+ int ftfile_dump(struct ftfile_entries *fte);
+ struct ftfile_entry *ftfile_entry_new(int len);
+ void ftfile_entry_free(struct ftfile_entry *entry);
+-int ftfile_mkpath(u_int32 ftime, int nest);
++int ftfile_mkpath(time_t ftime, int nest);
+ void ftfile_pathname(char *buf, int bsize, int nest, struct ftver ftv,
+- int done, u_int32 ftime);
++ int done, time_t ftime);
+ 
+ 
+ 
diff --git a/net/flow-tools/patches/patch-ap b/net/flow-tools/patches/patch-ap
new file mode 100644
index 00000000000..5172022376b
--- /dev/null
+++ b/net/flow-tools/patches/patch-ap
@@ -0,0 +1,40 @@
+$NetBSD: patch-ap,v 1.1 2013/02/03 17:48:45 kefren Exp $
+
+--- lib/ftfile.c.orig	2013-02-03 18:48:54.000000000 +0200
++++ lib/ftfile.c	2013-02-03 18:32:58.000000000 +0200
+@@ -410,7 +410,7 @@ int ftfile_dump(struct ftfile_entries *f
+  * 
+  */
+ void ftfile_pathname(char *buf, int bsize, int nest, struct ftver ftv,
+- int done, u_int32 ftime)
++ int done, time_t ftime)
+ {
+   struct tm *tm;
+   char *prefix, dbuf[64];
+@@ -418,7 +418,7 @@ void ftfile_pathname(char *buf, int bsiz
+   char gmt_sign;
+   int tm_gmtoff;
+   
+-  if (!(tm = localtime ((time_t*)&ftime))) {
++  if (!(tm = localtime (&ftime))) {
+     snprintf(buf, bsize, ".");
+   }
+ 
+@@ -499,7 +499,7 @@ void ftfile_pathname(char *buf, int bsiz
+  * returns -1 on error
+  * 
+  */
+-int ftfile_mkpath(u_int32 ftime, int nest)
++int ftfile_mkpath(time_t ftime, int nest)
+ {
+   struct tm *tm;
+   char buf[32];
+@@ -512,7 +512,7 @@ int ftfile_mkpath(u_int32 ftime, int nes
+   if ((nest > 3) || (nest < -3))
+     return -1;
+ 
+-  if (!(tm = localtime ((time_t*)&ftime)))
++  if (!(tm = localtime (&ftime)))
+     return -1;
+ 
+   if (nest == -1)