From nobody Fri Feb 07 11:23:02 2025 X-Original-To: dev-commits-ports-all@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 4YqBRC2lMNz5nDs8; Fri, 07 Feb 2025 11:23:03 +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 4YqBRB5Ylhz49R7; Fri, 07 Feb 2025 11:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738927382; 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=lCGZVf9E0f5hTR3/ZZDoiuPtyaeJLb+BI9NbntQSlKc=; b=BLRMuDAhGGnCAR515FlRhK8CxAMeFrb20DUT6UiDrpbjNXUyWi7Pm6qxhMFDyPJuWLnsfh 80BoELdJ460SmGEZ/mxjNV1R5eWHkapVIdnYif0oRuLWfbrcmPb59FhyMDBMRM3DKRM0uE svDd/gRA0WNFB7TFD7r8IxT5YkRanjo4E/GI+nYMpxsXkg5NZ32MDomgWRdmTbd02hlqQw knHGJtfF9F0E7wqIgoacqomAuEQPTCX1TbwebVcxKFZdHt14fMcNItoM8xDVHB1NJ/YlgY ztRizOlVMBgppH2x9L/QJE4LcPu8Rt5Z3beXTRwFHABgiebglTa8rPgjKwA3TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738927382; 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=lCGZVf9E0f5hTR3/ZZDoiuPtyaeJLb+BI9NbntQSlKc=; b=pEdmTpv9LjHDL0yCeuLEbxfRfkvS7nDq8FPwU3wDghoxbJY5/y482bRsajsXwPgHLrCLBj UdyL1g/B5bbN/k4fddQV2a7WeaCp02qE9n6MwQjyb98RTl2SZ6FqXtwH2ghZS34YIzQSM1 KaXyjPoPkXFaZKbTKpCbvnzeUNJq/CSgEyrGrwJKlPA280lc7VWdqpZnLCceieEY3pdNoU n6kbwV5/jueHmqUmFFFzj8EwWa2ZTaFr41v1uamNClv8dd5lKG1hwTa47heHx5/E+d8O0K zNCeVmAaQUs8eDaAC6ePRurPtnPTsjJ4zr68s8UAd/Ov9fpGRHlBh6b7/SIqaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738927382; a=rsa-sha256; cv=none; b=n1EiNJQW8hAmoTrQfCw8ldxpRkUf480bI08M5SbVQj6+uTrnEA3+m2EGg1c80z+44PvQBm Hn5Ylo0R4YHr1H16jH7Q2gHh+nJNCzNz7kulnVByfp0Quf2eXnbNc0WagJhK8NigN3AjJi 3TAfLK2XFLBm55kUkLvqoNXBHD9D2SYm8Yp9G8U2Oj8HrRKZubTeUcFUJIazP2xNtqtBlk 3b/kGrhP+gPpBeDNjWK6OD30Xmllwt5TZPlpmCgzBvmOlO6C6AwEF75EIG/qGAUmce3Snu MiuD1fz/PJ9g/V1giF39kJDC/o6TZ8/uTOV7GUWeHc/ginLkq0/23yvNBDpHww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YqBRB50v1z5qs; Fri, 07 Feb 2025 11:23:02 +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 517BN2pS028005; Fri, 7 Feb 2025 11:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 517BN2YC028002; Fri, 7 Feb 2025 11:23:02 GMT (envelope-from git) Date: Fri, 7 Feb 2025 11:23:02 GMT Message-Id: <202502071123.517BN2YC028002@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: 0f0e6c5d4622 - main - =?utf-8?Q?games/simutrans: update 124-2-2 =E2=86=92 124.3?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 0f0e6c5d462259705accf55fbf0edbf79f2a92bf Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f0e6c5d462259705accf55fbf0edbf79f2a92bf commit 0f0e6c5d462259705accf55fbf0edbf79f2a92bf Author: Dmitry Marakasov AuthorDate: 2025-02-05 14:01:19 +0000 Commit: Dmitry Marakasov CommitDate: 2025-02-07 11:22:10 +0000 games/simutrans: update 124-2-2 → 124.3 --- games/simutrans/Makefile | 10 +++------- games/simutrans/distinfo | 6 +++--- games/simutrans/files/patch-CMakeLists.txt | 15 ++++++++++++++ .../files/patch-src_simutrans_sys_simsys.cc | 23 +++++++++++----------- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile index 41b7526eccd2..915412b6d7c3 100644 --- a/games/simutrans/Makefile +++ b/games/simutrans/Makefile @@ -1,9 +1,6 @@ PORTNAME= simutrans -DISTVERSION= 124-2-2 -PORTREVISION= 1 +DISTVERSION= 124.3 CATEGORIES= games -MASTER_SITES= SF/simutrans/simutrans/${DISTVERSION} -DISTNAME= simutrans-src-${DISTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Transportation simulator @@ -18,15 +15,14 @@ LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libzstd.so:archivers/zstd -USES= cmake compiler:c++14-lang pkgconfig sdl zip +USES= cmake compiler:c++14-lang pkgconfig sdl +USE_GITHUB= yes USE_SDL= sdl2 CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_CCache \ CMAKE_DISABLE_FIND_PACKAGE_Git \ CMAKE_DISABLE_FIND_PACKAGE_Subversion CMAKE_ARGS= -DSIMUTRANS_USE_REVISION=1 -WRKSRC= ${WRKDIR}/simutrans-master - PORTDATA= * PORTDOCS= change_request.txt \ history.txt \ diff --git a/games/simutrans/distinfo b/games/simutrans/distinfo index 885576cc4d96..7471cf0d0c64 100644 --- a/games/simutrans/distinfo +++ b/games/simutrans/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725071923 -SHA256 (simutrans-src-124-2-2.zip) = 9fc744b4d21fc6bf1e36dd081906eb9ced31c44fc3a680475ddb29fde818cf4a -SIZE (simutrans-src-124-2-2.zip) = 5569050 +TIMESTAMP = 1738763106 +SHA256 (simutrans-simutrans-124.3_GH0.tar.gz) = ecc1abe6d1f99216718301c0c95c02bb9f4718edaf2272c77760e60b7c282e27 +SIZE (simutrans-simutrans-124.3_GH0.tar.gz) = 4555274 diff --git a/games/simutrans/files/patch-CMakeLists.txt b/games/simutrans/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..df68ec5a9071 --- /dev/null +++ b/games/simutrans/files/patch-CMakeLists.txt @@ -0,0 +1,15 @@ +Fixed upstream in https://github.com/simutrans/simutrans/commit/81d5165874303edcdbe81ba07df1fea8d5e03f4b + +Remove this patch with next update +--- CMakeLists.txt.orig 2025-01-11 14:40:58 UTC ++++ CMakeLists.txt +@@ -95,6 +95,9 @@ if (${SIMUTRANS_USE_REVISION}) + if (${SIMUTRANS_USE_REVISION}) + file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/src/simutrans/revision.h "#define REVISION ${SIMUTRANS_USE_REVISION}\n") + message(STATUS "Compiling Simutrans with manually specified revision ${SIMUTRANS_USE_REVISION}") ++ set(SIMUTRANS_WC_REVISION ${SIMUTRANS_USE_REVISION}) ++ set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) ++ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/SimutransRevision.cmake) + else () + string(FIND ${CMAKE_GENERATOR} "Visual Studio" VS ) + if (${VS} EQUAL 0) diff --git a/games/simutrans/files/patch-src_simutrans_sys_simsys.cc b/games/simutrans/files/patch-src_simutrans_sys_simsys.cc index ac91496e836c..61d3ec743b88 100644 --- a/games/simutrans/files/patch-src_simutrans_sys_simsys.cc +++ b/games/simutrans/files/patch-src_simutrans_sys_simsys.cc @@ -1,14 +1,15 @@ ---- src/simutrans/sys/simsys.cc.orig 2024-05-04 14:27:27 UTC +--- src/simutrans/sys/simsys.cc.orig 2024-12-29 01:27:00 UTC +++ src/simutrans/sys/simsys.cc -@@ -526,9 +526,9 @@ char const *dr_query_homedir() - } - #else +@@ -562,10 +562,10 @@ char const *dr_query_homedir() + int maxlen = PATH_MAX + 22; + unsigned n; if( getenv("XDG_DATA_HOME") == NULL ) { -- sprintf(buffer, "%s/simutrans", getenv("HOME")); -+ sprintf(buffer, "%s/.simutrans", getenv("HOME")); - } else { -- sprintf(buffer, "%s/simutrans", getenv("XDG_DATA_HOME")); -+ sprintf(buffer, "%s/.simutrans", getenv("XDG_DATA_HOME")); +- n = snprintf(buffer, maxlen, "%s/simutrans", getenv("HOME")); ++ n = snprintf(buffer, maxlen, "%s/.simutrans", getenv("HOME")); + } + else { +- n = snprintf(buffer, maxlen, "%s/simutrans", getenv("XDG_DATA_HOME")); ++ n = snprintf(buffer, maxlen, "%s/.simutrans", getenv("XDG_DATA_HOME")); } - #endif - + if (n >= maxlen) { + return NULL;