Date: Sat, 26 Jun 2021 12:17:49 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8eb508f23b68 - main - cleanup: remove more optional Node 10/12 usages Message-ID: <202106261217.15QCHncO000784@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=8eb508f23b685898ee99ba2d7933608d5cce1740 commit 8eb508f23b685898ee99ba2d7933608d5cce1740 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2021-06-26 12:15:31 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2021-06-26 12:15:31 +0000 cleanup: remove more optional Node 10/12 usages --- devel/rubygem-execjs/Makefile | 8 ++------ www/npm-node14/Makefile | 4 ++-- www/npm/Makefile | 13 +++---------- www/yarn-node14/Makefile | 4 ++-- www/yarn/Makefile | 11 +---------- 5 files changed, 10 insertions(+), 30 deletions(-) diff --git a/devel/rubygem-execjs/Makefile b/devel/rubygem-execjs/Makefile index f72130c5d030..222fc95c31c1 100644 --- a/devel/rubygem-execjs/Makefile +++ b/devel/rubygem-execjs/Makefile @@ -17,16 +17,12 @@ USE_RUBY= yes NO_ARCH= yes OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= NODE NODE10 NODE12 NODE14 +OPTIONS_SINGLE_BACKEND= NODE 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 +NODE_DESC= Use Node.js 16.x (www/node) as backend NODE14_DESC= Use Node.js 14.x (www/node14) as backend NODE_RUN_DEPENDS= node>=0:www/node -NODE10_RUN_DEPENDS= node10>=0:www/node10 -NODE12_RUN_DEPENDS= node12>=0:www/node12 NODE14_RUN_DEPENDS= node14>=0:www/node14 post-patch: diff --git a/www/npm-node14/Makefile b/www/npm-node14/Makefile index 7b46de5719f4..07a04844a7ca 100644 --- a/www/npm-node14/Makefile +++ b/www/npm-node14/Makefile @@ -2,9 +2,9 @@ PKGNAMESUFFIX= -node14 -CONFLICTS_INSTALL= npm npm-node10 npm-node12 +CONFLICTS_INSTALL= npm -OPTIONS_EXCLUDE=NODE NODE10 NODE12 +OPTIONS_EXCLUDE=NODE OPTIONS_SLAVE= NODE14 MASTERDIR= ${.CURDIR}/../npm diff --git a/www/npm/Makefile b/www/npm/Makefile index 6a14d0f4d9b2..a1d7ba2b2f78 100644 --- a/www/npm/Makefile +++ b/www/npm/Makefile @@ -19,13 +19,12 @@ NO_ARCH= yes NO_BUILD= yes REINPLACE_ARGS= -i '' -CONFLICTS_INSTALL?= npm-node10 npm-node14 +CONFLICTS_INSTALL?= npm-node14 OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= NODE NODE10 NODE14 +OPTIONS_SINGLE_BACKEND= NODE 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 +NODE_DESC= Use Node.js 16.x (www/node) as backend NODE14_DESC= Use Node.js 14.x (www/node14) as backend CPE_VENDOR= npmjs @@ -35,16 +34,10 @@ SHEBANG_GLOB= *.py 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 NODE14_RUN_DEPENDS= node14>=0.8.0:www/node14 .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MNODE10} -DEPRECATED= Uses EOL Python 2.7 via www/node10 -EXPIRATION_DATE=2021-06-23 -.endif - .if ${ARCH} == i386 # Workaround for kernel bug 178881 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-bug-178881 diff --git a/www/yarn-node14/Makefile b/www/yarn-node14/Makefile index 41bec036c377..7e51b027382d 100644 --- a/www/yarn-node14/Makefile +++ b/www/yarn-node14/Makefile @@ -2,9 +2,9 @@ PKGNAMESUFFIX= -node14 -CONFLICTS_INSTALL= yarn yarn-node10 yarn-node12 +CONFLICTS_INSTALL= yarn -OPTIONS_EXCLUDE= NODE NODE10 NODE12 +OPTIONS_EXCLUDE= NODE OPTIONS_SLAVE= NODE14 MASTERDIR= ${.CURDIR}/../yarn diff --git a/www/yarn/Makefile b/www/yarn/Makefile index d961b3088177..f58e153b410f 100644 --- a/www/yarn/Makefile +++ b/www/yarn/Makefile @@ -14,18 +14,16 @@ CONFLICTS_INSTALL?= yarn-node14 yarn-node10 OPTIONS_DEFINE= HADOOPCOMPAT OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= NODE10 NODE14 NODE +OPTIONS_SINGLE_BACKEND= 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 -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 -NODE10_RUN_DEPENDS= node10>=10.0.0:www/node10 HADOOPCOMPAT_CONFLICTS_INSTALL_OFF= hadoop2* @@ -52,11 +50,4 @@ do-install-HADOOPCOMPAT-off: ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn \ ${STAGEDIR}${PREFIX}/bin/yarn -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNODE10} -DEPRECATED= Uses EOL Python 2.7 via www/node10 -EXPIRATION_DATE=2021-06-23 -.endif - .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106261217.15QCHncO000784>