From nobody Mon Jul 22 22:42:25 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WSZzP5wTsz5QLHT; Mon, 22 Jul 2024 22:42:25 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WSZzP3Rpyz4nKt; Mon, 22 Jul 2024 22:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721688145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W7HtnazQsRnnqC/6QOvJkJhuSyO9+zE98tQRR7tmJKg=; b=vGNz+LbAmYADNDwPTc7Xm5cAoA83Du1c3X8/6enjqoZ90UBTNCvKy2H737ifY3DjUVq5zf xZfrgxjZJt6f3EPVgHlvc8Soj4442stAReYCVem1ThSzFDsbZxFF+jklpNBShf3Pg7LWTr 5dwH0ROw8dYNH68f1vZaQq3+HYFwIayC9zU8TMGDJ87H6nwLXNafqIO0qmGCvKjNAOfYfQ ci+DRKOZ4hCdt3mnhUe8A/mJ5dSNANfg7IV3jAC44TLTKc0sbid5V9Wfn86woSBOhQXNTu b5XIK8hERnCGE96q0//2DaHNTNLob8az7rK/4H3U+qzr89QmNhUiNvEqOSQuGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721688145; a=rsa-sha256; cv=none; b=jyS+GM3vhRoQUon5kExV9s5DYW/3EI64UUhN86W6hukAiA5kqObGbOF6B3TBi/f+fR8Cmk jvopMCXwJ28r3O6LFcSQDaD4TRMhuuzwGev0rRjn4goJf/DTOehYQyemJSzrtgmpNC1PPM jaRklFaVM/KAO+p+HwsVyA6TLfI/Zrd6ibtydgqOH3Jh+mrE9830EKU5bUUsGyiZGc54db Z/Rdsosv4NE8pQu/n5auhXvVbQyrssCdp/4CMlHddlctUAtbhuE3wYC1F9gFs+YeiVWFvh IA3pVrCrPgwDfLLlhvLsSdFDr5iZLYzmj1Buvyjj9yBnWteAQ1jzNmwwcq+qtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721688145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W7HtnazQsRnnqC/6QOvJkJhuSyO9+zE98tQRR7tmJKg=; b=veuXbK7UlMajZ4MxDQY7td/8tY5k7XJBkD2+4/xnSFgCpMYs3Gu8GJ7b9HfCIFi+E6VeLP tZnjPVtCtw/KCPjzKr/72cm6eatasa+Zz5arRVYzK53/23g/9WCUgrzWYe6KIfTqdAx+26 qyi4qGxsQHVfFJc7swwMAgoLyIP2UG03zjwcaMhbCOFN5q7u0zo+5y8dUCLJE4j8rdrKrK 3AnVeuE3oDGw76vTp3+JRD9hfzHm7pW83K6APaJucXNoIm3RzpTd1+P1YK2TIGQ9Q1anaX ZokOjYvgyzqoDXKPEc7GPBr7kSuBaELZiM1mOFG0EQ3jtf1am4klIZM9rI+yQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WSZzP33zpz13LV; Mon, 22 Jul 2024 22:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46MMgPcF030131; Mon, 22 Jul 2024 22:42:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46MMgPsL030128; Mon, 22 Jul 2024 22:42:25 GMT (envelope-from git) Date: Mon, 22 Jul 2024 22:42:25 GMT Message-Id: <202407222242.46MMgPsL030128@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 4490ccf3f2e9 - main - games/simutrans: update 124-1 =?utf-8?Q?=E2=86=92?= 124-2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4490ccf3f2e9465f2cbf110ab726ea116282131b Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=4490ccf3f2e9465f2cbf110ab726ea116282131b commit 4490ccf3f2e9465f2cbf110ab726ea116282131b Author: Dmitry Marakasov AuthorDate: 2024-07-22 16:32:41 +0000 Commit: Dmitry Marakasov CommitDate: 2024-07-22 22:38:01 +0000 games/simutrans: update 124-1 → 124-2 --- games/simutrans/Makefile | 5 ++-- games/simutrans/distinfo | 6 ++-- .../files/patch-cmake_SimutransInstall.cmake | 22 +++++++++----- games/simutrans/files/patch-upnp | 34 ---------------------- games/simutrans/pkg-plist | 15 +--------- 5 files changed, 21 insertions(+), 61 deletions(-) diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile index 147896fb5370..0b8889fdd7ef 100644 --- a/games/simutrans/Makefile +++ b/games/simutrans/Makefile @@ -1,6 +1,5 @@ PORTNAME= simutrans -DISTVERSION= 124-1 -PORTREVISION= 1 +DISTVERSION= 124-2 CATEGORIES= games MASTER_SITES= SF/simutrans/simutrans/${DISTVERSION} DISTNAME= simutrans-src-${DISTVERSION} @@ -25,7 +24,7 @@ CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_CCache \ CMAKE_DISABLE_FIND_PACKAGE_Subversion CMAKE_ARGS= -DSIMUTRANS_USE_REVISION=1 -NO_WRKSUBDIR= yes +WRKSRC= ${WRKDIR}/simutrans-src-142-2 PORTDATA= * PORTDOCS= change_request.txt \ diff --git a/games/simutrans/distinfo b/games/simutrans/distinfo index 401d552e667a..26a3703e0c1d 100644 --- a/games/simutrans/distinfo +++ b/games/simutrans/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717427925 -SHA256 (simutrans-src-124-1.zip) = 0fc4e071a8b7fe1931b30fc0293aa68967f943c6fa6d89c6df119eb3d84d5437 -SIZE (simutrans-src-124-1.zip) = 5965405 +TIMESTAMP = 1721655436 +SHA256 (simutrans-src-124-2.zip) = f25d7a898c3d9373c98efb5fb65a2dff3014e99de7c88877698cb2cac4c5c88e +SIZE (simutrans-src-124-2.zip) = 5578096 diff --git a/games/simutrans/files/patch-cmake_SimutransInstall.cmake b/games/simutrans/files/patch-cmake_SimutransInstall.cmake index be6f9b1dcde7..9aefe83cab7e 100644 --- a/games/simutrans/files/patch-cmake_SimutransInstall.cmake +++ b/games/simutrans/files/patch-cmake_SimutransInstall.cmake @@ -1,13 +1,14 @@ ---- cmake/SimutransInstall.cmake.orig 2024-05-04 14:27:27 UTC +--- cmake/SimutransInstall.cmake.orig 2024-07-20 16:43:38 UTC +++ cmake/SimutransInstall.cmake -@@ -36,19 +36,12 @@ else () - # MSVC has no variable on the install target path at execution time, which is why we expand the directories at creation time! - install(CODE "execute_process(COMMAND powershell -ExecutionPolicy Bypass -File ${CMAKE_SOURCE_DIR}/tools/get_lang_files.ps1 WORKING_DIRECTORY ${SIMUTRANS_OUTPUT_DIR}/${SIMUTRANS_BASE_DIR}/..)") - else () -- install(CODE "execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/tools/get_lang_files.sh WORKING_DIRECTORY ${SIMUTRANS_OUTPUT_DIR}/${SIMUTRANS_BASE_DIR}/.. )") +@@ -38,7 +38,6 @@ if (SIMUTRANS_UPDATE_LANGFILES) + # MSVC has no variable on the install target path at execution time, which is why we expand the directories at creation time! + install(CODE "execute_process(COMMAND powershell -ExecutionPolicy Bypass -File ${CMAKE_SOURCE_DIR}/tools/get_lang_files.ps1 WORKING_DIRECTORY ${SIMUTRANS_OUTPUT_DIR}/${SIMUTRANS_BASE_DIR}/..)") + else () +- install(CODE "execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/tools/get_lang_files.sh WORKING_DIRECTORY ${SIMUTRANS_OUTPUT_DIR}/${SIMUTRANS_BASE_DIR}/.. )") + endif () endif () - # +@@ -46,12 +45,6 @@ if (NOT WIN32) # Pak installer # if (NOT WIN32) @@ -20,3 +21,10 @@ else () # NSIS must be installed manually in the path with the right addons if(MINGW) +@@ -129,4 +122,4 @@ if (SIMUTRANS_STEAM_BUILT) + elseif(UNIX AND NOT APPLE) # For Apple it was already done in MacBundle.cmake + install(FILES ${CMAKE_SOURCE_DIR}/sdk/redistributable_bin/linux64/libsteam_api.so DESTINATION ${CMAKE_BINARY_DIR}/simutrans/lib) + endif() +-endif() +\ No newline at end of file ++endif() diff --git a/games/simutrans/files/patch-upnp b/games/simutrans/files/patch-upnp deleted file mode 100644 index 38267818dc2c..000000000000 --- a/games/simutrans/files/patch-upnp +++ /dev/null @@ -1,34 +0,0 @@ -From upstream commit b399b9c89b3369ebe3a9afa54459f74c9c5f52b1 - -diff --git src/simutrans/network/network.cc src/simutrans/network/network.cc -index 5acf10e5c7..52669ad9d0 100644 ---- src/simutrans/network/network.cc -+++ src/simutrans/network/network.cc -@@ -981,7 +981,12 @@ bool prepare_for_server( char *externalIPAddress, char *externalAltIPAddress, in - struct UPNPUrls urls; - struct IGDdatas data; - -+#if MINIUPNPC_API_VERSION <= 17 - UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof(lanaddr) ); -+#else -+ char wanaddr[64] = "uset"; -+ UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(lanaddr)); -+#endif - // we must know our IP address first - if( UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIPAddress) == UPNPCOMMAND_SUCCESS ) { - // this is our ID (at least the routes tells us this) -@@ -1040,7 +1045,13 @@ void remove_port_forwarding( int port ) - struct UPNPUrls urls; - struct IGDdatas data; - -- UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof(lanaddr) ); -+#if MINIUPNPC_API_VERSION <= 17 -+ UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr)); -+#else -+ char wanaddr[64] = "uset"; -+ UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(lanaddr)); -+#endif -+ - // we must know our IP address first - if( UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIPAddress) == UPNPCOMMAND_SUCCESS ) { - // this is our ID (at least the routes tells us this) diff --git a/games/simutrans/pkg-plist b/games/simutrans/pkg-plist index cd24657779ee..8877c63cbaa5 100644 --- a/games/simutrans/pkg-plist +++ b/games/simutrans/pkg-plist @@ -1,16 +1,3 @@ bin/simutrans share/icons/hicolor/scalable/apps/simutrans.svg -@dir %%DATADIR%%/text/th -@dir %%DATADIR%%/text/sq -@dir %%DATADIR%%/text/no -@dir %%DATADIR%%/text/lt -@dir %%DATADIR%%/text/gr -@dir %%DATADIR%%/text/fp -@dir %%DATADIR%%/text/et -@dir %%DATADIR%%/text/eo -@dir %%DATADIR%%/text/ca -@dir %%DATADIR%%/text/bg -@dir %%DATADIR%%/text/be -@dir %%DATADIR%%/screenshot -@dir %%DATADIR%%/save -@dir %%DATADIR%%/maps +share/metainfo/com.simutrans.Simutrans.metainfo.xml