exult: update to 1.6

04/17/20	v1.6

- A Shortcut bar with important shortcuts right on top of the screen (thanks Litchie)
- Switch to SDL2 - important for up to date OS
- NxBR and HQ3x/HQ4x scalers
- Option to drop stacks of items without confirmation
- Some more combat options to make charmed combat more difficult.
- Schedules got a workover and are more closer to the original but not yet perfect
- NPCs using beds are sleeping better now
- Papederdoll support of wearing diapers
- Portable option for Windows
- Seperate settings for fullscreen and windowed mode possible
- HighDPI mode available on macOS
- Better pathfinding when the party boards a barge
- Fixed most inexplicable crashes
- Serpent Isle Beta version works
- fixed tons of bugs
- Cleaned up the code in many places and fixed many compiler warnings

Known issues:

- Some crashes due to some cached out objects, we are working on this in another branch which will be the main snapshot after this release
- Antimagic rain caused by the cube generator is not dissipating as fast as it should
- Exult does not show the "you have beaten Ultima VII in n days" message
- Exult does not return to the game menu after beating the game (instead it quits)
- The BG intro does not have the proper sound effects
- Fire Elemenatals cannot walk across lava
- Some schedules need more detailed love
- Several bugs that need more in depth looking at but no plot stopping bugs
- When you disable "Gumps pause game", certain events might only happen after you close all gumps

10 files changed, 25 insertions, 152 deletions

diff --git a/games/exult/Makefile b/games/exult/Makefile
index bee89d05b4f..726b45eed1e 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2020/03/20 11:57:40 nia Exp $
+# $NetBSD: Makefile,v 1.29 2021/04/19 10:47:57 nia Exp $
 
-DISTNAME=	exult-1.4.9rc1
-PKGREVISION=	2
+DISTNAME=	exult-1.6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=exult/exult-all-versions/}
 
@@ -11,16 +10,20 @@ COMMENT=	Open-source Ultima 7 engine
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c gnu++03
-USE_TOOLS+=	yacc flex
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config yacc flex
 
-CFLAGS+=		-fpermissive
-LDFLAGS+=		-lz
-CONFIGURE_ARGS+=	--disable-sdltest --disable-oggtest --disable-vorbistest
+# C++17
+GCC_REQD+=	7
+
+CONFIGURE_ARGS+=	--with-sdl=sdl2
+CONFIGURE_ARGS+=	--disable-timidity-midi
+CONFIGURE_ARGS+=	--disable-alsa
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../audio/SDL2_mixer/buildlink3.mk"
+.include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
diff --git a/games/exult/PLIST b/games/exult/PLIST
index 6a92132507b..1ed4fc71275 100644
--- a/games/exult/PLIST
+++ b/games/exult/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.4 2015/04/19 19:30:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/04/19 10:47:57 nia Exp $
+bin/cmanip
 bin/expack
 bin/exult
+bin/mklink
+bin/rip
 bin/shp2pcx
 bin/splitshp
 bin/textpack
-bin/ucc
 bin/ucxt
+bin/wuc
 man/man1/expack.1
 man/man1/exult_studio.1
 man/man1/ipack.1
@@ -19,12 +22,13 @@ share/exult/bg_mr_faces.vga
 share/exult/bg_paperdol.vga
 share/exult/exult.flx
 share/exult/exult_bg.flx
+share/exult/exult_iphone.flx
 share/exult/exult_si.flx
 share/exult/exultmsg.txt
 share/exult/midisfx.flx
 share/exult/u7bgintrinsics.data
 share/exult/u7misc.data
 share/exult/u7opcodes.data
+share/exult/u7sibetaintrinsics.data
 share/exult/u7siintrinsics.data
 share/icons/exult.png
-@pkgdir share/exult/estudio/new
diff --git a/games/exult/distinfo b/games/exult/distinfo
index b8153c1ad21..6becfa249ce 100644
--- a/games/exult/distinfo
+++ b/games/exult/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.13 2020/03/22 18:09:10 tnn Exp $
+$NetBSD: distinfo,v 1.14 2021/04/19 10:47:57 nia Exp $
 
-SHA1 (exult-1.4.9rc1.tar.gz) = 259f778d6b8b5e9c9466e2f4967b6352435b6792
-RMD160 (exult-1.4.9rc1.tar.gz) = 8c6fce2bc17ff59709c5827c5dd70f2e2a473914
-SHA512 (exult-1.4.9rc1.tar.gz) = 0da559ce574a07eba597b44e6ed6ddd72d3db45dfa8f546ef6668277ef178700f4b92bce43b87ad238815eaf64d5ef0fcf6c09b31477e52ea69edce1aa05e302
-Size (exult-1.4.9rc1.tar.gz) = 5452640 bytes
-SHA1 (patch-audio_midi__drivers_forked__player.cc) = 058c77900828cc75643237e5ddbc1d21e67a2337
-SHA1 (patch-configure) = 0812526182ffa1746c45fd5a005ca8b10fd50093
-SHA1 (patch-files_U7obj.h) = fc17761779f99f2c2f8e5fa631601db61bb7b78c
-SHA1 (patch-files_databuf.h) = 2a11ad1820ed14ead54bb66d52855d594cf28c5c
-SHA1 (patch-imagewin_manip.h) = d9a90c7fbe046a4079618aeda4c428ef1672525e
-SHA1 (patch-istring.h) = 18e8b49932f7317e6c978c585e1dfe855ac05a51
-SHA1 (patch-usecode_compiler_ucstmt.cc) = 8aadf06c18f347d7de437709e44da86a0783bb1f
+SHA1 (exult-1.6.tar.gz) = 9d0459e24d796193490dfc441351219e1944e92c
+RMD160 (exult-1.6.tar.gz) = d73882320478a90e25bb4bae9f41d500c1823ef4
+SHA512 (exult-1.6.tar.gz) = e786ccc11d3fc1b0747c0c620b51152d09f5157ca1e458a5aecc5e66c91e3222b6ba61311149bd6be83e20d339ea1d6d47640f89cc1750a9720549278a33e1b2
+Size (exult-1.6.tar.gz) = 7906968 bytes
diff --git a/games/exult/patches/patch-audio_midi__drivers_forked__player.cc b/games/exult/patches/patch-audio_midi__drivers_forked__player.cc
deleted file mode 100644
index e3fb6cb864d..00000000000
--- a/games/exult/patches/patch-audio_midi__drivers_forked__player.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-audio_midi__drivers_forked__player.cc,v 1.1 2016/10/16 17:10:49 bsiegert Exp $
-
---- audio/midi_drivers/forked_player.cc.orig	2009-04-21 03:04:37.000000000 +0000
-+++ audio/midi_drivers/forked_player.cc
-@@ -41,7 +41,11 @@ const MidiDriver::MidiDriverDesc forked_
- // NB: This function doesn't return unless execlp fails!
- static  void    playFJmidifile(const char *name)
- {
-+#ifdef __NetBSD__
-+	execlp("midiplay","midiplay","-v","-v",name,(char *)0);
-+#else
- 	execlp("playmidi","playmidi","-v","-v","-e",name,(char *)0);
-+#endif
- }
- 
- forked_player::forked_player() : repeat_(false), forked_job(-1)
diff --git a/games/exult/patches/patch-configure b/games/exult/patches/patch-configure
deleted file mode 100644
index 29b2bfd6c1a..00000000000
--- a/games/exult/patches/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$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_U7obj.h b/games/exult/patches/patch-files_U7obj.h
deleted file mode 100644
index 52789e79a24..00000000000
--- a/games/exult/patches/patch-files_U7obj.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-files_U7obj.h,v 1.1 2020/03/22 18:09:10 tnn Exp $
-
-include <cstddef> for ptrdiff_t
-
---- files/U7obj.h.orig	2010-02-25 02:52:07.000000000 +0000
-+++ files/U7obj.h
-@@ -25,6 +25,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cstddef>
- #include <cstring>
- #include "common_types.h"
- #include "utils.h"
diff --git a/games/exult/patches/patch-files_databuf.h b/games/exult/patches/patch-files_databuf.h
deleted file mode 100644
index c3ec5be71e7..00000000000
--- a/games/exult/patches/patch-files_databuf.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-files_databuf.h,v 1.1 2020/03/22 18:09:10 tnn Exp $
-
-include <cstddef> for ptrdiff_t
-
---- files/databuf.h.orig	2010-03-10 04:07:05.000000000 +0000
-+++ files/databuf.h
-@@ -20,6 +20,7 @@
- #include <cstdio>
- #include <cstring>
- #include <cassert>
-+#include <cstddef>
- #include <fstream>
- #include <string>
- #include <iomanip>
diff --git a/games/exult/patches/patch-imagewin_manip.h b/games/exult/patches/patch-imagewin_manip.h
deleted file mode 100644
index 999a028eca7..00000000000
--- a/games/exult/patches/patch-imagewin_manip.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-imagewin_manip.h,v 1.1 2015/04/25 00:56:04 joerg Exp $
-
-Reference to member of base class must be explicit.
-
---- imagewin/manip.h.orig	2015-04-25 00:01:37.000000000 +0000
-+++ imagewin/manip.h
-@@ -319,7 +319,7 @@ public:
- 	static uintD copy(uintS src)
- 	{
- 		unsigned int r, g, b;
--		split_source(src,r,g,b);
-+		ManipBaseSrc<color_s,color_d>::split_source(src,r,g,b);
- 		return ManipBaseDest<color_d>::rgb(r,g,b);
- 	}
- 	static void copy(uintD& dest, uintS src)
diff --git a/games/exult/patches/patch-istring.h b/games/exult/patches/patch-istring.h
deleted file mode 100644
index c76f1c54aad..00000000000
--- a/games/exult/patches/patch-istring.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-istring.h,v 1.1 2015/04/25 00:56:04 joerg Exp $
-
-append does not depend on the template, so make reference explicit.
-
---- istring.h.orig	2015-04-24 23:56:35.000000000 +0000
-+++ istring.h
-@@ -162,19 +162,19 @@ public:
- 
- 	_Myt& operator+=(const _Myt& _Right)
- 		{	// append _Right
--		append(_Right);
-+		this->append(_Right);
- 		return (*this);
- 		}
- 
- 	_Myt& operator+=(const _Elem *_Ptr)
- 		{	// append [_Ptr, <null>)
--		append(_Ptr);
-+		this->append(_Ptr);
- 		return (*this);
- 		}
- 
- 	_Myt& operator+=(_Elem _Ch)
- 		{	// append 1 * _Ch
--		append(static_cast<size_type>(1), _Ch);
-+		this->append(static_cast<size_type>(1), _Ch);
- 		return (*this);
- 		}
- 
diff --git a/games/exult/patches/patch-usecode_compiler_ucstmt.cc b/games/exult/patches/patch-usecode_compiler_ucstmt.cc
deleted file mode 100644
index 1cdb7bd5108..00000000000
--- a/games/exult/patches/patch-usecode_compiler_ucstmt.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-usecode_compiler_ucstmt.cc,v 1.1 2015/04/25 00:56:04 joerg Exp $
-
-Key function must not be inline, otherwise the vtable is not created.
-
---- usecode/compiler/ucstmt.cc.orig	2015-04-25 00:38:04.000000000 +0000
-+++ usecode/compiler/ucstmt.cc
-@@ -808,7 +808,7 @@ void Uc_converse_statement::gen
-  *	Delete.
-  */
- 
--inline Uc_switch_expression_case_statement::~Uc_switch_expression_case_statement
-+Uc_switch_expression_case_statement::~Uc_switch_expression_case_statement
- 	(
- 	)
- 	{