Hi,
Here is a diff that updates OpenRA to the latest version 20210321. The
heavy lifting was done by patrick@; I added the nuget dependencies and
the workaround for the dllmap config files.
bcallah@: would appreciate if both distfiles could be hosted on the
nycbug mirror again.
Unfortunately the msbuild ports don't get nicer, so some dark magic is
required once again to make it work:
- nuget-openra-20210321.tar.xz is just an archive of the dependencies
fetched by nuget run with a working internet connection. I checked
that this builds with network interface down.
- DLLMAP_FILES doesn't work anymore because the the *.config files with
dllmap are built "on the fly" during the install goal. Best option I
could come up with (that doesn't hardcode the library versions like
the included script configure-system-libraries.sh tries to do) was to
copy the correct files from $FILESDIR (they are all trivial and
small).
- The build system (MSBuild or mono) erros with LangVersion 7.3; but
lowering it to 7.2 allows it to build without problems.
Tested in a brief single-player mission with Red Alert, and I checked
that the multiplayer lobby shows available servers/games.
ok? comments?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openra/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 26 Feb 2021 18:20:33 -0000 1.7
+++ Makefile 3 May 2021 21:40:21 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.7 2021/02/26 18:20:33 naddy Exp $
COMMENT = open-source real-time strategy game engine
-V = 20200503
+V = 20210321
DISTNAME = openra-${V}
CATEGORIES = games x11
HOMEPAGE = https://www.openra.net
@@ -15,10 +15,15 @@ MAINTAINER = Thomas Frohwein <thfr@open
# zlib (SDL2-CS, OpenAL-CS)
PERMIT_PACKAGE = Yes
+DIST_SUBDIR = openra
+
# dlopen'd via mono-config(5)
WANTLIB += SDL2 freetype openal
-MASTER_SITES = https://mirrors.nycbug.org/pub/distfiles/
+MASTER_SITES = https://thfr.info/distfiles/
+MASTER_SITES0 = https://thfr.info/distfiles/
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+ nuget-${DISTNAME}${EXTRACT_SUFX}:0
EXTRACT_SUFX = .tar.xz
FIX_CRLF_FILES = thirdparty/download/SharpFont.dll.config
@@ -26,15 +31,12 @@ FIX_CRLF_FILES = thirdparty/download/Sha
MODULES = lang/lua \
lang/mono
-DLLMAP_FILES = thirdparty/download/OpenAL-CS.dll.config \
- thirdparty/download/SDL2-CS.dll.config \
- thirdparty/download/SharpFont.dll.config
-
MODLUA_VERSION = 5.1
MODLUA_SA = Yes
BUILD_DEPENDS = devel/msbuild \
net/curl
RUN_DEPENDS = devel/desktop-file-utils \
+ misc/shared-mime-info \
net/libmaxminddb,-db \
x11/gtk+3,-guic
LIB_DEPENDS = audio/openal \
@@ -44,6 +46,12 @@ USE_GMAKE = Yes
NO_TEST = Yes
ALL_TARGET = version all
+# Without GIT_COMMIT, build breaks because of empty $(GitHeadSha)
+MAKE_ENV = NUGET_PACKAGES=${WRKDIR}/nuget-${DISTNAME} \
+ GIT_COMMIT=3c930fa8721935cf0e381fd349f6f50cf2bc223d
+# pass a different $HOME so that the build's NuGet doesn't try to write in
$HOME
+MAKE_FLAGS = HOME=${WRKSRC}/nugethome
+
SUBST_VARS += LOCALSTATEDIR
do-gen:
@@ -51,10 +59,12 @@ do-gen:
${SUBST_CMD} ${WRKSRC}/launch-dedicated.sh
${SUBST_CMD} ${WRKSRC}/OpenRA.Game/Network/GeoIP.cs
+# overwrite the config files that point to the wrong system libraries
post-install:
cd ${WRKSRC} && ${MAKE_PROGRAM} install-linux-shortcuts
${INSTALL_SCRIPT} ${WRKSRC}/launch-game.sh ${PREFIX}/bin/openra
${INSTALL_SCRIPT} ${WRKSRC}/launch-dedicated.sh \
${PREFIX}/bin/openra-dedicated
+ cp ${FILESDIR}/*.config ${PREFIX}/share/openra/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/openra/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 17 Jun 2020 15:24:30 -0000 1.2
+++ distinfo 3 May 2021 21:40:21 -0000
@@ -1,2 +1,4 @@
-SHA256 (openra-20200503.tar.xz) = zyCg6N+OHt7f2Zpl5Lzi1cVktPWLQ+cDm+SXDccRUWk=
-SIZE (openra-20200503.tar.xz) = 26813308
+SHA256 (openra/nuget-openra-20210321.tar.xz) =
aPJ6VvuEbP0YDAybmMQiaMweSpPE78xeSx1Oq0T+dy4=
+SHA256 (openra/openra-20210321.tar.xz) =
iz0gibiEvRapN9jqDnXVLhrU1oljDjzaKrIC9s19FM8=
+SIZE (openra/nuget-openra-20210321.tar.xz) = 71838084
+SIZE (openra/openra-20210321.tar.xz) = 25139608
Index: files/Eluant.dll.config
===================================================================
RCS file: files/Eluant.dll.config
diff -N files/Eluant.dll.config
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/Eluant.dll.config 3 May 2021 21:40:21 -0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <dllmap os="!windows" dll="lua51" target="liblua5.1.so" />
+ <dllmap os="osx" dll="lua51" target="lua51.dylib"/>
+</configuration>
Index: files/OpenAL-CS.Core.dll.config
===================================================================
RCS file: files/OpenAL-CS.Core.dll.config
diff -N files/OpenAL-CS.Core.dll.config
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/OpenAL-CS.Core.dll.config 3 May 2021 21:40:21 -0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <dllmap dll="soft_oal" os="!windows" target="libopenal.so"/>
+ <dllmap dll="soft_oal" os="osx" target="soft_oal.dylib"/>
+</configuration>
Index: files/OpenRA.Platforms.Default.dll.config
===================================================================
RCS file: files/OpenRA.Platforms.Default.dll.config
diff -N files/OpenRA.Platforms.Default.dll.config
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/OpenRA.Platforms.Default.dll.config 3 May 2021 21:40:21 -0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <dllmap dll="freetype6" os="!windows" target="libfreetype.so" />
+ <dllmap dll="freetype6" os="osx" target="freetype6.dylib" />
+</configuration>
Index: files/SDL2-CS.dll.config
===================================================================
RCS file: files/SDL2-CS.dll.config
diff -N files/SDL2-CS.dll.config
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/SDL2-CS.dll.config 3 May 2021 21:40:21 -0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <dllmap os="!windows" dll="SDL2" target="libSDL2.so" />
+ <dllmap os="osx" dll="SDL2" target="SDL2.dylib"/>
+</configuration>
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/openra/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 17 Jun 2020 15:24:30 -0000 1.3
+++ patches/patch-Makefile 3 May 2021 21:40:21 -0000
@@ -4,69 +4,55 @@ set the installdir to PREFIX/share rathe
hardcode VERSION, instead of getting it from git
don't install IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP; use libmaxminddb from
ports instead
+disable the script configure-system-libraries.sh which hardcodes shared libs
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -58,7 +58,7 @@ datadir ?= $(datarootdir)
+@@ -50,11 +50,11 @@ datadir ?= $(datarootdir)
mandir ?= $(datarootdir)/man/
bindir ?= $(prefix)/bin
libdir ?= $(prefix)/lib
-gameinstalldir ?= $(libdir)/openra
+gameinstalldir ?= $(datarootdir)/openra
- BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
- DATA_INSTALL_DIR = $(DESTDIR)$(gameinstalldir)
-@@ -76,13 +76,13 @@ INSTALL_PROGRAM = $(INSTALL) -m755
- INSTALL_DATA = $(INSTALL) -m644
-
# Toolchain
+ CWD = $(shell pwd)
-MSBUILD = msbuild -verbosity:m -nologo
+MSBUILD = msbuild -verbosity:d -nologo -clp:DisableConsoleColor
+ MONO = mono
+ RM = rm
+ RM_R = $(RM) -r
+@@ -62,7 +62,7 @@ RM_F = $(RM) -f
+ RM_RF = $(RM) -rf
+
+ # Only for use in target version:
+-VERSION := $(shell git name-rev --name-only --tags --no-undefined HEAD
2>/dev/null || (c=$$(git rev-parse --short HEAD 2>/dev/null) && echo git-$$c))
++VERSION := release-20210321
+
+ # Detect target platform for dependencies if not given by the user
+ ifndef TARGETPLATFORM
+@@ -86,23 +86,15 @@ OPENRA_UTILITY = ENGINE_DIR=".." $(MONO) --debug bin/O
+ all:
+ @command -v $(firstword $(MSBUILD)) >/dev/null || (echo "OpenRA
requires the '$(MSBUILD)' tool provided by Mono >= 5.18."; exit 1)
+ @$(MSBUILD) -t:Build -restore -p:Configuration=Release
-p:TargetPlatform=$(TARGETPLATFORM)
+-ifeq ($(TARGETPLATFORM), unix-generic)
+- @./configure-system-libraries.sh
+-endif
+- @./fetch-geoip.sh
- # Enable 32 bit builds while generating the windows installer
- WIN32 = false
-
- # program targets
--VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD
2>/dev/null || echo git-`git rev-parse --short HEAD`)
-+VERSION = release-20200503
+ clean:
+ @-$(RM_RF) ./bin ./*/bin ./*/obj
+ @$(MSBUILD) -t:Clean
+- @-$(RM_F) IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
- # dependencies
- UNAME_S := $(shell uname -s)
-@@ -101,7 +101,7 @@ check-scripts:
- check: dependencies
+ check:
@echo
@echo "Compiling in debug mode..."
-- @$(MSBUILD) -t:build -p:Configuration=Debug
-+ @$(MSBUILD)
+ @$(MSBUILD) -t:build -restore -p:Configuration=Debug
-p:TargetPlatform=$(TARGETPLATFORM)
+-ifeq ($(TARGETPLATFORM), unix-generic)
+- @./configure-system-libraries.sh
+-endif
@echo
@echo "Checking runtime assemblies..."
- @mono --debug OpenRA.Utility.exe all --check-runtime-assemblies
$(WHITELISTED_OPENRA_ASSEMBLIES) $(WHITELISTED_THIRDPARTY_ASSEMBLIES)
$(WHITELISTED_CORE_ASSEMBLIES)
-@@ -157,7 +157,7 @@ ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1))
- else
- @$(MSBUILD) -t:build -p:Configuration=Release
- endif
-- @./fetch-geoip.sh
-+# @./fetch-geoip.sh
-
- clean:
- @ $(MSBUILD) -t:clean
-@@ -169,10 +169,8 @@ clean:
- distclean: clean
-
- cli-dependencies:
-- @./thirdparty/fetch-thirdparty-deps.sh
- @ $(CP_R) thirdparty/download/*.dll .
- @ $(CP_R) thirdparty/download/*.dll.config .
-- @ test -f OpenRA.Game/obj/project.assets.json || $(MSBUILD) -t:restore
-
- linux-dependencies: cli-dependencies linux-native-dependencies
-
-@@ -219,7 +217,6 @@ install-engine:
- @$(INSTALL_DATA) VERSION "$(DATA_INSTALL_DIR)/VERSION"
- @$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
- @$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
-- @$(INSTALL_DATA) IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
"$(DATA_INSTALL_DIR)/IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP"
-
- @$(CP_R) glsl "$(DATA_INSTALL_DIR)"
- @$(CP_R) lua "$(DATA_INSTALL_DIR)"
+ @$(OPENRA_UTILITY) all --check-runtime-assemblies
$(WHITELISTED_OPENRA_ASSEMBLIES) $(WHITELISTED_THIRDPARTY_ASSEMBLIES)
$(WHITELISTED_CORE_ASSEMBLIES)
Index: patches/patch-OpenRA_Game_OpenRA_Game_csproj
===================================================================
RCS file: patches/patch-OpenRA_Game_OpenRA_Game_csproj
diff -N patches/patch-OpenRA_Game_OpenRA_Game_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Game_OpenRA_Game_csproj 3 May 2021 21:40:21
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.Game/OpenRA.Game.csproj
+--- OpenRA.Game/OpenRA.Game.csproj.orig
++++ OpenRA.Game/OpenRA.Game.csproj
+@@ -5,7 +5,7 @@
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <Optimize>true</Optimize>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
Index: patches/patch-OpenRA_Launcher_OpenRA_Launcher_csproj
===================================================================
RCS file: patches/patch-OpenRA_Launcher_OpenRA_Launcher_csproj
diff -N patches/patch-OpenRA_Launcher_OpenRA_Launcher_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Launcher_OpenRA_Launcher_csproj 3 May 2021
21:40:21 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.Launcher/OpenRA.Launcher.csproj
+--- OpenRA.Launcher/OpenRA.Launcher.csproj.orig
++++ OpenRA.Launcher/OpenRA.Launcher.csproj
+@@ -5,7 +5,7 @@
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <Optimize>true</Optimize>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
Index: patches/patch-OpenRA_Mods_Cnc_OpenRA_Mods_Cnc_csproj
===================================================================
RCS file: patches/patch-OpenRA_Mods_Cnc_OpenRA_Mods_Cnc_csproj
diff -N patches/patch-OpenRA_Mods_Cnc_OpenRA_Mods_Cnc_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Mods_Cnc_OpenRA_Mods_Cnc_csproj 3 May 2021
21:40:21 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+--- OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj.orig
++++ OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+@@ -3,7 +3,7 @@
+ <TargetFramework>net472</TargetFramework>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <Optimize>true</Optimize>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <OutputPath>../bin</OutputPath>
Index: patches/patch-OpenRA_Mods_Common_OpenRA_Mods_Common_csproj
===================================================================
RCS file: patches/patch-OpenRA_Mods_Common_OpenRA_Mods_Common_csproj
diff -N patches/patch-OpenRA_Mods_Common_OpenRA_Mods_Common_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Mods_Common_OpenRA_Mods_Common_csproj 3 May 2021
21:40:21 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+--- OpenRA.Mods.Common/OpenRA.Mods.Common.csproj.orig
++++ OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+@@ -3,7 +3,7 @@
+ <TargetFramework>net472</TargetFramework>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <Optimize>true</Optimize>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <OutputPath>../bin</OutputPath>
Index: patches/patch-OpenRA_Mods_Common_Widgets_Logic_MapChooserLogic_cs
===================================================================
RCS file: patches/patch-OpenRA_Mods_Common_Widgets_Logic_MapChooserLogic_cs
diff -N patches/patch-OpenRA_Mods_Common_Widgets_Logic_MapChooserLogic_cs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Mods_Common_Widgets_Logic_MapChooserLogic_cs 3 May
2021 21:40:21 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs
+--- OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs.orig
++++ OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs
+@@ -210,7 +210,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
+ gameModeDropdown.GetText = () =>
+ {
+ var item = categories.FirstOrDefault(m
=> m.Category == category);
+- if (item == default((string, int)))
++ if (item.Category == default(string) &&
++ item.Count == default(int))
+ item.Category = "No matches";
+
+ return showItem(item);
Index: patches/patch-OpenRA_Mods_D2k_OpenRA_Mods_D2k_csproj
===================================================================
RCS file: patches/patch-OpenRA_Mods_D2k_OpenRA_Mods_D2k_csproj
diff -N patches/patch-OpenRA_Mods_D2k_OpenRA_Mods_D2k_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Mods_D2k_OpenRA_Mods_D2k_csproj 3 May 2021
21:40:21 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
+--- OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj.orig
++++ OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
+@@ -3,7 +3,7 @@
+ <TargetFramework>net472</TargetFramework>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <Optimize>true</Optimize>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <OutputPath>../bin</OutputPath>
Index: patches/patch-OpenRA_Platforms_Default_OpenRA_Platforms_Default_csproj
===================================================================
RCS file: patches/patch-OpenRA_Platforms_Default_OpenRA_Platforms_Default_csproj
diff -N patches/patch-OpenRA_Platforms_Default_OpenRA_Platforms_Default_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Platforms_Default_OpenRA_Platforms_Default_csproj
3 May 2021 21:40:21 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj
+--- OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj.orig
++++ OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj
+@@ -3,7 +3,7 @@
+ <TargetFramework>net472</TargetFramework>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <Optimize>true</Optimize>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <OutputPath>../bin</OutputPath>
Index: patches/patch-OpenRA_Server_OpenRA_Server_csproj
===================================================================
RCS file: patches/patch-OpenRA_Server_OpenRA_Server_csproj
diff -N patches/patch-OpenRA_Server_OpenRA_Server_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Server_OpenRA_Server_csproj 3 May 2021 21:40:21
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.Server/OpenRA.Server.csproj
+--- OpenRA.Server/OpenRA.Server.csproj.orig
++++ OpenRA.Server/OpenRA.Server.csproj
+@@ -7,7 +7,7 @@
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ <OutputPath>../bin</OutputPath>
+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <PlatformTarget>AnyCPU</PlatformTarget>
Index: patches/patch-OpenRA_Test_OpenRA_Test_csproj
===================================================================
RCS file: patches/patch-OpenRA_Test_OpenRA_Test_csproj
diff -N patches/patch-OpenRA_Test_OpenRA_Test_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Test_OpenRA_Test_csproj 3 May 2021 21:40:21
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.Test/OpenRA.Test.csproj
+--- OpenRA.Test/OpenRA.Test.csproj.orig
++++ OpenRA.Test/OpenRA.Test.csproj
+@@ -2,7 +2,7 @@
+ <PropertyGroup>
+ <TargetFramework>net472</TargetFramework>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <OutputPath>../bin</OutputPath>
Index: patches/patch-OpenRA_Utility_OpenRA_Utility_csproj
===================================================================
RCS file: patches/patch-OpenRA_Utility_OpenRA_Utility_csproj
diff -N patches/patch-OpenRA_Utility_OpenRA_Utility_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_Utility_OpenRA_Utility_csproj 3 May 2021 21:40:21
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.Utility/OpenRA.Utility.csproj
+--- OpenRA.Utility/OpenRA.Utility.csproj.orig
++++ OpenRA.Utility/OpenRA.Utility.csproj
+@@ -7,7 +7,7 @@
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ <OutputPath>../bin</OutputPath>
+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <PlatformTarget>AnyCPU</PlatformTarget>
Index: patches/patch-OpenRA_WindowsLauncher_OpenRA_WindowsLauncher_csproj
===================================================================
RCS file: patches/patch-OpenRA_WindowsLauncher_OpenRA_WindowsLauncher_csproj
diff -N patches/patch-OpenRA_WindowsLauncher_OpenRA_WindowsLauncher_csproj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-OpenRA_WindowsLauncher_OpenRA_WindowsLauncher_csproj 3 May
2021 21:40:21 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj
+--- OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj.orig
++++ OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj
+@@ -5,7 +5,7 @@
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <Optimize>true</Optimize>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+- <LangVersion>7.3</LangVersion>
++ <LangVersion>7.2</LangVersion>
+ <DebugSymbols>true</DebugSymbols>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
Index: patches/patch-launch-dedicated_sh
===================================================================
RCS file: /cvs/ports/games/openra/patches/patch-launch-dedicated_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-launch-dedicated_sh
--- patches/patch-launch-dedicated_sh 17 Jun 2020 15:24:30 -0000 1.2
+++ patches/patch-launch-dedicated_sh 3 May 2021 21:40:21 -0000
@@ -1,16 +1,14 @@
-$OpenBSD: patch-launch-dedicated_sh,v 1.2 2020/06/17 15:24:30 thfr Exp $
-
-full path for the assembly
+$OpenBSD$
Index: launch-dedicated.sh
--- launch-dedicated.sh.orig
+++ launch-dedicated.sh
-@@ -24,7 +24,7 @@ ShareAnonymizedIPs="${ShareAnonymizedIPs:-"True"}"
+@@ -25,7 +25,7 @@ ShareAnonymizedIPs="${ShareAnonymizedIPs:-"True"}"
SupportDir="${SupportDir:-""}"
while true; do
-- mono --debug OpenRA.Server.exe Game.Mod="$Mod" \
-+ mono --debug ${PREFIX}/share/openra/OpenRA.Server.exe Game.Mod="$Mod" \
+- mono --debug bin/OpenRA.Server.exe Engine.EngineDir=".." Game.Mod="$Mod"
\
++ mono --debug ${PREFIX}/share/openra/OpenRA.Server.exe
Engine.EngineDir=".." Game.Mod="$Mod" \
Server.Name="$Name" \
Server.ListenPort="$ListenPort" \
Server.AdvertiseOnline="$AdvertiseOnline" \
Index: patches/patch-launch-game_sh
===================================================================
RCS file: /cvs/ports/games/openra/patches/patch-launch-game_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-launch-game_sh
--- patches/patch-launch-game_sh 2 Apr 2019 18:52:40 -0000 1.2
+++ patches/patch-launch-game_sh 3 May 2021 21:40:21 -0000
@@ -1,15 +1,15 @@
-$OpenBSD: patch-launch-game_sh,v 1.2 2019/04/02 18:52:40 ajacoutot Exp $
-
-don't use python for determining the path of the launcher
-set correct path for launching
-replace the bashism [ z"${*#*Game.Mod}" = z"$*" ] with something more portable
+$OpenBSD$
Index: launch-game.sh
--- launch-game.sh.orig
+++ launch-game.sh
-@@ -1,10 +1,21 @@
+@@ -1,14 +1,21 @@
#!/bin/sh
--MODLAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
+-if command -v python3 >/dev/null 2>&1; then
+- MODLAUNCHER=$(python3 -c "import os; print(os.path.realpath('$0'))")
+-else
+- MODLAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
+-fi
+MODLAUNCHER=$(readlink -f $0)
# Prompt for a mod to launch if one is not already specified
@@ -32,12 +32,12 @@ Index: launch-game.sh
if command -v zenity > /dev/null
then
TITLE=$(zenity --forms --add-combo="" --combo-values="Red
Alert|Tiberian Dawn|Dune 2000|Tiberian Sun" --text "Select mod" --title="" ||
echo "cancel")
-@@ -21,7 +32,7 @@ then
+@@ -25,7 +32,7 @@ then
fi
# Launch the engine with the appropriate arguments
--mono OpenRA.Game.exe Engine.LaunchPath="$MODLAUNCHER" $MODARG "$@"
-+mono ${PREFIX}/share/openra/OpenRA.Game.exe Engine.LaunchPath="$MODLAUNCHER"
$MODARG "$ARGLIST"
+-mono bin/OpenRA.exe Engine.EngineDir=".." Engine.LaunchPath="$MODLAUNCHER"
$MODARG "$@"
++mono ${PREFIX}/share/openra/OpenRA.exe Engine.EngineDir=".."
Engine.LaunchPath="$MODLAUNCHER" $MODARG "$@"
# Show a crash dialog if something went wrong
if [ $? != 0 ] && [ $? != 1 ]; then
Index: patches/patch-make_ps1
===================================================================
RCS file: patches/patch-make_ps1
diff -N patches/patch-make_ps1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-make_ps1 3 May 2021 21:40:21 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: make.ps1
+--- make.ps1.orig
++++ make.ps1
+@@ -19,14 +19,6 @@ function All-Command
+ {
+ Write-Host "Build succeeded." -ForegroundColor Green
+ }
+-
+- if (!(Test-Path "IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP") -Or (((get-date) -
(get-item "IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP").LastWriteTime) -gt (new-timespan
-days 30)))
+- {
+- echo "Downloading IP2Location GeoIP database."
+- $target = Join-Path $pwd.ToString()
"IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP"
+- [Net.ServicePointManager]::SecurityProtocol = 'Tls12'
+- (New-Object
System.Net.WebClient).DownloadFile("https://github.com/OpenRA/GeoIP-Database/releases/download/monthly/IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP";,
$target)
+- }
+ }
+
+ function Clean-Command
Index: patches/patch-packaging_functions_sh
===================================================================
RCS file: patches/patch-packaging_functions_sh
diff -N patches/patch-packaging_functions_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-packaging_functions_sh 3 May 2021 21:40:21 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+disable geoip and configure-system-libraries stuff
+
+Index: packaging/functions.sh
+--- packaging/functions.sh.orig
++++ packaging/functions.sh
+@@ -36,11 +36,7 @@ install_assemblies_mono() {
+ msbuild -verbosity:m -nologo -t:Clean
+ rm -rf "${SRC_PATH:?}/bin"
+ msbuild -verbosity:m -nologo -t:Build -restore -p:Configuration=Release
-p:TargetPlatform="${TARGETPLATFORM}"
+- if [ "${TARGETPLATFORM}" = "unix-generic" ]; then
+- ./configure-system-libraries.sh
+- fi
+
+- ./fetch-geoip.sh
+ cd "${ORIG_PWD}" || exit 1
+
+ echo "Installing engine to ${DEST_PATH}"
Index: patches/patch-thirdparty_Eluant_dll_config_in
===================================================================
RCS file: patches/patch-thirdparty_Eluant_dll_config_in
diff -N patches/patch-thirdparty_Eluant_dll_config_in
--- patches/patch-thirdparty_Eluant_dll_config_in 17 Jun 2020 15:24:30
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-thirdparty_Eluant_dll_config_in,v 1.2 2020/06/17 15:24:30 thfr
Exp $
-
-add openbsd to Eluant.dll config dllmap
-
-Index: thirdparty/Eluant.dll.config.in
---- thirdparty/Eluant.dll.config.in.orig
-+++ thirdparty/Eluant.dll.config.in
-@@ -1,3 +1,4 @@
- <configuration>
- <dllmap dll="lua51.dll" target="@LIBLUA51@" />
-+ <dllmap os="openbsd" dll="lua51.dll" target="liblua5.1.so" />
- </configuration>
Index: patches/patch-thirdparty_download_SharpFont_dll_config
===================================================================
RCS file: patches/patch-thirdparty_download_SharpFont_dll_config
diff -N patches/patch-thirdparty_download_SharpFont_dll_config
--- patches/patch-thirdparty_download_SharpFont_dll_config 26 Feb 2021
18:20:34 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-thirdparty_download_SharpFont_dll_config,v 1.5 2021/02/26
18:20:34 naddy Exp $
-
-add openbsd to dllmap
-
-Index: thirdparty/download/SharpFont.dll.config
---- thirdparty/download/SharpFont.dll.config.orig
-+++ thirdparty/download/SharpFont.dll.config
-@@ -1,6 +1,7 @@
- <?xml version="1.0" encoding="utf-8" ?>
- <configuration>
-- <dllmap dll="freetype6" os="linux" target="libfreetype.so.6" />
-+ <dllmap dll="freetype6" os="linux" target="libfreetype.so" />
- <dllmap dll="freetype6" os="osx"
target="/Library/Frameworks/Mono.framework/Libraries/libfreetype.6.dylib" />
-- <dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" />
-+ <dllmap dll="freetype6" os="freebsd" target="libfreetype.so" />
-+ <dllmap dll="freetype6" os="openbsd" target="libfreetype.so" />
- </configuration>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/openra/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 17 Jun 2020 15:24:30 -0000 1.3
+++ pkg/PLIST 3 May 2021 21:40:21 -0000
@@ -29,33 +29,40 @@ share/icons/hicolor/scalable/apps/openra
share/icons/hicolor/scalable/apps/openra-ra.svg
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
+share/mime/packages/openra-cnc.xml
+share/mime/packages/openra-d2k.xml
+share/mime/packages/openra-ra.xml
share/openra/
share/openra/AUTHORS
+share/openra/BeaconLib.dll
share/openra/COPYING
+share/openra/DiscordRPC.dll
share/openra/Eluant.dll
share/openra/Eluant.dll.config
share/openra/FuzzyLogicLibrary.dll
share/openra/ICSharpCode.SharpZipLib.dll
+share/openra/Newtonsoft.Json.dll
share/openra/Open.Nat.dll
-share/openra/OpenAL-CS.dll
-share/openra/OpenAL-CS.dll.config
-share/openra/OpenRA.Game.exe
+share/openra/OpenAL-CS.Core.dll
+share/openra/OpenAL-CS.Core.dll.config
+share/openra/OpenRA.Game.dll
+share/openra/OpenRA.Mods.Cnc.dll
+share/openra/OpenRA.Mods.Common.dll
+share/openra/OpenRA.Mods.D2k.dll
share/openra/OpenRA.Platforms.Default.dll
share/openra/OpenRA.Platforms.Default.dll.config
share/openra/OpenRA.Server.exe
share/openra/OpenRA.Utility.exe
+share/openra/OpenRA.exe
share/openra/SDL2-CS.dll
share/openra/SDL2-CS.dll.config
share/openra/VERSION
-share/openra/fetch-geoip.sh
share/openra/global mix database.dat
share/openra/glsl/
share/openra/glsl/combined.frag
share/openra/glsl/combined.vert
share/openra/glsl/model.frag
share/openra/glsl/model.vert
-share/openra/launch-dedicated.sh
-share/openra/launch-game.sh
share/openra/lua/
share/openra/lua/sandbox.lua
share/openra/lua/scriptwrapper.lua
@@ -73,7 +80,6 @@ share/openra/mods/cnc/bits/afld_d.shp
share/openra/mods/cnc/bits/allyrepair.shp
share/openra/mods/cnc/bits/apcmuz.shp
share/openra/mods/cnc/bits/apctur.shp
-share/openra/mods/cnc/bits/apctur2.shp
share/openra/mods/cnc/bits/atomicon.shp
share/openra/mods/cnc/bits/beaconclock.shp
share/openra/mods/cnc/bits/boaticnh.shp
@@ -125,6 +131,7 @@ share/openra/mods/cnc/bits/gunfire2.shp
share/openra/mods/cnc/bits/hand.shp
share/openra/mods/cnc/bits/handmake.shp
share/openra/mods/cnc/bits/harvdump.shp
+share/openra/mods/cnc/bits/harvlost.aud
share/openra/mods/cnc/bits/hclock.shp
share/openra/mods/cnc/bits/healcrate.shp
share/openra/mods/cnc/bits/heli.shp
@@ -513,13 +520,16 @@ share/openra/mods/cnc/languages/
share/openra/mods/cnc/languages/english.yaml
share/openra/mods/cnc/maps/
share/openra/mods/cnc/maps/16-9.oramap
+share/openra/mods/cnc/maps/african-gambit.oramap
share/openra/mods/cnc/maps/aggressive-tendencies.oramap
share/openra/mods/cnc/maps/alpha-juno-5.oramap
share/openra/mods/cnc/maps/antrax.oramap
+share/openra/mods/cnc/maps/anvil-of-war.oramap
share/openra/mods/cnc/maps/arcade.oramap
-share/openra/mods/cnc/maps/avocado.oramap
+share/openra/mods/cnc/maps/armageddon.oramap
share/openra/mods/cnc/maps/axis-of-advance.oramap
share/openra/mods/cnc/maps/back-to-basics.oramap
+share/openra/mods/cnc/maps/badland-ridges.oramap
share/openra/mods/cnc/maps/blank-shellmap/
share/openra/mods/cnc/maps/blank-shellmap/map.bin
share/openra/mods/cnc/maps/blank-shellmap/map.png
@@ -539,24 +549,25 @@ share/openra/mods/cnc/maps/cnc64gdi01/ma
share/openra/mods/cnc/maps/cnc64gdi01/rules.yaml
share/openra/mods/cnc/maps/cnc64gdi01/sequences.yaml
share/openra/mods/cnc/maps/collateral-chaos.oramap
-share/openra/mods/cnc/maps/contra.oramap
share/openra/mods/cnc/maps/control-and-chaos.oramap
share/openra/mods/cnc/maps/crossing-the-divide.oramap
-share/openra/mods/cnc/maps/dead-in-motion.oramap
-share/openra/mods/cnc/maps/desert-lakes.oramap
+share/openra/mods/cnc/maps/desert-invasion.oramap
+share/openra/mods/cnc/maps/desert-mandarins.oramap
share/openra/mods/cnc/maps/desert-rats-cnc/
share/openra/mods/cnc/maps/desert-rats-cnc/map.bin
share/openra/mods/cnc/maps/desert-rats-cnc/map.png
share/openra/mods/cnc/maps/desert-rats-cnc/map.yaml
share/openra/mods/cnc/maps/desert-rats-cnc/rules.yaml
share/openra/mods/cnc/maps/desert-storm-3.oramap
+share/openra/mods/cnc/maps/deserted-outpost.oramap
share/openra/mods/cnc/maps/deterring-democracy-plus.oramap
share/openra/mods/cnc/maps/deterring-democracy.oramap
share/openra/mods/cnc/maps/dualism.oramap
share/openra/mods/cnc/maps/east-vs-west-3.oramap
+share/openra/mods/cnc/maps/elysian-expanse.oramap
share/openra/mods/cnc/maps/escalations.oramap
+share/openra/mods/cnc/maps/fight-win-prevail.oramap
share/openra/mods/cnc/maps/frigid-pass.oramap
-share/openra/mods/cnc/maps/frostways.oramap
share/openra/mods/cnc/maps/funpark01/
share/openra/mods/cnc/maps/funpark01/map.bin
share/openra/mods/cnc/maps/funpark01/map.png
@@ -592,14 +603,12 @@ share/openra/mods/cnc/maps/gdi04a/map.bi
share/openra/mods/cnc/maps/gdi04a/map.png
share/openra/mods/cnc/maps/gdi04a/map.yaml
share/openra/mods/cnc/maps/gdi04a/rules.yaml
-share/openra/mods/cnc/maps/gdi04a/weapons.yaml
share/openra/mods/cnc/maps/gdi04b/
share/openra/mods/cnc/maps/gdi04b/gdi04b.lua
share/openra/mods/cnc/maps/gdi04b/map.bin
share/openra/mods/cnc/maps/gdi04b/map.png
share/openra/mods/cnc/maps/gdi04b/map.yaml
share/openra/mods/cnc/maps/gdi04b/rules.yaml
-share/openra/mods/cnc/maps/gdi04b/weapons.yaml
share/openra/mods/cnc/maps/gdi04c/
share/openra/mods/cnc/maps/gdi04c/gdi04c.lua
share/openra/mods/cnc/maps/gdi04c/map.bin
@@ -613,7 +622,6 @@ share/openra/mods/cnc/maps/gdi05a/map.bi
share/openra/mods/cnc/maps/gdi05a/map.png
share/openra/mods/cnc/maps/gdi05a/map.yaml
share/openra/mods/cnc/maps/gdi05a/rules.yaml
-share/openra/mods/cnc/maps/gdi05a/weapons.yaml
share/openra/mods/cnc/maps/gdi05b/
share/openra/mods/cnc/maps/gdi05b/gdi05b.lua
share/openra/mods/cnc/maps/gdi05b/map.bin
@@ -657,9 +665,10 @@ share/openra/mods/cnc/maps/hegemony-or-s
share/openra/mods/cnc/maps/island-duel.oramap
share/openra/mods/cnc/maps/jungle-conflict.oramap
share/openra/mods/cnc/maps/kolosseum.oramap
-share/openra/mods/cnc/maps/letters-from-lexington.oramap
share/openra/mods/cnc/maps/lost-souls.oramap
share/openra/mods/cnc/maps/manufacturing-consent.oramap
+share/openra/mods/cnc/maps/master-alert.oramap
+share/openra/mods/cnc/maps/master-of-the-jungle-book.oramap
share/openra/mods/cnc/maps/media-control.oramap
share/openra/mods/cnc/maps/model-150.oramap
share/openra/mods/cnc/maps/model-200.oramap
@@ -791,36 +800,33 @@ share/openra/mods/cnc/maps/nod10b/rules.
share/openra/mods/cnc/maps/order-of-battle.oramap
share/openra/mods/cnc/maps/ping-pong-bay.oramap
share/openra/mods/cnc/maps/pirates-and-emperors.oramap
-share/openra/mods/cnc/maps/plan-b.oramap
share/openra/mods/cnc/maps/pressure-cnc.oramap
+share/openra/mods/cnc/maps/reaching-out.oramap
share/openra/mods/cnc/maps/reasonable-doubt.oramap
share/openra/mods/cnc/maps/riverside-frontline.oramap
share/openra/mods/cnc/maps/scorched-earth.oramap
share/openra/mods/cnc/maps/sustain.oramap
share/openra/mods/cnc/maps/tactical-advance.oramap
-share/openra/mods/cnc/maps/thawed-front.oramap
share/openra/mods/cnc/maps/the-hot-box/
share/openra/mods/cnc/maps/the-hot-box/map.bin
share/openra/mods/cnc/maps/the-hot-box/map.png
share/openra/mods/cnc/maps/the-hot-box/map.yaml
share/openra/mods/cnc/maps/the-hot-box/rules.yaml
-share/openra/mods/cnc/maps/the-new-mandarins.oramap
share/openra/mods/cnc/maps/tiberian-falls.oramap
share/openra/mods/cnc/maps/tiberian-war.oramap
-share/openra/mods/cnc/maps/tiberium-canopy.oramap
+share/openra/mods/cnc/maps/tiberium-forest.oramap
share/openra/mods/cnc/maps/tiberium-garden-2.oramap
+share/openra/mods/cnc/maps/tiberium-rift.oramap
share/openra/mods/cnc/maps/too-hot.oramap
share/openra/mods/cnc/maps/trial-of-possession.oramap
share/openra/mods/cnc/maps/tropic-expanse.oramap
share/openra/mods/cnc/maps/twin-lakes.oramap
-share/openra/mods/cnc/maps/twisted-peak.oramap
share/openra/mods/cnc/maps/two-ponds.oramap
-share/openra/mods/cnc/maps/understanding-power.oramap
+share/openra/mods/cnc/maps/valley-of-gold-6p.oramap
share/openra/mods/cnc/maps/valley-of-gold.oramap
share/openra/mods/cnc/maps/vectors-of-battle.oramap
share/openra/mods/cnc/maps/warchild.oramap
share/openra/mods/cnc/maps/warkraft.oramap
-share/openra/mods/cnc/maps/winters-end.oramap
share/openra/mods/cnc/maps/x896.oramap
share/openra/mods/cnc/maps/year-501.oramap
share/openra/mods/cnc/metrics.yaml
@@ -877,10 +883,6 @@ share/openra/mods/cnc/weapons/superweapo
share/openra/mods/common/
share/openra/mods/common/FreeSans.ttf
share/openra/mods/common/FreeSansBold.ttf
-share/openra/mods/common/OpenRA.Mods.Cnc.dll
-share/openra/mods/common/OpenRA.Mods.Cnc.pdb
-share/openra/mods/common/OpenRA.Mods.Common.dll
-share/openra/mods/common/OpenRA.Mods.Common.pdb
share/openra/mods/common/chrome/
share/openra/mods/common/chrome/assetbrowser.yaml
share/openra/mods/common/chrome/color-picker.yaml
@@ -935,8 +937,6 @@ share/openra/mods/common/hotkeys/viewpor
share/openra/mods/common/metrics.yaml
share/openra/mods/d2k/
share/openra/mods/d2k/Dune2k.ttf
-share/openra/mods/d2k/OpenRA.Mods.D2k.dll
-share/openra/mods/d2k/OpenRA.Mods.D2k.pdb
share/openra/mods/d2k/audio/
share/openra/mods/d2k/audio/music.yaml
share/openra/mods/d2k/audio/notifications.yaml
@@ -1455,7 +1455,7 @@ share/openra/mods/ra/bits/attackmove.shp
share/openra/mods/ra/bits/bctrinit.aud
share/openra/mods/ra/bits/beaconclock.shp
share/openra/mods/ra/bits/bubbles.shp
-share/openra/mods/ra/bits/c3.shp
+share/openra/mods/ra/bits/c11.shp
share/openra/mods/ra/bits/camera.shp
share/openra/mods/ra/bits/chan.shp
share/openra/mods/ra/bits/cliffsl1.sno
@@ -1766,6 +1766,8 @@ share/openra/mods/ra/bits/sccrs.tem
share/openra/mods/ra/bits/sccsl.tem
share/openra/mods/ra/bits/sccsr.tem
share/openra/mods/ra/bits/scrate.shp
+share/openra/mods/ra/bits/scripts/
+share/openra/mods/ra/bits/scripts/campaign-global.lua
share/openra/mods/ra/bits/sh57.tem
share/openra/mods/ra/bits/sh58.tem
share/openra/mods/ra/bits/sh59.tem
@@ -1781,6 +1783,7 @@ share/openra/mods/ra/bits/sniper.shp
share/openra/mods/ra/bits/snipericon.shp
share/openra/mods/ra/bits/snowhut.shp
share/openra/mods/ra/bits/stnkicon.shp
+share/openra/mods/ra/bits/tag-spy.shp
share/openra/mods/ra/bits/tanktrap1.shp
share/openra/mods/ra/bits/tanktrap2.shp
share/openra/mods/ra/bits/tenficon.shp
@@ -1840,8 +1843,6 @@ share/openra/mods/ra/maps/a-nuclear-wint
share/openra/mods/ra/maps/a-nuclear-winter/rules.yaml
share/openra/mods/ra/maps/a-path-beyond.oramap
share/openra/mods/ra/maps/agenda.oramap
-share/openra/mods/ra/maps/alaska-anarchy-redux.oramap
-share/openra/mods/ra/maps/all-connected.oramap
share/openra/mods/ra/maps/allies-01/
share/openra/mods/ra/maps/allies-01/allies01.lua
share/openra/mods/ra/maps/allies-01/map.bin
@@ -1920,6 +1921,15 @@ share/openra/mods/ra/maps/allies-08b/map
share/openra/mods/ra/maps/allies-08b/map.png
share/openra/mods/ra/maps/allies-08b/map.yaml
share/openra/mods/ra/maps/allies-08b/rules.yaml
+share/openra/mods/ra/maps/allies-09a/
+share/openra/mods/ra/maps/allies-09a/allies09a-AI.lua
+share/openra/mods/ra/maps/allies-09a/allies09a.lua
+share/openra/mods/ra/maps/allies-09a/map.bin
+share/openra/mods/ra/maps/allies-09a/map.png
+share/openra/mods/ra/maps/allies-09a/map.yaml
+share/openra/mods/ra/maps/allies-09a/rules.yaml
+share/openra/mods/ra/maps/allies-09a/weapons.yaml
+share/openra/mods/ra/maps/altercation.oramap
share/openra/mods/ra/maps/ant-01/
share/openra/mods/ra/maps/ant-01/ant-01.lua
share/openra/mods/ra/maps/ant-01/ant-attack.lua
@@ -1927,10 +1937,12 @@ share/openra/mods/ra/maps/ant-01/map.bin
share/openra/mods/ra/maps/ant-01/map.png
share/openra/mods/ra/maps/ant-01/map.yaml
share/openra/mods/ra/maps/ant-01/rules.yaml
+share/openra/mods/ra/maps/archipelago.oramap
+share/openra/mods/ra/maps/ardennes.oramap
share/openra/mods/ra/maps/ascent.oramap
share/openra/mods/ra/maps/asymmetric-battle.oramap
-share/openra/mods/ra/maps/barracuda.oramap
share/openra/mods/ra/maps/behind-the-veil.oramap
+share/openra/mods/ra/maps/blitz.oramap
share/openra/mods/ra/maps/bombardment-islands.oramap
share/openra/mods/ra/maps/bomber-john/
share/openra/mods/ra/maps/bomber-john/brick.shp
@@ -1940,19 +1952,23 @@ share/openra/mods/ra/maps/bomber-john/ma
share/openra/mods/ra/maps/bomber-john/miner.shp
share/openra/mods/ra/maps/bomber-john/rules.yaml
share/openra/mods/ra/maps/bomber-john/sequences.yaml
-share/openra/mods/ra/maps/caffeinated.oramap
-share/openra/mods/ra/maps/center-of-attention-redux-2/
-share/openra/mods/ra/maps/center-of-attention-redux-2/map.bin
-share/openra/mods/ra/maps/center-of-attention-redux-2/map.png
-share/openra/mods/ra/maps/center-of-attention-redux-2/map.yaml
-share/openra/mods/ra/maps/center-of-attention-redux-2/rules.yaml
share/openra/mods/ra/maps/chaos-canyon.oramap
+share/openra/mods/ra/maps/chernobyl/
+share/openra/mods/ra/maps/chernobyl/map.bin
+share/openra/mods/ra/maps/chernobyl/map.png
+share/openra/mods/ra/maps/chernobyl/map.yaml
+share/openra/mods/ra/maps/chernobyl/plains.pal
+share/openra/mods/ra/maps/chernobyl/rules.yaml
+share/openra/mods/ra/maps/chernobyl/temperat.pal
share/openra/mods/ra/maps/climax-rev15.oramap
-share/openra/mods/ra/maps/coastal-influence.oramap
-share/openra/mods/ra/maps/cold-front.oramap
+share/openra/mods/ra/maps/code-19/
+share/openra/mods/ra/maps/code-19/map.bin
+share/openra/mods/ra/maps/code-19/map.png
+share/openra/mods/ra/maps/code-19/map.yaml
+share/openra/mods/ra/maps/code-19/rules.yaml
+share/openra/mods/ra/maps/collaboration.oramap
share/openra/mods/ra/maps/countercross.oramap
share/openra/mods/ra/maps/crossfire.oramap
-share/openra/mods/ra/maps/decrepit-isles.oramap
share/openra/mods/ra/maps/desert-rats/
share/openra/mods/ra/maps/desert-rats/map.bin
share/openra/mods/ra/maps/desert-rats/map.png
@@ -1965,6 +1981,7 @@ share/openra/mods/ra/maps/desert-shellma
share/openra/mods/ra/maps/desert-shellmap/map.yaml
share/openra/mods/ra/maps/desert-shellmap/rules.yaml
share/openra/mods/ra/maps/desert-shellmap/weapons.yaml
+share/openra/mods/ra/maps/discovery.oramap
share/openra/mods/ra/maps/doubles.oramap
share/openra/mods/ra/maps/doublestep.oramap
share/openra/mods/ra/maps/doughnut.oramap
@@ -1988,10 +2005,9 @@ share/openra/mods/ra/maps/drop-zone/map.
share/openra/mods/ra/maps/drop-zone/rules.yaml
share/openra/mods/ra/maps/drop-zone/weapons.yaml
share/openra/mods/ra/maps/dual-cold-front.oramap
-share/openra/mods/ra/maps/east-vs-west.oramap
-share/openra/mods/ra/maps/encounter.oramap
-share/openra/mods/ra/maps/engagement.oramap
+share/openra/mods/ra/maps/dusttown-battle.oramap
share/openra/mods/ra/maps/ensio-kaivo.oramap
+share/openra/mods/ra/maps/europe.oramap
share/openra/mods/ra/maps/evacuation/
share/openra/mods/ra/maps/evacuation/evacuation.lua
share/openra/mods/ra/maps/evacuation/map.bin
@@ -2004,6 +2020,14 @@ share/openra/mods/ra/maps/exodus/map.bin
share/openra/mods/ra/maps/exodus/map.png
share/openra/mods/ra/maps/exodus/map.yaml
share/openra/mods/ra/maps/exodus/rules.yaml
+share/openra/mods/ra/maps/fall-of-greece-1-personal-war/
+share/openra/mods/ra/maps/fall-of-greece-1-personal-war/map.bin
+share/openra/mods/ra/maps/fall-of-greece-1-personal-war/map.png
+share/openra/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml
+share/openra/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua
+share/openra/mods/ra/maps/fall-of-greece-1-personal-war/rules.yaml
+share/openra/mods/ra/maps/fall-of-greece-1-personal-war/weapons.yaml
+share/openra/mods/ra/maps/forgotten-plains.oramap
share/openra/mods/ra/maps/fort-lonestar/
share/openra/mods/ra/maps/fort-lonestar/fort-lonestar-AI.lua
share/openra/mods/ra/maps/fort-lonestar/fort-lonestar.lua
@@ -2020,11 +2044,12 @@ share/openra/mods/ra/maps/fort-lonestar/
share/openra/mods/ra/maps/fort-lonestar/thunder4.aud
share/openra/mods/ra/maps/fort-lonestar/thunder5.aud
share/openra/mods/ra/maps/fort-lonestar/weapons.yaml
+share/openra/mods/ra/maps/fortified.oramap
+share/openra/mods/ra/maps/forward-progress.oramap
share/openra/mods/ra/maps/great-sahara-2.oramap
share/openra/mods/ra/maps/green-belt.oramap
share/openra/mods/ra/maps/haos-ridges.oramap
share/openra/mods/ra/maps/hypothermia.oramap
-share/openra/mods/ra/maps/icy-ridge.oramap
share/openra/mods/ra/maps/imminent-destruction.oramap
share/openra/mods/ra/maps/infiltration/
share/openra/mods/ra/maps/infiltration/infiltration.lua
@@ -2043,6 +2068,7 @@ share/openra/mods/ra/maps/jungle-law.ora
share/openra/mods/ra/maps/keep-off-the-grass-2.oramap
share/openra/mods/ra/maps/mad-science.oramap
share/openra/mods/ra/maps/maelstrom.oramap
+share/openra/mods/ra/maps/marigold-town.oramap
share/openra/mods/ra/maps/mass-confliction.oramap
share/openra/mods/ra/maps/minor-pressure.oramap
share/openra/mods/ra/maps/monster-tank-madness/
@@ -2054,28 +2080,31 @@ share/openra/mods/ra/maps/monster-tank-m
share/openra/mods/ra/maps/monster-tank-madness/voices.yaml
share/openra/mods/ra/maps/monster-tank-madness/weapons.yaml
share/openra/mods/ra/maps/nine-lives.oramap
-share/openra/mods/ra/maps/north-by-northwest.oramap
-share/openra/mods/ra/maps/northwestpassage.oramap
+share/openra/mods/ra/maps/oil-spill/
+share/openra/mods/ra/maps/oil-spill/map.bin
+share/openra/mods/ra/maps/oil-spill/map.png
+share/openra/mods/ra/maps/oil-spill/map.yaml
+share/openra/mods/ra/maps/oil-spill/oil-spill.lua
+share/openra/mods/ra/maps/oil-spill/rules.yaml
+share/openra/mods/ra/maps/oil-spill/sequences.yaml
share/openra/mods/ra/maps/operation-goldmine.oramap
-share/openra/mods/ra/maps/opposite-force.oramap
share/openra/mods/ra/maps/ore-gardens.oramap
share/openra/mods/ra/maps/ore-lord.oramap
share/openra/mods/ra/maps/outdoor-trails.oramap
share/openra/mods/ra/maps/pie-of-animosity.oramap
share/openra/mods/ra/maps/pitfight.oramap
-share/openra/mods/ra/maps/poland-raid/
-share/openra/mods/ra/maps/poland-raid/map.bin
-share/openra/mods/ra/maps/poland-raid/map.png
-share/openra/mods/ra/maps/poland-raid/map.yaml
share/openra/mods/ra/maps/polar-disorder.oramap
share/openra/mods/ra/maps/pool-party.oramap
share/openra/mods/ra/maps/pressure.oramap
-share/openra/mods/ra/maps/puddles-redux.oramap
-share/openra/mods/ra/maps/rapa-nui/
-share/openra/mods/ra/maps/rapa-nui/map.bin
-share/openra/mods/ra/maps/rapa-nui/map.png
-share/openra/mods/ra/maps/rapa-nui/map.yaml
-share/openra/mods/ra/maps/regeneration-basin.oramap
+share/openra/mods/ra/maps/production-disruption/
+share/openra/mods/ra/maps/production-disruption/map.bin
+share/openra/mods/ra/maps/production-disruption/map.png
+share/openra/mods/ra/maps/production-disruption/map.yaml
+share/openra/mods/ra/maps/production-disruption/production-disruption.lua
+share/openra/mods/ra/maps/production-disruption/rules.yaml
+share/openra/mods/ra/maps/progress.oramap
+share/openra/mods/ra/maps/ridges.oramap
+share/openra/mods/ra/maps/ritual-circle.oramap
share/openra/mods/ra/maps/sarin-gas-1-crackdown/
share/openra/mods/ra/maps/sarin-gas-1-crackdown/crackdown-AI.lua
share/openra/mods/ra/maps/sarin-gas-1-crackdown/crackdown.lua
@@ -2089,23 +2118,40 @@ share/openra/mods/ra/maps/sarin-gas-2-do
share/openra/mods/ra/maps/sarin-gas-2-down-under/map.png
share/openra/mods/ra/maps/sarin-gas-2-down-under/map.yaml
share/openra/mods/ra/maps/sarin-gas-2-down-under/rules.yaml
+share/openra/mods/ra/maps/sarin-gas-3-controlled-burn/
+share/openra/mods/ra/maps/sarin-gas-3-controlled-burn/controlledburn-AI.lua
+share/openra/mods/ra/maps/sarin-gas-3-controlled-burn/controlledburn.lua
+share/openra/mods/ra/maps/sarin-gas-3-controlled-burn/map.bin
+share/openra/mods/ra/maps/sarin-gas-3-controlled-burn/map.png
+share/openra/mods/ra/maps/sarin-gas-3-controlled-burn/map.yaml
+share/openra/mods/ra/maps/sarin-gas-3-controlled-burn/rules.yaml
+share/openra/mods/ra/maps/shadowfiend-II.oramap
share/openra/mods/ra/maps/shattered-mountain/
share/openra/mods/ra/maps/shattered-mountain/map.bin
share/openra/mods/ra/maps/shattered-mountain/map.png
share/openra/mods/ra/maps/shattered-mountain/map.yaml
share/openra/mods/ra/maps/shattered-mountain/rules.yaml
+share/openra/mods/ra/maps/shock-therapy/
+share/openra/mods/ra/maps/shock-therapy/map.bin
+share/openra/mods/ra/maps/shock-therapy/map.png
+share/openra/mods/ra/maps/shock-therapy/map.yaml
+share/openra/mods/ra/maps/shock-therapy/rules.yaml
+share/openra/mods/ra/maps/shock-therapy/shock-therapy.lua
+share/openra/mods/ra/maps/siberian-conflict-1-fresh-tracks/
+share/openra/mods/ra/maps/siberian-conflict-1-fresh-tracks/fresh-tracks.lua
+share/openra/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.bin
+share/openra/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.png
+share/openra/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.yaml
+share/openra/mods/ra/maps/siberian-conflict-1-fresh-tracks/rules.yaml
share/openra/mods/ra/maps/sidestep.oramap
share/openra/mods/ra/maps/singles.oramap
-share/openra/mods/ra/maps/six-below-zero/
-share/openra/mods/ra/maps/six-below-zero/map.bin
-share/openra/mods/ra/maps/six-below-zero/map.png
-share/openra/mods/ra/maps/six-below-zero/map.yaml
-share/openra/mods/ra/maps/six-below-zero/rules.yaml
-share/openra/mods/ra/maps/snow-off/
-share/openra/mods/ra/maps/snow-off/map.bin
-share/openra/mods/ra/maps/snow-off/map.png
-share/openra/mods/ra/maps/snow-off/map.yaml
-share/openra/mods/ra/maps/snow-off/rules.yaml
+share/openra/mods/ra/maps/situation-critical/
+share/openra/mods/ra/maps/situation-critical/map.bin
+share/openra/mods/ra/maps/situation-critical/map.png
+share/openra/mods/ra/maps/situation-critical/map.yaml
+share/openra/mods/ra/maps/situation-critical/rules.yaml
+share/openra/mods/ra/maps/situation-critical/situation-critical.lua
+share/openra/mods/ra/maps/situation-critical/weapons.yaml
share/openra/mods/ra/maps/snow-town/
share/openra/mods/ra/maps/snow-town/map.bin
share/openra/mods/ra/maps/snow-town/map.png
@@ -2190,14 +2236,28 @@ share/openra/mods/ra/maps/soviet-08a/map
share/openra/mods/ra/maps/soviet-08a/rules.yaml
share/openra/mods/ra/maps/soviet-08a/soviet08a-AI.lua
share/openra/mods/ra/maps/soviet-08a/soviet08a.lua
+share/openra/mods/ra/maps/soviet-08b/
+share/openra/mods/ra/maps/soviet-08b/map.bin
+share/openra/mods/ra/maps/soviet-08b/map.png
+share/openra/mods/ra/maps/soviet-08b/map.yaml
+share/openra/mods/ra/maps/soviet-08b/rules.yaml
+share/openra/mods/ra/maps/soviet-08b/soviet08b-AI.lua
+share/openra/mods/ra/maps/soviet-08b/soviet08b.lua
+share/openra/mods/ra/maps/soviet-09/
+share/openra/mods/ra/maps/soviet-09/map.bin
+share/openra/mods/ra/maps/soviet-09/map.png
+share/openra/mods/ra/maps/soviet-09/map.yaml
+share/openra/mods/ra/maps/soviet-09/rules.yaml
+share/openra/mods/ra/maps/soviet-09/soviet09-AI.lua
+share/openra/mods/ra/maps/soviet-09/soviet09.lua
share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/
share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.bin
share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.png
share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml
share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/notifications.yaml
share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml
-share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/scu35ea-AI.lua
-share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/scu35ea.lua
+share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi-AI.lua
+share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua
share/openra/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/weapons.yaml
share/openra/mods/ra/maps/sudden-death.oramap
share/openra/mods/ra/maps/sunstroke.oramap
@@ -2215,8 +2275,6 @@ share/openra/mods/ra/maps/survival02/rul
share/openra/mods/ra/maps/survival02/survival02.lua
share/openra/mods/ra/maps/survival02/weapons.yaml
share/openra/mods/ra/maps/synergy.oramap
-share/openra/mods/ra/maps/tabula-rasa.oramap
-share/openra/mods/ra/maps/tainted-peak.oramap
share/openra/mods/ra/maps/tandem.oramap
share/openra/mods/ra/maps/temperal.oramap
share/openra/mods/ra/maps/top-o-the-world/
@@ -2227,12 +2285,11 @@ share/openra/mods/ra/maps/top-o-the-worl
share/openra/mods/ra/maps/top-o-the-world/scu36ea.lua
share/openra/mods/ra/maps/top-o-the-world/weapons.yaml
share/openra/mods/ra/maps/tournament-island.oramap
+share/openra/mods/ra/maps/trapped.oramap
share/openra/mods/ra/maps/unconventional-warfare.oramap
share/openra/mods/ra/maps/union-sacree.oramap
share/openra/mods/ra/maps/vegetation.oramap
-share/openra/mods/ra/maps/vihaan-lunta.oramap
share/openra/mods/ra/maps/warwind.oramap
-share/openra/mods/ra/maps/winter-storm.oramap
share/openra/mods/ra/maps/x-lake.oramap
share/openra/mods/ra/maps/ysmir.oramap
share/openra/mods/ra/metrics.yaml
@@ -2287,4 +2344,4 @@ share/openra/mods/ra/weapons/missiles.ya
share/openra/mods/ra/weapons/other.yaml
share/openra/mods/ra/weapons/smallcaliber.yaml
share/openra/mods/ra/weapons/superweapons.yaml
-share/openra/rix0rrr.BeaconLib.dll
+@tag update-mime-database
