3 files changed, 20 insertions, 24 deletions

diff --git a/games/openra/Makefile b/games/openra/Makefile
index d7b01e9bd542..d941b0250cfd 100644
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	openra
-PORTVERSION=	20161019
+PORTVERSION=	20170421
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20151227/:SDL2_CS \
+MASTER_SITES=	https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20161223/: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
@@ -26,12 +25,10 @@ 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 \
+		Open.Nat=2.1.0 \
+		SharpFont=4.0.1 \
 		SharpZipLib=0.86.0 \
 		SmartIrc4net=0.4.5.1 \
 		StyleCop.MSBuild=4.7.49.0 \
diff --git a/games/openra/distinfo b/games/openra/distinfo
index 53e47c9adb83..bc6b9abb1e24 100644
--- a/games/openra/distinfo
+++ b/games/openra/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1478024499
-SHA256 (SDL2-CS.dll) = 76206c2795cd3fae569fececb95025d1f9d92c618e2625188510b3331e171c3f
-SIZE (SDL2-CS.dll) = 86016
+TIMESTAMP = 1492797152
+SHA256 (SDL2-CS.dll) = b06c14a771d14cb37210f476dfd973d4e7d80d97f90566bd5bc78996ade4f7a0
+SIZE (SDL2-CS.dll) = 80896
 SHA256 (SDL2-CS.dll.config) = eff0594f7e86d40a94c1b28f8db87478f3de1cf0857f3d46e384bcc6744ce094
 SIZE (SDL2-CS.dll.config) = 194
 SHA256 (OpenAL-CS.dll) = d33391fd954c670a3ba3db2d1553015f78652ea33ca3eaf949da6377ec947e53
@@ -9,24 +9,20 @@ SHA256 (OpenAL-CS.dll.config) = 58eaf46a749e466fce0a0ec43184073b0153aa8eb24c8652
 SIZE (OpenAL-CS.dll.config) = 301
 SHA256 (Eluant.dll) = 218c4ea5424b44d746b5343563123beebc652fd9731967dfd49fed071b58df31
 SIZE (Eluant.dll) = 71168
-SHA256 (GeoLite2-Country.mmdb.gz) = 45b08815ceb42eef456fb32317459cfb8c41e36c73ad1807739579753c4b5ccd
-SIZE (GeoLite2-Country.mmdb.gz) = 1334841
+SHA256 (GeoLite2-Country.mmdb.gz) = 9716fa05ed0c654410794eebe6ff67edb87607df1e657f7fdc5358ce207f53e6
+SIZE (GeoLite2-Country.mmdb.gz) = 1366645
 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 (sharpfont.4.0.1.nupkg) = 48eff311d5fb4fe88612352462317a7e6a73a148c755afc6141c02ce4965a3f9
+SIZE (sharpfont.4.0.1.nupkg) = 141955
 SHA256 (sharpziplib.0.86.0.nupkg) = 5906c248bb986d50489192f490f94d2331d04e7d34337bc3c0d64df6d0008207
 SIZE (sharpziplib.0.86.0.nupkg) = 454026
 SHA256 (smartirc4net.0.4.5.1.nupkg) = a1c2b2be28d798187ecd118768b03ca3193995182d1d92983df23bacbb61dfcc
@@ -35,5 +31,5 @@ SHA256 (stylecop.msbuild.4.7.49.0.nupkg) = 6680dedaa5d27fb1ead475015de98e476e58f
 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
+SHA256 (openra-OpenRA-release-20170421_GH0.tar.gz) = 22d10663ded57ac3d30dd70460d1a468d853c32df08b17e6f21c8c96ae62ecac
+SIZE (openra-OpenRA-release-20170421_GH0.tar.gz) = 14705149
diff --git a/games/openra/files/patch-Makefile b/games/openra/files/patch-Makefile
index f5bf24bc3d71..ee407a8eb30a 100644
--- a/games/openra/files/patch-Makefile
+++ b/games/openra/files/patch-Makefile
@@ -1,8 +1,8 @@
 # Without zenity(1) fallback to either WinForms or no crash dialog
 
---- Makefile.orig	2015-08-28 13:11:47 UTC
+--- Makefile.orig	2017-03-04 17:51:43 UTC
 +++ Makefile
-@@ -400,12 +400,34 @@ install-man-page: man-page
+@@ -426,15 +426,37 @@ install-man-page: man-page
  install-linux-scripts:
  	@echo "#!/bin/sh" > openra
  	@echo 'cd "$(gameinstalldir)"' >> openra
@@ -19,10 +19,11 @@
 +	@echo '  mono --debug OpenRA.exe "$$@"' >> openra
 +endif
 +	@echo 'else' >> openra
+ # Note: this relies on the non-standard -f flag implemented by gnu readlink
  ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
- 	@echo 'mono OpenRA.Game.exe "$$@"' >> openra
+ 	@echo 'mono OpenRA.Game.exe Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
  else
- 	@echo 'mono --debug OpenRA.Game.exe "$$@"' >> openra
+ 	@echo 'mono --debug OpenRA.Game.exe Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
  endif
 +	@echo 'fi' >> openra
  	@echo 'if [ $$? != 0 -a $$? != 1 ]' >> openra
@@ -38,3 +39,5 @@
 +	@echo '    exit 1' >> openra
 +	@echo '  fi' >> openra
  	@echo '$$ZENITY --question --title "OpenRA" --text "OpenRA has encountered a fatal error.\nLog Files are available in ~/.openra." --ok-label "Quit" --cancel-label "View FAQ" || xdg-open https://github.com/OpenRA/OpenRA/wiki/FAQ' >> openra
+ 	@echo 'exit 1' >> openra
+ 	@echo 'fi' >> openra