Deal with the modern post-GCC2 world.

15 files changed, 234 insertions, 1 deletions

diff --git a/devel/doc++/distinfo b/devel/doc++/distinfo
index 4dc2d319b0b..27b1c3a6cc3 100644
--- a/devel/doc++/distinfo
+++ b/devel/doc++/distinfo
@@ -1,7 +1,21 @@
-$NetBSD: distinfo,v 1.6 2007/03/09 12:56:53 rillig Exp $
+$NetBSD: distinfo,v 1.7 2011/11/25 21:38:09 joerg Exp $
 
 SHA1 (doc++-3.4.10.tar.gz) = 2102e99152ab91d80d7977fa5e13dd6f6043b2c8
 RMD160 (doc++-3.4.10.tar.gz) = 85b14d32e2932ceb465f1bab16eb8389cd22d72d
 Size (doc++-3.4.10.tar.gz) = 408887 bytes
 SHA1 (patch-aa) = d71fd3064b9795ed1c82044c2b42f34f166f0061
 SHA1 (patch-docify) = e38383e7be4c7d2c224c90f97317d0bdbe98685f
+SHA1 (patch-src_comment.ll) = 1f402293b1eb5ad9b776fb26e1a37a4ffa0b4f9b
+SHA1 (patch-src_cpp.ll) = ca9b97fd2b9ab9552b56cd679111d1d7bed01648
+SHA1 (patch-src_datahashtable.h) = d746bfe674d751edaea9c148784b5ba96a95a65e
+SHA1 (patch-src_doc.ll) = 010251cda95ca5afb19d40293f523023eb70d1bd
+SHA1 (patch-src_doc2dbsgml.ll) = 988fe3bb63d002bf431e96dbb0a4afbb4c6084a8
+SHA1 (patch-src_doc2dbxml.ll) = 20e3e1cf750b5abd7ad2f27439090f5cd716fce4
+SHA1 (patch-src_doc2tex.ll) = 3215a67b145772e99bf071788e4acd75df8b68a5
+SHA1 (patch-src_html.cc) = 5d350abe9197b91a1f4b0f09272a2dfc066538c3
+SHA1 (patch-src_java.ll) = b6f3afb5de5c29d20b6b69582ae1fc71f31a61c9
+SHA1 (patch-src_main.cc) = a78300cea46ddb1edfafd09f6b15277beeed512e
+SHA1 (patch-src_nametable.cc) = 7d2976d12520572a6bc5a118f435f7446a560eaf
+SHA1 (patch-src_nametable.h) = da6cfcd23e69f069e238d5e03a5af69176e15792
+SHA1 (patch-src_php.ll) = b118886c8d0d9915dc18b41ebcaccc94b6a926d2
+SHA1 (patch-src_tex2gif.cc) = 10f4500735c58a9d733f904e119ed0edb428006e
diff --git a/devel/doc++/patches/patch-src_comment.ll b/devel/doc++/patches/patch-src_comment.ll
new file mode 100644
index 00000000000..b3755d5fb38
--- /dev/null
+++ b/devel/doc++/patches/patch-src_comment.ll
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_comment.ll,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/comment.ll.orig	2011-11-25 17:18:23.000000000 +0000
++++ src/comment.ll
+@@ -24,7 +24,7 @@
+ 
+ #include <assert.h>
+ #include <ctype.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
diff --git a/devel/doc++/patches/patch-src_cpp.ll b/devel/doc++/patches/patch-src_cpp.ll
new file mode 100644
index 00000000000..3d83792c412
--- /dev/null
+++ b/devel/doc++/patches/patch-src_cpp.ll
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_cpp.ll,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/cpp.ll.orig	2011-11-25 17:18:33.000000000 +0000
++++ src/cpp.ll
+@@ -26,7 +26,7 @@
+ 
+ #include <assert.h>
+ #include <ctype.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
diff --git a/devel/doc++/patches/patch-src_datahashtable.h b/devel/doc++/patches/patch-src_datahashtable.h
new file mode 100644
index 00000000000..a28afdd323b
--- /dev/null
+++ b/devel/doc++/patches/patch-src_datahashtable.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_datahashtable.h,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/datahashtable.h.orig	2011-11-25 17:20:17.000000000 +0000
++++ src/datahashtable.h
+@@ -26,11 +26,13 @@
+ #define _DATAHASHTABLE_H
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdlib.h>
+ 
+ #include "McDArray.h"
+ 
++using namespace std;
++
+ /* This should be a private subclass of #DataHashTable#. However, since cfront
+    is not able to compile this constrution, we had move the class to global
+    scope.
diff --git a/devel/doc++/patches/patch-src_doc.ll b/devel/doc++/patches/patch-src_doc.ll
new file mode 100644
index 00000000000..71a1627fec7
--- /dev/null
+++ b/devel/doc++/patches/patch-src_doc.ll
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_doc.ll,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/doc.ll.orig	2011-11-25 17:18:47.000000000 +0000
++++ src/doc.ll
+@@ -23,8 +23,8 @@
+ 
+ %{
+ #include <assert.h>
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/devel/doc++/patches/patch-src_doc2dbsgml.ll b/devel/doc++/patches/patch-src_doc2dbsgml.ll
new file mode 100644
index 00000000000..d53bfadb72f
--- /dev/null
+++ b/devel/doc++/patches/patch-src_doc2dbsgml.ll
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_doc2dbsgml.ll,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/doc2dbsgml.ll.orig	2011-11-25 17:19:15.000000000 +0000
++++ src/doc2dbsgml.ll
+@@ -22,12 +22,14 @@
+ 
+ %{
+ #include <assert.h>
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
++using namespace std;
++
+ #include "classgraph.h"
+ #include "doc.h"
+ 
diff --git a/devel/doc++/patches/patch-src_doc2dbxml.ll b/devel/doc++/patches/patch-src_doc2dbxml.ll
new file mode 100644
index 00000000000..9fd89532156
--- /dev/null
+++ b/devel/doc++/patches/patch-src_doc2dbxml.ll
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_doc2dbxml.ll,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/doc2dbxml.ll.orig	2011-11-25 17:19:02.000000000 +0000
++++ src/doc2dbxml.ll
+@@ -25,12 +25,14 @@
+ 
+ %{
+ #include <assert.h>
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
++using namespace std;
++
+ #include "classgraph.h"
+ #include "doc.h"
+ 
diff --git a/devel/doc++/patches/patch-src_doc2tex.ll b/devel/doc++/patches/patch-src_doc2tex.ll
new file mode 100644
index 00000000000..eed0873d4ec
--- /dev/null
+++ b/devel/doc++/patches/patch-src_doc2tex.ll
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_doc2tex.ll,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/doc2tex.ll.orig	2011-11-25 17:20:38.000000000 +0000
++++ src/doc2tex.ll
+@@ -23,8 +23,8 @@
+ 
+ %{
+ #include <assert.h>
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -33,6 +33,8 @@
+ #include "classgraph.h"
+ #include "doc.h"
+ 
++using namespace std;
++
+ #define YY_DECL int yylex()
+ 
+ #undef	YY_INPUT
diff --git a/devel/doc++/patches/patch-src_html.cc b/devel/doc++/patches/patch-src_html.cc
new file mode 100644
index 00000000000..846dc4424ad
--- /dev/null
+++ b/devel/doc++/patches/patch-src_html.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_html.cc,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/html.cc.orig	2011-11-25 17:18:04.000000000 +0000
++++ src/html.cc
+@@ -31,7 +31,7 @@
+ #include <direct.h>
+ #endif
+ #include <errno.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/devel/doc++/patches/patch-src_java.ll b/devel/doc++/patches/patch-src_java.ll
new file mode 100644
index 00000000000..a4d7acdbcaf
--- /dev/null
+++ b/devel/doc++/patches/patch-src_java.ll
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_java.ll,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/java.ll.orig	2011-11-25 17:21:13.000000000 +0000
++++ src/java.ll
+@@ -26,7 +26,7 @@
+ 
+ #include <assert.h>
+ #include <ctype.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ 
+ #include "doc.h"
diff --git a/devel/doc++/patches/patch-src_main.cc b/devel/doc++/patches/patch-src_main.cc
new file mode 100644
index 00000000000..804f60c0975
--- /dev/null
+++ b/devel/doc++/patches/patch-src_main.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_main.cc,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/main.cc.orig	2011-11-25 17:20:50.000000000 +0000
++++ src/main.cc
+@@ -25,7 +25,7 @@
+ #include "config.h"
+ 
+ #include <assert.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <getopt.h>
+ #include <locale.h>
+ #include <stdio.h>
diff --git a/devel/doc++/patches/patch-src_nametable.cc b/devel/doc++/patches/patch-src_nametable.cc
new file mode 100644
index 00000000000..d1a620d3914
--- /dev/null
+++ b/devel/doc++/patches/patch-src_nametable.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_nametable.cc,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/nametable.cc.orig	2011-11-25 17:21:36.000000000 +0000
++++ src/nametable.cc
+@@ -22,7 +22,7 @@
+ */
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/devel/doc++/patches/patch-src_nametable.h b/devel/doc++/patches/patch-src_nametable.h
new file mode 100644
index 00000000000..2f21b54df37
--- /dev/null
+++ b/devel/doc++/patches/patch-src_nametable.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_nametable.h,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/nametable.h.orig	2011-11-25 17:20:06.000000000 +0000
++++ src/nametable.h
+@@ -25,7 +25,7 @@
+ #define	_NAME_TABLE_H
+ 
+ #include <assert.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "datahashtable.h"
+ 
diff --git a/devel/doc++/patches/patch-src_php.ll b/devel/doc++/patches/patch-src_php.ll
new file mode 100644
index 00000000000..0e65ddedbf9
--- /dev/null
+++ b/devel/doc++/patches/patch-src_php.ll
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_php.ll,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/php.ll.orig	2011-11-25 17:21:59.000000000 +0000
++++ src/php.ll
+@@ -23,7 +23,7 @@
+ %{
+ #include <assert.h>
+ #include <ctype.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ 
+ #include "doc.h"
diff --git a/devel/doc++/patches/patch-src_tex2gif.cc b/devel/doc++/patches/patch-src_tex2gif.cc
new file mode 100644
index 00000000000..028dab9c8f5
--- /dev/null
+++ b/devel/doc++/patches/patch-src_tex2gif.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_tex2gif.cc,v 1.1 2011/11/25 21:38:09 joerg Exp $
+
+--- src/tex2gif.cc.orig	2011-11-25 17:21:47.000000000 +0000
++++ src/tex2gif.cc
+@@ -21,8 +21,8 @@
+   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
+ #include <stdio.h>
+ #include <string.h>
+