Make this package compile with NetBSD current's gcc (4.1.2).

Thanks to matt@ for the course on pointer arithmetic.

4 files changed, 141 insertions, 1 deletions

diff --git a/net/flow-tools/distinfo b/net/flow-tools/distinfo
index 32a0120a9f2..65e6f1c2205 100644
--- a/net/flow-tools/distinfo
+++ b/net/flow-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/02/24 20:32:19 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/07/18 11:06:48 seb Exp $
 
 SHA1 (flow-tools-0.68.tar.gz) = 6259263ac4fbf8a9394224e4053393fa756473c7
 RMD160 (flow-tools-0.68.tar.gz) = 71bfd1a40cb34fae55b2769d93208d13b3b0a927
@@ -17,3 +17,6 @@ SHA1 (patch-ak) = f5d13e165b7fac689bcea7e9d7ad07b17a79b7de
 SHA1 (patch-al) = 941cc23ea527624d21d40d3a73aa94f947f02552
 SHA1 (patch-am) = d0c096c0710fe8b41a6bb55528f9098d50cda378
 SHA1 (patch-an) = db119ec8b12eb2b2a064fe8d1af77157311132ce
+SHA1 (patch-ar) = 36db7e4c656bf083ff773d3bebffcf9118b81050
+SHA1 (patch-as) = 1c73317a2347f47fffb66f68a891cc78c93c644f
+SHA1 (patch-at) = 488e6d5f90a76e2f97f93cee20097adead550f7b
diff --git a/net/flow-tools/patches/patch-ar b/net/flow-tools/patches/patch-ar
new file mode 100644
index 00000000000..15dd53e2a53
--- /dev/null
+++ b/net/flow-tools/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2006/07/18 11:06:48 seb Exp $
+
+--- lib/ftchash.c.orig	2003-08-12 18:04:25.000000000 +0000
++++ lib/ftchash.c
+@@ -326,7 +326,7 @@ void *ftchash_foreach(struct ftchash *ft
+       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
+ 
+       ret = ftch->traverse_rec;
+-      (char*)ftch->traverse_rec += ftch->d_size;
++      ftch->traverse_rec = (char*)(ftch->traverse_rec) + ftch->d_size;
+       return ret;
+ 
+     } else {
diff --git a/net/flow-tools/patches/patch-as b/net/flow-tools/patches/patch-as
new file mode 100644
index 00000000000..309059eb15d
--- /dev/null
+++ b/net/flow-tools/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1 2006/07/18 11:06:48 seb Exp $
+
+--- lib/ftio.c.orig	2003-02-24 00:51:47.000000000 +0000
++++ lib/ftio.c
+@@ -2267,7 +2267,7 @@ int readn(register int fd, register void
+         break;
+ 
+       nleft -= nread;
+-      (char*)ptr += nread;
++      ptr = (char*)ptr + nread;
+   }
+   return (nbytes - nleft);
+ } /* readn */
+@@ -2292,7 +2292,7 @@ int writen(register int fd, register voi
+       return(nwritten); /* error */
+ 
+     nleft -= nwritten;
+-    (char*)ptr += nwritten;
++    ptr = (char*)ptr + nwritten;
+   }
+   return(nbytes - nleft);
+ } /* writen */
diff --git a/net/flow-tools/patches/patch-at b/net/flow-tools/patches/patch-at
new file mode 100644
index 00000000000..aefef6e588d
--- /dev/null
+++ b/net/flow-tools/patches/patch-at
@@ -0,0 +1,102 @@
+$NetBSD: patch-at,v 1.1 2006/07/18 11:06:48 seb Exp $
+
+--- lib/fttlv.c.orig	2003-02-13 02:38:43.000000000 +0000
++++ lib/fttlv.c
+@@ -68,10 +68,10 @@ int fttlv_enc_uint32(void *buf, int buf_
+   }
+ 
+   bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&v, buf, 4);
+ 
+@@ -107,10 +107,10 @@ int fttlv_enc_uint16(void *buf, int buf_
+   }
+ 
+   bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&v, buf, 2);
+ 
+@@ -145,10 +145,10 @@ int fttlv_enc_uint8(void *buf, int buf_s
+   }
+ 
+   bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&v, buf, 1);
+ 
+@@ -183,10 +183,10 @@ int fttlv_enc_str(void *buf, int buf_siz
+   }
+ 
+   bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(v, buf, len);
+ 
+@@ -230,16 +230,16 @@ int fttlv_enc_ifname(void *buf, int buf_
+     return -1;
+ 
+   bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&ip, buf, 4);
+-  (char*)buf += 4;
++  buf = (char*)buf + 4;
+ 
+   bcopy(&ifIndex, buf, 2);
+-  (char*)buf += 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(name, buf, n);
+ 
+@@ -287,19 +287,19 @@ int fttlv_enc_ifalias(void *buf, int buf
+   }
+ 
+   bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(&ip, buf, 4);
+-  (char*)buf += 4;
++  buf = (char*)buf + 4;
+ 
+   bcopy(&entries, buf, 2);
+-  (char*)buf += 2;
++  buf = (char*)buf + 2;
+ 
+   bcopy(ifIndex_list, buf, esize);
+-  (char*)buf += esize;
++  buf = (char*)buf + esize;
+ 
+   bcopy(name, buf, n);
+