games/openra: update to 20171014

- Drop DOCS as Lua API docs aren't available anymore
- Drop ZENITY as it's only used to show FAQ link on crashes
- Move game data to DATADIR, better mimicking hier(7)

Changes:	https://github.com/OpenRA/OpenRA/wiki/Changelog#release-20171014
MFH:		2017Q4 (for multiplayer)

4 files changed, 41 insertions, 85 deletions

diff --git a/games/openra/Makefile b/games/openra/Makefile
index 9178b360e2e2..e095c2cff814 100644
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	openra
-PORTVERSION=	20170527
+PORTVERSION=	20171014
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	3
 CATEGORIES=	games
 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 \
@@ -33,7 +32,8 @@ NUGET_DEPENDS=	FuzzyLogicLibrary=1.2.0 \
 		SharpZipLib=0.86.0 \
 		SmartIrc4net=0.4.5.1 \
 		StyleCop.MSBuild=4.7.49.0 \
-		StyleCopPlus.MSBuild=4.7.49.5
+		StyleCopPlus.MSBuild=4.7.49.5 \
+		rix0rrr.BeaconLib=1.0.1
 
 USE_GITHUB=	yes
 GH_PROJECT=	OpenRA
@@ -44,28 +44,19 @@ USES=		desktop-file-utils gmake lua:51,run mono:nuget openal:soft \
 USE_SDL=	sdl2
 NUGET_PACKAGEDIR=${WRKSRC}/thirdparty/download
 SHEBANG_FILES=	launch-dedicated.sh
-MAKE_ENV=	prefix="${PREFIX}" mandir="${PREFIX}/man"
+MAKE_ENV=	prefix="${PREFIX}" mandir="${PREFIX}/man" \
+		gameinstalldir="${DATADIR}"
 MAKE_ARGS=	VERSION="${GH_TAGNAME}"
 ALL_TARGET=	all
-INSTALL_TARGET=	install-all install-man-page \
+INSTALL_TARGET=	install install-man-page \
 		install-linux-mime install-linux-shortcuts
-DATADIR=	${PREFIX}/lib/${PORTNAME}
 PORTDATA=	*
-PORTDOCS=	*.html
 
-OPTIONS_DEFINE=	DOCS TEST ZENITY
-OPTIONS_DEFAULT=ZENITY
-
-DOCS_BUILD_DEPENDS=markdown:textproc/markdown
-DOCS_ALL_TARGET=docs
+OPTIONS_DEFINE=	TEST
 
 TEST_MAKE_ENV=	HOME="${WRKDIR}"
 TEST_ALL_TARGET=test
 
-ZENITY_RUN_DEPENDS=xdg-open:devel/xdg-utils \
-		zenity:x11/zenity
-ZENITY_DESC=	Use native crash dialog
-
 post-extract:
 	${CP} ${DISTFILES:C/:.*//:N*.nupkg:N*.tar*:S,^,${_DISTDIR}/,} \
 		${NUGET_PACKAGEDIR}
@@ -83,15 +74,4 @@ post-patch:
 		${WRKSRC}/thirdparty/Eluant.dll.config.in \
 		>${WRKSRC}/Eluant.dll.config
 
-post-build-DOCS-on:
-	@${ECHO_MSG} Generating HTML documentation...
-	@for f in ${WRKSRC}/*.md; do \
-		${ECHO_MSG} markdown $$f -\> $${f%.md}.html; \
-		markdown $$f >$${f%.md}.html; \
-	done
-
-post-install-DOCS-on:
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
-		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
-
 .include <bsd.port.mk>
diff --git a/games/openra/distinfo b/games/openra/distinfo
index fc55e863c907..55e4785ea7d4 100644
--- a/games/openra/distinfo
+++ b/games/openra/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1496897415
+TIMESTAMP = 1507980608
 SHA256 (SDL2-CS.dll) = b06c14a771d14cb37210f476dfd973d4e7d80d97f90566bd5bc78996ade4f7a0
 SIZE (SDL2-CS.dll) = 80896
 SHA256 (SDL2-CS.dll.config) = eff0594f7e86d40a94c1b28f8db87478f3de1cf0857f3d46e384bcc6744ce094
@@ -31,5 +31,7 @@ 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-20170527_GH0.tar.gz) = d8da40fbed12c529a3bb4008f0aba46bbac3fd6113805046eb5107bbdcb7c0c2
-SIZE (openra-OpenRA-release-20170527_GH0.tar.gz) = 14705630
+SHA256 (rix0rrr.beaconlib.1.0.1.nupkg) = e8e126b98ae7676cb0434455aa8a41c17a927c1b40c4cf368f9527af6bc251f2
+SIZE (rix0rrr.beaconlib.1.0.1.nupkg) = 8421
+SHA256 (openra-OpenRA-release-20171014_GH0.tar.gz) = ea8a6c38f22c3432bd173c15e3f3d96a7bb47c39f73db5aa5ab6df7e6980ed5a
+SIZE (openra-OpenRA-release-20171014_GH0.tar.gz) = 20125442
diff --git a/games/openra/files/patch-Makefile b/games/openra/files/patch-Makefile
deleted file mode 100644
index ee407a8eb30a..000000000000
--- a/games/openra/files/patch-Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Without zenity(1) fallback to either WinForms or no crash dialog
-
---- Makefile.orig	2017-03-04 17:51:43 UTC
-+++ Makefile
-@@ -426,15 +426,37 @@ install-man-page: man-page
- install-linux-scripts:
- 	@echo "#!/bin/sh" > openra
- 	@echo 'cd "$(gameinstalldir)"' >> openra
-+	@echo 'ZENITY=`which zenity`' >> openra
-+	@echo 'if [ -z "$$ZENITY" ] && (' >> openra
-+	@echo '  # from mono/io-layer/processes.c' >> openra
-+	@echo '  hash xdg-open 2>/dev/null ||' >> openra
-+	@echo '  hash gnome-open 2>/dev/null ||' >> openra
-+	@echo '  hash kfmclient 2>/dev/null)' >> openra
-+	@echo 'then' >> openra
-+ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-+	@echo '  mono OpenRA.exe "$$@"' >> openra
-+else
-+	@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 Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
- else
- 	@echo 'mono --debug OpenRA.Game.exe Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
- endif
-+	@echo 'fi' >> openra
- 	@echo 'if [ $$? != 0 -a $$? != 1 ]' >> openra
- 	@echo 'then' >> openra
--	@echo 'ZENITY=`which zenity` || echo "OpenRA needs zenity installed to display a graphical error dialog. See ~/.openra. for log files."' >> openra
-+	@echo '  if [ -z "$$ZENITY" ]' >> openra
-+	@echo '  then' >> openra
-+	@echo '    echo' >> openra
-+	@echo '    echo "OpenRA has encountered a fatal error."' >> openra
-+	@echo '    echo "Log Files are available in ~/.openra."' >> openra
-+	@echo '    echo' >> openra
-+	@echo '    echo "See https://github.com/OpenRA/OpenRA/wiki/FAQ"' >> openra
-+	@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
diff --git a/games/openra/pkg-plist b/games/openra/pkg-plist
index d5cac4219fcc..134e5609ad44 100644
--- a/games/openra/pkg-plist
+++ b/games/openra/pkg-plist
@@ -1,14 +1,31 @@
-bin/openra
-bin/openra-server
-share/applications/openra-join-servers.desktop
-share/applications/openra-launch-mod.desktop
-share/applications/openra-replays.desktop
-share/applications/openra.desktop
-share/icons/hicolor/128x128/apps/openra.png
-share/icons/hicolor/16x16/apps/openra.png
-share/icons/hicolor/32x32/apps/openra.png
-share/icons/hicolor/48x48/apps/openra.png
-share/icons/hicolor/64x64/apps/openra.png
-share/icons/hicolor/scalable/apps/openra.svg
+bin/openra-cnc
+bin/openra-cnc-server
+bin/openra-d2k
+bin/openra-d2k-server
+bin/openra-ra
+bin/openra-ra-server
 man/man6/openra.6.gz
+share/applications/openra-cnc-join-servers.desktop
+share/applications/openra-cnc.desktop
+share/applications/openra-d2k-join-servers.desktop
+share/applications/openra-d2k.desktop
+share/applications/openra-ra-join-servers.desktop
+share/applications/openra-ra.desktop
+share/icons/hicolor/128x128/apps/openra-cnc.png
+share/icons/hicolor/128x128/apps/openra-d2k.png
+share/icons/hicolor/128x128/apps/openra-ra.png
+share/icons/hicolor/16x16/apps/openra-cnc.png
+share/icons/hicolor/16x16/apps/openra-d2k.png
+share/icons/hicolor/16x16/apps/openra-ra.png
+share/icons/hicolor/32x32/apps/openra-cnc.png
+share/icons/hicolor/32x32/apps/openra-d2k.png
+share/icons/hicolor/32x32/apps/openra-ra.png
+share/icons/hicolor/48x48/apps/openra-cnc.png
+share/icons/hicolor/48x48/apps/openra-d2k.png
+share/icons/hicolor/48x48/apps/openra-ra.png
+share/icons/hicolor/64x64/apps/openra-cnc.png
+share/icons/hicolor/64x64/apps/openra-d2k.png
+share/icons/hicolor/64x64/apps/openra-ra.png
+share/icons/hicolor/scalable/apps/openra-cnc.svg
+share/icons/hicolor/scalable/apps/openra-ra.svg
 share/mime/packages/openra.xml