7kaa: Update to 2.15.3

This release fixes bugs, improves synchronization in multiplayer, has UI fixes, and adds several advanced config options.

Summary of changes from 2.15.2 to 2.15.3

- Fixed corrupt characters and fields in various in game messages.
- Improved translation support.
- Updated translations.
- Added some UI improvements.
- Fixed some crashing issues related to spies.
- Standardized on FPU code generation for better cross-platform compatibility.
- Added more advanced config options.
- Added more advanced config options.
- Improved manual.
- Added key binding support.
- Prevented chat keystrokes registering as a hotkey too.
- Fixed sometimes hiring wrong unit in the inn.
- Added scenario advanced config presets to restore default scenario game play to original game design parameters.
- Ensure screen redraw when dropping spy identity.
- Improved alternate font set.
- Added scroll button for long tutor messages.
- Removed gong sound for unsent AI diplomatic messages.
- Re-enabled AI ability to request direct military aid; expect allied AI to work together on defending now.
- Removed uninitialized parameter in Caravan CRC check.
- Removed improper variable-size cast, causing incorrect action processing on 64-bit platforms.
- Correct replay initialization for weather sync.

4 files changed, 17 insertions, 15 deletions

diff --git a/games/7kaa/Makefile b/games/7kaa/Makefile
index 61acb199fcd..ed6935aa93a 100644
--- a/games/7kaa/Makefile
+++ b/games/7kaa/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2019/11/30 11:47:15 nia Exp $
+# $NetBSD: Makefile,v 1.7 2020/01/08 16:59:07 nia Exp $
 
-DISTNAME=	7kaa-2.15.2
-PKGREVISION=	4
+DISTNAME=	7kaa-2.15.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=the3dfxdude/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/games/7kaa/PLIST b/games/7kaa/PLIST
index 9201d0b0623..25d2b6baba6 100644
--- a/games/7kaa/PLIST
+++ b/games/7kaa/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/11/30 11:47:15 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/01/08 16:59:07 nia Exp $
 bin/7kaa
 share/7kaa/ENCYC/FIRM/FACTORY.COL
 share/7kaa/ENCYC/FIRM/FACTORY.ICN
@@ -310,6 +310,7 @@ share/7kaa/SCENARI2/SCN_14.SCT
 share/7kaa/SCENARI2/SCN_15.SCN
 share/7kaa/SCENARI2/SCN_15.SCP
 share/7kaa/SCENARI2/SCN_15.SCT
+share/7kaa/SCENARI2/config.txt
 share/7kaa/SCENARIO/7FOR7.SCN
 share/7kaa/SCENARIO/7FOR7.SCP
 share/7kaa/SCENARIO/7FOR7.SCT
@@ -379,6 +380,7 @@ share/7kaa/SCENARIO/VIKBLITZ.SCT
 share/7kaa/SCENARIO/WEAKENED.SCN
 share/7kaa/SCENARIO/WEAKENED.SCP
 share/7kaa/SCENARIO/WEAKENED.SCT
+share/7kaa/SCENARIO/config.txt
 share/7kaa/SOUND/FIRE.WAV
 share/7kaa/SOUND/QUAKE.WAV
 share/7kaa/SOUND/RAIN.WAV
@@ -494,6 +496,7 @@ share/7kaa/TUTORIAL/8FRYHTAN.TUT
 share/7kaa/TUTORIAL/9SEATPOW.TUT
 share/7kaa/TUTORIAL/LOYALTY.TUT
 share/7kaa/TUTORIAL/SPYING.TUT
+share/7kaa/TUTORIAL/config.txt
 share/applications/7kaa.desktop
 share/doc/7kaa/COPYING
 share/doc/7kaa/README
diff --git a/games/7kaa/distinfo b/games/7kaa/distinfo
index 74a12635262..b91bd8cbb78 100644
--- a/games/7kaa/distinfo
+++ b/games/7kaa/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/10/25 10:00:58 kamil Exp $
+$NetBSD: distinfo,v 1.4 2020/01/08 16:59:07 nia Exp $
 
-SHA1 (7kaa-2.15.2.tar.xz) = 12ee27dc4f49e969edfff7593b06ac47f22ca6b7
-RMD160 (7kaa-2.15.2.tar.xz) = 39a358665bb5e88643d124cdee70da6558a50ca9
-SHA512 (7kaa-2.15.2.tar.xz) = df053b9934fa3fc32a9a0a239fdafdfb7e441b7e98e280d1c74622f867919be48335ddbc54abb06b12b11e4a84b7a20ebb244fac9e4d7aebb8ad3cbe3192c29a
-Size (7kaa-2.15.2.tar.xz) = 46821276 bytes
-SHA1 (patch-src_LocaleRes.cpp) = e7d1be36769b225912930960771dab9ea6290e72
+SHA1 (7kaa-2.15.3.tar.xz) = 25f680eb2e11e53bc04d6b9ecd5bc679b5b3cd22
+RMD160 (7kaa-2.15.3.tar.xz) = e48c20243efa42775d9fd2c452b01aa364082b8d
+SHA512 (7kaa-2.15.3.tar.xz) = 8881f73d1182bdeb6676484f9bf3cf3e48defda5cc40d9864fe3425c27666d2ace8e566052c0d8d1e00f5c9e1a044660653e5851513a00e656c975450a765554
+Size (7kaa-2.15.3.tar.xz) = 46852980 bytes
+SHA1 (patch-src_LocaleRes.cpp) = c1e8f370d0add3ef744aa430fab2ce11424dcdec
diff --git a/games/7kaa/patches/patch-src_LocaleRes.cpp b/games/7kaa/patches/patch-src_LocaleRes.cpp
index 7bd5b0f63de..2e057ef1d51 100644
--- a/games/7kaa/patches/patch-src_LocaleRes.cpp
+++ b/games/7kaa/patches/patch-src_LocaleRes.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_LocaleRes.cpp,v 1.3 2019/10/25 10:00:58 kamil Exp $
+$NetBSD: patch-src_LocaleRes.cpp,v 1.4 2020/01/08 16:59:07 nia Exp $
 
 Support NetBSD and SunOS iconv being special.
 
---- src/LocaleRes.cpp.orig	2019-06-22 22:22:26.000000000 +0000
+--- src/LocaleRes.cpp.orig	2019-12-22 22:27:28.000000000 +0000
 +++ src/LocaleRes.cpp
-@@ -30,6 +30,15 @@
- #include <ODB.h>
+@@ -31,6 +31,15 @@
+ #include <ConfigAdv.h>
  #include <LocaleRes.h>
  
 +#if defined(__NetBSD__)
@@ -20,7 +20,7 @@ Support NetBSD and SunOS iconv being special.
  //------------- End of function Constructor -------//
  //
  LocaleRes::LocaleRes()
-@@ -169,7 +178,11 @@ const char *LocaleRes::conv_str(iconv_t 
+@@ -191,7 +200,11 @@ const char *LocaleRes::conv_str(iconv_t 
  	size_t c;
  	while( in_left>0 )
  	{