Omar Polo <[email protected]> writes: > Klemens Nanni <[email protected]> writes: > >> On Mon, Nov 15, 2021 at 01:23:21AM +0100, Omar Polo wrote: >>> P.S.: if you're wondering about the `CONFIGURE_ENV += SHELL=sh' is >>> because one of the python scripts checked if SHELL is defined and raised >>> an error if not instead of defaulting to /bin/sh. >> >> Just say so in a comment above, otherwise future porters will scratch >> their heads again ;-) > > sure, here's an updated patch
I realized that it doesn't need python 2 anymore (thanks solene@!) so I'm dropping the explicit MODPY_VERSION too. It built fine without python 2 if I did everything correctly (moved the python executable, I know, don't do this at home kids, but I wanted to avoid removing all the packages that depends on it just to try the update.) Revised diff attached. Just out of curiosity I tried to build it with --with-native-mozjs and it fails with: ../../../source/scriptinterface/ScriptTypes.h:85:2: error: Your compiler is trying to use an untested minor version of the SpiderMonkey library. If you are a package maintainer, please make sure to check very carefully that this version does not change the behaviour of the code executed by SpiderMonkey. Different parts of the game (e.g. the multiplayer mode) rely on deterministic behaviour of the JavaScript engine. A simple way for testing this would be playing a network game with one player using the old version and one player using the new version. Another way for testing is running replays and comparing the final hash (check trac.wildfiregames.com/wiki/Debugging#Replaymode). For more information check this link: trac.wildfiregames.com/wiki/Debugging#Outofsync Even if now works (I haven't tested the multiplayer) it may break with future mozjs updates (or maybe upstream is exaggerating?) I've mentioned this in a comment. (oh and I sorted LIB_DEPENDS, don't know why fmt ended up in the wrong spot) Index: Makefile.inc =================================================================== RCS file: /home/cvs/ports/games/0ad/Makefile.inc,v retrieving revision 1.12 diff -u -p -r1.12 Makefile.inc --- Makefile.inc 14 Jun 2021 10:19:46 -0000 1.12 +++ Makefile.inc 13 Nov 2021 18:17:39 -0000 @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = amd64 i386 CATEGORIES = games -V ?= 0.0.23b +V ?= 0.0.25b HOMEPAGE = https://play0ad.com/ Index: base/Makefile =================================================================== RCS file: /home/cvs/ports/games/0ad/base/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- base/Makefile 22 Jun 2021 04:34:08 -0000 1.34 +++ base/Makefile 15 Nov 2021 09:55:01 -0000 @@ -1,31 +1,28 @@ # $OpenBSD: Makefile,v 1.34 2021/06/22 04:34:08 rsadowski Exp $ -# XXX fix build with icu >=5.9.1 (remove at next update?) -CXXFLAGS += -DU_USING_ICU_NAMESPACE=1 - COMMENT = historical real-time strategy game DISTNAME = 0ad-${V}-alpha-unix-build PKGNAME = 0ad-${V} -REVISION = 3 USE_WXNEEDED = Yes SO_VERSION = 0.0 -SHARED_LIBS += mozjs38-ps-release ${SO_VERSION} +SHARED_LIBS += mozjs78-ps-release ${SO_VERSION} -WANTLIB += ${COMPILER_LIBCXX} GL SDL2 X11 Xcursor boost_filesystem -WANTLIB += boost_system c curl enet execinfo gloox iconv icui18n -WANTLIB += icuuc m miniupnpc nspr4 ogg openal plc4 plds4 png sodium -WANTLIB += vorbis vorbisfile xml2 z +WANTLIB += ${COMPILER_LIBCXX} GL SDL2 X11 boost_filesystem +WANTLIB += boost_system c crypto curl enet execinfo fmt gloox iconv +WANTLIB += icudata icui18n icuuc idn m miniupnpc ogg openal +WANTLIB += png sodium ssl vorbis vorbisfile xml2 z BUILD_DEPENDS = archivers/zip \ + lang/rust,-main \ shells/bash LIB_DEPENDS = audio/libvorbis \ audio/openal \ converters/libiconv \ devel/boost \ - devel/nspr \ + devel/fmt \ devel/sdl2 \ graphics/png \ net/curl \ @@ -38,7 +35,6 @@ LIB_DEPENDS = audio/libvorbis \ RUN_DEPENDS = devel/desktop-file-utils \ games/0ad/data=${V} MODULES = lang/python -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2} COMPILER = base-clang ports-gcc @@ -49,16 +45,24 @@ MAKE_FLAGS = SILENT= MAKE_ENV = CC="${CC}" \ CXX="${CXX}" \ CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include" \ + LDFLAGS="-liconv" -FIX_CRLF_FILES = build/premake/premake4/build/gmake.bsd/Premake4.make +FIX_CRLF_FILES = build/premake/premake5/build/gmake.bsd/Premake5.make PATCHORIG = .orig.port USE_GMAKE = Yes + +# libraries/source/spidermonkey/mozjs-*/python/mach/mach/mixin/process.py +# checks this var and errors out if undefined: +# Exception: Could not detect environment shell! +CONFIGURE_ENV += SHELL=sh + +# XXX don't use --with-native-mozjs because 0ad needs to stay in sync +# with it: updates to mozjs could break the multiplayer. CONFIGURE_ARGS += --without-nvtt \ --datadir=${PREFIX}/share/0ad \ --libdir=${PREFIX}/lib \ - --premake4 \ --minimal-flags # XXX atlas (the level editor) requires threaded libxml Index: base/distinfo =================================================================== RCS file: /home/cvs/ports/games/0ad/base/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- base/distinfo 25 Dec 2018 00:32:55 -0000 1.8 +++ base/distinfo 13 Nov 2021 18:18:56 -0000 @@ -1,2 +1,2 @@ -SHA256 (0ad-0.0.23b-alpha-unix-build.tar.gz) = vC22XgkHb45yPFdDOedza1Vx1SXeOYXLuVyhHzGMx6g= -SIZE (0ad-0.0.23b-alpha-unix-build.tar.gz) = 34609819 +SHA256 (0ad-0.0.25b-alpha-unix-build.tar.gz) = AnMMMof21FEekRntNF1CSk7z9aMb9KCnzHntgNv+PIA= +SIZE (0ad-0.0.25b-alpha-unix-build.tar.gz) = 78022628 Index: base/patches/patch-build_premake_premake4_build_gmake_bsd_Premake4_make =================================================================== RCS file: base/patches/patch-build_premake_premake4_build_gmake_bsd_Premake4_make diff -N base/patches/patch-build_premake_premake4_build_gmake_bsd_Premake4_make --- base/patches/patch-build_premake_premake4_build_gmake_bsd_Premake4_make 26 Feb 2021 18:20:33 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-build_premake_premake4_build_gmake_bsd_Premake4_make,v 1.3 2021/02/26 18:20:33 naddy Exp $ ---- build/premake/premake4/build/gmake.bsd/Premake4.make.orig.port Sun Aug 19 12:49:02 2012 -+++ build/premake/premake4/build/gmake.bsd/Premake4.make Sun Oct 12 21:12:18 2014 -@@ -26,8 +26,8 @@ ifeq ($(config),release) - DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN - INCLUDES += -I../../src/host/lua-5.1.4/src - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) -- CFLAGS += $(CPPFLAGS) -Wall -Os -- CXXFLAGS += $(CPPFLAGS) -Wall -Os -+ CFLAGS += $(CPPFLAGS) -Wall -+ CXXFLAGS += $(CPPFLAGS) -Wall - LDFLAGS += -s -rdynamic - LIBS += -lm - RESFLAGS += $(DEFINES) $(INCLUDES) -@@ -302,4 +302,4 @@ $(OBJDIR)/lauxlib.o: ../../src/host/lua-5.1.4/src/laux - $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<" - - -include $(OBJECTS:%.o=%.d) ---include $(GCH:%.h.gch=%.h.d) -\ No newline at end of file -+-include $(GCH:%.h.gch=%.h.d) Index: base/patches/patch-build_premake_premake4_src_actions_make_make_solution_lua =================================================================== RCS file: base/patches/patch-build_premake_premake4_src_actions_make_make_solution_lua diff -N base/patches/patch-build_premake_premake4_src_actions_make_make_solution_lua --- base/patches/patch-build_premake_premake4_src_actions_make_make_solution_lua 21 Jul 2014 01:24:06 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-build_premake_premake4_src_actions_make_make_solution_lua,v 1.1.1.1 2014/07/21 01:24:06 bentley Exp $ ---- build/premake/premake4/src/actions/make/make_solution.lua.orig.port Fri Jul 15 11:32:06 2011 -+++ build/premake/premake4/src/actions/make/make_solution.lua Thu Apr 4 01:31:15 2013 -@@ -35,7 +35,7 @@ - for _, prj in ipairs(sln.projects) do - _p('%s: %s', _MAKE.esc(prj.name), table.concat(_MAKE.esc(table.extract(premake.getdependencies(prj), "name")), " ")) - _p('\t@echo "==== Building %s ($(config)) ===="', prj.name) -- _p('\t@${MAKE} --no-print-directory -C %s -f %s', _MAKE.esc(path.getrelative(sln.location, prj.location)), _MAKE.esc(_MAKE.getmakefilename(prj, true))) -+ _p('\t${MAKE} --no-print-directory -C %s -f %s', _MAKE.esc(path.getrelative(sln.location, prj.location)), _MAKE.esc(_MAKE.getmakefilename(prj, true))) - _p('') - end - Index: base/patches/patch-build_premake_premake5_build_gmake2_bsd_Premake5_make =================================================================== RCS file: base/patches/patch-build_premake_premake5_build_gmake2_bsd_Premake5_make diff -N base/patches/patch-build_premake_premake5_build_gmake2_bsd_Premake5_make --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ base/patches/patch-build_premake_premake5_build_gmake2_bsd_Premake5_make 13 Nov 2021 21:52:51 -0000 @@ -0,0 +1,18 @@ +$OpenBSD$ + +don't hardcode -O3 + +Index: build/premake/premake5/build/gmake2.bsd/Premake5.make +--- build/premake/premake5/build/gmake2.bsd/Premake5.make.orig ++++ build/premake/premake5/build/gmake2.bsd/Premake5.make +@@ -36,8 +36,8 @@ TARGETDIR = ../../bin/release + TARGET = $(TARGETDIR)/premake5 + OBJDIR = obj/Release/Premake5 + DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN +-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra +-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector ++ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra ++ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector + LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm + LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a + ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic Index: base/patches/patch-build_workspaces_update-workspaces_sh =================================================================== RCS file: /home/cvs/ports/games/0ad/base/patches/patch-build_workspaces_update-workspaces_sh,v retrieving revision 1.6 diff -u -p -r1.6 patch-build_workspaces_update-workspaces_sh --- base/patches/patch-build_workspaces_update-workspaces_sh 25 Dec 2018 00:32:56 -0000 1.6 +++ base/patches/patch-build_workspaces_update-workspaces_sh 13 Nov 2021 21:46:35 -0000 @@ -3,12 +3,12 @@ Don't build bundled libraries during con Index: build/workspaces/update-workspaces.sh --- build/workspaces/update-workspaces.sh.orig +++ build/workspaces/update-workspaces.sh -@@ -85,7 +85,7 @@ if [ "`uname -s`" != "Darwin" ]; then +@@ -86,7 +86,7 @@ if [ "`uname -s`" != "Darwin" ]; then echo # Build/update bundled external libraries -- (cd ../../libraries/source/fcollada/src && ${MAKE} ${JOBS}) || die "FCollada build failed" -+# (cd ../../libraries/source/fcollada/src && ${MAKE} ${JOBS}) || die "FCollada build failed" +- (cd ../../libraries/source/fcollada && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "FCollada build failed" ++ # (cd ../../libraries/source/fcollada && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "FCollada build failed" echo - if [ "$with_system_mozjs38" = "false" ]; then + if [ "$with_system_mozjs" = "false" ]; then (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed" Index: base/patches/patch-libraries_source_fcollada_src_Makefile =================================================================== RCS file: /home/cvs/ports/games/0ad/base/patches/patch-libraries_source_fcollada_src_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-libraries_source_fcollada_src_Makefile --- base/patches/patch-libraries_source_fcollada_src_Makefile 19 Oct 2014 07:46:45 -0000 1.2 +++ base/patches/patch-libraries_source_fcollada_src_Makefile 13 Nov 2021 21:46:35 -0000 @@ -1,6 +1,7 @@ $OpenBSD: patch-libraries_source_fcollada_src_Makefile,v 1.2 2014/10/19 07:46:45 bentley Exp $ ---- libraries/source/fcollada/src/Makefile.orig.port Mon Oct 13 06:24:26 2014 -+++ libraries/source/fcollada/src/Makefile Mon Oct 13 06:25:11 2014 +Index: libraries/source/fcollada/src/Makefile +--- libraries/source/fcollada/src/Makefile.orig ++++ libraries/source/fcollada/src/Makefile @@ -10,7 +10,7 @@ endif CXX ?= g++ CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) @@ -8,9 +9,9 @@ $OpenBSD: patch-libraries_source_fcollad -CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL +CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL CXXFLAGS_TEST := -O0 -g -D_DEBUG + LDFLAGS_TEST= -ldl LIBS += `pkg-config libxml-2.0 --libs` - INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` -@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/release/,$(SOURCE +@@ -225,7 +225,7 @@ OBJECTS_RELEASE = $(addprefix output/release/,$(SOURCE OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o)) OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST) @@ -18,10 +19,10 @@ $OpenBSD: patch-libraries_source_fcollad +all: output/libFColladaSD.a install output_dirs: - bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}' -@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_di + @for x in debug release test; \ +@@ -255,8 +255,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_di output/FColladaTest: $(OBJECTS_TEST) | output_dirs - $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS) + $(CXX) -o $@ $(OBJECTS_TEST) $(LIBS) $(LDFLAGS_TEST) -install: output/libFColladaSD.a output/libFColladaSR.a - cp output/libFColladaSD.a ../lib/libFColladaSD.a @@ -29,7 +30,7 @@ $OpenBSD: patch-libraries_source_fcollad cp output/libFColladaSR.a ../lib/libFColladaSR.a dfile = $(@:.o=.d) -@@ -272,5 +271,3 @@ clean: +@@ -283,5 +282,3 @@ clean: rm -rf output -include $(OBJECTS_ALL:.o=.P) Index: base/patches/patch-libraries_source_spidermonkey_FixSoVersionOpenBSD_diff =================================================================== RCS file: base/patches/patch-libraries_source_spidermonkey_FixSoVersionOpenBSD_diff diff -N base/patches/patch-libraries_source_spidermonkey_FixSoVersionOpenBSD_diff --- base/patches/patch-libraries_source_spidermonkey_FixSoVersionOpenBSD_diff 21 Sep 2015 11:27:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-libraries_source_spidermonkey_FixSoVersionOpenBSD_diff,v 1.1 2015/09/21 11:27:08 pascal Exp $ ---- libraries/source/spidermonkey/FixSoVersionOpenBSD.diff.orig.port Mon Aug 31 09:48:52 2015 -+++ libraries/source/spidermonkey/FixSoVersionOpenBSD.diff Mon Aug 31 09:49:46 2015 -@@ -0,0 +1,11 @@ -+--- a/js/src/configure.orig Mon Aug 31 09:44:26 2015 -++++ b/js/src/configure Mon Aug 31 09:45:01 2015 -+@@ -8246,7 +8246,7 @@ EOF -+ ;; -+ -+ *-openbsd*) -+- DLL_SUFFIX=".so.1.0" -++ DLL_SUFFIX=".so.${SO_VERSION}" -+ DSO_CFLAGS='' -+ DSO_PIC_CFLAGS='-fPIC' -+ DSO_LDOPTS='-shared -fPIC' Index: base/patches/patch-libraries_source_spidermonkey_build_sh =================================================================== RCS file: /home/cvs/ports/games/0ad/base/patches/patch-libraries_source_spidermonkey_build_sh,v retrieving revision 1.3 diff -u -p -r1.3 patch-libraries_source_spidermonkey_build_sh --- base/patches/patch-libraries_source_spidermonkey_build_sh 17 Nov 2016 11:16:43 -0000 1.3 +++ base/patches/patch-libraries_source_spidermonkey_build_sh 13 Nov 2021 21:46:35 -0000 @@ -1,57 +1,42 @@ $OpenBSD: patch-libraries_source_spidermonkey_build_sh,v 1.3 2016/11/17 11:16:43 pascal Exp $ ---- libraries/source/spidermonkey/build.sh.orig.port Tue Oct 4 17:01:34 2016 -+++ libraries/source/spidermonkey/build.sh Thu Nov 10 14:08:44 2016 -@@ -100,12 +100,12 @@ rm -rf build-release - # the LIBRARY_NAME for each build. - # (We use perl instead of sed so that it works with MozillaBuild on Windows, - # which has an ancient sed.) --perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-debug'\''/' moz.build --mkdir -p build-debug --cd build-debug --CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal --${MAKE} ${MAKE_OPTS} --cd .. -+#perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-debug'\''/' moz.build -+#mkdir -p build-debug -+#cd build-debug -+#CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal -+#${MAKE} ${MAKE_OPTS} -+#cd .. - - perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-release'\''/' moz.build - mkdir -p build-release -@@ -135,10 +135,10 @@ else - LIB_DST_SUFFIX=.so - if [ "`uname -s`" = "OpenBSD" ] - then -- DLL_SRC_SUFFIX=.so.1.0 -- DLL_DST_SUFFIX=.so.1.0 -- LIB_SRC_SUFFIX=.so.1.0 -- LIB_DST_SUFFIX=:so.1.0 -+ DLL_SRC_SUFFIX=.so.$SO_VERSION -+ DLL_DST_SUFFIX=.so.$SO_VERSION -+ LIB_SRC_SUFFIX=.so.$SO_VERSION -+ LIB_DST_SUFFIX=:so.$SO_VERSION - fi +Index: libraries/source/spidermonkey/build.sh +--- libraries/source/spidermonkey/build.sh.orig ++++ libraries/source/spidermonkey/build.sh +@@ -113,8 +113,8 @@ else + cd "$FOLDER" fi -@@ -158,15 +158,15 @@ fi - # Copy files into the necessary locations for building and running the game - - # js-config.h is different for debug and release builds, so we need different include directories for both --mkdir -p ${INCLUDE_DIR_DEBUG} -+#mkdir -p ${INCLUDE_DIR_DEBUG} - mkdir -p ${INCLUDE_DIR_RELEASE} - cp -R -L ${FOLDER}/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/ --cp -R -L ${FOLDER}/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/ -+#cp -R -L ${FOLDER}/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/ - - mkdir -p lib/ --cp -L ${FOLDER}/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_DST_SUFFIX} -+#cp -L ${FOLDER}/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_DST_SUFFIX} - cp -L ${FOLDER}/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs38-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs38-ps-release${LIB_DST_SUFFIX} --cp -L ${FOLDER}/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs38-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs38-ps-debug${DLL_DST_SUFFIX} -+#cp -L ${FOLDER}/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs38-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs38-ps-debug${DLL_DST_SUFFIX} - cp -L ${FOLDER}/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs38-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs38-ps-release${DLL_DST_SUFFIX} +-# Debug version of SM is broken on FreeBSD. +-if [ "$(uname -s)" != "FreeBSD" ]; then ++# Debug version of SM is broken on OpenBSD. ++if [ "$(uname -s)" != "OpenBSD" ]; then + mkdir -p build-debug + cd build-debug + # SM configure checks for autoconf, but we don't actually need it. +@@ -156,7 +156,7 @@ else + STATIC_LIB_SUFFIX=.a + if [ "`uname -s`" = "OpenBSD" ]; + then +- LIB_SUFFIX=.so.1.0 ++ LIB_SUFFIX=.so.$SO_VERSION + elif [ "`uname -s`" = "Darwin" ]; + then + LIB_SUFFIX=.a +@@ -182,7 +182,7 @@ fi + mkdir -p "${INCLUDE_DIR_RELEASE}" + cp -R -L "${FOLDER}"/build-release/dist/include/* "${INCLUDE_DIR_RELEASE}/" - # On Windows, also copy debugging symbols files +-if [ "$(uname -s)" != "FreeBSD" ]; then ++if [ "$(uname -s)" != "OpenBSD" ]; then + mkdir -p "${INCLUDE_DIR_DEBUG}" + cp -R -L "${FOLDER}"/build-debug/dist/include/* "${INCLUDE_DIR_DEBUG}/" + fi +@@ -223,7 +223,7 @@ else + # Copy shared libs to both lib/ and binaries/ so the compiler and executable (resp.) can find them. + cp -L "${FOLDER}/build-${REL}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}" "lib/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}" + cp -L "${FOLDER}/build-${REL}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-${REL}${LIB_SUFFIX}" +- if [ "$(uname -s)" != "FreeBSD" ]; then ++ if [ "$(uname -s)" != "OpenBSD" ]; then + cp -L "${FOLDER}/build-${DEB}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}" "../../../binaries/system/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}" + cp -L "${FOLDER}/build-${DEB}/js/src/build/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}" "lib/${LIB_PREFIX}${LIB_NAME}-${DEB}${LIB_SUFFIX}" + fi Index: base/patches/patch-libraries_source_spidermonkey_patch_sh =================================================================== RCS file: base/patches/patch-libraries_source_spidermonkey_patch_sh diff -N base/patches/patch-libraries_source_spidermonkey_patch_sh --- base/patches/patch-libraries_source_spidermonkey_patch_sh 17 Nov 2016 11:16:43 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-libraries_source_spidermonkey_patch_sh,v 1.2 2016/11/17 11:16:43 pascal Exp $ ---- libraries/source/spidermonkey/patch.sh.orig.port Sun Sep 25 12:20:55 2016 -+++ libraries/source/spidermonkey/patch.sh Wed Nov 9 11:43:25 2016 -@@ -23,6 +23,9 @@ patch -p1 < ../FixZLibMozBuild.diff - # This causes tracelogger to flush data to the disk regularly and prevents out of - # memory issues if a lot of data gets logged. - # * https://bugzilla.mozilla.org/show_bug.cgi?id=1155618 -+ -+# patch to fix SO_VERSION on OpenBSD -+patch -p1 -i ../FixSoVersionOpenBSD.diff - # Fix tracelogger destructor that touches possibly uninitialised hash table. - # * https://bugzilla.mozilla.org/show_bug.cgi?id=1223636 - # Don't treat extraTextId as containing only extra ids. Index: base/patches/patch-source_third_party_cppformat_format_cpp =================================================================== RCS file: base/patches/patch-source_third_party_cppformat_format_cpp diff -N base/patches/patch-source_third_party_cppformat_format_cpp --- base/patches/patch-source_third_party_cppformat_format_cpp 25 Dec 2018 00:32:56 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-source_third_party_cppformat_format_cpp,v 1.2 2018/12/25 00:32:56 bentley Exp $ -Index: source/third_party/cppformat/format.cpp ---- source/third_party/cppformat/format.cpp.orig -+++ source/third_party/cppformat/format.cpp -@@ -432,7 +432,7 @@ int fmt::internal::safe_strerror( - int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT(true) { - assert(buffer != 0 && buffer_size != 0); - int result = 0; --#if defined(_GNU_SOURCE) && !defined(__BIONIC__) -+#if defined(_GNU_SOURCE) && !defined(__BIONIC__) && !defined(__OpenBSD__) - char *message = strerror_r(error_code, buffer, buffer_size); - // If the buffer is full then the message is probably truncated. - if (message == buffer && strlen(buffer) == buffer_size - 1) Index: base/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/games/0ad/base/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- base/pkg/PLIST 22 Jun 2021 04:34:08 -0000 1.10 +++ base/pkg/PLIST 14 Nov 2021 10:18:14 -0000 @@ -12,8 +12,9 @@ bin/0ad @static-lib lib/libmocks_real.a @static-lib lib/libmocks_test.a @static-lib lib/libmongoose.a -@lib lib/libmozjs38-ps-release.so.${LIBmozjs38-ps-release_VERSION} +@lib lib/libmozjs78-ps-release.so.${LIBmozjs78-ps-release_VERSION} @static-lib lib/libnetwork.a +@static-lib lib/librlinterface.a @static-lib lib/libscriptinterface.a @static-lib lib/libsimulation2.a @static-lib lib/libtinygettext.a @@ -21,7 +22,6 @@ share/0ad/l10n/ share/0ad/l10n/.tx/ share/0ad/l10n/.tx/config share/0ad/l10n/ast.engine.po -share/0ad/l10n/bg.engine.po share/0ad/l10n/ca.engine.po share/0ad/l10n/cs.engine.po share/0ad/l10n/de.engine.po @@ -30,19 +30,16 @@ share/0ad/l10n/en_GB.engine.po share/0ad/l10n/engine.pot share/0ad/l10n/es.engine.po share/0ad/l10n/eu.engine.po +share/0ad/l10n/fi.engine.po share/0ad/l10n/fr.engine.po share/0ad/l10n/gd.engine.po -share/0ad/l10n/gl.engine.po share/0ad/l10n/hu.engine.po share/0ad/l10n/id.engine.po share/0ad/l10n/it.engine.po share/0ad/l10n/messages.json -share/0ad/l10n/ms.engine.po -share/0ad/l10n/nb.engine.po share/0ad/l10n/nl.engine.po share/0ad/l10n/pl.engine.po share/0ad/l10n/pt_BR.engine.po -share/0ad/l10n/pt_PT.engine.po share/0ad/l10n/ru.engine.po share/0ad/l10n/sk.engine.po share/0ad/l10n/sv.engine.po @@ -56,6 +53,25 @@ share/0ad/mods/_test.dae/art/animation/ share/0ad/mods/_test.dae/art/animation/jav2.dae share/0ad/mods/_test.dae/art/meshes/ share/0ad/mods/_test.dae/art/meshes/jav2.dae +share/0ad/mods/_test.gui/ +share/0ad/mods/_test.gui/gui/ +share/0ad/mods/_test.gui/gui/common/ +share/0ad/mods/_test.gui/gui/common/styles.xml +share/0ad/mods/_test.gui/gui/event/ +share/0ad/mods/_test.gui/gui/event/event.js +share/0ad/mods/_test.gui/gui/event/event.xml +share/0ad/mods/_test.gui/gui/event/page_event.xml +share/0ad/mods/_test.gui/gui/gui.rng +share/0ad/mods/_test.gui/gui/gui_page.rng +share/0ad/mods/_test.gui/gui/hotkey/ +share/0ad/mods/_test.gui/gui/hotkey/hotkey.js +share/0ad/mods/_test.gui/gui/hotkey/hotkey.xml +share/0ad/mods/_test.gui/gui/hotkey/page_hotkey.xml +share/0ad/mods/_test.gui/gui/regainFocus/ +share/0ad/mods/_test.gui/gui/regainFocus/page_emptyPage.xml +share/0ad/mods/_test.gui/gui/regainFocus/page_pushWithPopOnInit.xml +share/0ad/mods/_test.gui/gui/regainFocus/pushWithPopOnInit.js +share/0ad/mods/_test.gui/gui/regainFocus/pushWithPopOnInit.xml share/0ad/mods/_test.minimal/ share/0ad/mods/_test.minimal/art/ share/0ad/mods/_test.minimal/art/actors/ @@ -124,6 +140,8 @@ share/0ad/mods/_test.sim/simulation/comp share/0ad/mods/_test.sim/simulation/components/test-hotload1.js share/0ad/mods/_test.sim/simulation/components/test-hotload2.js share/0ad/mods/_test.sim/simulation/components/test-interface.js +share/0ad/mods/_test.sim/simulation/components/test-modding1.js +share/0ad/mods/_test.sim/simulation/components/test-modding2.js share/0ad/mods/_test.sim/simulation/components/test-msg.js share/0ad/mods/_test.sim/simulation/components/test-param.js share/0ad/mods/_test.sim/simulation/components/test-query.js Index: data/Makefile =================================================================== RCS file: /home/cvs/ports/games/0ad/data/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- data/Makefile 14 Jun 2021 10:19:47 -0000 1.4 +++ data/Makefile 13 Nov 2021 18:23:23 -0000 @@ -4,7 +4,6 @@ COMMENT = historical real-time strategy DISTNAME = 0ad-${V}-alpha-unix-data PKGNAME = 0ad-data-${V} -REVISION = 0 PKG_ARCH = * Index: data/distinfo =================================================================== RCS file: /home/cvs/ports/games/0ad/data/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- data/distinfo 25 Dec 2018 00:32:56 -0000 1.8 +++ data/distinfo 13 Nov 2021 18:25:28 -0000 @@ -1,2 +1,2 @@ -SHA256 (0ad-0.0.23b-alpha-unix-data.tar.gz) = /j9pp3qQEM6hWE8R5W7jAF2JIoG8Qs5FkndE9+6ZB3o= -SIZE (0ad-0.0.23b-alpha-unix-data.tar.gz) = 884752796 +SHA256 (0ad-0.0.25b-alpha-unix-data.tar.gz) = qeYM9hLOtk7xP5SYp9QuDZXaL9PtomwjApQsFEfAcyg= +SIZE (0ad-0.0.25b-alpha-unix-data.tar.gz) = 1608167375 Index: data/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/games/0ad/data/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- data/pkg/PLIST 25 Dec 2018 00:32:56 -0000 1.4 +++ data/pkg/PLIST 14 Nov 2021 09:58:29 -0000 @@ -7,6 +7,7 @@ share/0ad/mods/ share/0ad/mods/mod/ share/0ad/mods/mod/mod.zip share/0ad/mods/public/ +share/0ad/mods/public/mod.json share/0ad/mods/public/public.zip share/0ad/tools/ share/0ad/tools/atlas/
