git: 8447d035d06d - main - cleanup: unregister expired Node 12

[Rene Ladan]

The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8447d035d06d468eca2b2394722e11505659b1f9

commit 8447d035d06d468eca2b2394722e11505659b1f9
Author:     Rene Ladan <rene at FreeBSD.org>
AuthorDate: 2021-06-26 11:51:50 +0000
Commit:     Rene Ladan <rene at FreeBSD.org>
CommitDate: 2021-06-26 11:55:03 +0000

    cleanup: unregister expired Node 12
---
 www/node/Makefile |  2 +-
 www/npm/Makefile  | 10 ++--------
 www/yarn/Makefile | 11 ++---------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/www/node/Makefile b/www/node/Makefile
index 01a6ce8243f7..e16fc4019cdc 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -47,7 +47,7 @@ DTRACE_CONFIGURE_ON=	--with-dtrace
 
 HAS_CONFIGURE=	yes
 
-CONFLICTS_INSTALL=	node10-[0-9]* node12-[0-9]* node14-[0-9]*
+CONFLICTS_INSTALL=	node10-[0-9]* node14-[0-9]*
 
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--without-npm \
diff --git a/www/npm/Makefile b/www/npm/Makefile
index 78c4de630f81..6a14d0f4d9b2 100644
--- a/www/npm/Makefile
+++ b/www/npm/Makefile
@@ -19,14 +19,13 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ''
 
-CONFLICTS_INSTALL?=	npm-node10 npm-node12 npm-node14
+CONFLICTS_INSTALL?=	npm-node10 npm-node14
 
 OPTIONS_SINGLE=	BACKEND
-OPTIONS_SINGLE_BACKEND=	NODE NODE10 NODE12 NODE14
+OPTIONS_SINGLE_BACKEND=	NODE NODE10 NODE14
 OPTIONS_DEFAULT=NODE
 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
@@ -37,7 +36,6 @@ SHEBANG_FILES=	lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples
 
 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>
@@ -46,10 +44,6 @@ NODE14_RUN_DEPENDS=	node14>=0.8.0:www/node14
 DEPRECATED=	Uses EOL Python 2.7 via www/node10
 EXPIRATION_DATE=2021-06-23
 .endif
-.if ${PORT_OPTIONS:MNODE12}
-DEPRECATED=	Uses EOL Python 2.7 via www/node12
-EXPIRATION_DATE=2021-06-23
-.endif
 
 .if ${ARCH} == i386
 # Workaround for kernel bug 178881
diff --git a/www/yarn/Makefile b/www/yarn/Makefile
index 5be56e0ba9af..d961b3088177 100644
--- a/www/yarn/Makefile
+++ b/www/yarn/Makefile
@@ -10,23 +10,21 @@ COMMENT=	Package manager for node, alternative to npm
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS_INSTALL?=	yarn-node14 yarn-node12 yarn-node10
+CONFLICTS_INSTALL?=	yarn-node14 yarn-node10
 
 OPTIONS_DEFINE=	HADOOPCOMPAT
 OPTIONS_SINGLE=	BACKEND
-OPTIONS_SINGLE_BACKEND=	NODE10 NODE12 NODE14 NODE
+OPTIONS_SINGLE_BACKEND=	NODE10 NODE14 NODE
 OPTIONS_DEFAULT=	NODE
 HADOOPCOMPAT_DESC=	hadoop2 compatibility, the yarn script is excluded
 NODE_DESC=	Use www/node as backend
 NODE14_DESC=	Use www/node14 as backend
-NODE12_DESC=	Use www/node12 as backend
 NODE10_DESC=	Use www/node10 as backend
 
 OPTIONS_SUB=	yes
 
 NODE_RUN_DEPENDS=	node>=0.8.0:www/node
 NODE14_RUN_DEPENDS=	node14>=14.0.0:www/node14
-NODE12_RUN_DEPENDS=	node12>=12.0.0:www/node12
 NODE10_RUN_DEPENDS=	node10>=10.0.0:www/node10
 
 HADOOPCOMPAT_CONFLICTS_INSTALL_OFF=	hadoop2*
@@ -60,10 +58,5 @@ do-install-HADOOPCOMPAT-off:
 DEPRECATED=	Uses EOL Python 2.7 via www/node10
 EXPIRATION_DATE=2021-06-23
 .endif
-.if ${PORT_OPTIONS:MNODE12}
-DEPRECATED=	Uses EOL Python 2.7 via www/node12
-EXPIRATION_DATE=2021-06-23
-.endif
-
 
 .include <bsd.port.mk>