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.inc 21 Jul 2014 01:34:17 -0000 1.2 +++ Makefile.inc 13 Oct 2014 12:34:51 -0000 @@ -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 <[email protected]> -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 -0000 1.1.1.1 +++ base/Makefile 13 Oct 2014 12:34:51 -0000 @@ -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 -0000 1.1.1.1 +++ base/distinfo 13 Oct 2014 12:34:51 -0000 @@ -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 -0000 1.1.1.1 +++ base/patches/patch-build_premake_premake4_build_gmake_bsd_Premake4_make 13 Oct 2014 12:34:51 -0000 @@ -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_sh 21 Jul 2014 01:24:06 -0000 1.1.1.1 +++ base/patches/patch-build_workspaces_update-workspaces_sh 13 Oct 2014 12:34:51 -0000 @@ -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.port Sun 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.port Wed 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: base/patches/patch-libraries_source_fcollada_src_Makefile =================================================================== RCS file: /cvs/ports/games/0ad/base/patches/patch-libraries_source_fcollada_src_Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-libraries_source_fcollada_src_Makefile --- base/patches/patch-libraries_source_fcollada_src_Makefile 21 Jul 2014 01:24:06 -0000 1.1.1.1 +++ base/patches/patch-libraries_source_fcollada_src_Makefile 13 Oct 2014 12:34:51 -0000 @@ -1,26 +1,26 @@ -$OpenBSD: patch-libraries_source_fcollada_src_Makefile,v 1.1.1.1 2014/07/21 01:24:06 bentley Exp $ ---- libraries/source/fcollada/src/Makefile.orig.port Sun Oct 27 22:06:15 2013 -+++ libraries/source/fcollada/src/Makefile Sun Jul 13 11:18:39 2014 +$OpenBSD$ +--- 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 @@ -10,7 +10,7 @@ endif CXX ?= g++ CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL --CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL +-CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL +CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL - # (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1 until gcc >4.3 is typical.) CXXFLAGS_TEST := -O0 -g -D_DEBUG LIBS += `pkg-config libxml-2.0 --libs` -@@ -225,7 +225,7 @@ OBJECTS_RELEASE = $(addprefix output/release/,$(SOURCE + INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` +@@ -224,7 +224,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) --all: output_dirs output/libFColladaSD.a output/libFColladaSR.a install -+all: output_dirs output/libFColladaSR.a install +-all: output/libFColladaSD.a output/libFColladaSR.a install ++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}' -@@ -245,8 +245,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEASE) - output/FColladaTest: $(OBJECTS_TEST) +@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_di + output/FColladaTest: $(OBJECTS_TEST) | output_dirs $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS) -install: output/libFColladaSD.a output/libFColladaSR.a @@ -29,7 +29,7 @@ $OpenBSD: patch-libraries_source_fcollad cp output/libFColladaSR.a ../lib/libFColladaSR.a dfile = $(@:.o=.d) -@@ -273,5 +272,3 @@ clean: +@@ -272,5 +271,3 @@ clean: rm -rf output -include $(OBJECTS_ALL:.o=.P) Index: base/patches/patch-source_network_NetServer_cpp =================================================================== RCS file: base/patches/patch-source_network_NetServer_cpp diff -N base/patches/patch-source_network_NetServer_cpp --- base/patches/patch-source_network_NetServer_cpp 21 Jul 2014 01:24:06 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-source_network_NetServer_cpp,v 1.1.1.1 2014/07/21 01:24:06 bentley Exp $ -Handle miniupnp API change. -From upstream bug #2552: -http://trac.wildfiregames.com/attachment/ticket/2552/miniupnpc_api.patch ---- source/network/NetServer.cpp.orig.port Sat Apr 26 12:34:34 2014 -+++ source/network/NetServer.cpp Mon May 19 02:21:28 2014 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2013 Wildfire Games. -+/* Copyright (C) 2014 Wildfire Games. - * This file is part of 0 A.D. - * - * 0 A.D. is free software: you can redistribute it and/or modify -@@ -32,7 +32,6 @@ - #include "ps/ConfigDB.h" - - #if CONFIG2_MINIUPNPC --// Next four files are for UPnP port forwarding. - #include <miniupnpc/miniwget.h> - #include <miniupnpc/miniupnpc.h> - #include <miniupnpc/upnpcommands.h> -@@ -275,6 +274,9 @@ void* CNetServerWorker::SetupUPnP(void*) - ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL, - data.first.servicetype, - psPort, protocall, -+#if MINIUPNPC_API_VERSION >= 10 -+ NULL/*remoteHost*/, -+#endif - intClient, intPort, NULL/*desc*/, - NULL/*enabled*/, duration); - Index: base/pkg/PLIST =================================================================== RCS file: /cvs/ports/games/0ad/base/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- base/pkg/PLIST 21 Jul 2014 01:24:06 -0000 1.1.1.1 +++ base/pkg/PLIST 13 Oct 2014 12:34:51 -0000 @@ -25,6 +25,8 @@ share/0ad/l10n/de.engine.po share/0ad/l10n/en_GB.engine.po share/0ad/l10n/engine.pot share/0ad/l10n/es.engine.po +share/0ad/l10n/es_CL.engine.po +share/0ad/l10n/es_MX.engine.po share/0ad/l10n/fr.engine.po share/0ad/l10n/gd.engine.po share/0ad/l10n/gl.engine.po @@ -33,6 +35,8 @@ share/0ad/l10n/messages.json share/0ad/l10n/nl.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/tr.engine.po share/0ad/mods/_test.dae/ share/0ad/mods/_test.dae/art/ share/0ad/mods/_test.dae/art/actors/ @@ -115,7 +119,9 @@ share/0ad/mods/_test.sim/simulation/comp share/0ad/mods/_test.sim/simulation/components/test-serialize.js share/0ad/mods/_test.sim/simulation/components/test.js share/0ad/mods/_test.sim/simulation/data/ +share/0ad/mods/_test.sim/simulation/data/pathfinder.rng share/0ad/mods/_test.sim/simulation/data/pathfinder.xml +share/0ad/mods/_test.sim/simulation/data/territorymanager.rng share/0ad/mods/_test.sim/simulation/data/territorymanager.xml share/0ad/mods/_test.sim/simulation/helpers/ share/0ad/mods/_test.sim/simulation/helpers/test-helper.js Index: data/distinfo =================================================================== RCS file: /cvs/ports/games/0ad/data/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- data/distinfo 21 Jul 2014 01:24:06 -0000 1.1.1.1 +++ data/distinfo 13 Oct 2014 12:34:51 -0000 @@ -1,2 +1,2 @@ -SHA256 (0ad-0.0.16-alpha-unix-data.tar.gz) = oZk0F2VoeZpXwebcYhubebzn7teps+qnZ/yqvjzaCFk= -SIZE (0ad-0.0.16-alpha-unix-data.tar.gz) = 646512740 +SHA256 (0ad-0.0.17-alpha-unix-data.tar.gz) = OzE+5WbEH8YtVf+qY7hT5+EG6bYM2hRLEP60e4Dz0bs= +SIZE (0ad-0.0.17-alpha-unix-data.tar.gz) = 696554388 Index: data/pkg/PLIST =================================================================== RCS file: /cvs/ports/games/0ad/data/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- data/pkg/PLIST 21 Jul 2014 01:24:06 -0000 1.1.1.1 +++ data/pkg/PLIST 13 Oct 2014 12:34:51 -0000 @@ -4,6 +4,8 @@ share/0ad/config/ share/0ad/config/default.cfg share/0ad/config/keys.txt share/0ad/mods/ +share/0ad/mods/mod/ +share/0ad/mods/mod/mod.zip share/0ad/mods/public/ share/0ad/mods/public/public.zip share/0ad/tools/
