From nobody Sun Jul 09 10:46:20 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 4QzP2509fnz4lq9H; Sun, 9 Jul 2023 10:46:21 +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 4QzP2462ykz4bNt; Sun, 9 Jul 2023 10:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899580; 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=68s4ilgnkJ5MXabiMfD1fhRBJl1KrhK4HMItTWMofg4=; b=kaBUYC9e3KkRiXiyI8K/UD2lQJMZq6iJQbJ3koo0DvHXqjq7do3g659k6AFiYRPVbLt87d 6Mh8eAstQdTt35IQr6y+fB1N00WLuO/+448L9I3Iwn41xMl/b/anFk1gU3nKSOFibcaKHR 33VzZ8cDhn/1tIWDEOaf2o9NryvYl58upPNI/S8U8LYn9N7cdIfvWHFlwomm6+J72qX+Z8 1TyF7sDA9o+h4EHX+RM2utBWfvPgluZWIWytofgnYF1kGrUCs8LaXZrwH/EfYWgQZ91ahu 5i7U1d+3cxcfFyHgfJuV1zAmYiEWWg9dCYfH11+nAthtzA5MxlQ2H/6Xdgx+nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899580; 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=68s4ilgnkJ5MXabiMfD1fhRBJl1KrhK4HMItTWMofg4=; b=ToJekYZxbJOpMW/p3xdsEcqqcFFrBB2SzKcBXVirc+VJ4j6NMici5bMK2nYVXjAvYVlUsz OWCnY9jcxNn54c9Ocz8ZK75N6MM7yJRtKb9DtcP0HbSJCnoBEAoKEdqBcGKxfP7OEraVGs KYz4VeA1i5UyRxhKxoLjrgKo6nhNdv/IjTEfXHofHe0RInC702AjKqfuMiuaRGstc+9RIL 7guDBK6Ns1TMYrT0M20X+m+Z671yvJJl/UmNW98bQ6RGXlsf7qGkEYXWf90zqNER2A7hzz Sp8dqkfMXUunpIr4FX9Ilt7uAdYBjaKrH5hW7OTsUZfpObh4VihcAZbt5WRNNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688899580; a=rsa-sha256; cv=none; b=X3Rw3obGcvgnorKqWNfMQW2YIVCj42xewTLc2awYNpv4rCvtabB7Cbz3TEKyKYA5VSLijr MGBiNjyxmkWA4rvfKouzRFVpwIuI0z+zWiStoun5jZriSOvOOw6nCvkqpRlTYgy5tqrXxe 1SRho9ODv7g3TVTmTkmxCVn7vPIUZJiwZUG5hGKSza6dv4o+PkFaqTv91cxTaTk1iAjnTk h+dUuZhO8i6QtKXB0vew6870o7Wigu5BY6h5T8GPY70fjgyPYLRgt+MehoceOPP/AUsspS tqww2PG0pwTeQQJoncu+afbTyk0dF1B4Ti9dH+UtCGvzKMbazjS3Qhl+B7qtFA== 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 4QzP2457jWz10qf; Sun, 9 Jul 2023 10:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369AkKgh084917; Sun, 9 Jul 2023 10:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369AkKrN084916; Sun, 9 Jul 2023 10:46:20 GMT (envelope-from git) Date: Sun, 9 Jul 2023 10:46:20 GMT Message-Id: <202307091046.369AkKrN084916@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 97380bb19c48 - main - Mk/Uses/ghostscript.mk: Move ${BUILD,LIB,RUN,TEST}_DEPENDS supports together 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97380bb19c48baa27a12589ca33443bcd2e96516 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=97380bb19c48baa27a12589ca33443bcd2e96516 commit 97380bb19c48baa27a12589ca33443bcd2e96516 Author: Po-Chuan Hsieh AuthorDate: 2023-07-09 10:31:53 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-07-09 10:31:53 +0000 Mk/Uses/ghostscript.mk: Move ${BUILD,LIB,RUN,TEST}_DEPENDS supports together --- Mk/Uses/ghostscript.mk | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk index dd6ed4bab1ac..6a0491245acc 100644 --- a/Mk/Uses/ghostscript.mk +++ b/Mk/Uses/ghostscript.mk @@ -2,7 +2,7 @@ # # Feature: ghostscript # Usage: USES=ghostscript or USES=ghostscript:args -# Valid ARGS: , build, run, test, x11, lib +# Valid ARGS: , build, lib, run, test, x11 # # version The chooseable versions are 9, agpl and 10. If no version is # specified version agpl is selected. 9 and agpl are synonymous. @@ -11,15 +11,12 @@ # USES=ghostscript:run # Use the set default Ghostscript as a run dependency # USES=ghostscript:9,build # Use ghostscript 9 as a build dependency. # +# build Ghostscript is used as BUILD_DEPENDS +# lib Ghostscript is used as LIB_DEPENDS +# run Ghostscript is used as RUN_DEPENDS +# test Ghostscript is used as TEST_DEPENDS +# # x11 Indicate that X11 support is required. -# build Indicates that Ghostscript is needed at build time and adds -# it as BUILD_DEPENDS. -# run Indicates that Ghostscript is needed at run time and adds -# it as RUN_DEPENDS. -# test Indicates that Ghostscript is needed at test time and adds -# it as TEST_DEPENDS. -# lib Indicates that Ghostscript is needed at link time and adds -# it as LIB_DEPENDS. # # If build and run are omitted, Ghostscript will be added as BUILD_DEPENDS and # RUN_DEPENDS. @@ -36,7 +33,7 @@ _GS_VERSION= 9 agpl 10 _GS_ARGS= ${ghostscript_ARGS} -. if ${_GS_ARGS:N9:N10:Nagpl:Nx11:Nbuild:Nrun:Ntest:Nlib} +. if ${_GS_ARGS:N9:N10:Nagpl:Nbuild:Nlib:Nrun:Ntest:Nx11} IGNORE?= Unknown ghostscript argument ${_GS_ARGS} . endif @@ -47,25 +44,25 @@ IGNORE?= Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please selec # Make sure that no dependency or some other environment variable # pollutes the build/run dependency detection .undef _GS_BUILD_DEP +.undef _GS_LIB_DEP .undef _GS_RUN_DEP .undef _GS_TEST_DEP -.undef _GS_LIB_DEP . if ${_GS_ARGS:Mbuild} _GS_BUILD_DEP= yes . endif +. if ${_GS_ARGS:Mlib} +_GS_LIB_DEP= yes +. endif . if ${_GS_ARGS:Mrun} _GS_RUN_DEP= yes . endif . if ${_GS_ARGS:Mtest} _GS_TEST_DEP= yes . endif -. if ${_GS_ARGS:Mlib} -_GS_LIB_DEP= yes -. endif -# The port does not specify a build, run, test, or lib dependency, assume that +# The port does not specify a build, lib, run or test dependency, assume that # a build and run dependency is required. -. if !defined(_GS_BUILD_DEP) && !defined(_GS_RUN_DEP) && !defined(_GS_TEST_DEP) && !defined(_GS_LIB_DEP) +. if !defined(_GS_BUILD_DEP) && !defined(_GS_LIB_DEP) && !defined(_GS_RUN_DEP) && !defined(_GS_TEST_DEP) _GS_BUILD_DEP= yes _GS_RUN_DEP= yes . endif @@ -101,7 +98,7 @@ _GS_X11_PKGNAME=ghostscript${_GS_SELECTED}-x11 _GS_PORT= print/ghostscript${_GS_SELECTED}${_GS_FLAVORED:?:-base} _GS_X11_PORT= print/ghostscript${_GS_SELECTED}${_GS_FLAVORED:?@:-}x11 -. for type in BUILD RUN TEST LIB +. for type in BUILD LIB RUN TEST . if defined(_GS_${type}_DEP) . if !defined(_GS_FLAVORED) || !${_GS_ARGS:Mx11} . if ${type:MLIB}