diff options
45 files changed, 61 insertions, 725 deletions
diff --git a/games/exult/DESCR b/games/exult/DESCR index a9b83168c07..f34b7f89dcd 100644 --- a/games/exult/DESCR +++ b/games/exult/DESCR @@ -1,22 +1,13 @@ -Ultima 7, an RPG from the early 1990's, still has a huge following. -But, being a DOS game with a very nonstandard memory manager, it -is difficult to run it on the latest computers. Exult is a project -to create an Ultima 7 game engine that runs on modern operating -systems, capable of using the data and graphics files that come -with the game. +As computers evolve, we risk losing classic games from the +not-so-distant past. One of these, Ultima 7, an RPG from the early +1990's, still has a huge following, and many consider it to be one of +the most immersive games ever produced. -Exult is written in C++ and runs on, at least, Linux, Mac OS X and -Windows using the SDL library to make porting to other platforms -relatively easy. The current version supports all of "Ultima 7: -The Black Gate" and "Ultima 7 part 2: The Serpent Isle", allowing -you to finish both games. This is only possible due to the work -done by other fans who have decoded the various Ultima 7 data files, -especially Gary Thompson, Maxim Shatskih, Jakob Shonberg, and Wouter -Dijkslag. +Exult is a project to recreate Ultima 7 for modern operating systems, +using the game's original plot, data, and graphics files. It enables +play of Ultima VII: The Black Gate and Ultima VII Part Two: Serpent +Isle, and their corresponding expansion disks Forge of Virtue and +Silver Seed, on modern machines. -Exult aims to let those people who own Ultima 7 (copyright 1993) -play the game on modern hardware, in as close to (or perhaps even -surpassing) its original splendor as is possible. You need to own -"Ultima 7: The Black Gate" and/or "Ultima 7: Serpent Isle" and -optionally the add-ons (not required to run) in order to use Exult, -and we encourage you to buy a legal copy. +In order to play these games, data files from the original games are +needed. diff --git a/games/exult/Makefile b/games/exult/Makefile index b4c81708b63..b5640829634 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -1,25 +1,26 @@ -# $NetBSD: Makefile,v 1.19 2013/06/04 22:16:04 tron Exp $ -# +# $NetBSD: Makefile,v 1.20 2015/04/19 19:30:12 wiz Exp $ -DISTNAME= exult-1.2 -PKGREVISION= 10 -CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=exult/} +DISTNAME= exult-1.4.9rc1 +CATEGORIES= games +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=exult/exult-all-versions/} -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://exult.sourceforge.net/ -COMMENT= Open-source Ultima 7 engine +MAINTAINER= nikkohigashi@gmail.com +HOMEPAGE= http://exult.sourceforge.net/ +COMMENT= Open-source Ultima 7 engine +LICENSE= gnu-gpl-v2 -MAKE_JOBS_SAFE= no +GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ -USE_PKGLOCALEDIR= yes -USE_LANGUAGES= c c++ -USE_TOOLS+= yacc -USE_LIBTOOL= yes -GNU_CONFIGURE= yes +CFLAGS+= -fpermissive +LDFLAGS+= -lz +CONFIGURE_ARGS+= --disable-sdltest --disable-oggtest --disable-vorbistest +.include "../../devel/zlib/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../audio/SDL_mixer/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" +.include "../../multimedia/libogg/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/exult/PLIST b/games/exult/PLIST index 727186ba441..6a92132507b 100644 --- a/games/exult/PLIST +++ b/games/exult/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 19:10:36 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2015/04/19 19:30:12 wiz Exp $ bin/expack bin/exult bin/shp2pcx @@ -7,12 +7,16 @@ bin/textpack bin/ucc bin/ucxt man/man1/expack.1 +man/man1/exult_studio.1 man/man1/ipack.1 man/man1/shp2pcx.1 man/man1/splitshp.1 man/man1/textpack.1 +man/man1/ucc.1 man/man6/exult.6 share/applications/exult.desktop +share/exult/bg_mr_faces.vga +share/exult/bg_paperdol.vga share/exult/exult.flx share/exult/exult_bg.flx share/exult/exult_si.flx diff --git a/games/exult/distinfo b/games/exult/distinfo index 6ccefbb6fc1..4a3f71682be 100644 --- a/games/exult/distinfo +++ b/games/exult/distinfo @@ -1,45 +1,6 @@ -$NetBSD: distinfo,v 1.7 2012/07/03 18:42:31 joerg Exp $ +$NetBSD: distinfo,v 1.8 2015/04/19 19:30:12 wiz 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) = 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) = 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 -SHA1 (patch-usecode_ucxt_include_ops.h) = aca520d3b8d0d72ae918935f11f164ca0e633a81 -SHA1 (patch-usecode_useval.h) = 101dfb391a00bd99bbdacd4f71f6b22b9c38a214 -SHA1 (patch-vec.h) = 368d369fada797f90ea22919c1410f5b726eae0c +SHA1 (exult-1.4.9rc1.tar.gz) = 259f778d6b8b5e9c9466e2f4967b6352435b6792 +RMD160 (exult-1.4.9rc1.tar.gz) = 8c6fce2bc17ff59709c5827c5dd70f2e2a473914 +Size (exult-1.4.9rc1.tar.gz) = 5452640 bytes +SHA1 (patch-configure) = 0812526182ffa1746c45fd5a005ca8b10fd50093 diff --git a/games/exult/patches/patch-aa b/games/exult/patches/patch-aa deleted file mode 100644 index 567cb4915d5..00000000000 --- a/games/exult/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/12/26 18:53:31 wiz Exp $ - ---- files/zip/unzip.h.orig 2003-09-20 17:02:02.000000000 +0200 -+++ files/zip/unzip.h -@@ -54,6 +54,10 @@ extern "C" { - #include "zlib.h" - #endif - -+#ifndef OF -+#define OF(x) x -+#endif -+ - #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) - /* like the STRICT of WIN32, we define a pointer that cannot be converted - from (void*) without cast */ diff --git a/games/exult/patches/patch-ab b/games/exult/patches/patch-ab deleted file mode 100644 index 2d82cecb47c..00000000000 --- a/games/exult/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/12/26 18:53:31 wiz Exp $ - ---- files/zip/zip.h.orig 2003-09-20 17:02:02.000000000 +0200 -+++ files/zip/zip.h -@@ -58,6 +58,10 @@ extern "C" { - #include "zlib.h" - #endif - -+#ifndef OF -+#define OF(x) x -+#endif -+ - #if defined(STRICTZIP) || defined(STRICTZIPUNZIP) - /* like the STRICT of WIN32, we define a pointer that cannot be converted - from (void*) without cast */ diff --git a/games/exult/patches/patch-ac b/games/exult/patches/patch-ac deleted file mode 100644 index c5f4b218865..00000000000 --- a/games/exult/patches/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2011/11/25 21:53:26 joerg Exp $ - ---- 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> --# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) -+# if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ > 3) - using __gnu_cxx::hash_map; - # else - using std::hash_map; -@@ -44,7 +45,7 @@ using std::hash_map; - #else - #if HAVE_EXT_HASH_SET - # include <ext/hash_set> --# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) -+# if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ > 3) - using __gnu_cxx::hash_set; - # else - using std::hash_set; diff --git a/games/exult/patches/patch-actions.cc b/games/exult/patches/patch-actions.cc deleted file mode 100644 index 367da77d866..00000000000 --- a/games/exult/patches/patch-actions.cc +++ /dev/null @@ -1,13 +0,0 @@ -$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-ad b/games/exult/patches/patch-ad deleted file mode 100644 index 0cf54ef52cb..00000000000 --- a/games/exult/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2009/08/24 11:39:21 obache Exp $ - ---- mouse.h.orig 2003-08-31 17:32:24.000000000 +0000 -+++ mouse.h -@@ -27,6 +27,8 @@ - #include "vgafile.h" - #include "glshape.h" - -+class Game_window; -+ - /* - * Handle custom mouse pointers. - */ diff --git a/games/exult/patches/patch-ae b/games/exult/patches/patch-ae deleted file mode 100644 index 58ad74c7f34..00000000000 --- a/games/exult/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2008/07/27 20:14:14 dholland Exp $ - ---- audio/midi_drivers/fmopldrv.h~ 2002-08-06 14:10:31.000000000 -0400 -+++ audio/midi_drivers/fmopldrv.h 2008-07-27 14:03:16.000000000 -0400 -@@ -76,7 +76,7 @@ - /* output a packed midi command to the midi stream - * valid only if mode is MO_SIMPLE - */ -- void OplDriver::send(uint32 b); -+ void send(uint32 b); - - /* retrieve a string representation of an error code */ - static const char *get_error_name(int error_code); diff --git a/games/exult/patches/patch-af b/games/exult/patches/patch-af deleted file mode 100644 index 36bb1b93557..00000000000 --- a/games/exult/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2008/07/27 20:14:14 dholland Exp $ - ---- usecode/ucxt/include/ucfunc.h~ 2003-08-31 13:32:28.000000000 -0400 -+++ usecode/ucxt/include/ucfunc.h 2008-07-27 14:07:35.000000000 -0400 -@@ -206,7 +206,7 @@ - bool output_list(std::ostream &o, unsigned int funcno, const UCOptions &options); - - bool output_ucs(std::ostream &o, const FuncMap &funcmap, const std::map<unsigned int, std::string> &intrinsics, const UCOptions &options); -- std::ostream &UCFunc::output_ucs_funcname(std::ostream &o, const FuncMap &funcmap); -+ std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap); - std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap, - unsigned int funcid, - unsigned int numargs, bool return_var); diff --git a/games/exult/patches/patch-ag b/games/exult/patches/patch-ag deleted file mode 100644 index c25f309d6d0..00000000000 --- a/games/exult/patches/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2008/07/27 20:14:14 dholland Exp $ - ---- usecode/useval.cc~ 2004-05-23 01:07:11.000000000 -0400 -+++ usecode/useval.cc 2008-07-27 14:20:59.000000000 -0400 -@@ -464,7 +464,8 @@ - if (buflen < 5) - return -1; - *ptr++ = type; -- Write4(ptr, (int)value.ptr); -+ /* this may truncate the pointer! */ -+ Write4(ptr, (int32_t)(intptr_t)value.ptr); - break; - case string_type: - { diff --git a/games/exult/patches/patch-args.cc b/games/exult/patches/patch-args.cc deleted file mode 100644 index 32daa837528..00000000000 --- a/games/exult/patches/patch-args.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index dbe2141987a..00000000000 --- a/games/exult/patches/patch-audio_xmidi.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index f43eef3b2ac..00000000000 --- a/games/exult/patches/patch-conf_Configuration.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index ed3e48f0c3d..00000000000 --- a/games/exult/patches/patch-conf_xmain.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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-configure b/games/exult/patches/patch-configure new file mode 100644 index 00000000000..29b2bfd6c1a --- /dev/null +++ b/games/exult/patches/patch-configure @@ -0,0 +1,24 @@ +$NetBSD: patch-configure,v 1.1 2015/04/19 19:30:13 wiz Exp $ + +Fix unportable test(1) operator. + +--- configure.orig 2010-10-21 18:26:56.000000000 +0000 ++++ configure +@@ -21550,7 +21550,7 @@ fi + # --------------------------------------------------------------------- + # Black magic for static linking. + # --------------------------------------------------------------------- +-if test x$ARCH == xmacosx; then ++if test x$ARCH = xmacosx; then + + # Check whether --with-macosx-static-lib-path was given. + if test "${with_macosx_static_lib_path+set}" = set; then +@@ -22170,7 +22170,7 @@ if test x$enable_zip_support = xyes ; th + # if test x$GCC = xyes ; then + # ZLIB_LIBS="-Wl,-Bstatic -lz -Wl,-Bdynamic" + # else +- if test x$enable_static_libs == xno -o x$ARCH != xmacosx; then ++ if test x$enable_static_libs = xno -o x$ARCH != xmacosx; then + ZLIB_LIBS="-lz" + fi + # fi diff --git a/games/exult/patches/patch-files_Flex.h b/games/exult/patches/patch-files_Flex.h deleted file mode 100644 index f3944328c24..00000000000 --- a/games/exult/patches/patch-files_Flex.h +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 71502f0feb6..00000000000 --- a/games/exult/patches/patch-files_IFF.h +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index dddd0ea77f8..00000000000 --- a/games/exult/patches/patch-files_Table.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index de52f63ddab..00000000000 --- a/games/exult/patches/patch-files_U7file.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index e777d5bdf0e..00000000000 --- a/games/exult/patches/patch-files_listfiles.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index a07d7092f9a..00000000000 --- a/games/exult/patches/patch-files_msgfile.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index b95e2d562a3..00000000000 --- a/games/exult/patches/patch-files_utils.h +++ /dev/null @@ -1,76 +0,0 @@ -$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 deleted file mode 100644 index 6c9947c9592..00000000000 --- a/games/exult/patches/patch-imagewin_ibuf8.cc +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index d2366ba2201..00000000000 --- a/games/exult/patches/patch-objs_chunkter.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 887f51c6962..00000000000 --- a/games/exult/patches/patch-party.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 7360ea1dabe..00000000000 --- a/games/exult/patches/patch-server_objserial.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index da07a723ed3..00000000000 --- a/games/exult/patches/patch-server_server.cc +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 8ad9d4f810b..00000000000 --- a/games/exult/patches/patch-shapes_shapeinf.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 6603e0527bf..00000000000 --- a/games/exult/patches/patch-shapes_shapewrite.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 6f72c612b97..00000000000 --- a/games/exult/patches/patch-tools_cmanip.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 0f2d8c9ee3c..00000000000 --- a/games/exult/patches/patch-tools_splitshp.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index e71b21db6aa..00000000000 --- a/games/exult/patches/patch-usecode_compiler_ucfun.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index fec3d1f8e2e..00000000000 --- a/games/exult/patches/patch-usecode_compiler_uclex.ll +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index fc457933b3e..00000000000 --- a/games/exult/patches/patch-usecode_compiler_ucloc.cc +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-usecode_compiler_ucloc.cc,v 1.2 2011/12/21 16:58:15 dholland Exp $ - -- 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 - - #include <iostream> -+#include <cstring> - #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 deleted file mode 100644 index 12c899f22d5..00000000000 --- a/games/exult/patches/patch-usecode_compiler_ucloc.h +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index 26247befae8..00000000000 --- a/games/exult/patches/patch-usecode_compiler_ucmain.cc +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-usecode_compiler_ucmain.cc,v 1.2 2011/12/21 16:58:15 dholland Exp $ - - - 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> - #include <unistd.h> - #include <stdio.h> -+#include <cstring> - #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 deleted file mode 100644 index dab07b1d0bb..00000000000 --- a/games/exult/patches/patch-usecode_compiler_ucparse.yy +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-usecode_compiler_ucparse.yy,v 1.2 2011/12/21 16:58:15 dholland Exp $ - - - 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> - #include <stdio.h> - #include <stdlib.h> --#include <string.h> -+#include <cstring> - #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 *, diff --git a/games/exult/patches/patch-usecode_compiler_ucsym.cc b/games/exult/patches/patch-usecode_compiler_ucsym.cc deleted file mode 100644 index d08268610ba..00000000000 --- a/games/exult/patches/patch-usecode_compiler_ucsym.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index a62e35b16f8..00000000000 --- a/games/exult/patches/patch-usecode_ucmachine.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 58a2c1b9faa..00000000000 --- a/games/exult/patches/patch-usecode_ucxt_head2data.cc +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 1172f3c246f..00000000000 --- a/games/exult/patches/patch-usecode_ucxt_include_ops.h +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 200cf2407a4..00000000000 --- a/games/exult/patches/patch-usecode_useval.h +++ /dev/null @@ -1,12 +0,0 @@ -$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 diff --git a/games/exult/patches/patch-vec.h b/games/exult/patches/patch-vec.h deleted file mode 100644 index a630762190d..00000000000 --- a/games/exult/patches/patch-vec.h +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-vec.h,v 1.1 2012/07/03 18:42:31 joerg Exp $ - ---- vec.h.orig 2012-07-03 12:50:54.000000000 +0000 -+++ vec.h -@@ -33,7 +33,7 @@ public: - Exult_vector<T>() : baseClass() - {} - Exult_vector<T>(size_type n) : baseClass() -- { reserve(n); } -+ { this->reserve(n); } - - #ifndef MACOS /* should be something like PROPER_STD_CPP_LIB or so */ - T& at(int i) { return (*this)[i]; } -@@ -42,8 +42,8 @@ public: - { - if (i >= (int)this->size()) - { -- insert(this->begin() + this->size(), i - this->size(), 0); -- push_back(v); -+ this->insert(this->begin() + this->size(), i - this->size(), 0); -+ this->push_back(v); - } - else - (*this)[i] = v; -@@ -69,7 +69,7 @@ public: - - size_type append( const T& obj ) - { -- push_back( obj ); -+ this->push_back( obj ); - return this->size() - 1; - } - -@@ -80,7 +80,7 @@ public: - { - if( *X == obj ) - { -- erase(X); -+ this->erase(X); - return; - } - } |