From nobody Fri Nov 5 19:16:59 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 552EC184B5B5; Fri, 5 Nov 2021 19:17:02 +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 4Hm9HJ1fH9z3tBc; Fri, 5 Nov 2021 19:16:59 +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 9A45C1D48E; Fri, 5 Nov 2021 19:16:59 +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 1A5JGx9p087598; Fri, 5 Nov 2021 19:16:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A5JGxAG087597; Fri, 5 Nov 2021 19:16:59 GMT (envelope-from git) Date: Fri, 5 Nov 2021 19:16:59 GMT Message-Id: <202111051916.1A5JGxAG087597@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: b5e1c5e21682 - main - www/npm: Add NODE16 option 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5e1c5e21682bf5e152d42e2ecaea35b7c6f156b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5e1c5e21682bf5e152d42e2ecaea35b7c6f156b commit b5e1c5e21682bf5e152d42e2ecaea35b7c6f156b Author: Po-Chuan Hsieh AuthorDate: 2021-11-05 19:02:38 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-11-05 19:14:01 +0000 www/npm: Add NODE16 option - Update CONFLICTS_INSTALL --- www/npm/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/www/npm/Makefile b/www/npm/Makefile index 5db1f36b82e2..24c6ada8b40a 100644 --- a/www/npm/Makefile +++ b/www/npm/Makefile @@ -19,13 +19,14 @@ NO_ARCH= yes NO_BUILD= yes REINPLACE_ARGS= -i '' -CONFLICTS_INSTALL?= npm-node14 +CONFLICTS_INSTALL?= npm-node14 npm-node16 OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= NODE NODE14 +OPTIONS_SINGLE_BACKEND= NODE NODE14 NODE16 OPTIONS_DEFAULT=NODE NODE_DESC= Use www/node as backend NODE14_DESC= Use www/node14 as backend +NODE16_DESC= Use www/node16 as backend CPE_VENDOR= npmjs @@ -34,6 +35,7 @@ SHEBANG_FILES= lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples NODE_RUN_DEPENDS= node>=0.8.0:www/node NODE14_RUN_DEPENDS= node14>=0.8.0:www/node14 +NODE16_RUN_DEPENDS= node16>=0.8.0:www/node16 .include