CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Mar 11 09:22:50 UTC 2020

Modified Files:
        pkgsrc/lang/nodejs: Makefile.common
        pkgsrc/lang/nodejs10: Makefile
        pkgsrc/lang/nodejs12: Makefile
        pkgsrc/lang/nodejs8: Makefile

Log Message:
nodejs*: Unbreak builds, again, this time with comment.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/nodejs/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/nodejs10/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/nodejs12/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/nodejs8/Makefile

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

Modified files:

Index: pkgsrc/lang/nodejs/Makefile.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.32 pkgsrc/lang/nodejs/Makefile.common:1.33
--- pkgsrc/lang/nodejs/Makefile.common:1.32     Wed Mar  4 18:59:39 2020
+++ pkgsrc/lang/nodejs/Makefile.common  Wed Mar 11 09:22:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2020/03/04 18:59:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.33 2020/03/11 09:22:49 jperkin Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs8/Makefile
 # used by lang/nodejs10/Makefile
@@ -18,6 +18,12 @@ USE_TOOLS+=  bash gmake pkg-config
 
 PYTHON_FOR_BUILD_ONLY=         yes
 
+#
+# Do not remove this unless you are absolutely certain that every python script
+# in every nodejs that we support is python3 ready.
+#
+PYTHON_VERSIONS_ACCEPTED=      27
+
 GCC_REQD+=             4.9.4
 
 CONFIG_SHELL=          ${PYTHONBIN}

Index: pkgsrc/lang/nodejs10/Makefile
diff -u pkgsrc/lang/nodejs10/Makefile:1.6 pkgsrc/lang/nodejs10/Makefile:1.7
--- pkgsrc/lang/nodejs10/Makefile:1.6   Wed Mar  4 18:59:39 2020
+++ pkgsrc/lang/nodejs10/Makefile       Wed Mar 11 09:22:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/03/04 18:59:39 adam Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/11 09:22:49 jperkin Exp $
 
 DISTNAME=      node-v10.19.0
 
@@ -16,8 +16,6 @@ CONFIGURE_ARGS+=      --shared-http-parser
 CONFIGURE_ARGS+=       --shared-nghttp2
 CONFIGURE_ARGS+=       --with-intl=system-icu
 
-PYTHON_VERSIONS_ACCEPTED=      27
-
 CHECK_PORTABILITY_SKIP+=       deps/openssl/openssl/.travis-create-release.sh
 
 .if ${MACHINE_ARCH} == "i386"

Index: pkgsrc/lang/nodejs12/Makefile
diff -u pkgsrc/lang/nodejs12/Makefile:1.9 pkgsrc/lang/nodejs12/Makefile:1.10
--- pkgsrc/lang/nodejs12/Makefile:1.9   Wed Mar  4 18:59:39 2020
+++ pkgsrc/lang/nodejs12/Makefile       Wed Mar 11 09:22:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/03/04 18:59:39 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/03/11 09:22:49 jperkin Exp $
 
 DISTNAME=      node-v12.16.1
 
@@ -12,8 +12,6 @@ MAKE_ENV+=    LD_LIBRARY_PATH=${PREFIX}/lib
 CONFIGURE_ARGS+=       --shared-nghttp2
 CONFIGURE_ARGS+=       --with-intl=system-icu
 
-PYTHON_VERSIONS_ACCEPTED=      27
-
 CHECK_PORTABILITY_SKIP+=       deps/openssl/openssl/.travis-create-release.sh
 
 .if ${MACHINE_ARCH} == "i386"

Index: pkgsrc/lang/nodejs8/Makefile
diff -u pkgsrc/lang/nodejs8/Makefile:1.27 pkgsrc/lang/nodejs8/Makefile:1.28
--- pkgsrc/lang/nodejs8/Makefile:1.27   Wed Mar  4 18:59:40 2020
+++ pkgsrc/lang/nodejs8/Makefile        Wed Mar 11 09:22:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/03/04 18:59:40 adam Exp $
+# $NetBSD: Makefile,v 1.28 2020/03/11 09:22:50 jperkin Exp $
 
 DISTNAME=      node-v8.17.0
 PKGREVISION=   1
@@ -10,8 +10,6 @@ USE_LANGUAGES=        c c++
 CONFIGURE_ARGS+=       --shared-http-parser
 CONFIGURE_ARGS+=       --with-intl=system-icu
 
-PYTHON_VERSIONS_ACCEPTED=      27
-
 .include "../../lang/nodejs/Makefile.common"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../www/http-parser/buildlink3.mk"