From nobody Tue Feb 7 05:51:29 2023 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 4P9sh221GXz3pCSq; Tue, 7 Feb 2023 05:51:30 +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 4P9sh21bvGz41jc; Tue, 7 Feb 2023 05:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675749090; 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=pWjL6CcIrJXveXDgczk1v6JyA3t5zh65jbjA5uEjNsQ=; b=Sas+q4McApfcCn4VBYoO1WCiEMVdYaj5t3wOMWLcJLR2ts4g6oXmSW/T3AokOgOJNmH9Yf gBD4qEcScMxXiSpmMfjc1M5nC0z+kc4UnSeL6WKjp32mHteEXvxXpc42XE+EvdghEjJV4s Fmca4e7qlaLohpkXRtclFtPS3OjxeIeLyLN3cfue/OeiB/0KDnpZSdnVBETYMzim/wC+fv wPLjNr4lrms3fnqDitYHsOQysGB3SvXPtrHcE/CdVXguDnDHPWXExXh9EhhApA9kMuOqKw rjeDpWPU17EGhTEbQa3eIvU/jGyrT8aKJ0/AZHxCNT37vssKD32DfPIe0qNJRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675749090; 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=pWjL6CcIrJXveXDgczk1v6JyA3t5zh65jbjA5uEjNsQ=; b=edQc0hgQN4cs+3MydIG9UgnO43nOmFTSAPSvwAWk9GA+1ZluzD7DylINQk8k7zW/1EQwzs A2bxd6KFxTQ8E5bgSjWzCmID8RHmHAO0zRm9aLfbn00SS//25nEDhEyoXmPfl6jEhI0JGz nUG1kW40Oiz0ALLSh9t6MW7Mb6lJH+g3UMliNnYsI8Ghc7eF1B4qlAv6J0W6ZEcsdnK+C/ DEsvvL/wP9vLbWRqUyFAmP0w+i1Z10dkZkvV6dEOhL8eSzUxZO3coXAy2WnEm655NMV73D iYZ9BzFakQg+ZgHE9pjJV4NkFx3ZYVqBs3BNHMYoWAKE7tRuIluabjskf2yJDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675749090; a=rsa-sha256; cv=none; b=Hm15IfPQkSbHX6mWnjMpr7dlksA0XJkqtuhlSUIfKj9cu3xHHScnqDCHkuim6Ktm7eE03s QyVjR4RxSfBrBPp/c0+2xYNoYxbsjmBonSHQ/SFc9IBY79bqz4eRhc2mir3kLhMT4jux9c HcMOP/Th5sa8dgj/Vu7G3/OwqYo6+qWCWZiXhQEY0iHvK/NGJPCMdzZPeuUK/VXkVQfPT6 GAeQl5laVMu8SzFzKv8a90yoHNJKZGVS4JZnDkmROkol83LOQfQ7iarnrJ+AnkCrfBbF1Y cxoGahyKcUre+4dmPj2p0wi92+x5fVTGScLP+KW6Zu3y4zSV3QBJD3sB6grH4A== 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 4P9sh20h20z14pG; Tue, 7 Feb 2023 05:51:30 +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 3175pUYt002229; Tue, 7 Feb 2023 05:51:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3175pTPq002228; Tue, 7 Feb 2023 05:51:29 GMT (envelope-from git) Date: Tue, 7 Feb 2023 05:51:29 GMT Message-Id: <202302070551.3175pTPq002228@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: beb2c1dcea42 - main - games/openttd: handle port's dependencies somewhat better (+) 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: beb2c1dcea42b2712734a36aad1ab5103ad3b7d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=beb2c1dcea42b2712734a36aad1ab5103ad3b7d5 commit beb2c1dcea42b2712734a36aad1ab5103ad3b7d5 Author: Alexey Dokuchaev AuthorDate: 2023-02-07 05:49:54 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-02-07 05:49:54 +0000 games/openttd: handle port's dependencies somewhat better (+) - Prevent Fluidsynth detection if it was explicitly disabled - Depend on SDL2 if it's being installed (but prefer SDL1 by default); this should only affect local (manual) builds - Original proprietary game data files had not been required for a while, rephrase the installation message accordingly PR: 267862 --- games/openttd/Makefile | 11 ++++++++++- games/openttd/files/patch-CMakeLists.txt | 22 ++++++++++++++++++++++ games/openttd/files/pkg-message.in | 18 +++++++++--------- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/games/openttd/Makefile b/games/openttd/Makefile index b60b0442e37e..7a61527202a4 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -26,13 +26,14 @@ OPTIONS_DEFINE= DOCS FLUIDSYNTH SAVE_PASSWORDS SERVER SERVER_PREVENTS= FLUIDSYNTH FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth +FLUIDSYNTH_CMAKE_ON= -DWITH_FLUIDSYNTH:BOOL=ON SAVE_PASSWORDS_DESC= Save passwords between server restarts SAVE_PASSWORDS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-save-passwords SERVER_DESC= Build dedicated server only (no GUI) SERVER_USES_OFF= gnome sdl -SERVER_USE_OFF= SDL=sdl +SERVER_USE_OFF= SDL=${_SDL_VERSION} SERVER_CMAKE_ON= -DOPTION_DEDICATED:BOOL=ON SERVER_LIB_DEPENDS_OFF= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ @@ -41,6 +42,14 @@ SERVER_LIB_DEPENDS_OFF= libfontconfig.so:x11-fonts/fontconfig \ libiculx.so:devel/icu-lx SERVER_VARS= USE_RC_SUBR=${PORTNAME} +.include + +.if exists(${LOCALBASE}/lib/libSDL2.so) +_SDL_VERSION= sdl2 +.else +_SDL_VERSION= sdl +.endif + post-install-SERVER-on: @${REINPLACE_CMD} -E '/\.desktop|icons|pixmaps/d' ${TMPPLIST} diff --git a/games/openttd/files/patch-CMakeLists.txt b/games/openttd/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..24881ccc445a --- /dev/null +++ b/games/openttd/files/patch-CMakeLists.txt @@ -0,0 +1,22 @@ +--- CMakeLists.txt.orig 2022-04-02 10:38:20 UTC ++++ CMakeLists.txt +@@ -133,7 +133,9 @@ if(NOT OPTION_DEDICATED) + if(NOT SDL2_FOUND) + find_package(SDL) + endif() ++if(WITH_FLUIDSYNTH) + find_package(Fluidsynth) ++endif() + find_package(Fontconfig) + find_package(ICU OPTIONAL_COMPONENTS i18n lx) + endif() +@@ -260,7 +262,9 @@ link_package(LIBLZMA TARGET LibLZMA::LibLZMA ENCOURAGE + link_package(LZO) + + if(NOT OPTION_DEDICATED) ++ if(WITH_FLUIDSYNTH) + link_package(Fluidsynth) ++ endif() + link_package(SDL) + link_package(SDL2 TARGET SDL2::SDL2) + link_package(Allegro) diff --git a/games/openttd/files/pkg-message.in b/games/openttd/files/pkg-message.in index aa710e3a2c3e..e174e20f2745 100644 --- a/games/openttd/files/pkg-message.in +++ b/games/openttd/files/pkg-message.in @@ -1,10 +1,15 @@ [ { type: install message: <