Fri Dec 13 06:26:07 2019 UTC ()
Get rid of http-parser for nodejs 12+


(adam)
diff -r1.165 -r1.166 pkgsrc/lang/nodejs/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/nodejs/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/lang/nodejs12/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/nodejs12/buildlink3.mk
cvs diff -r1.165 -r1.166 pkgsrc/lang/nodejs/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/Makefile 2019/12/09 20:03:51 1.165
+++ pkgsrc/lang/nodejs/Makefile 2019/12/13 06:26:07 1.166
@@ -1,28 +1,25 @@ @@ -1,28 +1,25 @@
1# $NetBSD: Makefile,v 1.165 2019/12/09 20:03:51 adam Exp $ 1# $NetBSD: Makefile,v 1.166 2019/12/13 06:26:07 adam Exp $
2 2
3DISTNAME= node-v13.3.0 3DISTNAME= node-v13.3.0
4 4
5USE_LANGUAGES= c gnu++14 5USE_LANGUAGES= c gnu++14
6 6
7# Stated by the changelog as of 8.2.0 7# Stated by the changelog as of 8.2.0
8GCC_REQD+= 4.9.4 8GCC_REQD+= 4.9.4
9 9
10# Stated by the changelog 10# Stated by the changelog
11BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23 11BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23
12 12
13# Requires http_parser_set_max_header_size 
14BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0 
15 
16.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
17 14
18# XXX: figure out a way to add rpaths to torque 15# XXX: figure out a way to add rpaths to torque
19MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 16MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
20 17
21# Optional OpenSSL support in nghttp2 conflicts with OpenSSL 1.1.x 18# Optional OpenSSL support in nghttp2 conflicts with OpenSSL 1.1.x
22# bundled and built by lang/nodejs. 19# bundled and built by lang/nodejs.
23# Uncomment when we switch to openssl>=1.1 20# Uncomment when we switch to openssl>=1.1
24# CONFIGURE_ARGS+= --shared-nghttp2 21# CONFIGURE_ARGS+= --shared-nghttp2
25CONFIGURE_ARGS+= --with-intl=system-icu 22CONFIGURE_ARGS+= --with-intl=system-icu
26 23
27CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh 24CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh
28 25
cvs diff -r1.6 -r1.7 pkgsrc/lang/nodejs/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/buildlink3.mk 2019/04/03 00:32:50 1.6
+++ pkgsrc/lang/nodejs/buildlink3.mk 2019/12/13 06:26:07 1.7
@@ -1,38 +1,35 @@ @@ -1,38 +1,35 @@
1# $NetBSD: buildlink3.mk,v 1.6 2019/04/03 00:32:50 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2019/12/13 06:26:07 adam Exp $
2 2
3BUILDLINK_TREE+= nodejs 3BUILDLINK_TREE+= nodejs
4 4
5.if !defined(NODEJS_BUILDLINK3_MK) 5.if !defined(NODEJS_BUILDLINK3_MK)
6NODEJS_BUILDLINK3_MK:= 6NODEJS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.nodejs+= nodejs>=10 8BUILDLINK_API_DEPENDS.nodejs+= nodejs>=10
9BUILDLINK_ABI_DEPENDS.nodejs?= nodejs>=10.15.3nb2 9BUILDLINK_ABI_DEPENDS.nodejs?= nodejs>=10.15.3nb2
10BUILDLINK_PKGSRCDIR.nodejs?= ../../lang/nodejs 10BUILDLINK_PKGSRCDIR.nodejs?= ../../lang/nodejs
11 11
12.include "../../mk/bsd.fast.prefs.mk" 12.include "../../mk/bsd.fast.prefs.mk"
13 13
14.if ${OPSYS} != "Darwin" 14.if ${OPSYS} != "Darwin"
15.include "../../devel/libexecinfo/buildlink3.mk" 15.include "../../devel/libexecinfo/buildlink3.mk"
16.endif 16.endif
17# Stated by the changelog 17# Stated by the changelog
18BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23 18BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23
19.include "../../devel/libuv/buildlink3.mk" 19.include "../../devel/libuv/buildlink3.mk"
20.include "../../devel/zlib/buildlink3.mk" 20.include "../../devel/zlib/buildlink3.mk"
21.include "../../net/libcares/buildlink3.mk" 21.include "../../net/libcares/buildlink3.mk"
22.include "../../textproc/icu/buildlink3.mk" 22.include "../../textproc/icu/buildlink3.mk"
23# Requires http_parser_set_max_header_size 
24BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0 
25.include "../../www/http-parser/buildlink3.mk" 
26# Uncomment when we switch to openssl>=1.1 23# Uncomment when we switch to openssl>=1.1
27# .include "../../www/nghttp2/buildlink3.mk" 24# .include "../../www/nghttp2/buildlink3.mk"
28.include "../../mk/pthread.buildlink3.mk" 25.include "../../mk/pthread.buildlink3.mk"
29 26
30pkgbase := nodejs 27pkgbase := nodejs
31.include "../../mk/pkg-build-options.mk" 28.include "../../mk/pkg-build-options.mk"
32 29
33# Enable when we start using pkgsrc openssl-1.1.x 30# Enable when we start using pkgsrc openssl-1.1.x
34#.if !empty(PKG_BUILD_OPTIONS.nodejs:Mopenssl) 31#.if !empty(PKG_BUILD_OPTIONS.nodejs:Mopenssl)
35#. include "../../security/openssl/buildlink3.mk" 32#. include "../../security/openssl/buildlink3.mk"
36#.endif 33#.endif
37 34
38.endif # NODEJS_BUILDLINK3_MK 35.endif # NODEJS_BUILDLINK3_MK
cvs diff -r1.1 -r1.2 pkgsrc/lang/nodejs12/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs12/Attic/Makefile 2019/12/09 20:05:40 1.1
+++ pkgsrc/lang/nodejs12/Attic/Makefile 2019/12/13 06:26:07 1.2
@@ -1,28 +1,25 @@ @@ -1,28 +1,25 @@
1# $NetBSD: Makefile,v 1.1 2019/12/09 20:05:40 adam Exp $ 1# $NetBSD: Makefile,v 1.2 2019/12/13 06:26:07 adam Exp $
2 2
3DISTNAME= node-v12.13.1 3DISTNAME= node-v12.13.1
4 4
5USE_LANGUAGES= c gnu++14 5USE_LANGUAGES= c gnu++14
6 6
7# Stated by the changelog as of 8.2.0 7# Stated by the changelog as of 8.2.0
8GCC_REQD+= 4.9.4 8GCC_REQD+= 4.9.4
9 9
10# Stated by the changelog 10# Stated by the changelog
11BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23 11BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23
12 12
13# Requires http_parser_set_max_header_size 
14#BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0 
15 
16.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
17 14
18# XXX: figure out a way to add rpaths to torque 15# XXX: figure out a way to add rpaths to torque
19MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 16MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
20 17
21# Optional OpenSSL support in nghttp2 conflicts with OpenSSL 1.1.x 18# Optional OpenSSL support in nghttp2 conflicts with OpenSSL 1.1.x
22# bundled and built by lang/nodejs. 19# bundled and built by lang/nodejs.
23# Uncomment when we switch to openssl>=1.1 20# Uncomment when we switch to openssl>=1.1
24# CONFIGURE_ARGS+= --shared-nghttp2 21# CONFIGURE_ARGS+= --shared-nghttp2
25CONFIGURE_ARGS+= --with-intl=system-icu 22CONFIGURE_ARGS+= --with-intl=system-icu
26 23
27CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh 24CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh
28 25
cvs diff -r1.1 -r1.2 pkgsrc/lang/nodejs12/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/nodejs12/Attic/buildlink3.mk 2019/12/09 20:05:40 1.1
+++ pkgsrc/lang/nodejs12/Attic/buildlink3.mk 2019/12/13 06:26:07 1.2
@@ -1,38 +1,35 @@ @@ -1,38 +1,35 @@
1# $NetBSD: buildlink3.mk,v 1.1 2019/12/09 20:05:40 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2019/12/13 06:26:07 adam Exp $
2 2
3BUILDLINK_TREE+= nodejs 3BUILDLINK_TREE+= nodejs
4 4
5.if !defined(NODEJS_BUILDLINK3_MK) 5.if !defined(NODEJS_BUILDLINK3_MK)
6NODEJS_BUILDLINK3_MK:= 6NODEJS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.nodejs+= nodejs>=10 8BUILDLINK_API_DEPENDS.nodejs+= nodejs>=10
9BUILDLINK_ABI_DEPENDS.nodejs?= nodejs>=10.15.3nb2 9BUILDLINK_ABI_DEPENDS.nodejs?= nodejs>=10.15.3nb2
10BUILDLINK_PKGSRCDIR.nodejs?= ../../lang/nodejs 10BUILDLINK_PKGSRCDIR.nodejs?= ../../lang/nodejs
11 11
12.include "../../mk/bsd.fast.prefs.mk" 12.include "../../mk/bsd.fast.prefs.mk"
13 13
14.if ${OPSYS} != "Darwin" 14.if ${OPSYS} != "Darwin"
15.include "../../devel/libexecinfo/buildlink3.mk" 15.include "../../devel/libexecinfo/buildlink3.mk"
16.endif 16.endif
17# Stated by the changelog 17# Stated by the changelog
18BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23 18BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23
19.include "../../devel/libuv/buildlink3.mk" 19.include "../../devel/libuv/buildlink3.mk"
20.include "../../devel/zlib/buildlink3.mk" 20.include "../../devel/zlib/buildlink3.mk"
21.include "../../net/libcares/buildlink3.mk" 21.include "../../net/libcares/buildlink3.mk"
22.include "../../textproc/icu/buildlink3.mk" 22.include "../../textproc/icu/buildlink3.mk"
23# Requires http_parser_set_max_header_size 
24BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0 
25#.include "../../www/http-parser/buildlink3.mk" 
26# Uncomment when we switch to openssl>=1.1 23# Uncomment when we switch to openssl>=1.1
27# .include "../../www/nghttp2/buildlink3.mk" 24# .include "../../www/nghttp2/buildlink3.mk"
28.include "../../mk/pthread.buildlink3.mk" 25.include "../../mk/pthread.buildlink3.mk"
29 26
30pkgbase := nodejs 27pkgbase := nodejs
31.include "../../mk/pkg-build-options.mk" 28.include "../../mk/pkg-build-options.mk"
32 29
33# Enable when we start using pkgsrc openssl-1.1.x 30# Enable when we start using pkgsrc openssl-1.1.x
34#.if !empty(PKG_BUILD_OPTIONS.nodejs:Mopenssl) 31#.if !empty(PKG_BUILD_OPTIONS.nodejs:Mopenssl)
35#. include "../../security/openssl/buildlink3.mk" 32#. include "../../security/openssl/buildlink3.mk"
36#.endif 33#.endif
37 34
38.endif # NODEJS_BUILDLINK3_MK 35.endif # NODEJS_BUILDLINK3_MK