From nobody Tue Mar 15 17:46:08 2022 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 296E41A1AC72; Tue, 15 Mar 2022 17:46:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KJ16S4Z9mz52Ws; Tue, 15 Mar 2022 17:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647366368; 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=zL8OP2n5JXJpjjUliiuPPuqsoMlMACO5LKrBgCs3T5E=; b=VAyII+jMpQBAKliI268oTZ7OjVAkivogIh1PmZUivYwg6s6j0Gg6ohtd+GzLcTUzuB9vDU 8TIsiBOJw+mRo+bRIsB3Q8HmagHY9XbiYf/I+lKKTRUESqbGyfe6D42VdGdwOHwNNEtcsC 5hQuidkAgtiBIu4cNqqPRKodNMDPafed0HLCVdxMHow7EhUa4PQZEjAtRVu+G/0lWKvztq /UZq4LExqub4figOzPnCzgZfoakwvV37hB+WgCmPhI4xzlRX7qZ9MHYkBmLkXl6tAnzcFt tsuNxeFIcpsy4d2/bUWntbaXqPn999mW38dRxGYutXolA77bm0nzwETGHaQTSQ== 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 2EB0226044; Tue, 15 Mar 2022 17:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FHk85K033579; Tue, 15 Mar 2022 17:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FHk8G6033578; Tue, 15 Mar 2022 17:46:08 GMT (envelope-from git) Date: Tue, 15 Mar 2022 17:46:08 GMT Message-Id: <202203151746.22FHk8G6033578@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: 75bd60e30e2c - main - =?utf-8?Q?games/simutrans: update 121-0 =E2=86=92 123-0-1?= 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 75bd60e30e2c3071b2134e9ba6ed8585a4ebb3d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647366368; 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=zL8OP2n5JXJpjjUliiuPPuqsoMlMACO5LKrBgCs3T5E=; b=atmYuEEoPZVfkDZoJ2E8H57LoOPbimXONB2vc8GV0NRTE3Q+ePni+PfMnfuKcPvTwe1do0 RcuWgn2ecWFGkX/jYeax1y9qcB0xNMsEV+myF2PT6o+FZVN7pwdqG293T+Xr9S3hmmeSgd qAViuSEpgGVJD8UXieG/OopXpfNIO9yrkNjY47M1JEbf69VhXk3YTcB0RVBG7BHZCCuRE6 cIKQkT45J6ISSmlpmn2vR7Urj2TYTqqO7zC8VvLx2YaTYe6YhnxJq//DOWl10Ml75xUItH yvH5+nPtCprsLFVEQR7GO4iIPw0LjSEpKq2awpkAh6IcFl4pzDUENKNHUFQ6cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647366368; a=rsa-sha256; cv=none; b=Syp4WRIozuYX6AUkyp3i9k3r/GYTvIEdet8bK6PyGgqBdSl5dPBBP/YXFVgeu9tREcilTq dgzdFz4oZVR8TXLo6AD95L7eyiPOQYgE9gw/RZcHqEiPI7zTSGsBGiXniqkUN6m7BGp6KC wQUQkowy6fBoHX6cl0BiWJsb8LAAKDK9wdAyVoYrVID+sf9HHeNL6N1aV1ULIxScY8jUuE RrEwLNEqPVmxXWefmKw6XIn9om1/AbepYX9HSw+Z6ilwl2561GvlSFyg05P0yz6htBQg5N QDspmz/9d3ch9rk9EoEBJe+H8X08HVUJX08m7BnT8efSA7KsKgf83XCvm41g1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=75bd60e30e2c3071b2134e9ba6ed8585a4ebb3d9 commit 75bd60e30e2c3071b2134e9ba6ed8585a4ebb3d9 Author: Dmitry Marakasov AuthorDate: 2021-06-15 14:31:08 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-15 17:45:10 +0000 games/simutrans: update 121-0 → 123-0-1 --- games/simutrans/Makefile | 40 +++++++++++++++++++------------ games/simutrans/distinfo | 6 ++--- games/simutrans/files/patch-Makefile | 19 --------------- games/simutrans/files/patch-simsys.cc | 11 --------- games/simutrans/files/patch-sys_simsys.cc | 11 +++++++++ games/simutrans/pkg-plist | 3 +++ 6 files changed, 42 insertions(+), 48 deletions(-) diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile index c9df1bc373c0..03bfa77e019a 100644 --- a/games/simutrans/Makefile +++ b/games/simutrans/Makefile @@ -1,5 +1,5 @@ PORTNAME= simutrans -DISTVERSION= 121-0 +DISTVERSION= 123-0-1 CATEGORIES= games MASTER_SITES= SF/simutrans/simutrans/${DISTVERSION} DISTNAME= simutrans-src-${DISTVERSION} @@ -12,22 +12,21 @@ LICENSE_COMB= multi LICENSE_FILE_ART10= ${WRKSRC}/simutrans/license.txt LICENSE_FILE_MIT= ${WRKSRC}/simutrans/license_squirrel.txt -USES= compiler:c11 gmake sdl zip -USE_SDL= sdl2 mixer2 +LIB_DEPENDS= libpng.so:graphics/png \ + libfreetype.so:print/freetype2 \ + libzstd.so:archivers/zstd -# Threading disabled because FreeBSD does not have a static initializer -# for recursive mutexes. -MAKE_ENV= BACKEND=mixer_sdl2 \ - COLOUR_DEPTH=16 \ - MULTI_THREAD=0 \ - OSTYPE=freebsd \ - VERBOSE=1 +USES= cmake compiler:c++11-lib pkgconfig sdl zip +USE_SDL= sdl2 + +CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_CCache \ + CMAKE_DISABLE_FIND_PACKAGE_Git \ + CMAKE_DISABLE_FIND_PACKAGE_Subversion NO_WRKSUBDIR= yes SUB_FILES= simutrans -PLIST_FILES= bin/simutrans libexec/simutrans PORTDATA= * PORTDOCS= change_request.txt \ history.txt \ @@ -35,12 +34,12 @@ PORTDOCS= change_request.txt \ readme.txt \ thanks.txt -DESKTOP_ENTRIES=Simutrans "" "" simutrans "Game;Simulation;" false +DESKTOP_ENTRIES=Simutrans "" simutrans simutrans "Game;Simulation;" false -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS UPNP FLUIDSYNTH OPTIONS_MULTI= PAKS OPTIONS_MULTI_PAKS= PAK64 PAK128 PAK128_GERMAN -OPTIONS_DEFAULT=PAK128 +OPTIONS_DEFAULT=PAK128 UPNP FLUIDSYNTH PAKS_DESC= Graphics sets PAK64_DESC= Enable low resolution graphics set @@ -50,12 +49,23 @@ PAK128_RUN_DEPENDS= simutrans-pak128>=0:games/simutrans-pak128 PAK128_GERMAN_DESC= Enable german graphics set PAK128_GERMAN_RUN_DEPENDS= simutrans-pak128.german>=0:games/simutrans-pak128.german +UPNP_DESC= Use MiniUPNP for easier server setup +UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc +UPNP_CMAKE_BOOL= SIMUTRANS_USE_UPNP + +FLUIDSYNTH_DESC= Enable FluidSynth for MIDI playback +FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth +FLUIDSYNTH_CMAKE_BOOL= SIMUTRANS_USE_FLUIDSYNTH_MIDI + do-install: @cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} \ "ai config font music script text themes" ${STAGEDIR}${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/build/default/sim \ + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/simutrans/simutrans \ ${STAGEDIR}${PREFIX}/libexec/simutrans ${INSTALL_SCRIPT} ${WRKDIR}/simutrans ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_DATA} ${WRKSRC}/simutrans.svg \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/games/simutrans/distinfo b/games/simutrans/distinfo index 80d31ae4114e..b72743356db1 100644 --- a/games/simutrans/distinfo +++ b/games/simutrans/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575983380 -SHA256 (simutrans-src-121-0.zip) = 69fd95989761a013729106b48135f772f59126398cd93ada072f963c4d1e86b8 -SIZE (simutrans-src-121-0.zip) = 4154876 +TIMESTAMP = 1647349156 +SHA256 (simutrans-src-123-0-1.zip) = 8deb38c8de41fb5558640cdd4b9b161c38de92c077b3e506f74c34f93214f469 +SIZE (simutrans-src-123-0-1.zip) = 4771334 diff --git a/games/simutrans/files/patch-Makefile b/games/simutrans/files/patch-Makefile deleted file mode 100644 index 394bc9afc7cb..000000000000 --- a/games/simutrans/files/patch-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.orig 2019-12-03 10:58:12 UTC -+++ Makefile -@@ -37,7 +37,7 @@ else ifeq ($(OSTYPE),beos) - # BeOS (obsolete) - LIBS += -lnet - else ifeq ($(OSTYPE),freebsd) -- CFLAGS += -I/usr/local/include -+ CFLAGS += -isystem ${LOCALBASE}/include - else ifeq ($(OSTYPE),haiku) - # Haiku (needs to activate the GCC 4x) - LIBS += -lnetwork -lbe -@@ -84,7 +84,6 @@ ifdef OPTIMISE - endif - endif - else -- CFLAGS += -O - endif - - ifdef DEBUG diff --git a/games/simutrans/files/patch-simsys.cc b/games/simutrans/files/patch-simsys.cc deleted file mode 100644 index c5c6696f01f6..000000000000 --- a/games/simutrans/files/patch-simsys.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- simsys.cc.orig 2019-12-03 10:58:15 UTC -+++ simsys.cc -@@ -357,7 +357,7 @@ char const *dr_query_homedir() - find_directory(B_USER_DIRECTORY, &userDir); - sprintf(buffer, "%s/simutrans", userDir.Path()); - #else -- sprintf(buffer, "%s/simutrans", getenv("HOME")); -+ sprintf(buffer, "%s/.simutrans", getenv("HOME")); - #endif - - // create directory and subdirectories diff --git a/games/simutrans/files/patch-sys_simsys.cc b/games/simutrans/files/patch-sys_simsys.cc new file mode 100644 index 000000000000..be3822e9a858 --- /dev/null +++ b/games/simutrans/files/patch-sys_simsys.cc @@ -0,0 +1,11 @@ +--- sys/simsys.cc.orig 2022-01-28 11:17:50 UTC ++++ sys/simsys.cc +@@ -395,7 +395,7 @@ char const *dr_query_homedir() + #elif defined __ANDROID__ + tstrncpy(buffer,SDL_GetPrefPath("Simutrans Team","simutrans"),lengthof(buffer)); + #else +- sprintf(buffer, "%s/simutrans", getenv("HOME")); ++ sprintf(buffer, "%s/.simutrans", getenv("HOME")); + #endif + + // create directory and subdirectories diff --git a/games/simutrans/pkg-plist b/games/simutrans/pkg-plist new file mode 100644 index 000000000000..04bcdf5a1140 --- /dev/null +++ b/games/simutrans/pkg-plist @@ -0,0 +1,3 @@ +bin/simutrans +libexec/simutrans +share/icons/hicolor/scalable/apps/simutrans.svg