Index: branches/2017Q4/games/openra/files/patch-Makefile =================================================================== --- branches/2017Q4/games/openra/files/patch-Makefile (revision 454957) +++ branches/2017Q4/games/openra/files/patch-Makefile (nonexistent) @@ -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 Property changes on: branches/2017Q4/games/openra/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q4/games/openra/Makefile =================================================================== --- branches/2017Q4/games/openra/Makefile (revision 454957) +++ branches/2017Q4/games/openra/Makefile (revision 454958) @@ -1,97 +1,77 @@ # $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 \ https://github.com/${GH_ACCOUNT}/Eluant/releases/download/20160124/:Eluant \ https://geolite.maxmind.com/download/geoip/database/:GeoLite2 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*.config:N*.dll:N*.mmdb*:N*.nupkg} MAINTAINER= jbeich@FreeBSD.org COMMENT= Multiplayer re-envisioning of early RTS games by Westwood Studios LICENSE= GPLv3 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 \ SharpFont=4.0.1 \ 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 NO_ARCH= yes USES= desktop-file-utils gmake lua:51,run mono:nuget openal:soft \ shared-mime-info shebangfix 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 +OPTIONS_DEFINE= TEST -DOCS_BUILD_DEPENDS=markdown:textproc/markdown -DOCS_ALL_TARGET=docs - 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} post-patch: ${REINPLACE_CMD} \ -e '/echo/!s/ @/ /' \ -e '/^mods:/s/$$/ version/' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e '/[[:<:]]get[[:blank:]]/d' \ ${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh ${FIND} ${WRKSRC}/thirdparty -name '*.config*' -exec ${REINPLACE_CMD} \ -i '.bak.os' -e '/linux/{ p; s//${OPSYS:tl}/; }' {} + ${SED} 's/@LIBLUA51@/liblua-${LUA_VER}.so/' \ ${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 Index: branches/2017Q4/games/openra/distinfo =================================================================== --- branches/2017Q4/games/openra/distinfo (revision 454957) +++ branches/2017Q4/games/openra/distinfo (revision 454958) @@ -1,35 +1,37 @@ -TIMESTAMP = 1496897415 +TIMESTAMP = 1507980608 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 SIZE (OpenAL-CS.dll) = 18944 SHA256 (OpenAL-CS.dll.config) = 58eaf46a749e466fce0a0ec43184073b0153aa8eb24c865219491bc1db989571 SIZE (OpenAL-CS.dll.config) = 301 SHA256 (Eluant.dll) = 218c4ea5424b44d746b5343563123beebc652fd9731967dfd49fed071b58df31 SIZE (Eluant.dll) = 71168 SHA256 (GeoLite2-Country.mmdb.gz) = e10ae6872a330ec07d5ad3636dcd7a3d435ca998445ff4bb3805ee025fedb5d7 SIZE (GeoLite2-Country.mmdb.gz) = 1583522 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 (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 (open.nat.2.1.0.nupkg) = 93bb2ac468937855215ef28e77ae06df03e1bab8f09b3459e9bc31cf1d18cdcb SIZE (open.nat.2.1.0.nupkg) = 338198 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 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-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 Index: branches/2017Q4/games/openra/pkg-plist =================================================================== --- branches/2017Q4/games/openra/pkg-plist (revision 454957) +++ branches/2017Q4/games/openra/pkg-plist (revision 454958) @@ -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 Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 454957) +++ branches/2017Q4 (revision 454958) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r452072