Fix build with newer GCC

33 files changed, 485 insertions, 7 deletions

diff --git a/games/exult/distinfo b/games/exult/distinfo
index e613b8d9336..e65a6238339 100644
--- a/games/exult/distinfo
+++ b/games/exult/distinfo
@@ -1,12 +1,43 @@
-$NetBSD: distinfo,v 1.4 2009/08/24 11:39:21 obache Exp $
+$NetBSD: distinfo,v 1.5 2011/11/25 21:53:25 joerg Exp $
 
 SHA1 (exult-1.2.tar.gz) = 81f9d3d428c80990b8e970a4dee5c85a7236dace
 RMD160 (exult-1.2.tar.gz) = 339231edf84507f05115ab3189875cb15be9c04f
 Size (exult-1.2.tar.gz) = 1722259 bytes
 SHA1 (patch-aa) = 2acecb0c4e2da2769559d9603a08930c30b38c72
 SHA1 (patch-ab) = 039fd49b570ad5796a43d86fb679b517c4149f13
-SHA1 (patch-ac) = f6a1c4961e62cd99f9f355d14631457d5d2b5458
+SHA1 (patch-ac) = b92df8fa9c0663b8e37b25b7c3a59e5d58de051a
+SHA1 (patch-actions.cc) = 3844af60c445e8b1c88a59815daf164012175d3b
 SHA1 (patch-ad) = fbb34ab21468afd91caccc35354fbd23df800ca5
 SHA1 (patch-ae) = 3b863379cef2948ff92e9971ffbc37d6b1b0276f
 SHA1 (patch-af) = 43b2369d9dff1fc1aa387c174b3fe7c3e467c2e8
 SHA1 (patch-ag) = 2c8b385bb2346f0e7d11bd8e721a901ec361bb61
+SHA1 (patch-args.cc) = a6f66039c7fdf1396000078b1c28927c0cd0d5e0
+SHA1 (patch-audio_xmidi.cc) = 4b7944fad3fbc3685f0a3edbff013a03feff3f10
+SHA1 (patch-conf_Configuration.cc) = 4c49e9b3ee2f66d77fab32e8cb25c8bf3ac05c3e
+SHA1 (patch-conf_xmain.cc) = e1bc9f77f9642390795d2d8183578f508027a127
+SHA1 (patch-files_Flex.h) = 67c971321cab01286f7398d72274cc575fc39172
+SHA1 (patch-files_IFF.h) = 9dea7c166ebe48c8843be6a0114cb993e18dffb6
+SHA1 (patch-files_Table.cc) = b4379ee2be657c158c0b7d750ac1417d8343ab0a
+SHA1 (patch-files_U7file.cc) = 2147ee8cc5ead5cb06a9823cfb380006ae06a4ba
+SHA1 (patch-files_listfiles.cc) = 3c7ebeba5d64f3c9f758406c1b944e3a289a245e
+SHA1 (patch-files_msgfile.cc) = 8219ffe692b79cad2f9db19adc1e0591d404f315
+SHA1 (patch-files_utils.h) = d170f0afa05f7fb71166c7c01dd6d713411dd680
+SHA1 (patch-imagewin_ibuf8.cc) = d1172573e542e5d0f280049a6c31765005974dcd
+SHA1 (patch-objs_chunkter.cc) = d20c70fae5b61246defe26095113c85b62f9bf32
+SHA1 (patch-party.cc) = e0bba8a1ca0638cc885b2c6363d316feffe5c11b
+SHA1 (patch-server_objserial.cc) = 213b455a213ce538027d2501494c175ebe6dd9c5
+SHA1 (patch-server_server.cc) = 0bdd9e268fe7c87eb5e7abac783bc3c62514af28
+SHA1 (patch-shapes_shapeinf.cc) = a62f192f989c4be0d5d757dc74a5e268216c5a01
+SHA1 (patch-shapes_shapewrite.cc) = 30e33617e5f42b7794b523da1ac5817751f68fc6
+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_ucsym.cc) = a68b476a9aa1362051176ad4de5352b6ce610f55
+SHA1 (patch-usecode_ucmachine.cc) = 01db5ff3f6d9c23271dfbd15c50e1c78d9af28a1
+SHA1 (patch-usecode_ucxt_head2data.cc) = 1bb92845f2c7b2368ca6849031e0c9d35affc7e5
+SHA1 (patch-usecode_ucxt_include_ops.h) = aca520d3b8d0d72ae918935f11f164ca0e633a81
+SHA1 (patch-usecode_useval.h) = 101dfb391a00bd99bbdacd4f71f6b22b9c38a214
diff --git a/games/exult/patches/patch-ac b/games/exult/patches/patch-ac
index 952de19b7a1..c5f4b218865 100644
--- a/games/exult/patches/patch-ac
+++ b/games/exult/patches/patch-ac
@@ -1,8 +1,15 @@
-$NetBSD: patch-ac,v 1.1 2008/07/27 20:14:14 dholland Exp $
+$NetBSD: patch-ac,v 1.2 2011/11/25 21:53:26 joerg Exp $
 
---- hash_utils.h~	2003-08-31 13:32:24.000000000 -0400
-+++ hash_utils.h	2008-07-27 13:37:43.000000000 -0400
-@@ -26,7 +26,7 @@
+--- hash_utils.h.orig	2003-08-31 17:32:24.000000000 +0000
++++ hash_utils.h
+@@ -20,13 +20,14 @@
+ #define _HASH_UTILS_H_
+ 
+ #include "exult_types.h"
++#include <cstring>
+ 
+ #ifdef DONT_HAVE_HASH_MAP
+ #  include <map>
  #else
  #if HAVE_EXT_HASH_MAP
  #  include <ext/hash_map>
@@ -11,7 +18,7 @@ $NetBSD: patch-ac,v 1.1 2008/07/27 20:14:14 dholland Exp $
  using __gnu_cxx::hash_map;
  #  else
  using std::hash_map;
-@@ -44,7 +44,7 @@
+@@ -44,7 +45,7 @@ using std::hash_map;
  #else
  #if HAVE_EXT_HASH_SET
  #  include <ext/hash_set>
diff --git a/games/exult/patches/patch-actions.cc b/games/exult/patches/patch-actions.cc
new file mode 100644
index 00000000000..367da77d866
--- /dev/null
+++ b/games/exult/patches/patch-actions.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-actions.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- actions.cc.orig	2011-11-25 18:01:36.000000000 +0000
++++ actions.cc
+@@ -21,6 +21,8 @@
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
+ #endif
++#include <cstring>
++#include <cstdlib>
+ 
+ #include "gamewin.h"
+ #include "actions.h"
diff --git a/games/exult/patches/patch-args.cc b/games/exult/patches/patch-args.cc
new file mode 100644
index 00000000000..32daa837528
--- /dev/null
+++ b/games/exult/patches/patch-args.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-args.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- args.cc.orig	2011-11-25 18:02:23.000000000 +0000
++++ args.cc
+@@ -24,6 +24,7 @@
+ #  include <iostream>
+ #endif
+ 
++#include <cstdlib>
+ #include "args.h"
+ 
+ #ifndef UNDER_CE
diff --git a/games/exult/patches/patch-audio_xmidi.cc b/games/exult/patches/patch-audio_xmidi.cc
new file mode 100644
index 00000000000..dbe2141987a
--- /dev/null
+++ b/games/exult/patches/patch-audio_xmidi.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-audio_xmidi.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- audio/xmidi.cc.orig	2011-11-25 17:44:45.000000000 +0000
++++ audio/xmidi.cc
+@@ -26,6 +26,7 @@
+ #ifndef ALPHA_LINUX_CXX
+ #  include <cassert>
+ #  include <cstdio>
++#  include <cstdlib>
+ #  include <cmath>
+ #  include <iostream>
+ #  include <cmath>
diff --git a/games/exult/patches/patch-conf_Configuration.cc b/games/exult/patches/patch-conf_Configuration.cc
new file mode 100644
index 00000000000..f43eef3b2ac
--- /dev/null
+++ b/games/exult/patches/patch-conf_Configuration.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-conf_Configuration.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- conf/Configuration.cc.orig	2011-11-25 17:32:44.000000000 +0000
++++ conf/Configuration.cc
+@@ -28,6 +28,7 @@
+ #ifndef ALPHA_LINUX_CXX
+ #  include <cassert>
+ #  include <cstdio>
++#  include <cstdlib>
+ #endif
+ #include <stdio.h>
+ #include <iostream>
diff --git a/games/exult/patches/patch-conf_xmain.cc b/games/exult/patches/patch-conf_xmain.cc
new file mode 100644
index 00000000000..ed3e48f0c3d
--- /dev/null
+++ b/games/exult/patches/patch-conf_xmain.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-conf_xmain.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- conf/xmain.cc.orig	2011-11-25 17:33:59.000000000 +0000
++++ conf/xmain.cc
+@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include "Configuration.h"
+ #include <iostream>
+ #include <string>
++#include <cstring>
+ #include <cassert>
+ #include "common_types.h"
+ 
diff --git a/games/exult/patches/patch-files_Flex.h b/games/exult/patches/patch-files_Flex.h
new file mode 100644
index 00000000000..f3944328c24
--- /dev/null
+++ b/games/exult/patches/patch-files_Flex.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-files_Flex.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- files/Flex.h.orig	2011-11-25 17:26:18.000000000 +0000
++++ files/Flex.h
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include <vector>
+ #include <string>
+ #include <iosfwd>
++#include <cstring>
+ #include "common_types.h"
+ #include "U7file.h"
+ 
diff --git a/games/exult/patches/patch-files_IFF.h b/games/exult/patches/patch-files_IFF.h
new file mode 100644
index 00000000000..71502f0feb6
--- /dev/null
+++ b/games/exult/patches/patch-files_IFF.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-files_IFF.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- files/IFF.h.orig	2011-11-25 17:27:16.000000000 +0000
++++ files/IFF.h
+@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ 
+ #include <vector>
+ #include <string>
++#include <cstring>
+ #include "common_types.h"
+ #include "U7file.h"
+ 
diff --git a/games/exult/patches/patch-files_Table.cc b/games/exult/patches/patch-files_Table.cc
new file mode 100644
index 00000000000..dddd0ea77f8
--- /dev/null
+++ b/games/exult/patches/patch-files_Table.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-files_Table.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- files/Table.cc.orig	2011-11-25 17:26:41.000000000 +0000
++++ files/Table.cc
+@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #endif
+ #include <iostream>
+ #include "exceptions.h"
++#include <cstdlib>
+ #include "utils.h"
+ 
+ using std::string;
diff --git a/games/exult/patches/patch-files_U7file.cc b/games/exult/patches/patch-files_U7file.cc
new file mode 100644
index 00000000000..de52f63ddab
--- /dev/null
+++ b/games/exult/patches/patch-files_U7file.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-files_U7file.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- files/U7file.cc.orig	2011-11-25 17:28:14.000000000 +0000
++++ files/U7file.cc
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #  include <cstdio>
+ #endif
+ #include <iostream>
++#include <cstdlib>
+ 
+ #include "U7file.h"
+ #include "Flex.h"
diff --git a/games/exult/patches/patch-files_listfiles.cc b/games/exult/patches/patch-files_listfiles.cc
new file mode 100644
index 00000000000..e777d5bdf0e
--- /dev/null
+++ b/games/exult/patches/patch-files_listfiles.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-files_listfiles.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- files/listfiles.cc.orig	2011-11-25 17:29:04.000000000 +0000
++++ files/listfiles.cc
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #  include <cstdlib>
+ #  include <cctype>
+ #  include <cstdio>
++#  include <cstring>
+ #endif
+ 
+ #include <vector>
diff --git a/games/exult/patches/patch-files_msgfile.cc b/games/exult/patches/patch-files_msgfile.cc
new file mode 100644
index 00000000000..a07d7092f9a
--- /dev/null
+++ b/games/exult/patches/patch-files_msgfile.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-files_msgfile.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- files/msgfile.cc.orig	2011-11-25 17:32:19.000000000 +0000
++++ files/msgfile.cc
+@@ -24,6 +24,7 @@
+ 
+ #include <iostream>
+ #include <vector>
++#include <cstdlib>
+ #include "utils.h"
+ 
+ using std::istream;
diff --git a/games/exult/patches/patch-files_utils.h b/games/exult/patches/patch-files_utils.h
new file mode 100644
index 00000000000..b95e2d562a3
--- /dev/null
+++ b/games/exult/patches/patch-files_utils.h
@@ -0,0 +1,76 @@
+$NetBSD: patch-files_utils.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- files/utils.h.orig	2011-11-25 17:29:26.000000000 +0000
++++ files/utils.h
+@@ -22,6 +22,7 @@
+ #ifndef _UTILS_H_
+ #define _UTILS_H_
+ 
++#include <cstdio>
+ #include <iostream>
+ #include <string>
+ #ifndef ALPHA_LINUX_CXX
+@@ -70,7 +71,6 @@ inline uint16 Read2
+ 	return (b0 | (b1 << 8));
+ 	}
+ 
+-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
+ /*
+  *	Read a 2-byte value from a file.
+  */
+@@ -85,7 +85,6 @@ inline uint16 Read2
+ 	std::fread(&b1,sizeof(uint8),1,in);
+ 	return (b0 | (b1 << 8));
+ 	}
+-#endif
+ 
+ /*
+  *	Read a 2-byte value, hsb first.
+@@ -113,7 +112,6 @@ inline uint16 Read2high
+ 	return ((b0 << 8) | b1);
+ 	}
+ 
+-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
+ /*
+  *	Read a 2-byte value from a file.
+  */
+@@ -128,7 +126,6 @@ inline uint16 Read2high
+ 	std::fread(&b1,sizeof(uint8),1,in);
+ 	return ((b0 << 8) | b1);
+ 	}
+-#endif
+ 
+ /*
+  *	Read a 4-byte long value, lsb first.
+@@ -160,7 +157,6 @@ inline uint32 Read4
+ 	return (b0 | (b1<<8) | (b2<<16) | (b3<<24));
+ 	}
+ 
+-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
+ /*
+  *	Read a 4-byte value from a file.
+  */
+@@ -177,7 +173,6 @@ inline uint32 Read4
+ 	std::fread(&b3,sizeof(uint8),1,in);
+ 	return (b0 | (b1<<8) | (b2<<16) | (b3<<24));
+ 	}
+-#endif
+ /*
+  *	Read a 4-byte long value, hsb first.
+  */
+@@ -208,7 +203,6 @@ inline uint32 Read4high
+ 	return ((b0<<24) | (b1<<16) | (b2<<8) | b3);
+ 	}
+ 
+-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
+ /*
+  *	Read a 4-byte value from a file.
+  */
+@@ -225,7 +219,6 @@ inline uint32 Read4high
+ 	std::fread(&b3,sizeof(uint8),1,in);
+ 	return ((b0<<24) | (b1<<16) | (b2<<8) | b3);
+ 	}
+-#endif
+ 
+ /*
+  *	Write a 1-byte value.
diff --git a/games/exult/patches/patch-imagewin_ibuf8.cc b/games/exult/patches/patch-imagewin_ibuf8.cc
new file mode 100644
index 00000000000..6c9947c9592
--- /dev/null
+++ b/games/exult/patches/patch-imagewin_ibuf8.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-imagewin_ibuf8.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- imagewin/ibuf8.cc.orig	2011-11-25 17:36:29.000000000 +0000
++++ imagewin/ibuf8.cc
+@@ -25,6 +25,8 @@
+ 
+ #include "ibuf8.h"
+ #ifndef ALPHA_LINUX_CXX
++#  include <cstring>
++#  include <cstdlib>
+ #  include <string>
+ #  include <iostream>
+ #endif
diff --git a/games/exult/patches/patch-objs_chunkter.cc b/games/exult/patches/patch-objs_chunkter.cc
new file mode 100644
index 00000000000..d2366ba2201
--- /dev/null
+++ b/games/exult/patches/patch-objs_chunkter.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-objs_chunkter.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- objs/chunkter.cc.orig	2011-11-25 17:56:42.000000000 +0000
++++ objs/chunkter.cc
+@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #ifdef INCL_OPENGL
+ #include "glshape.h"
+ #endif
++#include <cstring>
+ 
+ Chunk_terrain *Chunk_terrain::render_queue = 0;
+ int Chunk_terrain::queue_size = 0;
diff --git a/games/exult/patches/patch-party.cc b/games/exult/patches/patch-party.cc
new file mode 100644
index 00000000000..887f51c6962
--- /dev/null
+++ b/games/exult/patches/patch-party.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-party.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- party.cc.orig	2011-11-25 18:04:22.000000000 +0000
++++ party.cc
+@@ -25,6 +25,7 @@
+ #endif
+ 
+ #include <iostream>
++#include <cstring>
+ #include <string>
+ #include "party.h"
+ #include "actors.h"
diff --git a/games/exult/patches/patch-server_objserial.cc b/games/exult/patches/patch-server_objserial.cc
new file mode 100644
index 00000000000..7360ea1dabe
--- /dev/null
+++ b/games/exult/patches/patch-server_objserial.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-server_objserial.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- server/objserial.cc.orig	2011-11-25 17:58:05.000000000 +0000
++++ server/objserial.cc
+@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include "objserial.h"
+ #include "servemsg.h"
+ #include <iostream>
++#include <cstring>
+ 
+ using std::cout;
+ using std::endl;
diff --git a/games/exult/patches/patch-server_server.cc b/games/exult/patches/patch-server_server.cc
new file mode 100644
index 00000000000..da07a723ed3
--- /dev/null
+++ b/games/exult/patches/patch-server_server.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-server_server.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- server/server.cc.orig	2011-11-25 18:01:01.000000000 +0000
++++ server/server.cc
+@@ -45,6 +45,8 @@ Foundation, Inc., 59 Temple Place - Suit
+ #endif
+ 
+ #include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ 
+ #ifdef _AIX
+ #include <strings.h>
diff --git a/games/exult/patches/patch-shapes_shapeinf.cc b/games/exult/patches/patch-shapes_shapeinf.cc
new file mode 100644
index 00000000000..8ad9d4f810b
--- /dev/null
+++ b/games/exult/patches/patch-shapes_shapeinf.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-shapes_shapeinf.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- shapes/shapeinf.cc.orig	2011-11-25 17:35:12.000000000 +0000
++++ shapes/shapeinf.cc
+@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ 
+ #include "utils.h"
+ #include <iomanip>	/* Debugging */
++#include <cstring>
+ using std::cout;
+ using std::endl;
+ 
diff --git a/games/exult/patches/patch-shapes_shapewrite.cc b/games/exult/patches/patch-shapes_shapewrite.cc
new file mode 100644
index 00000000000..6603e0527bf
--- /dev/null
+++ b/games/exult/patches/patch-shapes_shapewrite.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-shapes_shapewrite.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- shapes/shapewrite.cc.orig	2011-11-25 17:35:49.000000000 +0000
++++ shapes/shapewrite.cc
+@@ -24,6 +24,7 @@
+ #  include <config.h>
+ #endif
+ 
++#include <cstring>
+ #include "shapevga.h"
+ #include "shapeinf.h"
+ #include "monstinf.h"
diff --git a/games/exult/patches/patch-tools_cmanip.cc b/games/exult/patches/patch-tools_cmanip.cc
new file mode 100644
index 00000000000..6f72c612b97
--- /dev/null
+++ b/games/exult/patches/patch-tools_cmanip.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_cmanip.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- tools/cmanip.cc.orig	2011-11-25 17:39:15.000000000 +0000
++++ tools/cmanip.cc
+@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ 
+ #ifndef ALPHA_LINUX_CXX
+ #  include <cstdio>
++#  include <cstdlib>
+ #endif
+ #include "Configuration.h"
+ #include <iostream>
diff --git a/games/exult/patches/patch-tools_splitshp.cc b/games/exult/patches/patch-tools_splitshp.cc
new file mode 100644
index 00000000000..0f2d8c9ee3c
--- /dev/null
+++ b/games/exult/patches/patch-tools_splitshp.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_splitshp.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- tools/splitshp.cc.orig	2011-11-25 17:38:30.000000000 +0000
++++ tools/splitshp.cc
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ 
+ #ifndef ALPHA_LINUX_CXX
+ #  include <cstdio>
++#  include <cstdlib>
+ #  include <cstring>
+ #  include <string>
+ #endif
diff --git a/games/exult/patches/patch-usecode_compiler_ucfun.cc b/games/exult/patches/patch-usecode_compiler_ucfun.cc
new file mode 100644
index 00000000000..e71b21db6aa
--- /dev/null
+++ b/games/exult/patches/patch-usecode_compiler_ucfun.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-usecode_compiler_ucfun.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/compiler/ucfun.cc.orig	2011-11-25 17:50:25.000000000 +0000
++++ usecode/compiler/ucfun.cc
+@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ 
+ #include <stdio.h>
+ #include <cassert>
++#include <cstring>
+ #include "ucfun.h"
+ #include "ucstmt.h"
+ #include "utils.h"
diff --git a/games/exult/patches/patch-usecode_compiler_uclex.ll b/games/exult/patches/patch-usecode_compiler_uclex.ll
new file mode 100644
index 00000000000..fec3d1f8e2e
--- /dev/null
+++ b/games/exult/patches/patch-usecode_compiler_uclex.ll
@@ -0,0 +1,12 @@
+$NetBSD: patch-usecode_compiler_uclex.ll,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/compiler/uclex.ll.orig	2011-11-25 17:49:15.000000000 +0000
++++ usecode/compiler/uclex.ll
+@@ -23,6 +23,7 @@ along with this program; if not, write t
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
++#include <cstring>
+ #include <string>
+ #include <vector>
+ #include "ucparse.h"
diff --git a/games/exult/patches/patch-usecode_compiler_ucloc.cc b/games/exult/patches/patch-usecode_compiler_ucloc.cc
new file mode 100644
index 00000000000..9366974f61f
--- /dev/null
+++ b/games/exult/patches/patch-usecode_compiler_ucloc.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-usecode_compiler_ucloc.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/compiler/ucloc.cc.orig	2011-11-25 17:50:54.000000000 +0000
++++ usecode/compiler/ucloc.cc
+@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #endif
+ 
+ #include <iostream>
++#include <cstring>
+ #include "ucloc.h"
+ 
+ using std::strcmp;
diff --git a/games/exult/patches/patch-usecode_compiler_ucmain.cc b/games/exult/patches/patch-usecode_compiler_ucmain.cc
new file mode 100644
index 00000000000..6f393f14e28
--- /dev/null
+++ b/games/exult/patches/patch-usecode_compiler_ucmain.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-usecode_compiler_ucmain.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/compiler/ucmain.cc.orig	2011-11-25 17:49:32.000000000 +0000
++++ usecode/compiler/ucmain.cc
+@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include <fstream>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <cstring>
+ #include <string>
+ #include <vector>
+ #include "ucloc.h"
diff --git a/games/exult/patches/patch-usecode_compiler_ucparse.yy b/games/exult/patches/patch-usecode_compiler_ucparse.yy
new file mode 100644
index 00000000000..085ac246937
--- /dev/null
+++ b/games/exult/patches/patch-usecode_compiler_ucparse.yy
@@ -0,0 +1,13 @@
+$NetBSD: patch-usecode_compiler_ucparse.yy,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/compiler/ucparse.yy.orig	2011-11-25 17:48:55.000000000 +0000
++++ usecode/compiler/ucparse.yy
+@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <string.h>
++#include <cstring>
+ #include <vector>
+ 
+ #include "ucfun.h"
diff --git a/games/exult/patches/patch-usecode_compiler_ucsym.cc b/games/exult/patches/patch-usecode_compiler_ucsym.cc
new file mode 100644
index 00000000000..d08268610ba
--- /dev/null
+++ b/games/exult/patches/patch-usecode_compiler_ucsym.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-usecode_compiler_ucsym.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/compiler/ucsym.cc.orig	2011-11-25 17:51:14.000000000 +0000
++++ usecode/compiler/ucsym.cc
+@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #endif
+ 
+ 
++#include <cstring>
+ #include <stdio.h>
+ #include "ucsym.h"
+ #include "opcodes.h"
diff --git a/games/exult/patches/patch-usecode_ucmachine.cc b/games/exult/patches/patch-usecode_ucmachine.cc
new file mode 100644
index 00000000000..a62e35b16f8
--- /dev/null
+++ b/games/exult/patches/patch-usecode_ucmachine.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-usecode_ucmachine.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/ucmachine.cc.orig	2011-11-25 17:54:27.000000000 +0000
++++ usecode/ucmachine.cc
+@@ -23,6 +23,7 @@
+ #  include <config.h>
+ #endif
+ 
++#include <cstring>
+ #include "ucmachine.h"
+ #include "keyring.h"
+ #include "conversation.h"
diff --git a/games/exult/patches/patch-usecode_ucxt_head2data.cc b/games/exult/patches/patch-usecode_ucxt_head2data.cc
new file mode 100644
index 00000000000..58a2c1b9faa
--- /dev/null
+++ b/games/exult/patches/patch-usecode_ucxt_head2data.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-usecode_ucxt_head2data.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/ucxt/head2data.cc.orig	2011-11-25 17:51:52.000000000 +0000
++++ usecode/ucxt/head2data.cc
+@@ -8,6 +8,7 @@
+ #include <iomanip>
+ #include <vector>
+ #include <fstream>
++#include <cstdlib>
+ 
+ using std::cout;
+ using std::cerr;
diff --git a/games/exult/patches/patch-usecode_ucxt_include_ops.h b/games/exult/patches/patch-usecode_ucxt_include_ops.h
new file mode 100644
index 00000000000..1172f3c246f
--- /dev/null
+++ b/games/exult/patches/patch-usecode_ucxt_include_ops.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-usecode_ucxt_include_ops.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/ucxt/include/ops.h.orig	2011-11-25 17:52:40.000000000 +0000
++++ usecode/ucxt/include/ops.h
+@@ -19,6 +19,7 @@
+ #ifndef OPCODES_H
+ #define OPCODES_H
+ 
++#include <cstdlib>
+ #include <map>
+ #include <string>
+ #include <vector>
diff --git a/games/exult/patches/patch-usecode_useval.h b/games/exult/patches/patch-usecode_useval.h
new file mode 100644
index 00000000000..200cf2407a4
--- /dev/null
+++ b/games/exult/patches/patch-usecode_useval.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-usecode_useval.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
+
+--- usecode/useval.h.orig	2011-11-25 17:54:48.000000000 +0000
++++ usecode/useval.h
+@@ -23,6 +23,7 @@
+ #define USEVAL_H	1
+ 
+ #include <cassert>
++#include <cstdlib>
+ #include <iostream>
+ 
+ #include <vector>	// STL container