games/openra: simplify fetch phase via upstream fix

2 files changed, 52 insertions, 55 deletions

diff --git a/games/openra/Makefile b/games/openra/Makefile
index 6086d89daedb..60c648b16355 100644
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@@ -3,16 +3,12 @@
 PORTNAME=	openra
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	20200202
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20190907/:SDL2_CS \
-		https://github.com/${GH_ACCOUNT}/OpenAL-CS/releases/download/20190907/:OpenAL_CS \
-		https://github.com/${GH_ACCOUNT}/Eluant/releases/download/20160124/:Eluant
-DISTFILES=	SDL2-CS.dll:SDL2_CS \
-		SDL2-CS.dll.config:SDL2_CS \
-		OpenAL-CS.dll:OpenAL_CS \
-		OpenAL-CS.dll.config:OpenAL_CS \
-		Eluant.dll:Eluant
-EXTRACT_ONLY=	${DISTFILES:C/:.*//:N*.config:N*.dll:N*.nupkg}
+
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	23306a7a73d9.patch:-p1 # https://github.com/OpenRA/OpenRA/pull/17744
+PATCHFILES+=	f2177f57e6f4.patch:-p1 # https://github.com/OpenRA/OpenRA/pull/17744
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Multiplayer re-envisioning of early RTS games by Westwood Studios
@@ -22,15 +18,20 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	msbuild:devel/msbuild
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgdiplus.so:x11-toolkits/libgdiplus
-NUGET_DEPENDS=	FuzzyLogicLibrary=1.2.0 \
-		MaxMind.Db=2.0.0 \
-		NUnit=3.0.1 \
-		NUnit.Console=3.0.1 \
-		Open.NAT=2.1.0 \
-		SharpZipLib=1.1.0 \
-		StyleCop.MSBuild=4.7.49 \
-		StyleCopPlus.MSBuild=4.7.49.5 \
-		rix0rrr.BeaconLib=1.0.1
+NUGET_DEPENDS=	MaxMind.Db=2.6.1 \
+		Microsoft.NETFramework.ReferenceAssemblies=1.0.0 \
+		Microsoft.NETFramework.ReferenceAssemblies.net472=1.0.0 \
+		NUnit=3.12.0 \
+		NuGet.CommandLine=4.4.1 \
+		OpenRA-Eluant=1.0.14 \
+		OpenRA-Freetype6=1.0.4 \
+		OpenRA-FuzzyLogicLibrary=1.0.1 \
+		OpenRA-Open.NAT=1.0.0 \
+		OpenRA-OpenAL-CS=1.0.13 \
+		OpenRA-SDL2-CS=1.0.23 \
+		SharpZipLib=1.2.0 \
+		StyleCop.Analyzers=1.1.118 \
+		rix0rrr.BeaconLib=1.0.2
 
 USE_GITHUB=	yes
 GH_PROJECT=	OpenRA
@@ -39,8 +40,6 @@ NO_ARCH=	yes
 USES=		desktop-file-utils gmake lua:51,run mono:nuget openal:soft sdl \
 		shared-mime-info shebangfix
 USE_SDL=	sdl2
-NUGET_LAYOUT=	flat
-NUGET_PACKAGEDIR=${WRKSRC}/thirdparty/download
 SHEBANG_FILES=	launch-dedicated.sh
 MAKE_ENV=	prefix="${PREFIX}" \
 		gameinstalldir="${DATADIR}"
@@ -54,19 +53,13 @@ OPTIONS_DEFINE=	TEST
 TEST_MAKE_ENV=	HOME="${WRKDIR}"
 TEST_ALL_TARGET=test
 
-post-extract:
-	${CP} ${DISTFILES:C/:.*//:N*.nupkg:N*.tar*:S,^,${_DISTDIR}/,} \
-		${NUGET_PACKAGEDIR}
-
 post-patch:
 	${REINPLACE_CMD} \
-		-e '/MSBUILD.*-t:restore/d' \
+		-e 's/ -verbosity:m//' \
 		-e '/echo/!s/	@/	/' \
 		-e '/^VERSION/s/=.*/=	${GH_TAGNAME}/' \
 		-e '/^core:/s/$$/ version/' \
 		${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e '/noget\.sh/d' \
-			${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh
 	${SED} 's/@LIBLUA51@/liblua-${LUA_VER}.so/' \
 		${WRKSRC}/thirdparty/Eluant.dll.config.in \
 		>${WRKSRC}/Eluant.dll.config
diff --git a/games/openra/distinfo b/games/openra/distinfo
index b17565aaa3c8..1b4bdf813cfb 100644
--- a/games/openra/distinfo
+++ b/games/openra/distinfo
@@ -1,31 +1,35 @@
 TIMESTAMP = 1580560421
-SHA256 (SDL2-CS.dll) = b06c14a771d14cb37210f476dfd973d4e7d80d97f90566bd5bc78996ade4f7a0
-SIZE (SDL2-CS.dll) = 80896
-SHA256 (SDL2-CS.dll.config) = 7d75ef450e1ceb3f61e77a0513b034a5bc2e754065182bc1bc9134ac664da6bd
-SIZE (SDL2-CS.dll.config) = 257
-SHA256 (OpenAL-CS.dll) = 4cc20a160107748a8e13dfc5e29f9daacf2675e4b302e066bfbe4a1be0596015
-SIZE (OpenAL-CS.dll) = 19456
-SHA256 (OpenAL-CS.dll.config) = 12704a902127e3f67e7d9a3e2331bf2d65e008b59ab96d132807add14e0f2a1c
-SIZE (OpenAL-CS.dll.config) = 304
-SHA256 (Eluant.dll) = 218c4ea5424b44d746b5343563123beebc652fd9731967dfd49fed071b58df31
-SIZE (Eluant.dll) = 71168
-SHA256 (fuzzylogiclibrary.1.2.0.nupkg) = ca8caf33637ae661dfdd5797589f034950d2fcb4f7192ee858830f6e2525df3f
-SIZE (fuzzylogiclibrary.1.2.0.nupkg) = 80141
-SHA256 (maxmind.db.2.0.0.nupkg) = 98595abd21c735fe8bb84911a7b254f5d37c910818411f8edded7378e3e7c181
-SIZE (maxmind.db.2.0.0.nupkg) = 28890
-SHA256 (nunit.3.0.1.nupkg) = eb0b156b44142622d7cd573073d6dc925f8529f2860637325f5af85f94db423c
-SIZE (nunit.3.0.1.nupkg) = 1000576
-SHA256 (nunit.console.3.0.1.nupkg) = 164ce9124d769ac994a79234e59ce51a21be5089e86210666abfef0791ade07f
-SIZE (nunit.console.3.0.1.nupkg) = 479750
-SHA256 (open.nat.2.1.0.nupkg) = c532dee1478b4a7e28aa4797a5efc3f829a6bd0cc0af646aac001ce183f0e3e2
-SIZE (open.nat.2.1.0.nupkg) = 347767
-SHA256 (sharpziplib.1.1.0.nupkg) = 0f4bb6666a67fde963d90f4a96fd68eb1d098ef55a936d6e712cea74d4b798ca
-SIZE (sharpziplib.1.1.0.nupkg) = 409619
-SHA256 (stylecop.msbuild.4.7.49.nupkg) = 8d7c7ad97e740f08996186bfc33cd995b5d6b99ef3ed32326e40c67148d650b2
-SIZE (stylecop.msbuild.4.7.49.nupkg) = 2376565
-SHA256 (stylecopplus.msbuild.4.7.49.5.nupkg) = c98225a744586907bed767a4cb2a756ff3a8d13ff355b40ecc43c3e2537683d9
-SIZE (stylecopplus.msbuild.4.7.49.5.nupkg) = 134291
-SHA256 (rix0rrr.beaconlib.1.0.1.nupkg) = ed4d44f176af53a2fcb31b35def9a5af4cd42bb3639bc2c458f843d991f074ec
-SIZE (rix0rrr.beaconlib.1.0.1.nupkg) = 17989
+SHA256 (maxmind.db.2.6.1.nupkg) = 3e24a3d777044793c363badae5b170090af9e973119d4ef721eebf192c3ea491
+SIZE (maxmind.db.2.6.1.nupkg) = 112729
+SHA256 (microsoft.netframework.referenceassemblies.1.0.0.nupkg) = e9f68f4388da158dce186564de564a5be0c465a20e059ff01ea6e20d3b114759
+SIZE (microsoft.netframework.referenceassemblies.1.0.0.nupkg) = 20946
+SHA256 (microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg) = 2c8fd79ea19bd03cece40ed92b7bafde024f87c73abcebe3eff8da6e05b611af
+SIZE (microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg) = 20790131
+SHA256 (nunit.3.12.0.nupkg) = 62b67516a08951a20b12b02e5d20b5045edbb687c3aabe9170286ec5bb9000a1
+SIZE (nunit.3.12.0.nupkg) = 3463090
+SHA256 (nuget.commandline.4.4.1.nupkg) = 4ba9247f4f10200013e361f35df1e17217af7f2d69b6434e998109c1172cf3eb
+SIZE (nuget.commandline.4.4.1.nupkg) = 1590324
+SHA256 (openra-eluant.1.0.14.nupkg) = 6745645b78fea1f386e65291dd0becfad790bd85b874c32881067f4fd837c0c2
+SIZE (openra-eluant.1.0.14.nupkg) = 445731
+SHA256 (openra-freetype6.1.0.4.nupkg) = a18c5a259c62148756d2c072259004ec648b54eb11139e158cd367e01bd9112d
+SIZE (openra-freetype6.1.0.4.nupkg) = 2252973
+SHA256 (openra-fuzzylogiclibrary.1.0.1.nupkg) = 356e5ee72c14f1752d55ecc1e251d03dce2600ad736f7c27a52beb90085ac04e
+SIZE (openra-fuzzylogiclibrary.1.0.1.nupkg) = 26615
+SHA256 (openra-open.nat.1.0.0.nupkg) = 6bf30bdad9fc7ea62fe1ac5e78720769ebd78a2c76d5cb7ecc16a02992fbd60f
+SIZE (openra-open.nat.1.0.0.nupkg) = 53261
+SHA256 (openra-openal-cs.1.0.13.nupkg) = 4b5934286d36b72e2dd14b7df3990f6008d3c82d6570f0de21166f71b7524b08
+SIZE (openra-openal-cs.1.0.13.nupkg) = 1299884
+SHA256 (openra-sdl2-cs.1.0.23.nupkg) = c0f63cde946a94b0016a9f73731728c71f1570adcb18819a9a88dea6e31afa4f
+SIZE (openra-sdl2-cs.1.0.23.nupkg) = 3699932
+SHA256 (sharpziplib.1.2.0.nupkg) = a5e21787aa106a999f6a22a8dbec57498b1678dc2d6b2ef91ae2543971e8d07a
+SIZE (sharpziplib.1.2.0.nupkg) = 414031
+SHA256 (stylecop.analyzers.1.1.118.nupkg) = 0a30b57f9cf4b0fd7917a15e5ea2033ad64b1ea8239904f3a6c22b464c574442
+SIZE (stylecop.analyzers.1.1.118.nupkg) = 377566
+SHA256 (rix0rrr.beaconlib.1.0.2.nupkg) = a49c7c050f4a4d1f1ca174ae6d4be8b6630cd1869cccb321dcd26c74e1891e38
+SIZE (rix0rrr.beaconlib.1.0.2.nupkg) = 24329
 SHA256 (openra-OpenRA-release-20200202_GH0.tar.gz) = 2e7b6131d76875ff8ed0e288b06cbe617e5e4cdb4c4fd98812dc17a541a5284f
 SIZE (openra-OpenRA-release-20200202_GH0.tar.gz) = 26549978
+SHA256 (23306a7a73d9.patch) = a0de85a3cf0e82553f7af646ae2199ef35b5c642b771eddb1e69316c0931de44
+SIZE (23306a7a73d9.patch) = 57838
+SHA256 (f2177f57e6f4.patch) = 440351bf739be39f2830fdf4295f609034d7bd73d6a9aa46bc285280bcbd701c
+SIZE (f2177f57e6f4.patch) = 1470