Re: update games/0ad
On 2022/10/08 11:56:47 +0200, Florian Viehweger wrote: > Hi, > > > > OK for after the unlock? > > > > Hi, > > Works fine for me. OK kirby@ > > I can confirm, works fine. Thanks! Thank you both!
Re: update games/0ad
Hi,
> > OK for after the unlock?
>
> Hi,
> Works fine for me. OK kirby@
I can confirm, works fine. Thanks!
> >
> > Index: Makefile.inc
> > ===
> > RCS file: /home/cvs/ports/games/0ad/Makefile.inc,v
> > retrieving revision 1.14
> > diff -u -p -r1.14 Makefile.inc
> > --- Makefile.inc11 Mar 2022 19:04:03 - 1.14
> > +++ Makefile.inc2 Oct 2022 20:33:54 -
> > @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =amd64 i386
> >
> > CATEGORIES = games
> >
> > -V ?= 0.0.25b
> > +V ?= 0.0.26
> >
> > HOMEPAGE = https://play0ad.com/
> >
> > Index: base/Makefile
> > ===
> > RCS file: /home/cvs/ports/games/0ad/base/Makefile,v
> > retrieving revision 1.37
> > diff -u -p -r1.37 Makefile
> > --- base/Makefile 18 Aug 2022 02:24:48 - 1.37
> > +++ base/Makefile 3 Oct 2022 14:42:02 -
> > @@ -3,15 +3,13 @@ COMMENT = historical real-time
> > strategy DISTNAME = 0ad-${V}-alpha-unix-build
> > PKGNAME = 0ad-${V}
> >
> > -REVISION = 0
> > -
> > USE_WXNEEDED = Yes
> >
> > SO_VERSION = 0.0
> > SHARED_LIBS += mozjs78-ps-release${SO_VERSION}
> >
> > -WANTLIB += ${COMPILER_LIBCXX} GL SDL2 X11 boost_filesystem
> > -WANTLIB += boost_system c crypto curl enet execinfo fmt gloox iconv
> > +WANTLIB += ${COMPILER_LIBCXX} SDL2 X11 boost_filesystem
> > +WANTLIB += boost_system c crypto curl enet execinfo fmt freetype
> > gloox iconv WANTLIB += icudata icui18n icuuc idn m miniupnpc ogg
> > openal WANTLIB += png sodium ssl vorbis vorbisfile xml2 z
> >
> > Index: base/distinfo
> > ===
> > RCS file: /home/cvs/ports/games/0ad/base/distinfo,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 distinfo
> > --- base/distinfo 22 Nov 2021 16:00:30 - 1.9
> > +++ base/distinfo 2 Oct 2022 20:34:16 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (0ad-0.0.25b-alpha-unix-build.tar.gz) =
> > AnMMMof21FEekRntNF1CSk7z9aMb9KCnzHntgNv+PIA=
> > -SIZE (0ad-0.0.25b-alpha-unix-build.tar.gz) = 78022628
> > +SHA256 (0ad-0.0.26-alpha-unix-build.tar.gz) =
> > SpkFAE4iDXdP8H/TH+XKqzraOAfut79mSykEWDcRQhw=
> > +SIZE (0ad-0.0.26-alpha-unix-build.tar.gz) = 78065537
> > Index: base/patches/patch-build_premake_extern_libs5_lua
> > ===
> > RCS file: base/patches/patch-build_premake_extern_libs5_lua
> > diff -N base/patches/patch-build_premake_extern_libs5_lua
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ base/patches/patch-build_premake_extern_libs5_lua 2 Oct
> > 2022 22:15:24 -
> > @@ -0,0 +1,12 @@
> > +Index: build/premake/extern_libs5.lua
> > +--- build/premake/extern_libs5.lua.orig
> > build/premake/extern_libs5.lua
> > +@@ -675,7 +675,7 @@ extern_lib_defs = {
> > + -- TODO: We need to force linking
> > with these as currently
> > + -- they need to be loaded
> > explicitly on execution
> > + add_default_links({
> > +- unix_names = { "ogg",
> > "vorbis" }, ++ unix_names =
> > { "ogg", "vorbis", "vorbisfile" },
> > + })
> > + else
> > + pkgconfig.add_links("vorbisfile")
> > 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.8
> > diff -u -p -r1.8 patch-build_workspaces_update-workspaces_sh
> > --- base/patches/patch-build_workspaces_update-workspaces_sh
> > 11 Mar 2022 19:04:03 - 1.8
> > +++ base/patches/patch-build_workspaces_update-workspaces_sh
> > 2 Oct 2022 20:42:23 -
> > @@ -2,7 +2,7 @@ Don't build bundled libraries during con
> > Index: build/workspaces/update-workspaces.sh
> > --- build/workspaces/update-workspaces.sh.orig
> > +++ build/workspaces/update-workspaces.sh
> > -@@ -86,7 +86,7 @@ if [ "`uname -s`" != "Darwin" ]; then
> > +@@ -90,7 +90,7 @@ if [ "`uname -s`" != "Darwin" ]; then
> > echo
> >
> > # Build/update bundled external libraries
> > @@ -10,4 +10,4 @@ Index: build/workspaces/update-workspace
> > + # (cd ../../libraries/source/fcollada && MAKE=${MAKE}
> > JOBS=${JOBS} ./build.sh) || die "FCollada build failed"
> > echo
> > if [ "$with_system_mozjs" = "false" ]; then
> > - (cd ../../libraries/source/spidermonkey && MAKE=${MAKE}
> > JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed"
> > + (cd ../../libraries/source/spidermonkey && MAKE=${MAKE}
> > JOBS=${JOBS} PYTHONNOUSERSITE=true ./build.sh) || die "SpiderMonkey
> > build failed" Index:
> >
Re: update games/0ad
On Mon, October 3, 2022 17:55, Omar Polo wrote:
> here's an updated for games/0ad, sending it a bit early so interested
> folks can play it :)
>
> https://play0ad.com/new-release-0-a-d-alpha-26-zhuangzi/
>
> I've only played it briefly, but the new civilization (Han) is really
> cool. Will hopefully play it more in the following days.
>
> port-wise I removed the backported diff and updated the one we need.
> Upstream explicitly links to libogg and libvorbis on OpenBSD (there's
> a check in build/premake/extern_libs5.lua -- I'm assuming they dlopen
> on other platforms?) but starting from this version it also need
> vorbisfile to link.
>
> OK for after the unlock?
Hi,
Works fine for me. OK kirby@
>
> Index: Makefile.inc
> ===
> RCS file: /home/cvs/ports/games/0ad/Makefile.inc,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile.inc
> --- Makefile.inc 11 Mar 2022 19:04:03 - 1.14
> +++ Makefile.inc 2 Oct 2022 20:33:54 -
> @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS = amd64 i386
>
> CATEGORIES = games
>
> -V ?= 0.0.25b
> +V ?= 0.0.26
>
> HOMEPAGE = https://play0ad.com/
>
> Index: base/Makefile
> ===
> RCS file: /home/cvs/ports/games/0ad/base/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- base/Makefile 18 Aug 2022 02:24:48 - 1.37
> +++ base/Makefile 3 Oct 2022 14:42:02 -
> @@ -3,15 +3,13 @@ COMMENT = historical real-time strategy
> DISTNAME = 0ad-${V}-alpha-unix-build
> PKGNAME =0ad-${V}
>
> -REVISION = 0
> -
> USE_WXNEEDED = Yes
>
> SO_VERSION = 0.0
> SHARED_LIBS += mozjs78-ps-release${SO_VERSION}
>
> -WANTLIB += ${COMPILER_LIBCXX} GL SDL2 X11 boost_filesystem
> -WANTLIB += boost_system c crypto curl enet execinfo fmt gloox iconv
> +WANTLIB += ${COMPILER_LIBCXX} SDL2 X11 boost_filesystem
> +WANTLIB += boost_system c crypto curl enet execinfo fmt freetype gloox iconv
> WANTLIB += icudata icui18n icuuc idn m miniupnpc ogg openal
> WANTLIB += png sodium ssl vorbis vorbisfile xml2 z
>
> Index: base/distinfo
> ===
> RCS file: /home/cvs/ports/games/0ad/base/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- base/distinfo 22 Nov 2021 16:00:30 - 1.9
> +++ base/distinfo 2 Oct 2022 20:34:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (0ad-0.0.25b-alpha-unix-build.tar.gz) =
> AnMMMof21FEekRntNF1CSk7z9aMb9KCnzHntgNv+PIA=
> -SIZE (0ad-0.0.25b-alpha-unix-build.tar.gz) = 78022628
> +SHA256 (0ad-0.0.26-alpha-unix-build.tar.gz) =
> SpkFAE4iDXdP8H/TH+XKqzraOAfut79mSykEWDcRQhw=
> +SIZE (0ad-0.0.26-alpha-unix-build.tar.gz) = 78065537
> Index: base/patches/patch-build_premake_extern_libs5_lua
> ===
> RCS file: base/patches/patch-build_premake_extern_libs5_lua
> diff -N base/patches/patch-build_premake_extern_libs5_lua
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ base/patches/patch-build_premake_extern_libs5_lua 2 Oct 2022 22:15:24
> -
> @@ -0,0 +1,12 @@
> +Index: build/premake/extern_libs5.lua
> +--- build/premake/extern_libs5.lua.orig
> build/premake/extern_libs5.lua
> +@@ -675,7 +675,7 @@ extern_lib_defs = {
> + -- TODO: We need to force linking with these as
> currently
> + -- they need to be loaded explicitly on
> execution
> + add_default_links({
> +-unix_names = { "ogg", "vorbis" },
> ++unix_names = { "ogg", "vorbis",
> "vorbisfile" },
> + })
> + else
> + pkgconfig.add_links("vorbisfile")
> 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.8
> diff -u -p -r1.8 patch-build_workspaces_update-workspaces_sh
> --- base/patches/patch-build_workspaces_update-workspaces_sh 11 Mar 2022
> 19:04:03 -1.8
> +++ base/patches/patch-build_workspaces_update-workspaces_sh 2 Oct 2022
> 20:42:23 -
> @@ -2,7 +2,7 @@ Don't build bundled libraries during con
> Index: build/workspaces/update-workspaces.sh
> --- build/workspaces/update-workspaces.sh.orig
> +++ build/workspaces/update-workspaces.sh
> -@@ -86,7 +86,7 @@ if [ "`uname -s`" != "Darwin" ]; then
> +@@ -90,7 +90,7 @@ if [ "`uname -s`" != "Darwin" ]; then
> echo
>
> # Build/update bundled external libraries
> @@ -10,4 +10,4 @@ Index: build/workspaces/update-workspace
> + # (cd ../../libraries/source/fcollada &&
update games/0ad
here's an updated for games/0ad, sending it a bit early so interested
folks can play it :)
https://play0ad.com/new-release-0-a-d-alpha-26-zhuangzi/
I've only played it briefly, but the new civilization (Han) is really
cool. Will hopefully play it more in the following days.
port-wise I removed the backported diff and updated the one we need.
Upstream explicitly links to libogg and libvorbis on OpenBSD (there's
a check in build/premake/extern_libs5.lua -- I'm assuming they dlopen
on other platforms?) but starting from this version it also need
vorbisfile to link.
OK for after the unlock?
Index: Makefile.inc
===
RCS file: /home/cvs/ports/games/0ad/Makefile.inc,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.inc
--- Makefile.inc11 Mar 2022 19:04:03 - 1.14
+++ Makefile.inc2 Oct 2022 20:33:54 -
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =amd64 i386
CATEGORIES = games
-V ?= 0.0.25b
+V ?= 0.0.26
HOMEPAGE = https://play0ad.com/
Index: base/Makefile
===
RCS file: /home/cvs/ports/games/0ad/base/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- base/Makefile 18 Aug 2022 02:24:48 - 1.37
+++ base/Makefile 3 Oct 2022 14:42:02 -
@@ -3,15 +3,13 @@ COMMENT = historical real-time strategy
DISTNAME = 0ad-${V}-alpha-unix-build
PKGNAME = 0ad-${V}
-REVISION = 0
-
USE_WXNEEDED = Yes
SO_VERSION = 0.0
SHARED_LIBS += mozjs78-ps-release${SO_VERSION}
-WANTLIB += ${COMPILER_LIBCXX} GL SDL2 X11 boost_filesystem
-WANTLIB += boost_system c crypto curl enet execinfo fmt gloox iconv
+WANTLIB += ${COMPILER_LIBCXX} SDL2 X11 boost_filesystem
+WANTLIB += boost_system c crypto curl enet execinfo fmt freetype gloox iconv
WANTLIB += icudata icui18n icuuc idn m miniupnpc ogg openal
WANTLIB += png sodium ssl vorbis vorbisfile xml2 z
Index: base/distinfo
===
RCS file: /home/cvs/ports/games/0ad/base/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- base/distinfo 22 Nov 2021 16:00:30 - 1.9
+++ base/distinfo 2 Oct 2022 20:34:16 -
@@ -1,2 +1,2 @@
-SHA256 (0ad-0.0.25b-alpha-unix-build.tar.gz) =
AnMMMof21FEekRntNF1CSk7z9aMb9KCnzHntgNv+PIA=
-SIZE (0ad-0.0.25b-alpha-unix-build.tar.gz) = 78022628
+SHA256 (0ad-0.0.26-alpha-unix-build.tar.gz) =
SpkFAE4iDXdP8H/TH+XKqzraOAfut79mSykEWDcRQhw=
+SIZE (0ad-0.0.26-alpha-unix-build.tar.gz) = 78065537
Index: base/patches/patch-build_premake_extern_libs5_lua
===
RCS file: base/patches/patch-build_premake_extern_libs5_lua
diff -N base/patches/patch-build_premake_extern_libs5_lua
--- /dev/null 1 Jan 1970 00:00:00 -
+++ base/patches/patch-build_premake_extern_libs5_lua 2 Oct 2022 22:15:24
-
@@ -0,0 +1,12 @@
+Index: build/premake/extern_libs5.lua
+--- build/premake/extern_libs5.lua.orig
build/premake/extern_libs5.lua
+@@ -675,7 +675,7 @@ extern_lib_defs = {
+ -- TODO: We need to force linking with these as
currently
+ -- they need to be loaded explicitly on
execution
+ add_default_links({
+- unix_names = { "ogg", "vorbis" },
++ unix_names = { "ogg", "vorbis",
"vorbisfile" },
+ })
+ else
+ pkgconfig.add_links("vorbisfile")
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.8
diff -u -p -r1.8 patch-build_workspaces_update-workspaces_sh
--- base/patches/patch-build_workspaces_update-workspaces_sh11 Mar 2022
19:04:03 - 1.8
+++ base/patches/patch-build_workspaces_update-workspaces_sh2 Oct 2022
20:42:23 -
@@ -2,7 +2,7 @@ Don't build bundled libraries during con
Index: build/workspaces/update-workspaces.sh
--- build/workspaces/update-workspaces.sh.orig
+++ build/workspaces/update-workspaces.sh
-@@ -86,7 +86,7 @@ if [ "`uname -s`" != "Darwin" ]; then
+@@ -90,7 +90,7 @@ if [ "`uname -s`" != "Darwin" ]; then
echo
# Build/update bundled external libraries
@@ -10,4 +10,4 @@ Index: build/workspaces/update-workspace
+ # (cd ../../libraries/source/fcollada && MAKE=${MAKE} JOBS=${JOBS}
./build.sh) || die "FCollada build failed"
echo
if [ "$with_system_mozjs" = "false" ]; then
- (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS}
./build.sh) || die "SpiderMonkey build failed"
+ (cd
Re: [update] games/0ad: 0.0.23b -> 0.0.25b
Omar Polo writes: > 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. ok bentley@
Re: [update] games/0ad: 0.0.23b -> 0.0.25b
Am Mon, 15 Nov 2021 10:43:09 +0100
schrieb Omar Polo :
> Omar Polo writes:
>
> > Klemens Nanni 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.
I've played 0ad with Omar for several hours and we found no issues.
Everything was working as expected.
We did play using solely OpenBSD and with OpenBSD + Linux mixed
installations. No interoperability problems found.
Thank you for your work!
> (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 - 1.12
> +++ Makefile.inc 13 Nov 2021 18:17:39 -
> @@ -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 - 1.34
> +++ base/Makefile 15 Nov 2021 09:55:01 -
> @@ -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 =
Re: [update] games/0ad: 0.0.23b -> 0.0.25b
Omar Polo writes:
> Klemens Nanni 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.inc14 Jun 2021 10:19:46 - 1.12
+++ Makefile.inc13 Nov 2021 18:17:39 -
@@ -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 - 1.34
+++ base/Makefile 15 Nov 2021 09:55:01 -
@@ -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
Re: [update] games/0ad: 0.0.23b -> 0.0.25b
Klemens Nanni 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
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.inc14 Jun 2021 10:19:46 - 1.12
+++ Makefile.inc13 Nov 2021 18:17:39 -
@@ -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 - 1.34
+++ base/Makefile 15 Nov 2021 07:49:15 -
@@ -1,31 +1,27 @@
# $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/sdl2 \
graphics/png \
net/curl \
@@ -33,6 +29,7 @@ LIB_DEPENDS = audio/libvorbis \
net/gloox>=1.0.20 \
net/miniupnp/miniupnpc \
security/libsodium \
+ devel/fmt \
textproc/icu4c \
textproc/libxml
RUN_DEPENDS = devel/desktop-file-utils \
@@ -49,16 +46,22 @@ 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
+
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 - 1.8
+++ base/distinfo 13 Nov 2021 18:18:56 -
@@ -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
Re: [update] games/0ad: 0.0.23b -> 0.0.25b
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 ;-)
[update] games/0ad: 0.0.23b -> 0.0.25b
Hello,
Please find attached a diff to update 0ad to the latest alpha available.
Played for a couple of hours (and lost, as usual) and runs fine on
amdgpu. (I'll take my revenge against the carthaginians another day.)
Comments/OKs?
Cheers!
Omar Polo
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.
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.inc14 Jun 2021 10:19:46 - 1.12
+++ Makefile.inc13 Nov 2021 18:17:39 -
@@ -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 - 1.34
+++ base/Makefile 14 Nov 2021 10:44:33 -
@@ -1,31 +1,27 @@
# $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/sdl2 \
graphics/png \
net/curl \
@@ -33,6 +29,7 @@ LIB_DEPENDS = audio/libvorbis \
net/gloox>=1.0.20 \
net/miniupnp/miniupnpc \
security/libsodium \
+ devel/fmt \
textproc/icu4c \
textproc/libxml
RUN_DEPENDS = devel/desktop-file-utils \
@@ -49,16 +46,17 @@ 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
+CONFIGURE_ENV += SHELL=sh
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 - 1.8
+++ base/distinfo 13 Nov 2021 18:18:56 -
@@ -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 - 1.3
+++
UPDATE: games/0ad
Hi,
Here's an update to 0ad-0.0.22.
ok?
Index: Makefile.inc
===
RCS file: /cvs/ports/games/0ad/Makefile.inc,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.inc
--- Makefile.inc17 Nov 2016 11:16:43 - 1.8
+++ Makefile.inc8 Aug 2017 09:00:31 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =amd64 i386
CATEGORIES = games
-V ?= 0.0.21
+V ?= 0.0.22
HOMEPAGE = https://play0ad.com/
Index: base/Makefile
===
RCS file: /cvs/ports/games/0ad/base/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- base/Makefile 26 Jul 2017 22:45:20 - 1.19
+++ base/Makefile 8 Aug 2017 09:00:31 -
@@ -28,12 +28,12 @@ LIB_DEPENDS = audio/libvorbis \
graphics/png \
net/curl \
net/enet \
- net/gloox \
+ net/gloox>=1.0.20 \
net/miniupnp/miniupnpc \
textproc/icu4c \
textproc/libxml
RUN_DEPENDS = devel/desktop-file-utils \
- games/0ad/data
+ games/0ad/data=${V}
MODULES = lang/python
# sync with devel/spidermonkey
Index: base/distinfo
===
RCS file: /cvs/ports/games/0ad/base/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- base/distinfo 17 Nov 2016 11:16:43 - 1.6
+++ base/distinfo 8 Aug 2017 09:00:31 -
@@ -1,2 +1,2 @@
-SHA256 (0ad-0.0.21-alpha-unix-build.tar.gz) =
6rTYdXzKIitXGBlYhVN8AIubhFACl/BHBY5bpSoiNVQ=
-SIZE (0ad-0.0.21-alpha-unix-build.tar.gz) = 30785689
+SHA256 (0ad-0.0.22-alpha-unix-build.tar.gz) =
tQ71qoAEvGDFQkk9LDzv9Z69763NkB1SnEkskVA+0Ec=
+SIZE (0ad-0.0.22-alpha-unix-build.tar.gz) = 30784885
Index: base/pkg/PLIST
===
RCS file: /cvs/ports/games/0ad/base/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- base/pkg/PLIST 17 Nov 2016 11:16:43 - 1.6
+++ base/pkg/PLIST 8 Aug 2017 09:00:31 -
@@ -24,9 +24,11 @@ share/0ad/l10n/bg.engine.po
share/0ad/l10n/ca.engine.po
share/0ad/l10n/cs.engine.po
share/0ad/l10n/de.engine.po
+share/0ad/l10n/el.engine.po
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/fr.engine.po
share/0ad/l10n/gd.engine.po
share/0ad/l10n/gl.engine.po
@@ -43,6 +45,7 @@ share/0ad/l10n/ru.engine.po
share/0ad/l10n/sk.engine.po
share/0ad/l10n/sv.engine.po
share/0ad/l10n/tr.engine.po
+share/0ad/l10n/uk.engine.po
share/0ad/mods/_test.dae/
share/0ad/mods/_test.dae/art/
share/0ad/mods/_test.dae/art/actors/
@@ -141,9 +144,15 @@ share/0ad/mods/_test.sim/simulation/temp
share/0ad/mods/_test.sim/simulation/templates/inherit-special.xml
share/0ad/mods/_test.sim/simulation/templates/inherit1.xml
share/0ad/mods/_test.sim/simulation/templates/inherit2.xml
+share/0ad/mods/_test.sim/simulation/templates/inherit_a.xml
+share/0ad/mods/_test.sim/simulation/templates/inherit_b.xml
+share/0ad/mods/_test.sim/simulation/templates/inherit_c.xml
+share/0ad/mods/_test.sim/simulation/templates/inherit_d.xml
share/0ad/mods/_test.sim/simulation/templates/invalid.xml
share/0ad/mods/_test.sim/simulation/templates/special/
share/0ad/mods/_test.sim/simulation/templates/special/actor.xml
+share/0ad/mods/_test.sim/simulation/templates/special_filter/
+share/0ad/mods/_test.sim/simulation/templates/special_filter/foundation.xml
share/0ad/mods/_test.sim/simulation/templates/template-serialize.xml
share/0ad/mods/_test.sim/simulation/templates/test1-inherit.xml
share/0ad/mods/_test.sim/simulation/templates/test1.xml
Index: data/distinfo
===
RCS file: /cvs/ports/games/0ad/data/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- data/distinfo 17 Nov 2016 11:16:43 - 1.6
+++ data/distinfo 8 Aug 2017 09:00:31 -
@@ -1,2 +1,2 @@
-SHA256 (0ad-0.0.21-alpha-unix-data.tar.gz) =
/ZSUr7wP+FGpJ9yiUtHSjaAdPhSVDviEyGPqb5Cw8j8=
-SIZE (0ad-0.0.21-alpha-unix-data.tar.gz) = 734300320
+SHA256 (0ad-0.0.22-alpha-unix-data.tar.gz) =
sJDey/mal42SZC632BOwHaPCyBXOP/zYeVcn4t+ZjzA=
+SIZE (0ad-0.0.22-alpha-unix-data.tar.gz) = 801186094
Index: data/pkg/PLIST
===
RCS file: /cvs/ports/games/0ad/data/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- data/pkg/PLIST 19 Oct 2014 07:46:45 - 1.2
+++ data/pkg/PLIST 8 Aug 2017 09:00:31 -
@@ -33,6 +33,7 @@ share/0ad/tools/atlas/toolbar/map.png
share/0ad/tools/atlas/toolbar/mapsettings.png
UPDATE: games/0ad
Hi,
Here is an update to 0ad-0.0.17.
Tested on i386/amd64.
ok?
Index: Makefile.inc
===
RCS file: /cvs/ports/games/0ad/Makefile.inc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile.inc
--- Makefile.inc21 Jul 2014 01:34:17 - 1.2
+++ Makefile.inc13 Oct 2014 12:34:51 -
@@ -4,14 +4,13 @@ ONLY_FOR_ARCHS = amd64 i386
CATEGORIES = games
-V ?= 0.0.16
+V ?= 0.0.17
HOMEPAGE = http://play0ad.com/
MAINTAINER = Anthony J. Bentley anth...@cathet.us
-MASTER_SITES = http://releases.wildfiregames.com/ \
- ${MASTER_SITE_SOURCEFORGE:=zero-ad/}
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=zero-ad/}
# GPLv2+, MIT for libs, CC-BY-SA for data
PERMIT_PACKAGE_CDROM = Yes
Index: base/Makefile
===
RCS file: /cvs/ports/games/0ad/base/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- base/Makefile 21 Jul 2014 01:24:06 - 1.1.1.1
+++ base/Makefile 13 Oct 2014 12:34:51 -
@@ -31,7 +31,7 @@ MODULES = gcc4 \
lang/python \
converters/libiconv
MODPY_RUNDEP = No
-MODPY_ADJ_FILES = ../../../libraries/source/cxxtest-4.3/bin/cxxtestgen
+MODPY_ADJ_FILES = ../../../libraries/source/cxxtest-4.4/bin/cxxtestgen
MODGCC4_ARCHS =*
MODGCC4_LANGS =c c++
@@ -45,7 +45,6 @@ PATCHORIG = .orig.port
USE_GMAKE =Yes
CONFIGURE_ARGS += --without-nvtt \
- --with-system-enet \
--with-system-miniupnpc \
--with-system-mozjs24 \
--datadir=${PREFIX}/share/0ad \
Index: base/distinfo
===
RCS file: /cvs/ports/games/0ad/base/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- base/distinfo 21 Jul 2014 01:24:06 - 1.1.1.1
+++ base/distinfo 13 Oct 2014 12:34:51 -
@@ -1,2 +1,2 @@
-SHA256 (0ad-0.0.16-alpha-unix-build.tar.gz) =
KNVlEPloaqRNHiM5zLkmOnJ+aA1blKUFIfB7TNWp6Ho=
-SIZE (0ad-0.0.16-alpha-unix-build.tar.gz) = 22020780
+SHA256 (0ad-0.0.17-alpha-unix-build.tar.gz) =
WAsRoI/BqFscLjJqKe5ib/otQe3QOZC/0oxiJeZbyF4=
+SIZE (0ad-0.0.17-alpha-unix-build.tar.gz) = 21249653
Index: base/patches/patch-build_premake_premake4_build_gmake_bsd_Premake4_make
===
RCS file:
/cvs/ports/games/0ad/base/patches/patch-build_premake_premake4_build_gmake_bsd_Premake4_make,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1
patch-build_premake_premake4_build_gmake_bsd_Premake4_make
--- base/patches/patch-build_premake_premake4_build_gmake_bsd_Premake4_make
21 Jul 2014 01:24:06 - 1.1.1.1
+++ base/patches/patch-build_premake_premake4_build_gmake_bsd_Premake4_make
13 Oct 2014 12:34:51 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-build_premake_premake4_build_gmake_bsd_Premake4_make,v 1.1.1.1
2014/07/21 01:24:06 bentley Exp $
build/premake/premake4/build/gmake.bsd/Premake4.make.orig.port Sun Jul
13 10:43:11 2014
-+++ build/premake/premake4/build/gmake.bsd/Premake4.make Sun Jul 13
10:43:19 2014
+$OpenBSD$
+--- 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
Index: base/patches/patch-build_workspaces_update-workspaces_sh
===
RCS file:
/cvs/ports/games/0ad/base/patches/patch-build_workspaces_update-workspaces_sh,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-build_workspaces_update-workspaces_sh
--- base/patches/patch-build_workspaces_update-workspaces_sh21 Jul 2014
01:24:06 - 1.1.1.1
+++ base/patches/patch-build_workspaces_update-workspaces_sh13 Oct 2014
12:34:51 -
@@ -1,8 +1,8 @@
$OpenBSD: patch-build_workspaces_update-workspaces_sh,v 1.1.1.1 2014/07/21
01:24:06 bentley Exp $
Don't build bundled libraries during configure.
build/workspaces/update-workspaces.sh.orig.portSun Apr 20 13:17:32 2014
-+++ build/workspaces/update-workspaces.sh Mon May 19 01:28:21 2014
-@@ -80,7 +80,7 @@ if [ `uname -s` != Darwin ]; then
+--- build/workspaces/update-workspaces.sh.orig.portWed Sep 24 19:54:58 2014
build/workspaces/update-workspaces.sh Sun Oct 12 20:26:25 2014
+@@ -86,7 +86,7 @@ if [ `uname -s` != Darwin ]; then
echo
# Build/update bundled external libraries
Index:
