diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile index f92733f1e62..862e67f3b28 100644 --- a/games/gemrb/Makefile +++ b/games/gemrb/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2019/07/31 07:55:32 kirby Exp $ +# $OpenBSD: Makefile,v 1.15 2019/12/13 08:24:26 kirby Exp $ SHARED_LIBS += gemrb_core 0.0 COMMENT = open-source implementation of Bioware's Infinity Engine -DISTNAME = gemrb-0.8.5 -REVISION = 3 +DISTNAME = gemrb-0.8.6 CATEGORIES = games emulators x11 diff --git a/games/gemrb/distinfo b/games/gemrb/distinfo index 9ba24c62da9..5b7d04e6902 100644 --- a/games/gemrb/distinfo +++ b/games/gemrb/distinfo @@ -1,2 +1,2 @@ -SHA256 (gemrb-0.8.5.tar.gz) = FHV7Jtr7yxaUbGFbsrbCSKqLlmIidvVau+afBUickEw= -SIZE (gemrb-0.8.5.tar.gz) = 12371885 +SHA256 (gemrb-0.8.6.tar.gz) = dC12PoqkNaq+U5FHGer674P3z+BAo9oZPhZaP9gHlyw= +SIZE (gemrb-0.8.6.tar.gz) = 12421522 diff --git a/games/gemrb/patches/patch-gemrb_GemRB_cfg_sample_in b/games/gemrb/patches/patch-gemrb_GemRB_cfg_sample_in index bc51bcef01b..3864088a948 100644 --- a/games/gemrb/patches/patch-gemrb_GemRB_cfg_sample_in +++ b/games/gemrb/patches/patch-gemrb_GemRB_cfg_sample_in @@ -1,8 +1,8 @@ -$OpenBSD: patch-gemrb_GemRB_cfg_sample_in,v 1.2 2017/11/27 18:12:30 kirby Exp $ +$OpenBSD: patch-gemrb_GemRB_cfg_sample_in,v 1.3 2019/12/13 08:24:27 kirby Exp $ Index: gemrb/GemRB.cfg.sample.in --- gemrb/GemRB.cfg.sample.in.orig +++ gemrb/GemRB.cfg.sample.in -@@ -188,7 +188,7 @@ CD5=/mnt/windows/Programmi/Black Isle/BGII - SoA/CD5/ +@@ -171,7 +171,7 @@ GamePath=/mnt/windows/Programmi/Black Isle/BGII - SoA/ # Cache directory. # ##################################################### @@ -11,7 +11,7 @@ Index: gemrb/GemRB.cfg.sample.in ##################################################### # GemRB Save Path [String] # -@@ -225,7 +225,7 @@ CachePath=@DEFAULT_CACHE_DIR@ +@@ -208,7 +208,7 @@ CachePath=@DEFAULT_CACHE_DIR@ # the 'GUIScript' subdirectory. # ##################################################### @@ -20,7 +20,7 @@ Index: gemrb/GemRB.cfg.sample.in ##################################################### # GemRB Plugins Path [String] # -@@ -239,7 +239,7 @@ CachePath=@DEFAULT_CACHE_DIR@ +@@ -222,7 +222,7 @@ CachePath=@DEFAULT_CACHE_DIR@ # GemRB from source directory on Linux. # ##################################################### @@ -28,8 +28,8 @@ Index: gemrb/GemRB.cfg.sample.in +PluginsPath=@DEFAULT_PLUGINS_DIR@ ##################################################### - # Custom Font Path [String] # -@@ -283,7 +283,7 @@ CachePath=@DEFAULT_CACHE_DIR@ + # Custom Font Path [String] # +@@ -266,7 +266,7 @@ CachePath=@DEFAULT_CACHE_DIR@ ##################################################### #GemRBOverridePath=@DATA_DIR@ diff --git a/games/gemrb/patches/patch-gemrb_core_System_VFS_cpp b/games/gemrb/patches/patch-gemrb_core_System_VFS_cpp deleted file mode 100644 index a6e17f3835f..00000000000 --- a/games/gemrb/patches/patch-gemrb_core_System_VFS_cpp +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-gemrb_core_System_VFS_cpp,v 1.1 2019/07/31 07:55:32 kirby Exp $ - -Fixes [Core/FATAL]: Unable to create cache directory '/tmp/cache' -Upstream commit 3225a40f0f0c236934feba773d0be0cc2a14c64b - -Index: gemrb/core/System/VFS.cpp ---- gemrb/core/System/VFS.cpp.orig -+++ gemrb/core/System/VFS.cpp -@@ -413,7 +413,7 @@ bool MakeDirectories(const char* path) - assert(strnlen(path, _MAX_PATH/2) < _MAX_PATH/2); - strcpy(Tokenized, path); - -- char* Token = strtok(Tokenized, &PathDelimiter); -+ char* Token = strtok(Tokenized, SPathDelimiter); - while(Token != NULL) { - if(TempFilePath[0] == 0) { - if(path[0] == PathDelimiter) { -@@ -428,7 +428,7 @@ bool MakeDirectories(const char* path) - if(!MakeDirectory(TempFilePath)) - return false; - -- Token = strtok(NULL, &PathDelimiter); -+ Token = strtok(NULL, SPathDelimiter); - } - return true; - } diff --git a/games/gemrb/pkg/PLIST b/games/gemrb/pkg/PLIST index fc9c2bf976c..ba4d49a5f12 100644 --- a/games/gemrb/pkg/PLIST +++ b/games/gemrb/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2019/07/31 07:55:32 kirby Exp $ +@comment $OpenBSD: PLIST,v 1.7 2019/12/13 08:24:27 kirby Exp $ bin/extend2da.py @bin bin/gemrb lib/gemrb/ @@ -55,7 +55,7 @@ share/doc/gemrb/AUTHORS share/doc/gemrb/COPYING share/doc/gemrb/INSTALL share/doc/gemrb/NEWS -share/doc/gemrb/README +share/doc/gemrb/README.md share/doc/gemrb/en/ share/doc/gemrb/en/CheatKeys.txt share/doc/gemrb/en/CodingStyle.txt @@ -78,7 +78,7 @@ 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.txt +share/doc/gemrb/en/Release.md share/doc/gemrb/en/Tables/ share/doc/gemrb/en/Tables/HPBARB.txt share/doc/gemrb/en/Tables/ability.txt @@ -175,6 +175,8 @@ share/gemrb/GUIScripts/GUILOAD.py share/gemrb/GUIScripts/GUILOAD.pyc share/gemrb/GUIScripts/GUIMA.py share/gemrb/GUIScripts/GUIMA.pyc +share/gemrb/GUIScripts/GUIMACommon.py +share/gemrb/GUIScripts/GUIMACommon.pyc share/gemrb/GUIScripts/GUIMG.py share/gemrb/GUIScripts/GUIMG.pyc share/gemrb/GUIScripts/GUIMOVIE.py @@ -583,8 +585,10 @@ share/gemrb/override/bg1/efftext.2da share/gemrb/override/bg1/minorglb.vvc share/gemrb/override/bg2/ share/gemrb/override/bg2/clearair.2da +share/gemrb/override/bg2/cut17d.bcs share/gemrb/override/bg2/efftext.2da share/gemrb/override/bg2/minorglb.vvc +share/gemrb/override/bg2/ogmagi01.bcs share/gemrb/override/bg2/spells.2da share/gemrb/override/how/ share/gemrb/override/how/baldur.bcs @@ -625,7 +629,6 @@ share/gemrb/unhardcoded/bg1/arrowfli.pro share/gemrb/unhardcoded/bg1/arrowflm.pro share/gemrb/unhardcoded/bg1/arrowhvy.pro share/gemrb/unhardcoded/bg1/avatars.2da -share/gemrb/unhardcoded/bg1/avprefc.2da share/gemrb/unhardcoded/bg1/avprefr.2da share/gemrb/unhardcoded/bg1/axe.pro share/gemrb/unhardcoded/bg1/axeex.pro @@ -780,7 +783,6 @@ share/gemrb/unhardcoded/bg2/area_reverbs.2da share/gemrb/unhardcoded/bg2/areapro.2da share/gemrb/unhardcoded/bg2/at2xlvl.spl share/gemrb/unhardcoded/bg2/avatars.2da -share/gemrb/unhardcoded/bg2/avprefc.2da share/gemrb/unhardcoded/bg2/avprefr.2da share/gemrb/unhardcoded/bg2/bloodclr.2da share/gemrb/unhardcoded/bg2/cgtable.2da @@ -913,7 +915,6 @@ share/gemrb/unhardcoded/how/asumm1x.pro share/gemrb/unhardcoded/how/asumm2h.pro share/gemrb/unhardcoded/how/asumm3h.pro share/gemrb/unhardcoded/how/avatars.2da -share/gemrb/unhardcoded/how/avprefc.2da share/gemrb/unhardcoded/how/avprefr.2da share/gemrb/unhardcoded/how/axe.pro share/gemrb/unhardcoded/how/axeex.pro @@ -1247,7 +1248,6 @@ share/gemrb/unhardcoded/how/wvdeath.pro share/gemrb/unhardcoded/how/wvhith.pro share/gemrb/unhardcoded/how/wwolf.pro share/gemrb/unhardcoded/how/zlaura.pro -share/gemrb/unhardcoded/how/zzweaps.2da share/gemrb/unhardcoded/iwd/ share/gemrb/unhardcoded/iwd/ability.2da share/gemrb/unhardcoded/iwd/abjurap.pro @@ -1290,7 +1290,6 @@ share/gemrb/unhardcoded/iwd/asumm1x.pro share/gemrb/unhardcoded/iwd/asumm2h.pro share/gemrb/unhardcoded/iwd/asumm3h.pro share/gemrb/unhardcoded/iwd/avatars.2da -share/gemrb/unhardcoded/iwd/avprefc.2da share/gemrb/unhardcoded/iwd/avprefr.2da share/gemrb/unhardcoded/iwd/axe.pro share/gemrb/unhardcoded/iwd/axeex.pro @@ -1620,7 +1619,6 @@ share/gemrb/unhardcoded/iwd/wvdeath.pro share/gemrb/unhardcoded/iwd/wvhith.pro share/gemrb/unhardcoded/iwd/wwolf.pro share/gemrb/unhardcoded/iwd/zlaura.pro -share/gemrb/unhardcoded/iwd/zzweaps.2da share/gemrb/unhardcoded/iwd2/ share/gemrb/unhardcoded/iwd2/24895.spl share/gemrb/unhardcoded/iwd2/24896.spl @@ -1864,6 +1862,7 @@ share/gemrb/unhardcoded/iwd2/gaze.pro share/gemrb/unhardcoded/iwd2/geloopx.pro share/gemrb/unhardcoded/iwd2/gemprjtl.ids share/gemrb/unhardcoded/iwd2/gemrb.ini +share/gemrb/unhardcoded/iwd2/gemtrig.ids share/gemrb/unhardcoded/iwd2/gender.2da share/gemrb/unhardcoded/iwd2/golcloud.pro share/gemrb/unhardcoded/iwd2/grease.pro @@ -2381,6 +2380,7 @@ share/gemrb/unhardcoded/pst/strings.2da share/gemrb/unhardcoded/pst/tlaugh.pro share/gemrb/unhardcoded/pst/trapglyp.pro share/gemrb/unhardcoded/pst/trapskul.pro +share/gemrb/unhardcoded/pst/vcremap.2da share/gemrb/unhardcoded/pst/vtouch.pro share/gemrb/unhardcoded/pst/weapprof.2da share/gemrb/unhardcoded/pst/web.pro @@ -2388,6 +2388,7 @@ share/gemrb/unhardcoded/pst/wmmos2b.mos share/gemrb/unhardcoded/shared/ share/gemrb/unhardcoded/shared/REVERB.2DA share/gemrb/unhardcoded/shared/avatar_shadows.2da +share/gemrb/unhardcoded/shared/avprefc.2da share/gemrb/unhardcoded/shared/avprefg.2da share/gemrb/unhardcoded/shared/avprefix.2da share/gemrb/unhardcoded/shared/axeflm.pro @@ -2415,6 +2416,7 @@ share/gemrb/unhardcoded/shared/japanese.ini share/gemrb/unhardcoded/shared/keymap.2da 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/polystat.2da share/gemrb/unhardcoded/shared/redholy.pro @@ -2464,6 +2466,7 @@ share/gemrb/unhardcoded/shared/spsmold.pro share/gemrb/unhardcoded/shared/spsmpuff.pro share/gemrb/unhardcoded/shared/storespl.2da share/gemrb/unhardcoded/shared/turn.spl +share/gemrb/unhardcoded/shared/zzweaps.2da share/icons/hicolor/scalable/apps/gemrb.svg share/pixmaps/ share/pixmaps/gemrb.png