From owner-svn-ports-head@freebsd.org Sat Jan 5 21:05:17 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 423601422F97; Sat, 5 Jan 2019 21:05:17 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DC8E66D10B; Sat, 5 Jan 2019 21:05:16 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA7AF1E0DE; Sat, 5 Jan 2019 21:05:16 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x05L5Gcb014264; Sat, 5 Jan 2019 21:05:16 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x05L5FNR014258; Sat, 5 Jan 2019 21:05:15 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201901052105.x05L5FNR014258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 5 Jan 2019 21:05:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489384 - in head/games/wyrmsun: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/wyrmsun: . files X-SVN-Commit-Revision: 489384 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DC8E66D10B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jan 2019 21:05:17 -0000 Author: amdmi3 Date: Sat Jan 5 21:05:15 2019 New Revision: 489384 URL: https://svnweb.freebsd.org/changeset/ports/489384 Log: - Update to 3.5.1 Added: head/games/wyrmsun/files/patch-cmake (contents, props changed) head/games/wyrmsun/files/patch-scripts_tilesets_cave.lua (contents, props changed) head/games/wyrmsun/files/patch-scripts_tilesets_dungeon.lua (contents, props changed) head/games/wyrmsun/pkg-plist (contents, props changed) Deleted: head/games/wyrmsun/files/wyrmsun.in Modified: head/games/wyrmsun/Makefile head/games/wyrmsun/distinfo Modified: head/games/wyrmsun/Makefile ============================================================================== --- head/games/wyrmsun/Makefile Sat Jan 5 21:05:00 2019 (r489383) +++ head/games/wyrmsun/Makefile Sat Jan 5 21:05:15 2019 (r489384) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wyrmsun -PORTVERSION= 3.4.1 +PORTVERSION= 3.5.1 DISTVERSIONPREFIX= v CATEGORIES= games @@ -18,33 +18,13 @@ USE_GITHUB= yes GH_ACCOUNT= Andrettin GH_PROJECT= Wyrmsun -NO_BUILD= yes +USES= cmake gnome +INSTALLS_ICONS= yes NO_ARCH= yes -PLIST_FILES= bin/${PORTNAME} \ - share/applications/${PORTNAME}.desktop \ - share/appdata/${PORTNAME}.appdata.xml PORTDATA= * PORTDOCS= * -SUB_FILES= ${PORTNAME} - OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} -e 's|wyrmgus -d /usr/share/wyrmsun|${PORTNAME}|' \ - ${WRKSRC}/linux/wyrmsun.desktop - -do-install: - cd ${WRKSRC} && ${COPYTREE_SHARE} "graphics maps music oaml.defs \ - scripts sounds translations" ${STAGEDIR}${DATADIR}/ - ${INSTALL_DATA} ${WRKSRC}/linux/wyrmsun.desktop ${STAGEDIR}${PREFIX}/share/applications - @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata - ${INSTALL_DATA} ${WRKSRC}/linux/wyrmsun.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR} .include Modified: head/games/wyrmsun/distinfo ============================================================================== --- head/games/wyrmsun/distinfo Sat Jan 5 21:05:00 2019 (r489383) +++ head/games/wyrmsun/distinfo Sat Jan 5 21:05:15 2019 (r489384) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541690210 -SHA256 (Andrettin-Wyrmsun-v3.4.1_GH0.tar.gz) = 2616f0dbc30b3473db9d4e9bbfb65f69fda5a4f835e6e3fba8f381e796732185 -SIZE (Andrettin-Wyrmsun-v3.4.1_GH0.tar.gz) = 272461186 +TIMESTAMP = 1545918235 +SHA256 (Andrettin-Wyrmsun-v3.5.1_GH0.tar.gz) = a2f5c0521a8d6fa0b4643478946b01957357f5c99a6b7ab5d629e519aa02f4ac +SIZE (Andrettin-Wyrmsun-v3.5.1_GH0.tar.gz) = 273083934 Added: head/games/wyrmsun/files/patch-cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wyrmsun/files/patch-cmake Sat Jan 5 21:05:15 2019 (r489384) @@ -0,0 +1,68 @@ +commit 15caa201694821770e1355f989a716afd3ea650b +Author: Dmitry Marakasov +Date: Wed Dec 26 22:14:17 2018 +0300 + + Add CMake-based installation support + + - Provide script to run wyrmsun from command line + - Fix hardcoded path to /usr/share/wyrmsun + - Install data, documentation, script, desktop and appdata files as well + as icons into designated locations + +diff --git CMakeLists.txt CMakeLists.txt +new file mode 100644 +index 00000000..91ef748a +--- /dev/null ++++ CMakeLists.txt +@@ -0,0 +1,30 @@ ++project(wyrmsun) ++cmake_minimum_required(VERSION 3.0) ++ ++set(DATADIR share/wyrmsun CACHE STRING "Where to install Wyrmsun data files") ++set(DOCSDIR share/doc/wyrmsun CACHE STRING "Where to install Wyrmsun documentation") ++ ++configure_file(linux/wyrmsun.sh.in linux/wyrmsun.sh @ONLY) ++ ++install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/linux/wyrmsun.sh DESTINATION bin RENAME wyrmsun) ++install(FILES linux/wyrmsun.desktop DESTINATION share/applications) ++install(FILES linux/wyrmsun.appdata.xml DESTINATION share/appdata) ++install(FILES graphics/ui/icons/wyrmsun_icon_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME wyrmsun.png) ++install(FILES graphics/ui/icons/wyrmsun_icon_64.png DESTINATION share/icons/hicolor/64x64/apps RENAME wyrmsun.png) ++install(FILES graphics/ui/icons/wyrmsun_icon_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME wyrmsun.png) ++ ++install(FILES oaml.defs DESTINATION ${DATADIR}) ++ ++install(DIRECTORY ++ data ++ graphics ++ maps ++ music ++ scripts ++ sounds ++ translations ++ DESTINATION ${DATADIR} ++) ++ ++install(FILES readme.txt DESTINATION ${DOCSDIR}) ++install(DIRECTORY documents DESTINATION ${DOCSDIR}) +diff --git linux/wyrmsun.desktop linux/wyrmsun.desktop +index b779fa63..cad9ea6b 100644 +--- linux/wyrmsun.desktop ++++ linux/wyrmsun.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] + Categories=Game;StrategyGame; +-Exec=wyrmgus -d /usr/share/wyrmsun ++Exec=wyrmsun + GenericName=Mythologic realtime-strategy game + GenericName[de]=Mythologisches Echtzeitstrategiespiel + Icon=wyrmsun +diff --git linux/wyrmsun.sh.in linux/wyrmsun.sh.in +new file mode 100644 +index 00000000..6bcb0675 +--- /dev/null ++++ linux/wyrmsun.sh.in +@@ -0,0 +1,3 @@ ++#!/bin/sh ++ ++exec wyrmgus -d @CMAKE_INSTALL_PREFIX@/@DATADIR@ "$@" Added: head/games/wyrmsun/files/patch-scripts_tilesets_cave.lua ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wyrmsun/files/patch-scripts_tilesets_cave.lua Sat Jan 5 21:05:15 2019 (r489384) @@ -0,0 +1,10 @@ +--- scripts/tilesets/cave.lua.orig 2018-12-25 12:18:32 UTC ++++ scripts/tilesets/cave.lua +@@ -165,4 +165,6 @@ BuildTilesetTables() + + Load("scripts/scripts.lua") + GameSettings.Inside = true +-SetTimeOfDaySchedule("") ++if (LoadedGame == false) then ++ SetTimeOfDaySchedule("") ++end Added: head/games/wyrmsun/files/patch-scripts_tilesets_dungeon.lua ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wyrmsun/files/patch-scripts_tilesets_dungeon.lua Sat Jan 5 21:05:15 2019 (r489384) @@ -0,0 +1,10 @@ +--- scripts/tilesets/dungeon.lua.orig 2018-12-25 12:18:32 UTC ++++ scripts/tilesets/dungeon.lua +@@ -216,4 +216,6 @@ BuildTilesetTables() + + Load("scripts/scripts.lua") + GameSettings.Inside = true +-SetTimeOfDaySchedule("") ++if (LoadedGame == false) then ++ SetTimeOfDaySchedule("") ++end Added: head/games/wyrmsun/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wyrmsun/pkg-plist Sat Jan 5 21:05:15 2019 (r489384) @@ -0,0 +1,6 @@ +bin/wyrmsun +share/appdata/wyrmsun.appdata.xml +share/applications/wyrmsun.desktop +share/icons/hicolor/128x128/apps/wyrmsun.png +share/icons/hicolor/32x32/apps/wyrmsun.png +share/icons/hicolor/64x64/apps/wyrmsun.png