From owner-svn-ports-head@freebsd.org Sun Nov 8 17:50:12 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 925152D1300; Sun, 8 Nov 2020 17:50:12 +0000 (UTC) (envelope-from sunpoet@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CThVC0kBjz4fjB; Sun, 8 Nov 2020 17:50:11 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1DEC823BB2; Sun, 8 Nov 2020 17:50:08 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A8Ho7ti030283; Sun, 8 Nov 2020 17:50:07 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A8Ho73M030278; Sun, 8 Nov 2020 17:50:07 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202011081750.0A8Ho73M030278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 8 Nov 2020 17:50:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554640 - in head/www: . npm npm-node10 npm-node12 npm-node14 X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/www: . npm npm-node10 npm-node12 npm-node14 X-SVN-Commit-Revision: 554640 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2020 17:50:12 -0000 Author: sunpoet Date: Sun Nov 8 17:50:06 2020 New Revision: 554640 URL: https://svnweb.freebsd.org/changeset/ports/554640 Log: Add npm-node14 and NODE14 option - Update CONFLICTS_INSTALL PR: 250729 Submitted by: Eric Camachat Added: head/www/npm-node14/ - copied from r554176, head/www/npm-node12/ Modified: head/www/Makefile head/www/npm-node10/Makefile head/www/npm-node12/Makefile head/www/npm-node14/Makefile head/www/npm/Makefile Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Sun Nov 8 17:49:49 2020 (r554639) +++ head/www/Makefile Sun Nov 8 17:50:06 2020 (r554640) @@ -464,6 +464,7 @@ SUBDIR += npm SUBDIR += npm-node10 SUBDIR += npm-node12 + SUBDIR += npm-node14 SUBDIR += nspluginwrapper SUBDIR += obhttpd SUBDIR += oneshot Modified: head/www/npm-node10/Makefile ============================================================================== --- head/www/npm-node10/Makefile Sun Nov 8 17:49:49 2020 (r554639) +++ head/www/npm-node10/Makefile Sun Nov 8 17:50:06 2020 (r554640) @@ -3,9 +3,9 @@ PKGNAMESUFFIX= -node10 -CONFLICTS_INSTALL= npm npm-node12 +CONFLICTS_INSTALL= npm npm-node12 npm-node14 -OPTIONS_EXCLUDE=NODE NODE12 +OPTIONS_EXCLUDE=NODE NODE12 NODE14 OPTIONS_SLAVE= NODE10 MASTERDIR= ${.CURDIR}/../npm Modified: head/www/npm-node12/Makefile ============================================================================== --- head/www/npm-node12/Makefile Sun Nov 8 17:49:49 2020 (r554639) +++ head/www/npm-node12/Makefile Sun Nov 8 17:50:06 2020 (r554640) @@ -3,9 +3,9 @@ PKGNAMESUFFIX= -node12 -CONFLICTS_INSTALL= npm npm-node10 +CONFLICTS_INSTALL= npm npm-node10 npm-node14 -OPTIONS_EXCLUDE=NODE NODE10 +OPTIONS_EXCLUDE=NODE NODE10 NODE14 OPTIONS_SLAVE= NODE12 MASTERDIR= ${.CURDIR}/../npm Modified: head/www/npm-node14/Makefile ============================================================================== --- head/www/npm-node12/Makefile Fri Nov 6 10:11:06 2020 (r554176) +++ head/www/npm-node14/Makefile Sun Nov 8 17:50:06 2020 (r554640) @@ -1,12 +1,12 @@ # Created by: Po-Chuan Hsieh # $FreeBSD$ -PKGNAMESUFFIX= -node12 +PKGNAMESUFFIX= -node14 -CONFLICTS_INSTALL= npm npm-node10 +CONFLICTS_INSTALL= npm npm-node10 npm-node12 -OPTIONS_EXCLUDE=NODE NODE10 -OPTIONS_SLAVE= NODE12 +OPTIONS_EXCLUDE=NODE NODE10 NODE12 +OPTIONS_SLAVE= NODE14 MASTERDIR= ${.CURDIR}/../npm Modified: head/www/npm/Makefile ============================================================================== --- head/www/npm/Makefile Sun Nov 8 17:49:49 2020 (r554639) +++ head/www/npm/Makefile Sun Nov 8 17:50:06 2020 (r554640) @@ -20,14 +20,15 @@ NO_ARCH= yes NO_BUILD= yes REINPLACE_ARGS= -i '' -CONFLICTS_INSTALL?= npm-node10 npm-node12 +CONFLICTS_INSTALL?= npm-node10 npm-node12 npm-node14 OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= NODE NODE10 NODE12 +OPTIONS_SINGLE_BACKEND= NODE NODE10 NODE12 NODE14 OPTIONS_DEFAULT=NODE -NODE_DESC= Use Node.js 13.x (www/node) as backend +NODE_DESC= Use Node.js 15.x (www/node) as backend NODE10_DESC= Use Node.js 10.x (www/node10) as backend NODE12_DESC= Use Node.js 12.x (www/node12) as backend +NODE14_DESC= Use Node.js 14.x (www/node14) as backend CPE_VENDOR= npmjs CPE_PRODUCT= node_packaged_modules @@ -38,6 +39,7 @@ SHEBANG_FILES= lib/node_modules/npm/node_modules/node- NODE_RUN_DEPENDS= node>=0.8.0:www/node NODE10_RUN_DEPENDS= node10>=0.8.0:www/node10 NODE12_RUN_DEPENDS= node12>=0.8.0:www/node12 +NODE14_RUN_DEPENDS= node14>=0.8.0:www/node14 .include