Tue Feb 18 23:06:05 2020 UTC ()
nodejs*: Consolidate python27 requirement.

It's still required as of nodejs v13.


(jperkin)
diff -r1.30 -r1.31 pkgsrc/lang/nodejs/Makefile.common
diff -r1.4 -r1.5 pkgsrc/lang/nodejs10/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/nodejs12/Makefile
diff -r1.25 -r1.26 pkgsrc/lang/nodejs8/Makefile
cvs diff -r1.30 -r1.31 pkgsrc/lang/nodejs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/Makefile.common 2020/01/24 18:52:20 1.30
+++ pkgsrc/lang/nodejs/Makefile.common 2020/02/18 23:06:05 1.31
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: Makefile.common,v 1.30 2020/01/24 18:52:20 adam Exp $ 1# $NetBSD: Makefile.common,v 1.31 2020/02/18 23:06:05 jperkin Exp $
2# used by lang/nodejs/Makefile 2# used by lang/nodejs/Makefile
3# used by lang/nodejs8/Makefile 3# used by lang/nodejs8/Makefile
4# used by lang/nodejs10/Makefile 4# used by lang/nodejs10/Makefile
5# used by lang/nodejs12/Makefile 5# used by lang/nodejs12/Makefile
6 6
7CATEGORIES= lang 7CATEGORIES= lang
8MASTER_SITES= https://nodejs.org/dist/${DISTNAME:S/node-//}/ 8MASTER_SITES= https://nodejs.org/dist/${DISTNAME:S/node-//}/
9PKGNAME= ${DISTNAME:S/-v/js-/} 9PKGNAME= ${DISTNAME:S/-v/js-/}
10 10
11MAINTAINER= fhajny@NetBSD.org 11MAINTAINER= fhajny@NetBSD.org
12HOMEPAGE= https://nodejs.org/ 12HOMEPAGE= https://nodejs.org/
13COMMENT= V8 JavaScript for clients and servers 13COMMENT= V8 JavaScript for clients and servers
14LICENSE= mit 14LICENSE= mit
15 15
16HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
17USE_TOOLS+= bash gmake pkg-config 17USE_TOOLS+= bash gmake pkg-config
18 18
19PYTHON_FOR_BUILD_ONLY= yes 19PYTHON_FOR_BUILD_ONLY= yes
 20PYTHON_VERSIONS_ACCEPTED= 27
20 21
21GCC_REQD+= 4.9.4 22GCC_REQD+= 4.9.4
22 23
23CONFIG_SHELL= ${PYTHONBIN} 24CONFIG_SHELL= ${PYTHONBIN}
24CONFIGURE_ARGS+= --prefix=${PREFIX} 25CONFIGURE_ARGS+= --prefix=${PREFIX}
25CONFIGURE_ARGS+= --shared-cares 26CONFIGURE_ARGS+= --shared-cares
26CONFIGURE_ARGS+= --shared-libuv 27CONFIGURE_ARGS+= --shared-libuv
27CONFIGURE_ARGS+= --shared-zlib 28CONFIGURE_ARGS+= --shared-zlib
28CONFIGURE_ARGS+= --without-npm 29CONFIGURE_ARGS+= --without-npm
29PTHREAD_AUTO_VARS= yes 30PTHREAD_AUTO_VARS= yes
30 31
31CONFIGURE_ENV.NetBSD+= GYP_DEFINES="OS=netbsd" 32CONFIGURE_ENV.NetBSD+= GYP_DEFINES="OS=netbsd"
32MAKE_ENV.NetBSD+= GYP_DEFINES="OS=netbsd" 33MAKE_ENV.NetBSD+= GYP_DEFINES="OS=netbsd"
cvs diff -r1.4 -r1.5 pkgsrc/lang/nodejs10/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs10/Attic/Makefile 2020/02/07 09:50:36 1.4
+++ pkgsrc/lang/nodejs10/Attic/Makefile 2020/02/18 23:06:05 1.5
@@ -1,35 +1,33 @@ @@ -1,35 +1,33 @@
1# $NetBSD: Makefile,v 1.4 2020/02/07 09:50:36 adam Exp $ 1# $NetBSD: Makefile,v 1.5 2020/02/18 23:06:05 jperkin Exp $
2 2
3DISTNAME= node-v10.19.0 3DISTNAME= node-v10.19.0
4 4
5USE_LANGUAGES= c gnu++14 5USE_LANGUAGES= c gnu++14
6 6
7# Requires http_parser_set_max_header_size 7# Requires http_parser_set_max_header_size
8BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0 8BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0
9 9
10.include "../../mk/bsd.prefs.mk" 10.include "../../mk/bsd.prefs.mk"
11 11
12# XXX: figure out a way to add rpaths to torque 12# XXX: figure out a way to add rpaths to torque
13MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 13MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
14 14
15CONFIGURE_ARGS+= --shared-http-parser 15CONFIGURE_ARGS+= --shared-http-parser
16CONFIGURE_ARGS+= --shared-nghttp2 16CONFIGURE_ARGS+= --shared-nghttp2
17CONFIGURE_ARGS+= --with-intl=system-icu 17CONFIGURE_ARGS+= --with-intl=system-icu
18 18
19CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh 19CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh
20 20
21PYTHON_VERSIONS_ACCEPTED= 27 
22 
23.if ${MACHINE_ARCH} == "i386" 21.if ${MACHINE_ARCH} == "i386"
24# 64 bit atomic ops are required 22# 64 bit atomic ops are required
25CXXFLAGS+= -march=i586 23CXXFLAGS+= -march=i586
26# required for SSE2 code under i386. 24# required for SSE2 code under i386.
27CXXFLAGS+= -mstackrealign 25CXXFLAGS+= -mstackrealign
28.endif 26.endif
29 27
30.include "../../lang/nodejs/options.mk" 28.include "../../lang/nodejs/options.mk"
31 29
32.include "../../lang/nodejs/Makefile.common" 30.include "../../lang/nodejs/Makefile.common"
33.include "../../textproc/icu/buildlink3.mk" 31.include "../../textproc/icu/buildlink3.mk"
34.include "../../www/http-parser/buildlink3.mk" 32.include "../../www/http-parser/buildlink3.mk"
35.include "../../www/nghttp2/buildlink3.mk" 33.include "../../www/nghttp2/buildlink3.mk"
cvs diff -r1.6 -r1.7 pkgsrc/lang/nodejs12/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs12/Attic/Makefile 2020/02/07 09:51:09 1.6
+++ pkgsrc/lang/nodejs12/Attic/Makefile 2020/02/18 23:06:05 1.7
@@ -1,31 +1,29 @@ @@ -1,31 +1,29 @@
1# $NetBSD: Makefile,v 1.6 2020/02/07 09:51:09 adam Exp $ 1# $NetBSD: Makefile,v 1.7 2020/02/18 23:06:05 jperkin Exp $
2 2
3DISTNAME= node-v12.15.0 3DISTNAME= node-v12.15.0
4 4
5USE_LANGUAGES= c gnu++14 5USE_LANGUAGES= c gnu++14
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9# XXX: figure out a way to add rpaths to torque 9# XXX: figure out a way to add rpaths to torque
10MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 10MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
11 11
12CONFIGURE_ARGS+= --shared-nghttp2 12CONFIGURE_ARGS+= --shared-nghttp2
13CONFIGURE_ARGS+= --with-intl=system-icu 13CONFIGURE_ARGS+= --with-intl=system-icu
14 14
15CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh 15CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh
16 16
17PYTHON_VERSIONS_ACCEPTED= 27 
18 
19.if ${MACHINE_ARCH} == "i386" 17.if ${MACHINE_ARCH} == "i386"
20# 64 bit atomic ops are required 18# 64 bit atomic ops are required
21CXXFLAGS+= -march=i586 19CXXFLAGS+= -march=i586
22# required for SSE2 code under i386. 20# required for SSE2 code under i386.
23CXXFLAGS+= -mstackrealign 21CXXFLAGS+= -mstackrealign
24.endif 22.endif
25 23
26.include "../../lang/nodejs/options.mk" 24.include "../../lang/nodejs/options.mk"
27 25
28.include "../../lang/nodejs/Makefile.common" 26.include "../../lang/nodejs/Makefile.common"
29.include "../../textproc/icu/buildlink3.mk" 27.include "../../textproc/icu/buildlink3.mk"
30.include "../../www/nghttp2/buildlink3.mk" 28.include "../../www/nghttp2/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/lang/nodejs8/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs8/Attic/Makefile 2020/01/24 18:58:12 1.25
+++ pkgsrc/lang/nodejs8/Attic/Makefile 2020/02/18 23:06:05 1.26
@@ -1,18 +1,16 @@ @@ -1,18 +1,16 @@
1# $NetBSD: Makefile,v 1.25 2020/01/24 18:58:12 adam Exp $ 1# $NetBSD: Makefile,v 1.26 2020/02/18 23:06:05 jperkin Exp $
2 2
3DISTNAME= node-v8.17.0 3DISTNAME= node-v8.17.0
4PKGREVISION= 1 4PKGREVISION= 1
5 5
6USE_LANGUAGES= c c++ 6USE_LANGUAGES= c c++
7 7
8.include "options.mk" 8.include "options.mk"
9 9
10CONFIGURE_ARGS+= --shared-http-parser 10CONFIGURE_ARGS+= --shared-http-parser
11CONFIGURE_ARGS+= --with-intl=system-icu 11CONFIGURE_ARGS+= --with-intl=system-icu
12 12
13PYTHON_VERSIONS_ACCEPTED= 27 
14 
15.include "../../lang/nodejs/Makefile.common" 13.include "../../lang/nodejs/Makefile.common"
16.include "../../textproc/icu/buildlink3.mk" 14.include "../../textproc/icu/buildlink3.mk"
17.include "../../www/http-parser/buildlink3.mk" 15.include "../../www/http-parser/buildlink3.mk"
18.include "../../mk/bsd.pkg.mk" 16.include "../../mk/bsd.pkg.mk"