Add a missing header and correct a type, to make this build on NetBSD 1.6.

4 files changed, 59 insertions, 1 deletions

diff --git a/devel/re2c/distinfo b/devel/re2c/distinfo
index db537369812..5fe29db71c2 100644
--- a/devel/re2c/distinfo
+++ b/devel/re2c/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.3 2004/09/10 18:52:29 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/11/06 18:08:48 kristerw Exp $
 
 SHA1 (re2c-0.9.3.tar.gz) = f7afa459474abadea146031f2d9dbadbfc5a568f
 Size (re2c-0.9.3.tar.gz) = 173075 bytes
+SHA1 (patch-aa) = e02c2e2bcbd277b7df81b8e453366453830798ff
+SHA1 (patch-ab) = d41159b20c75b97c39dcf5d6fc5c547a0639860c
+SHA1 (patch-ac) = c92be8d3b6caa1a86056b030609b353856d89e4d
diff --git a/devel/re2c/patches/patch-aa b/devel/re2c/patches/patch-aa
new file mode 100644
index 00000000000..42118db41e8
--- /dev/null
+++ b/devel/re2c/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.3 2004/11/06 18:08:48 kristerw Exp $
+
+--- substr.h.orig	Sat Nov  6 18:54:16 2004
++++ substr.h	Sat Nov  6 18:55:42 2004
+@@ -8,11 +8,11 @@
+ class SubStr {
+ public:
+     char		*str;
+-    uint		len;
++    unsigned int	len;
+ public:
+     friend bool operator==(const SubStr &, const SubStr &);
+-    SubStr(uchar*, uint);
+-    SubStr(char*, uint);
++    SubStr(uchar*, unsigned int);
++    SubStr(char*, unsigned int);
+     SubStr(const SubStr&);
+     void out(std::ostream&) const;
+ };
+@@ -34,10 +34,10 @@
+     return o << *s;
+ }
+ 
+-inline SubStr::SubStr(uchar *s, uint l)
++inline SubStr::SubStr(uchar *s, unsigned int l)
+     : str((char*) s), len(l) { }
+ 
+-inline SubStr::SubStr(char *s, uint l)
++inline SubStr::SubStr(char *s, unsigned int l)
+     : str(s), len(l) { }
+ 
+ inline SubStr::SubStr(const SubStr &s)
diff --git a/devel/re2c/patches/patch-ab b/devel/re2c/patches/patch-ab
new file mode 100644
index 00000000000..6b0f06afef7
--- /dev/null
+++ b/devel/re2c/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.1 2004/11/06 18:08:48 kristerw Exp $
+
+--- substr.cc.orig	Sat Nov  6 18:55:56 2004
++++ substr.cc	Sat Nov  6 18:56:08 2004
+@@ -33,5 +33,5 @@
+ Str::~Str() {
+     delete str;
+     str = (char*)-1;
+-    len = (uint)-1;
++    len = (unsigned int)-1;
+ }
diff --git a/devel/re2c/patches/patch-ac b/devel/re2c/patches/patch-ac
new file mode 100644
index 00000000000..e3ded13640a
--- /dev/null
+++ b/devel/re2c/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2004/11/06 18:08:48 kristerw Exp $
+
+--- actions.cc.orig	Sat Nov  6 18:52:41 2004
++++ actions.cc	Sat Nov  6 18:53:24 2004
+@@ -3,6 +3,7 @@
+ #include <string.h>
+ #include <iostream>
+ #include <iomanip>
++#include <ctype.h>
+ 
+ #include "globals.h"
+ #include "parser.h"