Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Oct 2016 08:05:52 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r424981 - head/games/openra
Message-ID:  <201610310805.u9V85qH6081162@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Oct 31 08:05:52 2016
New Revision: 424981
URL: https://svnweb.freebsd.org/changeset/ports/424981

Log:
  games/openra: convert to USES=mono:nuget

Modified:
  head/games/openra/Makefile   (contents, props changed)
  head/games/openra/distinfo   (contents, props changed)

Modified: head/games/openra/Makefile
==============================================================================
--- head/games/openra/Makefile	Mon Oct 31 08:01:20 2016	(r424980)
+++ head/games/openra/Makefile	Mon Oct 31 08:05:52 2016	(r424981)
@@ -4,42 +4,17 @@ PORTNAME=	openra
 PORTVERSION=	20161019
 DISTVERSIONPREFIX=	release-
 CATEGORIES=	games
-# XXX Convert to USES=nuget or package dependencies instead
-MASTER_SITES=	https://nuget.org/api/v2/package/StyleCopPlus.MSBuild/4.7.49.5?dummy=/:StyleCopPlus \
-		https://nuget.org/api/v2/package/StyleCop.MSBuild/4.7.49.0?dummy=/:StyleCop \
-		https://nuget.org/api/v2/package/SharpZipLib/0.86.0?dummy=/:SharpZipLib \
-		https://nuget.org/api/v2/package/Newtonsoft.Json/8.0.3?dummy=/:Newtonsoft_Json \
-		https://nuget.org/api/v2/package/MaxMind.Db/2.0.0?dummy=/:MaxMind_Db \
-		https://nuget.org/api/v2/package/MaxMind.GeoIP2/2.6.0?dummy=/:MaxMind_GeoIP2 \
-		https://nuget.org/api/v2/package/SharpFont/3.1.0?dummy=/:SharpFont \
-		https://nuget.org/api/v2/package/NUnit/3.0.1?dummy=/:NUnit \
-		https://nuget.org/api/v2/package/NUnit.Console/3.0.1?dummy=/:NUnit_Console \
-		https://nuget.org/api/v2/package/Open.Nat/2.1.0?dummy=/:Open_Nat \
-		https://nuget.org/api/v2/package/FuzzyLogicLibrary/1.2.0?dummy=/:FuzzyLogicLibrary \
-		https://nuget.org/api/v2/package/SmartIrc4net/0.4.5.1?dummy=/:SmartIrc4net \
-		https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20151227/:SDL2_CS \
+MASTER_SITES=	https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20151227/:SDL2_CS \
 		https://github.com/${GH_ACCOUNT}/OpenAL-CS/releases/download/20151227/:OpenAL_CS \
 		https://github.com/${GH_ACCOUNT}/Eluant/releases/download/20160124/:Eluant \
 		https://geolite.maxmind.com/download/geoip/database/:GeoLite2
-DISTFILES=	StyleCopPlus.MSBuild-4.7.49.5.zip:StyleCopPlus \
-		StyleCop.MSBuild-4.7.49.0.zip:StyleCop \
-		SharpZipLib-0.86.0.zip:SharpZipLib \
-		Newtonsoft.Json-8.0.3.zip:Newtonsoft_Json \
-		MaxMind.Db-2.0.0.zip:MaxMind_Db \
-		MaxMind.GeoIP2-2.6.0.zip:MaxMind_GeoIP2 \
-		SharpFont-3.1.0.zip:SharpFont \
-		NUnit-3.0.1.zip:NUnit \
-		NUnit.Console-3.0.1.zip:NUnit_Console \
-		Open.Nat-2.1.0.zip:Open_Nat \
-		FuzzyLogicLibrary-1.2.0.zip:FuzzyLogicLibrary \
-		SmartIrc4net-0.4.5.1.zip:SmartIrc4net \
-		SDL2-CS.dll:SDL2_CS \
+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 \
 		GeoLite2-Country.mmdb.gz:GeoLite2
-EXTRACT_ONLY=	${DISTFILES:C/:.*//:N*.dll:N*.config:N*.mmdb*}
+EXTRACT_ONLY=	${DISTFILES:C/:.*//:N*.config:N*.dll:N*.mmdb*:N*.nupkg}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Multiplayer re-envisioning of early RTS games by Westwood Studios
@@ -48,15 +23,28 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgdiplus.so:x11-toolkits/libgdiplus
+NUGET_DEPENDS=	FuzzyLogicLibrary=1.2.0 \
+		MaxMind.Db=2.0.0 \
+		MaxMind.GeoIP2=2.6.0 \
+		NUnit=3.0.1 \
+		NUnit.Console=3.0.1 \
+		Newtonsoft.Json=8.0.3 \
+		Open.NAT=2.1.0 \
+		SharpFont=3.1.0 \
+		SharpZipLib=0.86.0 \
+		SmartIrc4net=0.4.5.1 \
+		StyleCop.MSBuild=4.7.49.0 \
+		StyleCopPlus.MSBuild=4.7.49.5
 
 USE_GITHUB=	yes
 GH_PROJECT=	OpenRA
 
 NO_ARCH=	yes
-USES=		desktop-file-utils gmake lua:51,run mono openal:soft \
+USES=		desktop-file-utils gmake lua:51,run mono:nuget openal:soft \
 		shared-mime-info shebangfix
-SHEBANG_FILES=	launch-dedicated.sh
 USE_SDL=	sdl2
+TARGET_ORDER_OVERRIDE=	520:nuget-extract
+SHEBANG_FILES=	launch-dedicated.sh
 MAKE_ENV=	prefix="${PREFIX}" mandir="${PREFIX}/man"
 MAKE_ARGS=	VERSION="${GH_TAGNAME}"
 INSTALL_TARGET=	install-all install-man-page \
@@ -80,11 +68,11 @@ ZENITY_DESC=	Use native crash dialog
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/thirdparty/download
-	@${CP} -v ${DISTFILES:C/:.*//:N*.tar*:N*.zip:S,^,${_DISTDIR}/,} \
+	@${CP} -v ${DISTFILES:C/:.*//:N*.nupkg:N*.tar*:N*.zip:S,^,${_DISTDIR}/,} \
 		${WRKSRC}/thirdparty/download
 	@for f in $$(${SED} -n 's/\.$$//; s,cp \./,,p' \
 			${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh); do \
-		${MV} -v ${WRKDIR}/$${f#*/} ${WRKSRC}/thirdparty/download; \
+		${MV} -v ${NUGET_PACKAGEDIR}/$$f ${WRKSRC}/thirdparty/download; \
 	done
 
 post-patch:

Modified: head/games/openra/distinfo
==============================================================================
--- head/games/openra/distinfo	Mon Oct 31 08:01:20 2016	(r424980)
+++ head/games/openra/distinfo	Mon Oct 31 08:05:52 2016	(r424981)
@@ -1,28 +1,4 @@
 TIMESTAMP = 1476910506
-SHA256 (StyleCopPlus.MSBuild-4.7.49.5.zip) = b98a8ed20c5e82ff5fe6c2a52ecd45bffd4d4ab284611f35a25889c3bba364c3
-SIZE (StyleCopPlus.MSBuild-4.7.49.5.zip) = 124724
-SHA256 (StyleCop.MSBuild-4.7.49.0.zip) = 6680dedaa5d27fb1ead475015de98e476e58fa9a27e4b7ad0f08d5f7d8f6ee66
-SIZE (StyleCop.MSBuild-4.7.49.0.zip) = 2366995
-SHA256 (SharpZipLib-0.86.0.zip) = 5906c248bb986d50489192f490f94d2331d04e7d34337bc3c0d64df6d0008207
-SIZE (SharpZipLib-0.86.0.zip) = 454026
-SHA256 (Newtonsoft.Json-8.0.3.zip) = 210e42a1bad0928188ef35e1ecdc9e0f3468b8f9153db268cdaa2c2d5c9b2197
-SIZE (Newtonsoft.Json-8.0.3.zip) = 1368174
-SHA256 (MaxMind.Db-2.0.0.zip) = 095d62c6ecda38c1e8fe79935b4eaf228d2637f9498caec48b8b48a0aba6d5aa
-SIZE (MaxMind.Db-2.0.0.zip) = 19307
-SHA256 (MaxMind.GeoIP2-2.6.0.zip) = 07daaf477b42e28585b51f0a64208488c1194fadb40a9daa217153870c2931b6
-SIZE (MaxMind.GeoIP2-2.6.0.zip) = 32058
-SHA256 (SharpFont-3.1.0.zip) = 0256291172dd1fc767c37988dc515e2e4e425724db9eae3188207e124928fe8c
-SIZE (SharpFont-3.1.0.zip) = 61251
-SHA256 (NUnit-3.0.1.zip) = 17ac607de03c861b9595fe7063ea5fe7ed60b72d063fb9c3ba2aeff4f61c72bc
-SIZE (NUnit-3.0.1.zip) = 990994
-SHA256 (NUnit.Console-3.0.1.zip) = b744e7921a6d8e4fccd4c05cf50b040b6c8d11c4c7346ed1f6ba242b2ac78b94
-SIZE (NUnit.Console-3.0.1.zip) = 470168
-SHA256 (Open.Nat-2.1.0.zip) = 93bb2ac468937855215ef28e77ae06df03e1bab8f09b3459e9bc31cf1d18cdcb
-SIZE (Open.Nat-2.1.0.zip) = 338198
-SHA256 (FuzzyLogicLibrary-1.2.0.zip) = b464509236260f53d963771ed99410a7e1cdbd268a2bde43b189e7d15044a174
-SIZE (FuzzyLogicLibrary-1.2.0.zip) = 70571
-SHA256 (SmartIrc4net-0.4.5.1.zip) = a1c2b2be28d798187ecd118768b03ca3193995182d1d92983df23bacbb61dfcc
-SIZE (SmartIrc4net-0.4.5.1.zip) = 104627
 SHA256 (SDL2-CS.dll) = 76206c2795cd3fae569fececb95025d1f9d92c618e2625188510b3331e171c3f
 SIZE (SDL2-CS.dll) = 86016
 SHA256 (SDL2-CS.dll.config) = eff0594f7e86d40a94c1b28f8db87478f3de1cf0857f3d46e384bcc6744ce094
@@ -35,5 +11,29 @@ SHA256 (Eluant.dll) = 218c4ea5424b44d746
 SIZE (Eluant.dll) = 71168
 SHA256 (GeoLite2-Country.mmdb.gz) = be007196c155814b9e46f3969d992aca43158b0b8840b747079312c0aafaa530
 SIZE (GeoLite2-Country.mmdb.gz) = 1302893
+SHA256 (fuzzylogiclibrary.1.2.0.nupkg) = b464509236260f53d963771ed99410a7e1cdbd268a2bde43b189e7d15044a174
+SIZE (fuzzylogiclibrary.1.2.0.nupkg) = 70571
+SHA256 (maxmind.db.2.0.0.nupkg) = 095d62c6ecda38c1e8fe79935b4eaf228d2637f9498caec48b8b48a0aba6d5aa
+SIZE (maxmind.db.2.0.0.nupkg) = 19307
+SHA256 (maxmind.geoip2.2.6.0.nupkg) = 07daaf477b42e28585b51f0a64208488c1194fadb40a9daa217153870c2931b6
+SIZE (maxmind.geoip2.2.6.0.nupkg) = 32058
+SHA256 (nunit.3.0.1.nupkg) = 17ac607de03c861b9595fe7063ea5fe7ed60b72d063fb9c3ba2aeff4f61c72bc
+SIZE (nunit.3.0.1.nupkg) = 990994
+SHA256 (nunit.console.3.0.1.nupkg) = b744e7921a6d8e4fccd4c05cf50b040b6c8d11c4c7346ed1f6ba242b2ac78b94
+SIZE (nunit.console.3.0.1.nupkg) = 470168
+SHA256 (newtonsoft.json.8.0.3.nupkg) = 210e42a1bad0928188ef35e1ecdc9e0f3468b8f9153db268cdaa2c2d5c9b2197
+SIZE (newtonsoft.json.8.0.3.nupkg) = 1368174
+SHA256 (open.nat.2.1.0.nupkg) = 93bb2ac468937855215ef28e77ae06df03e1bab8f09b3459e9bc31cf1d18cdcb
+SIZE (open.nat.2.1.0.nupkg) = 338198
+SHA256 (sharpfont.3.1.0.nupkg) = 0256291172dd1fc767c37988dc515e2e4e425724db9eae3188207e124928fe8c
+SIZE (sharpfont.3.1.0.nupkg) = 61251
+SHA256 (sharpziplib.0.86.0.nupkg) = 5906c248bb986d50489192f490f94d2331d04e7d34337bc3c0d64df6d0008207
+SIZE (sharpziplib.0.86.0.nupkg) = 454026
+SHA256 (smartirc4net.0.4.5.1.nupkg) = a1c2b2be28d798187ecd118768b03ca3193995182d1d92983df23bacbb61dfcc
+SIZE (smartirc4net.0.4.5.1.nupkg) = 104627
+SHA256 (stylecop.msbuild.4.7.49.0.nupkg) = 6680dedaa5d27fb1ead475015de98e476e58fa9a27e4b7ad0f08d5f7d8f6ee66
+SIZE (stylecop.msbuild.4.7.49.0.nupkg) = 2366995
+SHA256 (stylecopplus.msbuild.4.7.49.5.nupkg) = b98a8ed20c5e82ff5fe6c2a52ecd45bffd4d4ab284611f35a25889c3bba364c3
+SIZE (stylecopplus.msbuild.4.7.49.5.nupkg) = 124724
 SHA256 (openra-OpenRA-release-20161019_GH0.tar.gz) = 1cbc258466e1e1180a9ad95d44f3867191552a611dd45be0561372b1e6c055df
 SIZE (openra-OpenRA-release-20161019_GH0.tar.gz) = 12017426



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610310805.u9V85qH6081162>