CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Feb 18 23:06:05 UTC 2020

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

Log Message:
nodejs*: Consolidate python27 requirement.

It's still required as of nodejs v13.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/nodejs/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/nodejs10/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/nodejs12/Makefile
cvs rdiff -u -r1.25 -r1.26 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.30 pkgsrc/lang/nodejs/Makefile.common:1.31
--- pkgsrc/lang/nodejs/Makefile.common:1.30     Fri Jan 24 18:52:20 2020
+++ pkgsrc/lang/nodejs/Makefile.common  Tue Feb 18 23:06:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2020/01/24 18:52:20 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2020/02/18 23:06:05 jperkin Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs8/Makefile
 # used by lang/nodejs10/Makefile
@@ -17,6 +17,7 @@ HAS_CONFIGURE=        yes
 USE_TOOLS+=    bash gmake pkg-config
 
 PYTHON_FOR_BUILD_ONLY=         yes
+PYTHON_VERSIONS_ACCEPTED=      27
 
 GCC_REQD+=             4.9.4
 

Index: pkgsrc/lang/nodejs10/Makefile
diff -u pkgsrc/lang/nodejs10/Makefile:1.4 pkgsrc/lang/nodejs10/Makefile:1.5
--- pkgsrc/lang/nodejs10/Makefile:1.4   Fri Feb  7 09:50:36 2020
+++ pkgsrc/lang/nodejs10/Makefile       Tue Feb 18 23:06:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/02/07 09:50:36 adam Exp $
+# $NetBSD: Makefile,v 1.5 2020/02/18 23:06:05 jperkin Exp $
 
 DISTNAME=      node-v10.19.0
 
@@ -18,8 +18,6 @@ CONFIGURE_ARGS+=      --with-intl=system-icu
 
 CHECK_PORTABILITY_SKIP+=       deps/openssl/openssl/.travis-create-release.sh
 
-PYTHON_VERSIONS_ACCEPTED=      27
-
 .if ${MACHINE_ARCH} == "i386"
 # 64 bit atomic ops are required
 CXXFLAGS+=     -march=i586

Index: pkgsrc/lang/nodejs12/Makefile
diff -u pkgsrc/lang/nodejs12/Makefile:1.6 pkgsrc/lang/nodejs12/Makefile:1.7
--- pkgsrc/lang/nodejs12/Makefile:1.6   Fri Feb  7 09:51:09 2020
+++ pkgsrc/lang/nodejs12/Makefile       Tue Feb 18 23:06:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/02/07 09:51:09 adam Exp $
+# $NetBSD: Makefile,v 1.7 2020/02/18 23:06:05 jperkin Exp $
 
 DISTNAME=      node-v12.15.0
 
@@ -14,8 +14,6 @@ CONFIGURE_ARGS+=      --with-intl=system-icu
 
 CHECK_PORTABILITY_SKIP+=       deps/openssl/openssl/.travis-create-release.sh
 
-PYTHON_VERSIONS_ACCEPTED=      27
-
 .if ${MACHINE_ARCH} == "i386"
 # 64 bit atomic ops are required
 CXXFLAGS+=     -march=i586

Index: pkgsrc/lang/nodejs8/Makefile
diff -u pkgsrc/lang/nodejs8/Makefile:1.25 pkgsrc/lang/nodejs8/Makefile:1.26
--- pkgsrc/lang/nodejs8/Makefile:1.25   Fri Jan 24 18:58:12 2020
+++ pkgsrc/lang/nodejs8/Makefile        Tue Feb 18 23:06:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/01/24 18:58:12 adam Exp $
+# $NetBSD: Makefile,v 1.26 2020/02/18 23:06:05 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"