[pkgsrc/trunk]: pkgsrc/games/exult Fix build with newer GCC

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd6862478262
branches:  trunk
changeset: 595834:bd6862478262
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Nov 25 21:53:25 2011 +0000

description:
Fix build with newer GCC

diffstat:

 games/exult/distinfo                                  |  35 ++++++++-
 games/exult/patches/patch-ac                          |  17 +++-
 games/exult/patches/patch-actions.cc                  |  13 +++
 games/exult/patches/patch-args.cc                     |  12 +++
 games/exult/patches/patch-audio_xmidi.cc              |  12 +++
 games/exult/patches/patch-conf_Configuration.cc       |  12 +++
 games/exult/patches/patch-conf_xmain.cc               |  12 +++
 games/exult/patches/patch-files_Flex.h                |  12 +++
 games/exult/patches/patch-files_IFF.h                 |  12 +++
 games/exult/patches/patch-files_Table.cc              |  12 +++
 games/exult/patches/patch-files_U7file.cc             |  12 +++
 games/exult/patches/patch-files_listfiles.cc          |  12 +++
 games/exult/patches/patch-files_msgfile.cc            |  12 +++
 games/exult/patches/patch-files_utils.h               |  76 +++++++++++++++++++
 games/exult/patches/patch-imagewin_ibuf8.cc           |  13 +++
 games/exult/patches/patch-objs_chunkter.cc            |  12 +++
 games/exult/patches/patch-party.cc                    |  12 +++
 games/exult/patches/patch-server_objserial.cc         |  12 +++
 games/exult/patches/patch-server_server.cc            |  13 +++
 games/exult/patches/patch-shapes_shapeinf.cc          |  12 +++
 games/exult/patches/patch-shapes_shapewrite.cc        |  12 +++
 games/exult/patches/patch-tools_cmanip.cc             |  12 +++
 games/exult/patches/patch-tools_splitshp.cc           |  12 +++
 games/exult/patches/patch-usecode_compiler_ucfun.cc   |  12 +++
 games/exult/patches/patch-usecode_compiler_uclex.ll   |  12 +++
 games/exult/patches/patch-usecode_compiler_ucloc.cc   |  12 +++
 games/exult/patches/patch-usecode_compiler_ucmain.cc  |  12 +++
 games/exult/patches/patch-usecode_compiler_ucparse.yy |  13 +++
 games/exult/patches/patch-usecode_compiler_ucsym.cc   |  12 +++
 games/exult/patches/patch-usecode_ucmachine.cc        |  12 +++
 games/exult/patches/patch-usecode_ucxt_head2data.cc   |  12 +++
 games/exult/patches/patch-usecode_ucxt_include_ops.h  |  12 +++
 games/exult/patches/patch-usecode_useval.h            |  12 +++
 33 files changed, 485 insertions(+), 7 deletions(-)

diffs (truncated from 645 to 300 lines):

diff -r 912e9dca0966 -r bd6862478262 games/exult/distinfo
--- a/games/exult/distinfo      Fri Nov 25 21:52:33 2011 +0000
+++ b/games/exult/distinfo      Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-ac
--- a/games/exult/patches/patch-ac      Fri Nov 25 21:52:33 2011 +0000
+++ b/games/exult/patches/patch-ac      Fri Nov 25 21:53:25 2011 +0000
@@ -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 @@
  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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-actions.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-actions.cc      Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-args.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-args.cc Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-audio_xmidi.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-audio_xmidi.cc  Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-conf_Configuration.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-conf_Configuration.cc   Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-conf_xmain.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-conf_xmain.cc   Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-files_Flex.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-files_Flex.h    Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-files_IFF.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-files_IFF.h     Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-files_Table.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-files_Table.cc  Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-files_U7file.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-files_U7file.cc Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-files_listfiles.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-files_listfiles.cc      Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-files_msgfile.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-files_msgfile.cc        Fri Nov 25 21:53:25 2011 +0000
@@ -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 -r 912e9dca0966 -r bd6862478262 games/exult/patches/patch-files_utils.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/exult/patches/patch-files_utils.h   Fri Nov 25 21:53:25 2011 +0000
@@ -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);