Date: Mon, 22 Jul 2024 22:42:25 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4490ccf3f2e9 - main - games/simutrans: update 124-1 =?utf-8?Q?=E2=86=92?= 124-2 Message-ID: <202407222242.46MMgPsL030128@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=4490ccf3f2e9465f2cbf110ab726ea116282131b commit 4490ccf3f2e9465f2cbf110ab726ea116282131b Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2024-07-22 16:32:41 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407222242.46MMgPsL030128>