Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Nov 2020 17:50:07 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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
Message-ID:  <202011081750.0A8Ho73M030278@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <eric@camachat.org>

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 <sunpoet@FreeBSD.org>
 # $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 <bsd.port.pre.mk>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011081750.0A8Ho73M030278>