From nobody Tue May 09 06:22:07 2023 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 4QFp3M34Lnz49m0y; Tue, 9 May 2023 06:22:07 +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 4QFp3M1jR7z3kpV; Tue, 9 May 2023 06:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683613327; 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=rH2rOAuZpYxQSbfgE2jibB/+CO77cda5zzQ05DyiGzs=; b=LM+qmJahjsZ9HKA9FZaJ+abWi/jRL9rQ1QS0bgrHt6W4jqNS7qCSGpf/GZk3Pa+YTYS6Wh xeOYWY7nCtP3ltkWdzLvpqfnRoGmMgMuBS7NyzkZCigCLO62aWVauWMZkLl2msNNOqlV94 QFOJqcZXtkXSL+2Bx3o5il7yYr42Mr4lIs1Pz5m2/Ko2Oe8c4poQsOvB58W4tupgfg4llp W2Wv1ZFhSNLox+ipQNDRlJotA5p6xPhyZ6pAAF2CBZnwRJGJAxtEP4I3OF0U0kuCZZ3A0a nW7uImQdqjm9FjaOcoYOzScjFsw5ZALrZkjEIr/miTzxlt1m6XdpwrUPKxYEaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683613327; 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=rH2rOAuZpYxQSbfgE2jibB/+CO77cda5zzQ05DyiGzs=; b=hsWmw4kEDDx+3PVp3iC5VP9sSY6ltXHGelwCWF0x2d5iaJI4tm//kE56TTBoFZSQElxRUB 3L98fA2Gy7wrmYUUKC88Q9XkfcV/ErOlXyJG070b+DDNRin6xXe3QZ4DH7IrfQkyQInIoF YpyATMPXx3pDYw2nj4WGnA2AF6TPmp45x5nIJv3aS67gSa2IffFQH/Q8R1OBttDfVetIXH 8X3uwgKYf9acX+T9WiyaeHwk+2iLv29Q2qj3AIghFgmNwQoCw8mlncYezhNe4ifm4WDzAW 5hmfXA55P3fkoze5oJPbbGEgAd+8YSTmCAQwg2w3/h+mHfkbud7cQU8sxfPhhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683613327; a=rsa-sha256; cv=none; b=vUOdu+wisGeUdQca/K0n5goNuZCGw60oWTS2ttqk6n0EJDqbILXNW7obzB034F4O5wCERx FFPHTx4VgVLvx3muLnOL+BVmRD0fu2fCybJLv/TyXB/bTGReuGx5Ljza467cUYf+HLC6wo c346ibA9vV0NL80e6zcJOyQyNvg5gAe13eh/EJP++5M1nHCM/kb5VOjPRqFjgK+AHUOgtT 3YHErl08k/XetCI5b6PZNKSb8cbf9ohwkK+XkU6NtNWB27nFBn/HNkgtKomWVH/4vgHVjL pTVYqlOAU2K1NYlf/hySfUNKZXk03LVUhxOPUFz3EFEvKGGoEbzy0DP3FS2htg== 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 4QFp3M0m8BzHTm; Tue, 9 May 2023 06:22:07 +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 3496M7EN023832; Tue, 9 May 2023 06:22:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3496M7Tf023831; Tue, 9 May 2023 06:22:07 GMT (envelope-from git) Date: Tue, 9 May 2023 06:22:07 GMT Message-Id: <202305090622.3496M7Tf023831@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 326005b3bb9f - main - Mk/Uses/magick.mk: Improve readability 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 326005b3bb9fae43c2bbd321c7391dc58091af65 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=326005b3bb9fae43c2bbd321c7391dc58091af65 commit 326005b3bb9fae43c2bbd321c7391dc58091af65 Author: Felix Palmen AuthorDate: 2023-05-02 06:36:25 +0000 Commit: Felix Palmen CommitDate: 2023-05-09 06:20:49 +0000 Mk/Uses/magick.mk: Improve readability Improve readability by replacing the AT&T-style expansions with some explicit logic. This also avoids incompatibility with very old make versions where % in these expansions also matches empty strings. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D39986 --- Mk/Uses/magick.mk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/magick.mk b/Mk/Uses/magick.mk index 08802d7ccebd..9739a8260f9d 100644 --- a/Mk/Uses/magick.mk +++ b/Mk/Uses/magick.mk @@ -60,6 +60,8 @@ IGNORE= Invalid version of ImageMagick: "${_magick_version}" #=== Flavor selection === _magick_flavors= x11 nox11 _magick_flavor= # +_magick_portflavor= # +_magick_pkgflavor= # . for _flavor in ${_magick_flavors:O:u} . if ${magick_ARGS:M${_flavor}} . if empty(_magick_flavor) @@ -73,8 +75,15 @@ IGNORE= Incorrect USES=magick:${magick_ARGS} - multiple flavors defined . if empty(_magick_flavor) && ${IMAGEMAGICK_DEFAULT:M*-*} _magick_flavor= ${IMAGEMAGICK_DEFAULT:C/.*-//} . endif -. if !empty(_magick_flavor) && !${_magick_flavors:M${_magick_flavor}} +. if !empty(_magick_flavor) +. if !${_magick_flavors:M${_magick_flavor}} IGNORE= Invalid flavor of ImageMagick: "${_magick_flavor}" +. else +_magick_portflavor= @${_magick_flavor} +. if ${_magick_flavor:Mnox11} +_magick_pkgflavor= -nox11 +. endif +. endif . endif #=== Dependency selection === @@ -99,9 +108,9 @@ IGNORE= Invalid USES=magick - unsupported argument(s): ${_magick_unknown_args} . endif #=== Dependency setup === -_MAGICK_PORT= graphics/ImageMagick${_magick_version}${_magick_flavor:%=@%} +_MAGICK_PORT= graphics/ImageMagick${_magick_version}${_magick_portflavor} _MAGICK_LIB= libMagick++-${_magick_version}.so -_MAGICK_PKG= ImageMagick${_magick_version}${_magick_flavor:Mnox11:%=-%} +_MAGICK_PKG= ImageMagick${_magick_version}${_magick_pkgflavor} _MAGICK_BUILD_DEPENDS= ${_MAGICK_PKG}>=${_magick_version}:${_MAGICK_PORT} _MAGICK_LIB_DEPENDS= ${_MAGICK_LIB}:${_MAGICK_PORT}