Fix const correctness problems that I ran into with gcc 4.5.

I have no idea why nobody else has seen this...

5 files changed, 62 insertions, 10 deletions

diff --git a/games/exult/distinfo b/games/exult/distinfo
index e65a6238339..0d078a1b208 100644
--- a/games/exult/distinfo
+++ b/games/exult/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/11/25 21:53:25 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/12/21 16:58:15 dholland Exp $
 
 SHA1 (exult-1.2.tar.gz) = 81f9d3d428c80990b8e970a4dee5c85a7236dace
 RMD160 (exult-1.2.tar.gz) = 339231edf84507f05115ab3189875cb15be9c04f
@@ -33,9 +33,10 @@ SHA1 (patch-tools_cmanip.cc) = 3bb7231dc1a4bddf430222888b7d83893b9efd1f
 SHA1 (patch-tools_splitshp.cc) = 1eb810b609c5ae5b0b4cae5e043e376c0d6ebd84
 SHA1 (patch-usecode_compiler_ucfun.cc) = aa7d0248b46685c1af42d1114a8f92637bab6b6d
 SHA1 (patch-usecode_compiler_uclex.ll) = 791e55539ebd09011ee5024f6f576bc3a50f87ab
-SHA1 (patch-usecode_compiler_ucloc.cc) = 0ad6e6e96db7e02cbda9ede04824978ba824ed00
-SHA1 (patch-usecode_compiler_ucmain.cc) = fa35d5d6083d8ffc21d80733c0c9be1c7568bdab
-SHA1 (patch-usecode_compiler_ucparse.yy) = 6a645e9001722ce6665d24933853982ed20d7c05
+SHA1 (patch-usecode_compiler_ucloc.cc) = 28e27090fc9a161a49ffa0d570ea1d665d8c40fe
+SHA1 (patch-usecode_compiler_ucloc.h) = a2ed46a6ae96a6634bc5709bba14929a5774d98c
+SHA1 (patch-usecode_compiler_ucmain.cc) = 9f124c0113497f3132f66646aebc21a2e92fce38
+SHA1 (patch-usecode_compiler_ucparse.yy) = 4caa0927da5846b24df3a78af0ea5350064d6080
 SHA1 (patch-usecode_compiler_ucsym.cc) = a68b476a9aa1362051176ad4de5352b6ce610f55
 SHA1 (patch-usecode_ucmachine.cc) = 01db5ff3f6d9c23271dfbd15c50e1c78d9af28a1
 SHA1 (patch-usecode_ucxt_head2data.cc) = 1bb92845f2c7b2368ca6849031e0c9d35affc7e5
diff --git a/games/exult/patches/patch-usecode_compiler_ucloc.cc b/games/exult/patches/patch-usecode_compiler_ucloc.cc
index 9366974f61f..fc457933b3e 100644
--- a/games/exult/patches/patch-usecode_compiler_ucloc.cc
+++ b/games/exult/patches/patch-usecode_compiler_ucloc.cc
@@ -1,6 +1,9 @@
-$NetBSD: patch-usecode_compiler_ucloc.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+$NetBSD: patch-usecode_compiler_ucloc.cc,v 1.2 2011/12/21 16:58:15 dholland Exp $
 
---- usecode/compiler/ucloc.cc.orig	2011-11-25 17:50:54.000000000 +0000
+- use standard headers
+- const correctness demanded by gcc 4.5
+
+--- usecode/compiler/ucloc.cc.orig	2002-06-04 21:00:00.000000000 +0000
 +++ usecode/compiler/ucloc.cc
 @@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
  #endif
@@ -10,3 +13,12 @@ $NetBSD: patch-usecode_compiler_ucloc.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
  #include "ucloc.h"
  
  using std::strcmp;
+@@ -88,7 +89,7 @@ void Uc_location::error
+ 
+ void Uc_location::yyerror
+ 	(
+-	char *s
++	const char *s
+ 	)
+ 	{
+ 	cout << cur_source << ':' << cur_line + 1 << ": " << s << endl;
diff --git a/games/exult/patches/patch-usecode_compiler_ucloc.h b/games/exult/patches/patch-usecode_compiler_ucloc.h
new file mode 100644
index 00000000000..12c899f22d5
--- /dev/null
+++ b/games/exult/patches/patch-usecode_compiler_ucloc.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-usecode_compiler_ucloc.h,v 1.1 2011/12/21 16:58:15 dholland Exp $
+
+- const correctness demanded by gcc 4.5
+
+--- usecode/compiler/ucloc.h~	2001-04-16 10:00:43.000000000 +0000
++++ usecode/compiler/ucloc.h
+@@ -50,7 +50,7 @@ public:
+ 	const char *get_source()
+ 		{ return source; }
+ 	void error(char *s);		// Print error.
+-	static void yyerror(char *s);	// Print error at cur. location.
++	static void yyerror(const char *s);	// Print error at cur. location.
+ 	static int get_num_errors()
+ 		{ return num_errors; }
+ 	};
diff --git a/games/exult/patches/patch-usecode_compiler_ucmain.cc b/games/exult/patches/patch-usecode_compiler_ucmain.cc
index 6f393f14e28..26247befae8 100644
--- a/games/exult/patches/patch-usecode_compiler_ucmain.cc
+++ b/games/exult/patches/patch-usecode_compiler_ucmain.cc
@@ -1,6 +1,9 @@
-$NetBSD: patch-usecode_compiler_ucmain.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+$NetBSD: patch-usecode_compiler_ucmain.cc,v 1.2 2011/12/21 16:58:15 dholland Exp $
 
---- usecode/compiler/ucmain.cc.orig	2011-11-25 17:49:32.000000000 +0000
+ - use standard headers
+ - const correctness demanded by gcc 4.5
+
+--- usecode/compiler/ucmain.cc.orig	2003-09-18 06:37:05.000000000 +0000
 +++ usecode/compiler/ucmain.cc
 @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
  #include <fstream>
@@ -10,3 +13,12 @@ $NetBSD: patch-usecode_compiler_ucmain.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
  #include <string>
  #include <vector>
  #include "ucloc.h"
+@@ -133,7 +134,7 @@ int main
+  */
+ void yyerror
+ 	(
+-	char *s
++	const char *s
+ 	)
+ 	{
+ 	Uc_location::yyerror(s);
diff --git a/games/exult/patches/patch-usecode_compiler_ucparse.yy b/games/exult/patches/patch-usecode_compiler_ucparse.yy
index 085ac246937..dab07b1d0bb 100644
--- a/games/exult/patches/patch-usecode_compiler_ucparse.yy
+++ b/games/exult/patches/patch-usecode_compiler_ucparse.yy
@@ -1,6 +1,9 @@
-$NetBSD: patch-usecode_compiler_ucparse.yy,v 1.1 2011/11/25 21:53:26 joerg Exp $
+$NetBSD: patch-usecode_compiler_ucparse.yy,v 1.2 2011/12/21 16:58:15 dholland Exp $
 
---- usecode/compiler/ucparse.yy.orig	2011-11-25 17:48:55.000000000 +0000
+ - use standard headers
+ - const correctness demanded by gcc 4.5
+
+--- usecode/compiler/ucparse.yy.orig	2003-09-18 06:37:05.000000000 +0000
 +++ usecode/compiler/ucparse.yy
 @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
  #include <iostream>
@@ -11,3 +14,12 @@ $NetBSD: patch-usecode_compiler_ucparse.yy,v 1.1 2011/11/25 21:53:26 joerg Exp $
  #include <vector>
  
  #include "ucfun.h"
+@@ -42,7 +42,7 @@ using std::strcpy;
+ using std::strcat;
+ using std::strlen;
+ 
+-void yyerror(char *);
++void yyerror(const char *);
+ extern int yylex();
+ static Uc_array_expression *Create_array(int, Uc_expression *);
+ static Uc_array_expression *Create_array(int, Uc_expression *,