CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jul 13 11:41:07 UTC 2022

Modified Files:
        pkgsrc/devel/yarn: Makefile
        pkgsrc/lang/npm: Makefile
        pkgsrc/lang/ruby-execjs: Makefile
        pkgsrc/www/py-cfscrape: Makefile

Log Message:
*: 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.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/yarn/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/lang/npm/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/ruby-execjs/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/py-cfscrape/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/yarn/Makefile
diff -u pkgsrc/devel/yarn/Makefile:1.20 pkgsrc/devel/yarn/Makefile:1.21
--- pkgsrc/devel/yarn/Makefile:1.20     Fri May 13 10:54:37 2022
+++ pkgsrc/devel/yarn/Makefile  Wed Jul 13 11:41:06 2022
@@ -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 @@ LICENSE=      2-clause-bsd
 
 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 @@ do-install:
                ${DESTDIR}${PREFIX}/bin/yarnpkg
 
 .include "../../lang/nodejs/application.mk"
-.include "../../lang/nodejs/nodeversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/npm/Makefile
diff -u pkgsrc/lang/npm/Makefile:1.53 pkgsrc/lang/npm/Makefile:1.54
--- pkgsrc/lang/npm/Makefile:1.53       Thu Jul  7 10:05:11 2022
+++ pkgsrc/lang/npm/Makefile    Wed Jul 13 11:41:06 2022
@@ -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 @@ LICENSE=      artistic-2.0
 
 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 @@ do-install:
        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"

Index: pkgsrc/lang/ruby-execjs/Makefile
diff -u pkgsrc/lang/ruby-execjs/Makefile:1.14 pkgsrc/lang/ruby-execjs/Makefile:1.15
--- pkgsrc/lang/ruby-execjs/Makefile:1.14       Fri May 13 10:56:05 2022
+++ pkgsrc/lang/ruby-execjs/Makefile    Wed Jul 13 11:41:06 2022
@@ -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 @@ HOMEPAGE=       https://github.com/rails/execj
 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"

Index: pkgsrc/www/py-cfscrape/Makefile
diff -u pkgsrc/www/py-cfscrape/Makefile:1.17 pkgsrc/www/py-cfscrape/Makefile:1.18
--- pkgsrc/www/py-cfscrape/Makefile:1.17        Fri Jul  8 14:08:38 2022
+++ pkgsrc/www/py-cfscrape/Makefile     Wed Jul 13 11:41:06 2022
@@ -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 @@ COMMENT=    Python module for dealing with 
 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"