gemrb: Update to 0.8.7

GemRB v0.8.7 (2020-08-23):
  New features:
    - new smarter pathfinder with bumping support
    - animal taming, iwd2 hardcoded saving throw bonuses
    - vcpkg and out-of-the box msvc support
    - non-ascii data filename support

  Improved features:
    - disk reading speedups, ease of setup
    - iwd chargen, pst spell timing, hardcoded overlays, iwd2 casting ai
    - better actor speeds & walk sounds
    - audio, pst ini handling, savegame compatibility, morale handling
    - effects, projectiles, actions, range calculations
    - bugfixes

  Notes:
    - switched to c++11 and cmake 3.1 as a minimum
    - dropped windows 9x compatibility

7 files changed, 138 insertions, 27 deletions

diff --git a/games/gemrb/MESSAGE b/games/gemrb/MESSAGE
index 0876b7ac1f4..71e2288ba60 100644
--- a/games/gemrb/MESSAGE
+++ b/games/gemrb/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2019/11/13 19:40:48 nia Exp $
+$NetBSD: MESSAGE,v 1.3 2020/08/31 12:46:21 nia Exp $
 
 To install the DRM-free version of Baldur's Gate:
 
@@ -9,5 +9,6 @@ $ mkdir ~/.gemrb
 $ cp ${PREFIX}/share/examples/gemrb/GemRB.cfg.sample ~/.gemrb/gemrb.cfg
 
 Edit ~/.gemrb/gemrb.cfg and change the GamePath to ~/BaldursGate.
+Uncomment GemRBPath=${PREFIX}/share/gemrb.
 
 ===========================================================================
diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile
index f2771e040f2..ba8aba40035 100644
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2020/08/18 17:57:51 leot Exp $
+# $NetBSD: Makefile,v 1.6 2020/08/31 12:46:21 nia Exp $
 
-DISTNAME=	gemrb-0.8.6
-PKGREVISION=	2
+DISTNAME=	gemrb-0.8.7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=gemrb/}
-GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gemrb.org/
@@ -15,6 +14,8 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
+GCC_REQD+=	4.7 # -std=gnu++11
+
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/gemrb
 
 CMAKE_ARGS+=	-DDISABLE_WERROR=ON
diff --git a/games/gemrb/PLIST b/games/gemrb/PLIST
index aaa42936440..19d10c77cc0 100644
--- a/games/gemrb/PLIST
+++ b/games/gemrb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/11/26 18:42:03 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/08/31 12:46:21 nia Exp $
 bin/extend2da.py
 bin/gemrb
 lib/gemrb/libgemrb_core.so
@@ -35,6 +35,7 @@ lib/gemrb/plugins/PNGImporter.so
 lib/gemrb/plugins/PROImporter.so
 lib/gemrb/plugins/PSTOpcodes.so
 lib/gemrb/plugins/SAVImporter.so
+lib/gemrb/plugins/SDLAudio.so
 lib/gemrb/plugins/SDLVideo.so
 lib/gemrb/plugins/SPLImporter.so
 lib/gemrb/plugins/STOImporter.so
@@ -62,16 +63,6 @@ share/doc/gemrb/en/Engine/Projectile.txt
 share/doc/gemrb/en/Engine/Triggers.txt
 share/doc/gemrb/en/Engine/Usability.txt
 share/doc/gemrb/en/EngineChanges.txt
-share/doc/gemrb/en/GUIScript/accessing_gui_controls.txt
-share/doc/gemrb/en/GUIScript/bit_operation.txt
-share/doc/gemrb/en/GUIScript/console.txt
-share/doc/gemrb/en/GUIScript/controls.txt
-share/doc/gemrb/en/GUIScript/data_exchange.txt
-share/doc/gemrb/en/GUIScript/doc_template.txt
-share/doc/gemrb/en/GUIScript/index.txt
-share/doc/gemrb/en/GUIScript/reserved_functions.txt
-share/doc/gemrb/en/GUIScript/start.txt
-share/doc/gemrb/en/Release.md
 share/doc/gemrb/en/Tables/HPBARB.txt
 share/doc/gemrb/en/Tables/ability.txt
 share/doc/gemrb/en/Tables/aligns.txt
@@ -130,6 +121,7 @@ share/doc/gemrb/en/Tables/wstwohnd.txt
 share/doc/gemrb/en/Tables/wstwowpn.txt
 share/doc/gemrb/en/default_ini.txt
 share/doc/gemrb/en/gemrb_ini.txt
+share/examples/gemrb/GemRB.cfg
 share/examples/gemrb/GemRB.cfg.noinstall.sample
 share/examples/gemrb/GemRB.cfg.sample
 share/gemrb/GUIScripts/Actor.py
@@ -476,6 +468,7 @@ share/gemrb/unhardcoded/bg1/polish.ini
 share/gemrb/unhardcoded/bg1/proftype.2da
 share/gemrb/unhardcoded/bg1/qslots.2da
 share/gemrb/unhardcoded/bg1/races.2da
+share/gemrb/unhardcoded/bg1/racethac.2da
 share/gemrb/unhardcoded/bg1/randitem.2da
 share/gemrb/unhardcoded/bg1/restmov.2da
 share/gemrb/unhardcoded/bg1/savegame.2da
@@ -603,6 +596,7 @@ share/gemrb/unhardcoded/bg2/lightbnb.pro
 share/gemrb/unhardcoded/bg2/magesch.2da
 share/gemrb/unhardcoded/bg2/modal.2da
 share/gemrb/unhardcoded/bg2/monkbon.2da
+share/gemrb/unhardcoded/bg2/moverate.2da
 share/gemrb/unhardcoded/bg2/overlay.2da
 share/gemrb/unhardcoded/bg2/pathfind.2da
 share/gemrb/unhardcoded/bg2/pdolls.2da
@@ -611,6 +605,7 @@ share/gemrb/unhardcoded/bg2/proftype.2da
 share/gemrb/unhardcoded/bg2/qslot2.2da
 share/gemrb/unhardcoded/bg2/qslots.2da
 share/gemrb/unhardcoded/bg2/races.2da
+share/gemrb/unhardcoded/bg2/racethac.2da
 share/gemrb/unhardcoded/bg2/randitem.2da
 share/gemrb/unhardcoded/bg2/rest.spl
 share/gemrb/unhardcoded/bg2/restmov.2da
@@ -628,7 +623,9 @@ share/gemrb/unhardcoded/bg2/spfdeath.pro
 share/gemrb/unhardcoded/bg2/spfirewl.pro
 share/gemrb/unhardcoded/bg2/spgenhla.pro
 share/gemrb/unhardcoded/bg2/spholymt.pro
+share/gemrb/unhardcoded/bg2/splbrdkn.2da
 share/gemrb/unhardcoded/bg2/splspec.2da
+share/gemrb/unhardcoded/bg2/splwizkn.2da
 share/gemrb/unhardcoded/bg2/spscorch.pro
 share/gemrb/unhardcoded/bg2/spscoric.pro
 share/gemrb/unhardcoded/bg2/spshield.vvc
@@ -661,6 +658,7 @@ share/gemrb/unhardcoded/how/alterap.pro
 share/gemrb/unhardcoded/how/alteras.pro
 share/gemrb/unhardcoded/how/alterh.pro
 share/gemrb/unhardcoded/how/altert.pro
+share/gemrb/unhardcoded/how/amshelc.vvc
 share/gemrb/unhardcoded/how/area1np.pro
 share/gemrb/unhardcoded/how/area1p.pro
 share/gemrb/unhardcoded/how/area2.pro
@@ -711,7 +709,6 @@ share/gemrb/unhardcoded/how/cfelemh.pro
 share/gemrb/unhardcoded/how/cfelemx.pro
 share/gemrb/unhardcoded/how/cfog.pro
 share/gemrb/unhardcoded/how/cgraceh.pro
-share/gemrb/unhardcoded/how/cgtable.2da
 share/gemrb/unhardcoded/how/chant.pro
 share/gemrb/unhardcoded/how/chromorb.pro
 share/gemrb/unhardcoded/how/clabdrui.2da
@@ -726,7 +723,6 @@ share/gemrb/unhardcoded/how/cloudkil.pro
 share/gemrb/unhardcoded/how/cloudks.pro
 share/gemrb/unhardcoded/how/clowncol.2da
 share/gemrb/unhardcoded/how/clskills.2da
-share/gemrb/unhardcoded/how/clssplab.2da
 share/gemrb/unhardcoded/how/clwounh.pro
 share/gemrb/unhardcoded/how/cmdamah.pro
 share/gemrb/unhardcoded/how/cmwounh.pro
@@ -735,6 +731,7 @@ share/gemrb/unhardcoded/how/cobonh1.pro
 share/gemrb/unhardcoded/how/cobonh2.pro
 share/gemrb/unhardcoded/how/cocold.pro
 share/gemrb/unhardcoded/how/cocoldh.pro
+share/gemrb/unhardcoded/how/cofearc.vvc
 share/gemrb/unhardcoded/how/cofire.pro
 share/gemrb/unhardcoded/how/coldh.pro
 share/gemrb/unhardcoded/how/colrspry.pro
@@ -814,6 +811,7 @@ share/gemrb/unhardcoded/how/gender.2da
 share/gemrb/unhardcoded/how/golcloud.pro
 share/gemrb/unhardcoded/how/grease.pro
 share/gemrb/unhardcoded/how/gshout.pro
+share/gemrb/unhardcoded/how/gsolac1.vvc
 share/gemrb/unhardcoded/how/guibtact.2da
 share/gemrb/unhardcoded/how/guils.chu
 share/gemrb/unhardcoded/how/harmh.pro
@@ -853,6 +851,7 @@ share/gemrb/unhardcoded/how/malison.pro
 share/gemrb/unhardcoded/how/mfmiss.pro
 share/gemrb/unhardcoded/how/mfmiss2.pro
 share/gemrb/unhardcoded/how/mfmissh.pro
+share/gemrb/unhardcoded/how/mgoinvc.vvc
 share/gemrb/unhardcoded/how/mmagich.pro
 share/gemrb/unhardcoded/how/mmissile.pro
 share/gemrb/unhardcoded/how/moelda.pro
@@ -862,6 +861,7 @@ share/gemrb/unhardcoded/how/mspore.pro
 share/gemrb/unhardcoded/how/msumm1.pro
 share/gemrb/unhardcoded/how/msumm1h.pro
 share/gemrb/unhardcoded/how/msumm1x.pro
+share/gemrb/unhardcoded/how/msumm1x.vvc
 share/gemrb/unhardcoded/how/msumm2h.pro
 share/gemrb/unhardcoded/how/msumm3h.pro
 share/gemrb/unhardcoded/how/msumm4h.pro
@@ -874,11 +874,13 @@ share/gemrb/unhardcoded/how/necroh.pro
 share/gemrb/unhardcoded/how/necrot.pro
 share/gemrb/unhardcoded/how/npoisoh.pro
 share/gemrb/unhardcoded/how/ofsphe.pro
+share/gemrb/unhardcoded/how/orsphec.vvc
 share/gemrb/unhardcoded/how/overlay.2da
 share/gemrb/unhardcoded/how/paralh.pro
 share/gemrb/unhardcoded/how/pathfind.2da
 share/gemrb/unhardcoded/how/pdolls.2da
 share/gemrb/unhardcoded/how/pfire.pro
+share/gemrb/unhardcoded/how/pfnmisc.vvc
 share/gemrb/unhardcoded/how/pictures.2da
 share/gemrb/unhardcoded/how/poisimm.spl
 share/gemrb/unhardcoded/how/poisonh.pro
@@ -899,6 +901,7 @@ share/gemrb/unhardcoded/how/pwstun.pro
 share/gemrb/unhardcoded/how/pwstunh.pro
 share/gemrb/unhardcoded/how/qslots.2da
 share/gemrb/unhardcoded/how/races.2da
+share/gemrb/unhardcoded/how/racethac.2da
 share/gemrb/unhardcoded/how/rad100.pro
 share/gemrb/unhardcoded/how/rad250.pro
 share/gemrb/unhardcoded/how/randitem.2da
@@ -917,6 +920,7 @@ share/gemrb/unhardcoded/how/schargh.pro
 share/gemrb/unhardcoded/how/script.2da
 share/gemrb/unhardcoded/how/seater.pro
 share/gemrb/unhardcoded/how/seaterh.pro
+share/gemrb/unhardcoded/how/seyesc1.vvc
 share/gemrb/unhardcoded/how/sgrowth.pro
 share/gemrb/unhardcoded/how/shout.pro
 share/gemrb/unhardcoded/how/shroud.pro
@@ -925,8 +929,10 @@ share/gemrb/unhardcoded/how/skills.2da
 share/gemrb/unhardcoded/how/sleep.pro
 share/gemrb/unhardcoded/how/slivinh.pro
 share/gemrb/unhardcoded/how/slottype.2da
+share/gemrb/unhardcoded/how/soflamc.vvc
 share/gemrb/unhardcoded/how/soflamh.pro
 share/gemrb/unhardcoded/how/sohope.pro
+share/gemrb/unhardcoded/how/solatc1.vvc
 share/gemrb/unhardcoded/how/sooneh.pro
 share/gemrb/unhardcoded/how/sopain.pro
 share/gemrb/unhardcoded/how/sparbknp.pro
@@ -982,6 +988,7 @@ share/gemrb/unhardcoded/how/spoisoh.pro
 share/gemrb/unhardcoded/how/spscorch.pro
 share/gemrb/unhardcoded/how/spscoric.pro
 share/gemrb/unhardcoded/how/spwrath.pro
+share/gemrb/unhardcoded/how/sshellc.vvc
 share/gemrb/unhardcoded/how/ssorbh.pro
 share/gemrb/unhardcoded/how/ssswarm.pro
 share/gemrb/unhardcoded/how/sstone.pro
@@ -1006,6 +1013,7 @@ share/gemrb/unhardcoded/how/uward.pro
 share/gemrb/unhardcoded/how/uwardh.pro
 share/gemrb/unhardcoded/how/vcremap.2da
 share/gemrb/unhardcoded/how/vspherh.pro
+share/gemrb/unhardcoded/how/walksnd.2da
 share/gemrb/unhardcoded/how/wdeath1.pro
 share/gemrb/unhardcoded/how/wdeath2.pro
 share/gemrb/unhardcoded/how/weapprof.2da
@@ -1036,6 +1044,7 @@ share/gemrb/unhardcoded/iwd/alterap.pro
 share/gemrb/unhardcoded/iwd/alteras.pro
 share/gemrb/unhardcoded/iwd/alterh.pro
 share/gemrb/unhardcoded/iwd/altert.pro
+share/gemrb/unhardcoded/iwd/amshelc.vvc
 share/gemrb/unhardcoded/iwd/area1np.pro
 share/gemrb/unhardcoded/iwd/area1p.pro
 share/gemrb/unhardcoded/iwd/area2.pro
@@ -1085,7 +1094,6 @@ share/gemrb/unhardcoded/iwd/cfelemh.pro
 share/gemrb/unhardcoded/iwd/cfelemx.pro
 share/gemrb/unhardcoded/iwd/cfog.pro
 share/gemrb/unhardcoded/iwd/cgraceh.pro
-share/gemrb/unhardcoded/iwd/cgtable.2da
 share/gemrb/unhardcoded/iwd/chant.pro
 share/gemrb/unhardcoded/iwd/chromorb.pro
 share/gemrb/unhardcoded/iwd/clabdrui.2da
@@ -1100,7 +1108,6 @@ share/gemrb/unhardcoded/iwd/cloudkil.pro
 share/gemrb/unhardcoded/iwd/cloudks.pro
 share/gemrb/unhardcoded/iwd/clowncol.2da
 share/gemrb/unhardcoded/iwd/clskills.2da
-share/gemrb/unhardcoded/iwd/clssplab.2da
 share/gemrb/unhardcoded/iwd/clwounh.pro
 share/gemrb/unhardcoded/iwd/cmdamah.pro
 share/gemrb/unhardcoded/iwd/cmwounh.pro
@@ -1109,6 +1116,7 @@ share/gemrb/unhardcoded/iwd/cobonh1.pro
 share/gemrb/unhardcoded/iwd/cobonh2.pro
 share/gemrb/unhardcoded/iwd/cocold.pro
 share/gemrb/unhardcoded/iwd/cocoldh.pro
+share/gemrb/unhardcoded/iwd/cofearc.vvc
 share/gemrb/unhardcoded/iwd/cofire.pro
 share/gemrb/unhardcoded/iwd/coldh.pro
 share/gemrb/unhardcoded/iwd/colrspry.pro
@@ -1186,6 +1194,7 @@ share/gemrb/unhardcoded/iwd/gender.2da
 share/gemrb/unhardcoded/iwd/golcloud.pro
 share/gemrb/unhardcoded/iwd/grease.pro
 share/gemrb/unhardcoded/iwd/gshout.pro
+share/gemrb/unhardcoded/iwd/gsolac1.vvc
 share/gemrb/unhardcoded/iwd/guibtact.2da
 share/gemrb/unhardcoded/iwd/guils.chu
 share/gemrb/unhardcoded/iwd/harmh.pro
@@ -1224,6 +1233,7 @@ share/gemrb/unhardcoded/iwd/malison.pro
 share/gemrb/unhardcoded/iwd/mfmiss.pro
 share/gemrb/unhardcoded/iwd/mfmiss2.pro
 share/gemrb/unhardcoded/iwd/mfmissh.pro
+share/gemrb/unhardcoded/iwd/mgoinvc.vvc
 share/gemrb/unhardcoded/iwd/mmagich.pro
 share/gemrb/unhardcoded/iwd/mmissile.pro
 share/gemrb/unhardcoded/iwd/moelda.pro
@@ -1234,6 +1244,7 @@ share/gemrb/unhardcoded/iwd/mspore.pro
 share/gemrb/unhardcoded/iwd/msumm1.pro
 share/gemrb/unhardcoded/iwd/msumm1h.pro
 share/gemrb/unhardcoded/iwd/msumm1x.pro
+share/gemrb/unhardcoded/iwd/msumm1x.vvc
 share/gemrb/unhardcoded/iwd/msumm2h.pro
 share/gemrb/unhardcoded/iwd/msumm3h.pro
 share/gemrb/unhardcoded/iwd/msumm4h.pro
@@ -1246,11 +1257,13 @@ share/gemrb/unhardcoded/iwd/necroh.pro
 share/gemrb/unhardcoded/iwd/necrot.pro
 share/gemrb/unhardcoded/iwd/npoisoh.pro
 share/gemrb/unhardcoded/iwd/ofsphe.pro
+share/gemrb/unhardcoded/iwd/orsphec.vvc
 share/gemrb/unhardcoded/iwd/overlay.2da
 share/gemrb/unhardcoded/iwd/paralh.pro
 share/gemrb/unhardcoded/iwd/pathfind.2da
 share/gemrb/unhardcoded/iwd/pdolls.2da
 share/gemrb/unhardcoded/iwd/pfire.pro
+share/gemrb/unhardcoded/iwd/pfnmisc.vvc
 share/gemrb/unhardcoded/iwd/pictures.2da
 share/gemrb/unhardcoded/iwd/poisonh.pro
 share/gemrb/unhardcoded/iwd/pomab.2da
@@ -1270,6 +1283,7 @@ share/gemrb/unhardcoded/iwd/pwstun.pro
 share/gemrb/unhardcoded/iwd/pwstunh.pro
 share/gemrb/unhardcoded/iwd/qslots.2da
 share/gemrb/unhardcoded/iwd/races.2da
+share/gemrb/unhardcoded/iwd/racethac.2da
 share/gemrb/unhardcoded/iwd/rad100.pro
 share/gemrb/unhardcoded/iwd/rad250.pro
 share/gemrb/unhardcoded/iwd/randitem.2da
@@ -1288,6 +1302,7 @@ share/gemrb/unhardcoded/iwd/schargh.pro
 share/gemrb/unhardcoded/iwd/script.2da
 share/gemrb/unhardcoded/iwd/seater.pro
 share/gemrb/unhardcoded/iwd/seaterh.pro
+share/gemrb/unhardcoded/iwd/seyesc1.vvc
 share/gemrb/unhardcoded/iwd/sgrowth.pro
 share/gemrb/unhardcoded/iwd/shout.pro
 share/gemrb/unhardcoded/iwd/shroud.pro
@@ -1296,8 +1311,10 @@ share/gemrb/unhardcoded/iwd/skills.2da
 share/gemrb/unhardcoded/iwd/sleep.pro
 share/gemrb/unhardcoded/iwd/slivinh.pro
 share/gemrb/unhardcoded/iwd/slottype.2da
+share/gemrb/unhardcoded/iwd/soflamc.vvc
 share/gemrb/unhardcoded/iwd/soflamh.pro
 share/gemrb/unhardcoded/iwd/sohope.pro
+share/gemrb/unhardcoded/iwd/solatc1.vvc
 share/gemrb/unhardcoded/iwd/sooneh.pro
 share/gemrb/unhardcoded/iwd/sopain.pro
 share/gemrb/unhardcoded/iwd/sparbknp.pro
@@ -1353,6 +1370,7 @@ share/gemrb/unhardcoded/iwd/spoisoh.pro
 share/gemrb/unhardcoded/iwd/spscorch.pro
 share/gemrb/unhardcoded/iwd/spscoric.pro
 share/gemrb/unhardcoded/iwd/spwrath.pro
+share/gemrb/unhardcoded/iwd/sshellc.vvc
 share/gemrb/unhardcoded/iwd/ssorbh.pro
 share/gemrb/unhardcoded/iwd/ssswarm.pro
 share/gemrb/unhardcoded/iwd/sstone.pro
@@ -1376,6 +1394,7 @@ share/gemrb/unhardcoded/iwd/uward.pro
 share/gemrb/unhardcoded/iwd/uwardh.pro
 share/gemrb/unhardcoded/iwd/vcremap.2da
 share/gemrb/unhardcoded/iwd/vspherh.pro
+share/gemrb/unhardcoded/iwd/walksnd.2da
 share/gemrb/unhardcoded/iwd/wdeath1.pro
 share/gemrb/unhardcoded/iwd/wdeath2.pro
 share/gemrb/unhardcoded/iwd/weapprof.2da
@@ -1495,7 +1514,6 @@ share/gemrb/unhardcoded/iwd2/cfelemh.pro
 share/gemrb/unhardcoded/iwd2/cfelemx.pro
 share/gemrb/unhardcoded/iwd2/cfog.pro
 share/gemrb/unhardcoded/iwd2/cgraceh.pro
-share/gemrb/unhardcoded/iwd2/cgtable.2da
 share/gemrb/unhardcoded/iwd2/chant.pro
 share/gemrb/unhardcoded/iwd2/chromorb.pro
 share/gemrb/unhardcoded/iwd2/classes.2da
@@ -1908,7 +1926,6 @@ share/gemrb/unhardcoded/pst/classes.2da
 share/gemrb/unhardcoded/pst/cloud.pro
 share/gemrb/unhardcoded/pst/cloudkil.pro
 share/gemrb/unhardcoded/pst/clskills.2da
-share/gemrb/unhardcoded/pst/clssplab.2da
 share/gemrb/unhardcoded/pst/cocold.pro
 share/gemrb/unhardcoded/pst/colrspry.pro
 share/gemrb/unhardcoded/pst/comment.2da
@@ -2046,6 +2063,7 @@ share/gemrb/unhardcoded/pst/races.2da
 share/gemrb/unhardcoded/pst/randitem.2da
 share/gemrb/unhardcoded/pst/rdead.pro
 share/gemrb/unhardcoded/pst/rdead.spl
+share/gemrb/unhardcoded/pst/restmov.2da
 share/gemrb/unhardcoded/pst/rock.pro
 share/gemrb/unhardcoded/pst/rotorm.pro
 share/gemrb/unhardcoded/pst/rune.2da
@@ -2157,7 +2175,9 @@ share/gemrb/unhardcoded/shared/avprefg.2da
 share/gemrb/unhardcoded/shared/avprefix.2da
 share/gemrb/unhardcoded/shared/axeflm.pro
 share/gemrb/unhardcoded/shared/bardsong.spl
+share/gemrb/unhardcoded/shared/cgtable.2da
 share/gemrb/unhardcoded/shared/chinese.ini
+share/gemrb/unhardcoded/shared/clssplab.2da
 share/gemrb/unhardcoded/shared/comment.2da
 share/gemrb/unhardcoded/shared/containr.2da
 share/gemrb/unhardcoded/shared/cow.pro
@@ -2174,6 +2194,7 @@ share/gemrb/unhardcoded/shared/findtrap.spl
 share/gemrb/unhardcoded/shared/flmstrk.pro
 share/gemrb/unhardcoded/shared/gemact.ids
 share/gemrb/unhardcoded/shared/gemtrig.ids
+share/gemrb/unhardcoded/shared/german.ini
 share/gemrb/unhardcoded/shared/invtrav.pro
 share/gemrb/unhardcoded/shared/itemspec.2da
 share/gemrb/unhardcoded/shared/japanese.ini
@@ -2182,6 +2203,7 @@ share/gemrb/unhardcoded/shared/korean.ini
 share/gemrb/unhardcoded/shared/modal.2da
 share/gemrb/unhardcoded/shared/numwslot.2da
 share/gemrb/unhardcoded/shared/panic.spl
+share/gemrb/unhardcoded/shared/polish.ini
 share/gemrb/unhardcoded/shared/polystat.2da
 share/gemrb/unhardcoded/shared/redholy.pro
 share/gemrb/unhardcoded/shared/sanctuc.vvc
@@ -2223,7 +2245,9 @@ share/gemrb/unhardcoded/shared/spboom1.pro
 share/gemrb/unhardcoded/shared/spboom2.pro
 share/gemrb/unhardcoded/shared/spboom3.pro
 share/gemrb/unhardcoded/shared/spdimdr.pro
+share/gemrb/unhardcoded/shared/splbrdkn.2da
 share/gemrb/unhardcoded/shared/spldisp.2da
+share/gemrb/unhardcoded/shared/splwizkn.2da
 share/gemrb/unhardcoded/shared/spmagmis.pro
 share/gemrb/unhardcoded/shared/spsmkjet.pro
 share/gemrb/unhardcoded/shared/spsmold.pro
diff --git a/games/gemrb/distinfo b/games/gemrb/distinfo
index d858c92927d..65770f67d38 100644
--- a/games/gemrb/distinfo
+++ b/games/gemrb/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.2 2019/11/26 18:42:03 nia Exp $
+$NetBSD: distinfo,v 1.3 2020/08/31 12:46:21 nia Exp $
 
-SHA1 (gemrb-0.8.6.tar.gz) = 251885fdc831ca59bfdad92cce0f204d0070afbb
-RMD160 (gemrb-0.8.6.tar.gz) = 8ebd6d2c02d6265db0170c5cf579820e6362062f
-SHA512 (gemrb-0.8.6.tar.gz) = 0b2975bcc3f64f9ed113728bc3e43df6292dba4fc5d23cf4d02d66b4640ced6b38e68c5c39a2a120fafe6e7d9e32dc5d892a450007427f84c6013ca252f13e64
-Size (gemrb-0.8.6.tar.gz) = 12421522 bytes
+SHA1 (gemrb-0.8.7.tar.gz) = 3c616ddff1278b0e052b0493d0a767c38201b660
+RMD160 (gemrb-0.8.7.tar.gz) = af92ea4ef244128289a5d22858e05b4924a5f963
+SHA512 (gemrb-0.8.7.tar.gz) = f3358635a55202f39869308647bf4da5e14fa90fc9fe20e348ce3945b392092c0e29ae944087a41cbcbe7eb51bf0e41c59f56683a168b9f98b09bc39719ad274
+Size (gemrb-0.8.7.tar.gz) = 12446067 bytes
+SHA1 (patch-gemrb_core_System_Logging.h) = bba78f6b5ecc835ffc83b2d335e16de81184db0c
+SHA1 (patch-gemrb_core_System_String.cpp) = 12bc64c4e24ec1c85ba5efe31d96b62d52fad4de
+SHA1 (patch-gemrb_plugins_TTFImporter_TTFFont.cpp) = 5d21363e3b1957f96bf20f4229ebe529909bc3da
diff --git a/games/gemrb/patches/patch-gemrb_core_System_Logging.h b/games/gemrb/patches/patch-gemrb_core_System_Logging.h
new file mode 100644
index 00000000000..249ff066b81
--- /dev/null
+++ b/games/gemrb/patches/patch-gemrb_core_System_Logging.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-gemrb_core_System_Logging.h,v 1.1 2020/08/31 12:46:21 nia Exp $
+
+Include <cstdarg> for va_list
+
+--- gemrb/core/System/Logging.h.orig	2020-08-23 18:32:26.000000000 +0000
++++ gemrb/core/System/Logging.h
+@@ -29,6 +29,8 @@
+ #include "exports.h"
+ #include "win32def.h"
+ 
++#include <cstdarg>
++
+ namespace GemRB {
+ 
+ #ifdef WIN32
diff --git a/games/gemrb/patches/patch-gemrb_core_System_String.cpp b/games/gemrb/patches/patch-gemrb_core_System_String.cpp
new file mode 100644
index 00000000000..4bccd85932a
--- /dev/null
+++ b/games/gemrb/patches/patch-gemrb_core_System_String.cpp
@@ -0,0 +1,34 @@
+$NetBSD: patch-gemrb_core_System_String.cpp,v 1.1 2020/08/31 12:46:21 nia Exp $
+
+Deal with old NetBSD/SunOS style iconv.
+
+--- gemrb/core/System/String.cpp.orig	2020-08-23 18:32:26.000000000 +0000
++++ gemrb/core/System/String.cpp
+@@ -35,6 +35,15 @@
+ #if HAVE_ICONV
+ #include <iconv.h>
+ #include <cerrno>
++
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#else
++#define NETBSD_POSIX_ICONV 0
++#endif /* __NetBSD_Prereq__(9,99,17) */
++#endif /* defined(__NetBSD__) */
+ #endif
+ 
+ namespace GemRB {
+@@ -127,7 +136,11 @@ char* ConvertCharEncoding(const char* st
+ 	size_t out_len_left = out_len;
+ 	char* buf = (char*) malloc(out_len);
+ 	char* buf_out = buf;
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++	size_t ret = iconv(cd, (const char **)&in, &in_len, &buf_out, &out_len_left);
++#else
+ 	size_t ret = iconv(cd, &in, &in_len, &buf_out, &out_len_left);
++#endif
+ 	iconv_close(cd);
+ 
+ 	if (ret == (size_t)-1) {
diff --git a/games/gemrb/patches/patch-gemrb_plugins_TTFImporter_TTFFont.cpp b/games/gemrb/patches/patch-gemrb_plugins_TTFImporter_TTFFont.cpp
new file mode 100644
index 00000000000..9a592f3c019
--- /dev/null
+++ b/games/gemrb/patches/patch-gemrb_plugins_TTFImporter_TTFFont.cpp
@@ -0,0 +1,33 @@
+$NetBSD: patch-gemrb_plugins_TTFImporter_TTFFont.cpp,v 1.1 2020/08/31 12:46:21 nia Exp $
+
+Deal with old NetBSD/SunOS style iconv.
+
+--- gemrb/plugins/TTFImporter/TTFFont.cpp.orig	2020-08-23 18:32:26.000000000 +0000
++++ gemrb/plugins/TTFImporter/TTFFont.cpp
+@@ -28,6 +28,14 @@
+ #if HAVE_ICONV
+ #include <iconv.h>
+ #include <errno.h>
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#else
++#define NETBSD_POSIX_ICONV 0
++#endif /* __NetBSD_Prereq__(9,99,17) */
++#endif /* defined(__NetBSD__) */
+ #endif
+ 
+ namespace GemRB {
+@@ -50,7 +58,11 @@ const Glyph& TTFFont::GetGlyph(ieWord ch
+ 		// TODO: make this work on BE systems
+ 		// TODO: maybe we want to work with non-unicode fonts?
+ 		iconv_t cd = iconv_open("UTF-16LE", core->TLKEncoding.encoding.c_str());
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++		size_t ret = iconv(cd, (const char **)&oldchar, &in, &newchar, &out);
++#else
+ 		size_t ret = iconv(cd, &oldchar, &in, &newchar, &out);
++#endif
+ 
+ 		if (ret != GEM_OK) {
+ 			Log(ERROR, "FONT", "iconv error: %d", errno);