[pkgsrc/trunk]: pkgsrc *: Revert nodeversion.mk changes.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/167ffef19e50
branches:  trunk
changeset: 381781:167ffef19e50
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Jul 13 11:41:06 2022 +0000

description:
*: Revert nodeversion.mk changes.

The intention was to avoid nodejs-18.x which no longer supports older
platforms, but that didn't work as pbulk still chooses the latest anyway, so
we'll need to fix that a different way.

It also has the downside of tying them to a specific version, which meant you
could no longer use the npm or yarn package managers with anything other than
the default nodejs version.

diffstat:

 devel/yarn/Makefile       |  5 +++--
 lang/npm/Makefile         |  5 +++--
 lang/ruby-execjs/Makefile |  5 +++--
 www/py-cfscrape/Makefile  |  4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diffs (89 lines):

diff -r 2400dfb316d2 -r 167ffef19e50 devel/yarn/Makefile
--- a/devel/yarn/Makefile       Wed Jul 13 09:59:25 2022 +0000
+++ b/devel/yarn/Makefile       Wed Jul 13 11:41:06 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2022/05/13 10:54:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2022/07/13 11:41:06 jperkin Exp $
 
 DISTNAME=      yarn-v1.22.19
 PKGREVISION=   1
@@ -14,6 +14,8 @@
 
 USE_LANGUAGES= # none
 
+DEPENDS+=      nodejs-[0-9]*:../../lang/nodejs
+
 INSTALLATION_DIRS=     bin libexec/yarn/bin libexec/yarn/lib
 
 REPLACE_NODEJS=        bin/yarn.js
@@ -32,5 +34,4 @@
                ${DESTDIR}${PREFIX}/bin/yarnpkg
 
 .include "../../lang/nodejs/application.mk"
-.include "../../lang/nodejs/nodeversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2400dfb316d2 -r 167ffef19e50 lang/npm/Makefile
--- a/lang/npm/Makefile Wed Jul 13 09:59:25 2022 +0000
+++ b/lang/npm/Makefile Wed Jul 13 11:41:06 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2022/07/07 10:05:11 adam Exp $
+# $NetBSD: Makefile,v 1.54 2022/07/13 11:41:06 jperkin Exp $
 
 DISTNAME=      npm-8.13.2
 CATEGORIES=    lang
@@ -13,6 +13,8 @@
 
 USE_TOOLS+=    bash gmake perl
 
+DEPENDS+=      nodejs-[0-9]*:../../lang/nodejs
+
 MAKE_JOBS_SAFE=        no      # building man-pages
 
 REPLACE_INTERPRETER+=  node
@@ -46,6 +48,5 @@
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${PREFIX}/bin/node \
                bin/npm-cli.js install -g -f ${PKGNAME_NOREV}.tgz
 
-.include "../../lang/nodejs/nodeversion.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2400dfb316d2 -r 167ffef19e50 lang/ruby-execjs/Makefile
--- a/lang/ruby-execjs/Makefile Wed Jul 13 09:59:25 2022 +0000
+++ b/lang/ruby-execjs/Makefile Wed Jul 13 11:41:06 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/05/13 10:56:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2022/07/13 11:41:06 jperkin Exp $
 
 DISTNAME=      execjs-2.8.1
 PKGREVISION=   1
@@ -9,6 +9,7 @@
 COMMENT=       Run JavaScript code from Ruby
 LICENSE=       mit
 
-.include "../../lang/nodejs/nodeversion.mk"
+DEPENDS+=      nodejs-[0-9]*:../../lang/nodejs
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2400dfb316d2 -r 167ffef19e50 www/py-cfscrape/Makefile
--- a/www/py-cfscrape/Makefile  Wed Jul 13 09:59:25 2022 +0000
+++ b/www/py-cfscrape/Makefile  Wed Jul 13 11:41:06 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2022/07/08 14:08:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/07/13 11:41:06 jperkin Exp $
 
 DISTNAME=      cfscrape-2.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,11 +11,11 @@
 LICENSE=       mit
 
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.6.1:../../devel/py-requests
+DEPENDS+=      nodejs-[0-9]*:../../lang/nodejs
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
-.include "../../lang/nodejs/nodeversion.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"