git: 620c166728b8 - main - www/*-node17: Rename for update of www/node to version 18

The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=620c166728b828c0c95cb40f519f4676e4d45cec

commit 620c166728b828c0c95cb40f519f4676e4d45cec
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2022-06-01 18:28:50 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2022-06-03 17:01:42 +0000

    www/*-node17: Rename for update of www/node to version 18
    
    PR:             263590
    Sponsored by:   The FreeBSD Foundation
---
 www/Makefile                              | 4 ++--
 www/npm-node14/Makefile                   | 2 +-
 www/npm-node16/Makefile                   | 2 +-
 www/{npm-node17 => npm-node18}/Makefile   | 4 ++--
 www/npm/Makefile                          | 2 +-
 www/yarn-node14/Makefile                  | 2 +-
 www/yarn-node16/Makefile                  | 2 +-
 www/{yarn-node17 => yarn-node18}/Makefile | 4 ++--
 www/yarn/Makefile                         | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/www/Makefile b/www/Makefile
index 28c99a2ee123..b665af628994 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -470,7 +470,7 @@
     SUBDIR += npm
     SUBDIR += npm-node14
     SUBDIR += npm-node16
-    SUBDIR += npm-node17
+    SUBDIR += npm-node18
     SUBDIR += nspluginwrapper
     SUBDIR += oauth2-proxy
     SUBDIR += obhttpd
@@ -2382,7 +2382,7 @@
     SUBDIR += yarn
     SUBDIR += yarn-node14
     SUBDIR += yarn-node16
-    SUBDIR += yarn-node17
+    SUBDIR += yarn-node18
     SUBDIR += yarr
     SUBDIR += yaws
     SUBDIR += you-get
diff --git a/www/npm-node14/Makefile b/www/npm-node14/Makefile
index 013b1b46fec3..3dd0fb4f6dc2 100644
--- a/www/npm-node14/Makefile
+++ b/www/npm-node14/Makefile
@@ -2,7 +2,7 @@
 
 PKGNAMESUFFIX=	-node14
 
-CONFLICTS_INSTALL=	npm npm-node16 npm-node17
+CONFLICTS_INSTALL=	npm npm-node16 npm-node18
 
 USES=		nodejs:14,run
 
diff --git a/www/npm-node16/Makefile b/www/npm-node16/Makefile
index 991c68e1fe71..1d7d87141151 100644
--- a/www/npm-node16/Makefile
+++ b/www/npm-node16/Makefile
@@ -2,7 +2,7 @@
 
 PKGNAMESUFFIX=	-node16
 
-CONFLICTS_INSTALL=	npm npm-node14 npm-node17
+CONFLICTS_INSTALL=	npm npm-node14 npm-node18
 
 USES=		nodejs:16,run
 
diff --git a/www/npm-node17/Makefile b/www/npm-node18/Makefile
similarity index 80%
rename from www/npm-node17/Makefile
rename to www/npm-node18/Makefile
index aeedc0838b0b..1e989eb75b1e 100644
--- a/www/npm-node17/Makefile
+++ b/www/npm-node18/Makefile
@@ -1,10 +1,10 @@
 # Created by: Matthias Fechner <mfechner@FreeBSD.org>
 
-PKGNAMESUFFIX=	-node17
+PKGNAMESUFFIX=	-node18
 
 CONFLICTS_INSTALL=	npm npm-node14 npm-node16
 
-USES=		nodejs:17,run
+USES=		nodejs:18,run
 
 MASTERDIR=	${.CURDIR}/../npm
 
diff --git a/www/npm/Makefile b/www/npm/Makefile
index adfcea7cee56..eb05ac6b9d13 100644
--- a/www/npm/Makefile
+++ b/www/npm/Makefile
@@ -20,7 +20,7 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ''
 
-CONFLICTS_INSTALL?=	npm-node14 npm-node16 npm-node17
+CONFLICTS_INSTALL?=	npm-node14 npm-node16 npm-node18
 
 CPE_VENDOR=	npmjs
 
diff --git a/www/yarn-node14/Makefile b/www/yarn-node14/Makefile
index 63095b3354cb..9367dde49394 100644
--- a/www/yarn-node14/Makefile
+++ b/www/yarn-node14/Makefile
@@ -2,7 +2,7 @@
 
 PKGNAMESUFFIX=	-node14
 
-CONFLICTS_INSTALL=	yarn yarn-node16 yarn-node17
+CONFLICTS_INSTALL=	yarn yarn-node16 yarn-node18
 
 USES=		nodejs:14,run
 
diff --git a/www/yarn-node16/Makefile b/www/yarn-node16/Makefile
index 4864ad171d19..4978e68008f4 100644
--- a/www/yarn-node16/Makefile
+++ b/www/yarn-node16/Makefile
@@ -2,7 +2,7 @@
 
 PKGNAMESUFFIX=	-node16
 
-CONFLICTS_INSTALL=	yarn yarn-node14 yarn-node17
+CONFLICTS_INSTALL=	yarn yarn-node14 yarn-node18
 
 USES=		nodejs:16,run
 
diff --git a/www/yarn-node17/Makefile b/www/yarn-node18/Makefile
similarity index 79%
rename from www/yarn-node17/Makefile
rename to www/yarn-node18/Makefile
index fcaecbdfef81..175419653323 100644
--- a/www/yarn-node17/Makefile
+++ b/www/yarn-node18/Makefile
@@ -1,10 +1,10 @@
 # Created by: Matthias Fechner <mfechner@FreeBSD.org>
 
-PKGNAMESUFFIX=	-node17
+PKGNAMESUFFIX=	-node18
 
 CONFLICTS_INSTALL=	yarn yarn-node14 yarn-node16
 
-USES=		nodejs:17,run
+USES=		nodejs:18,run
 
 MASTERDIR=	${.CURDIR}/../yarn
 
diff --git a/www/yarn/Makefile b/www/yarn/Makefile
index a48453830465..1d71a76fa19f 100644
--- a/www/yarn/Makefile
+++ b/www/yarn/Makefile
@@ -15,7 +15,7 @@ USES?=		nodejs:run
 USES+=		cpe
 CPE_VENDOR=	${PORTNAME}pkg
 
-CONFLICTS_INSTALL?=	yarn-node17 yarn-node16 yarn-node14
+CONFLICTS_INSTALL?=	yarn-node18 yarn-node16 yarn-node14
 
 OPTIONS_DEFINE=	HADOOPCOMPAT
 HADOOPCOMPAT_DESC=	hadoop2 compatibility, the yarn script is excluded