From nobody Mon Oct 18 11:32:23 2021 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 E4AD5180ADD9; Mon, 18 Oct 2021 11:32:23 +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 4HXvqW5V6bz3kTw; Mon, 18 Oct 2021 11:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 765181FA5A; Mon, 18 Oct 2021 11:32:23 +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 19IBWNHl065950; Mon, 18 Oct 2021 11:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19IBWNTZ065949; Mon, 18 Oct 2021 11:32:23 GMT (envelope-from git) Date: Mon, 18 Oct 2021 11:32:23 GMT Message-Id: <202110181132.19IBWNTZ065949@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5c7b1f13e5e7 - main - Mk/bsd.port.mk: Add FLAVOR_SUB 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c7b1f13e5e7d19caedabd0b0e1087622c5a8f08 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c7b1f13e5e7d19caedabd0b0e1087622c5a8f08 commit 5c7b1f13e5e7d19caedabd0b0e1087622c5a8f08 Author: Baptiste Daroussin AuthorDate: 2021-10-14 14:34:04 +0000 Commit: Baptiste Daroussin CommitDate: 2021-10-18 11:31:56 +0000 Mk/bsd.port.mk: Add FLAVOR_SUB If defined, for each flavors it will create for the non active one: PLIST_SUB= FLAVORNAME="@comment " NO_FLAVOUNAME="" and for the active one: PLIST_SUB= FLAVORNAME="" NO_FLAVOUNAME="@comment " Same for SUB_LIST Reviewed by: manu, bdrewery, mat Differential Revision: https://reviews.freebsd.org/D32495 --- Mk/bsd.port.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index a0f19bd77697..ba8e97da8f9c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1545,6 +1545,12 @@ ${v}+= ${${FLAVOR}_${v}} ${v}= flavor "${FLAVOR}" ${${FLAVOR}_${v}} .endif .endfor +.if defined(FLAVORS_SUB) +PLIST_SUB+= ${FLAVORS:N${FLAVOR}:@v@${v:tu}="\@comment " NO_${v:tu}=""@} +PLIST_SUB+= ${FLAVOR:tu}="" NO_${FLAVOR:tu}="@comment " +SUB_LIST+= ${FLAVORS:N${FLAVOR}:@v@${v:tu}="\@comment " NO_${v:tu}=""@} +SUB_LIST+= ${FLAVOR:tu}="" NO_${FLAVOR:tu}="@comment " +.endif .endif # defined(${FLAVOR})