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 @@ -1,35 +1,31 @@ # Created by: Steve Wills PORTNAME= execjs PORTVERSION= 2.7.0 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= ExecJS lets you run JavaScript code from Ruby LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE USES= gem 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: @${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#' ${WRKSRC}/lib/execjs/runtimes.rb .include 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 @@ -1,12 +1,12 @@ # Created by: Po-Chuan Hsieh 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 .include "${MASTERDIR}/Makefile" diff --git a/www/npm/Makefile b/www/npm/Makefile index 6a14d0f4d9b2..a1d7ba2b2f78 100644 --- a/www/npm/Makefile +++ b/www/npm/Makefile @@ -1,64 +1,57 @@ # Created by: Sunpoet Po-Chuan Hsieh PORTNAME= npm PORTVERSION= 6.14.8 CATEGORIES= www MASTER_SITES= LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Node package manager LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/lib/node_modules/npm/LICENSE RUN_DEPENDS= gmake:devel/gmake USES= cpe python:3.5+ shebangfix tar:xz 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 CPE_PRODUCT= node_packaged_modules 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 -.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 .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/etc/man.d/npm.conf @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp @${REINPLACE_CMD} -e 's|exec python |exec ${PYTHON_CMD} |' ${WRKSRC}/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp @${FIND} ${WRKSRC}/ -name '*.sh' -exec ${REINPLACE_CMD} -e '1 s|/usr/local|${LOCALBASE}|' {} + do-install: cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/ ${ECHO_CMD} 'python=${PYTHON_CMD}' > ${STAGEDIR}${PREFIX}/etc/npmrc ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp -f ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp .include 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 @@ -1,12 +1,12 @@ # Created by: Luca Pizzamiglio 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 .include "${MASTERDIR}/Makefile" diff --git a/www/yarn/Makefile b/www/yarn/Makefile index d961b3088177..f58e153b410f 100644 --- a/www/yarn/Makefile +++ b/www/yarn/Makefile @@ -1,62 +1,53 @@ PORTNAME= yarn DISTVERSIONPREFIX= v DISTVERSION= 1.22.10 CATEGORIES= www MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/ MAINTAINER= pizzamig@FreeBSD.org COMMENT= Package manager for node, alternative to npm LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE 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* NO_ARCH= yes NO_BUILD= yes post-patch: @${RM} ${WRKSRC}/bin/*.cmd @${REINPLACE_CMD} -i '' \ -e 's|"installationMethod": "tar"|"installationMethod": "pkg"|g' \ ${WRKSRC}/package.json @${REINPLACE_CMD} -i '' -e 's%Linux)%Linux|FreeBSD)%g' \ ${WRKSRC}/bin/yarn do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn (cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/node_modules/yarn) ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn.js \ ${STAGEDIR}${PREFIX}/bin/yarn.js ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarnpkg \ ${STAGEDIR}${PREFIX}/bin/yarnpkg do-install-HADOOPCOMPAT-off: ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn \ ${STAGEDIR}${PREFIX}/bin/yarn -.include - -.if ${PORT_OPTIONS:MNODE10} -DEPRECATED= Uses EOL Python 2.7 via www/node10 -EXPIRATION_DATE=2021-06-23 -.endif - .include