From nobody Fri Nov 05 19:17:00 2021 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 0D6C7184B63C; Fri, 5 Nov 2021 19:17:03 +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 4Hm9HK0Q3Cz3tMs; Fri, 5 Nov 2021 19:17:00 +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 C0D871CCDF; Fri, 5 Nov 2021 19:17:00 +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 1A5JH0iS087622; Fri, 5 Nov 2021 19:17:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A5JH0PH087621; Fri, 5 Nov 2021 19:17:00 GMT (envelope-from git) Date: Fri, 5 Nov 2021 19:17:00 GMT Message-Id: <202111051917.1A5JH0PH087621@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: a421b9d61604 - main - www/npm-node14: Update CONFLICTS_INSTALL and OPTIONS_EXCLUDE for npm-node16 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: a421b9d61604bd281d4af2a0a0514efee9782b1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a421b9d61604bd281d4af2a0a0514efee9782b1d commit a421b9d61604bd281d4af2a0a0514efee9782b1d Author: Po-Chuan Hsieh AuthorDate: 2021-11-05 19:02:42 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-11-05 19:14:02 +0000 www/npm-node14: Update CONFLICTS_INSTALL and OPTIONS_EXCLUDE for npm-node16 --- www/npm-node14/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/npm-node14/Makefile b/www/npm-node14/Makefile index 07a04844a7ca..4d78d3e6e2e2 100644 --- a/www/npm-node14/Makefile +++ b/www/npm-node14/Makefile @@ -2,9 +2,9 @@ PKGNAMESUFFIX= -node14 -CONFLICTS_INSTALL= npm +CONFLICTS_INSTALL= npm npm-node16 -OPTIONS_EXCLUDE=NODE +OPTIONS_EXCLUDE=NODE NODE16 OPTIONS_SLAVE= NODE14 MASTERDIR= ${.CURDIR}/../npm