diff options
author | fhajny <fhajny@pkgsrc.org> | 2015-06-03 18:23:24 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2015-06-03 18:23:24 +0000 |
commit | d0ad88850bd511a85f51cd5143eb48da8a168f31 (patch) | |
tree | fe958ad59b7c009ec81437eba57c9b287fd0007b /lang | |
parent | 473035223a62933c1268c62fefc1d1dabf690fc4 (diff) | |
download | pkgsrc-d0ad88850bd511a85f51cd5143eb48da8a168f31.tar.gz |
Update nodejs to 0.12.4.
Fix joerg's patch to actually do the right thing on NetBSD 6.
Add option to build with Intl support using textproc/icu.
Cleanup.
2015.05.22, Version 0.12.4 (Stable)
* npm: upgrade to 2.10.1
* V8: revert v8 Array.prototype.values() removal (cjihrig)
* win: bring back xp/2k3 support (Bert Belder)
Diffstat (limited to 'lang')
-rw-r--r-- | lang/nodejs/Makefile | 12 | ||||
-rw-r--r-- | lang/nodejs/PLIST | 49 | ||||
-rw-r--r-- | lang/nodejs/distinfo | 10 | ||||
-rw-r--r-- | lang/nodejs/options.mk | 9 | ||||
-rw-r--r-- | lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc | 4 |
5 files changed, 47 insertions, 37 deletions
diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile index 38084dca995..025cf86c5e0 100644 --- a/lang/nodejs/Makefile +++ b/lang/nodejs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2015/05/19 14:31:16 fhajny Exp $ +# $NetBSD: Makefile,v 1.35 2015/06/03 18:23:24 fhajny Exp $ -DISTNAME= node-v0.12.3 +DISTNAME= node-v0.12.4 CATEGORIES= devel MASTER_SITES= http://nodejs.org/dist/${DISTNAME:S/node-//}/ PKGNAME= ${DISTNAME:S/-v/js-/} @@ -33,6 +33,7 @@ SUBST_VARS.man= PKGMANDIR CONFIG_SHELL= ${PYTHONBIN} CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --shared-zlib .if ${OPSYS} == "NetBSD" CONFIGURE_ENV+= GYP_DEFINES="OS=netbsd" @@ -41,13 +42,7 @@ MAKE_ENV+= GYP_DEFINES="OS=netbsd" REPLACE_PYTHON+= configure REPLACE_PYTHON+= tools/genv8constants.py -REPLACE_PYTHON+= tools/gyp_node REPLACE_PYTHON+= tools/gyp/pylib/gyp/flock_tool.py -REPLACE_PYTHON+= tools/gyp/pylib/gyp/sun_tool.py -REPLACE_PYTHON+= tools/node-waf -REPLACE_PYTHON+= tools/waf-light -REPLACE_PYTHON+= tools/wafadmin/*.py -REPLACE_PYTHON+= tools/wafadmin/Tools/*.py CHECK_INTERPRETER_SKIP+= lib/node_modules/npm/* @@ -62,6 +57,7 @@ pre-install: .if ${OPSYS} != "Darwin" .include "../../devel/libexecinfo/buildlink3.mk" .endif +.include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/nodejs/PLIST b/lang/nodejs/PLIST index 436e8a87d1b..5cc39189782 100644 --- a/lang/nodejs/PLIST +++ b/lang/nodejs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2015/05/19 14:31:16 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.22 2015/06/03 18:23:24 fhajny Exp $ bin/node bin/npm include/node/android-ifaddrs.h @@ -36,10 +36,7 @@ include/node/v8-util.h include/node/v8.h include/node/v8config.h include/node/v8stdint.h -include/node/zconf.h -include/node/zlib.h ${PLIST.dtrace}lib/dtrace/node.d -lib/node_modules/npm/.eslintrc lib/node_modules/npm/.mailmap lib/node_modules/npm/.npmignore lib/node_modules/npm/.npmrc @@ -191,7 +188,6 @@ lib/node_modules/npm/html/doc/api/npm-search.html lib/node_modules/npm/html/doc/api/npm-shrinkwrap.html lib/node_modules/npm/html/doc/api/npm-start.html lib/node_modules/npm/html/doc/api/npm-stop.html -lib/node_modules/npm/html/doc/api/npm-submodule.html lib/node_modules/npm/html/doc/api/npm-tag.html lib/node_modules/npm/html/doc/api/npm-test.html lib/node_modules/npm/html/doc/api/npm-uninstall.html @@ -241,7 +237,6 @@ lib/node_modules/npm/html/doc/cli/npm-star.html lib/node_modules/npm/html/doc/cli/npm-stars.html lib/node_modules/npm/html/doc/cli/npm-start.html lib/node_modules/npm/html/doc/cli/npm-stop.html -lib/node_modules/npm/html/doc/cli/npm-submodule.html lib/node_modules/npm/html/doc/cli/npm-tag.html lib/node_modules/npm/html/doc/cli/npm-test.html lib/node_modules/npm/html/doc/cli/npm-uninstall.html @@ -303,7 +298,6 @@ lib/node_modules/npm/html/partial/doc/api/npm-search.html lib/node_modules/npm/html/partial/doc/api/npm-shrinkwrap.html lib/node_modules/npm/html/partial/doc/api/npm-start.html lib/node_modules/npm/html/partial/doc/api/npm-stop.html -lib/node_modules/npm/html/partial/doc/api/npm-submodule.html lib/node_modules/npm/html/partial/doc/api/npm-tag.html lib/node_modules/npm/html/partial/doc/api/npm-test.html lib/node_modules/npm/html/partial/doc/api/npm-uninstall.html @@ -353,7 +347,6 @@ lib/node_modules/npm/html/partial/doc/cli/npm-star.html lib/node_modules/npm/html/partial/doc/cli/npm-stars.html lib/node_modules/npm/html/partial/doc/cli/npm-start.html lib/node_modules/npm/html/partial/doc/cli/npm-stop.html -lib/node_modules/npm/html/partial/doc/cli/npm-submodule.html lib/node_modules/npm/html/partial/doc/cli/npm-tag.html lib/node_modules/npm/html/partial/doc/cli/npm-test.html lib/node_modules/npm/html/partial/doc/cli/npm-uninstall.html @@ -516,7 +509,6 @@ lib/node_modules/npm/man/man1/npm-star.1 lib/node_modules/npm/man/man1/npm-stars.1 lib/node_modules/npm/man/man1/npm-start.1 lib/node_modules/npm/man/man1/npm-stop.1 -lib/node_modules/npm/man/man1/npm-submodule.1 lib/node_modules/npm/man/man1/npm-tag.1 lib/node_modules/npm/man/man1/npm-test.1 lib/node_modules/npm/man/man1/npm-uninstall.1 @@ -556,7 +548,6 @@ lib/node_modules/npm/man/man3/npm-search.3 lib/node_modules/npm/man/man3/npm-shrinkwrap.3 lib/node_modules/npm/man/man3/npm-start.3 lib/node_modules/npm/man/man3/npm-stop.3 -lib/node_modules/npm/man/man3/npm-submodule.3 lib/node_modules/npm/man/man3/npm-tag.3 lib/node_modules/npm/man/man3/npm-test.3 lib/node_modules/npm/man/man3/npm-uninstall.3 @@ -823,6 +814,14 @@ lib/node_modules/npm/node_modules/init-package-json/node_modules/promzard/exampl lib/node_modules/npm/node_modules/init-package-json/node_modules/promzard/example/substack-input.js lib/node_modules/npm/node_modules/init-package-json/node_modules/promzard/package.json lib/node_modules/npm/node_modules/init-package-json/node_modules/promzard/promzard.js +lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-license/LICENSE.md +lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-license/README.md +lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-license/index.js +lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/.npmignore +lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/README.md +lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json +lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/spdx-correct.js +lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-license/package.json lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-name/.npmignore lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-name/README.md lib/node_modules/npm/node_modules/init-package-json/node_modules/validate-npm-package-name/index.js @@ -841,8 +840,6 @@ lib/node_modules/npm/node_modules/lru-cache/.npmignore lib/node_modules/npm/node_modules/lru-cache/CONTRIBUTORS lib/node_modules/npm/node_modules/lru-cache/LICENSE lib/node_modules/npm/node_modules/lru-cache/README.md -lib/node_modules/npm/node_modules/lru-cache/bar.js -lib/node_modules/npm/node_modules/lru-cache/foo.js lib/node_modules/npm/node_modules/lru-cache/lib/lru-cache.js lib/node_modules/npm/node_modules/lru-cache/package.json lib/node_modules/npm/node_modules/minimatch/LICENSE @@ -869,7 +866,6 @@ lib/node_modules/npm/node_modules/minimatch/node_modules/brace-expansion/node_mo lib/node_modules/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json lib/node_modules/npm/node_modules/minimatch/node_modules/brace-expansion/package.json lib/node_modules/npm/node_modules/minimatch/package.json -lib/node_modules/npm/node_modules/mkdirp/.npmignore lib/node_modules/npm/node_modules/mkdirp/.travis.yml lib/node_modules/npm/node_modules/mkdirp/LICENSE lib/node_modules/npm/node_modules/mkdirp/README.markdown @@ -1329,7 +1325,6 @@ lib/node_modules/npm/node_modules/realize-package-specifier/.npmignore lib/node_modules/npm/node_modules/realize-package-specifier/README.md lib/node_modules/npm/node_modules/realize-package-specifier/index.js lib/node_modules/npm/node_modules/realize-package-specifier/package.json -lib/node_modules/npm/node_modules/request/.eslintrc lib/node_modules/npm/node_modules/request/.npmignore lib/node_modules/npm/node_modules/request/.travis.yml lib/node_modules/npm/node_modules/request/CHANGELOG.md @@ -1352,7 +1347,6 @@ lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/LICENSE lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/README.md lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/index.js lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/package.json -lib/node_modules/npm/node_modules/request/node_modules/bl/.jshintrc lib/node_modules/npm/node_modules/request/node_modules/bl/.npmignore lib/node_modules/npm/node_modules/request/node_modules/bl/.travis.yml lib/node_modules/npm/node_modules/request/node_modules/bl/LICENSE.md @@ -1502,7 +1496,6 @@ lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_module lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/jsonpointer.js lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/test.js -lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/.jshintrc lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/.npmignore lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/LICENCE lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/Makefile @@ -1626,7 +1619,6 @@ lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modul lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsl.conf lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsstyle lib/node_modules/npm/node_modules/request/node_modules/http-signature/package.json -lib/node_modules/npm/node_modules/request/node_modules/isstream/.jshintrc lib/node_modules/npm/node_modules/request/node_modules/isstream/.npmignore lib/node_modules/npm/node_modules/request/node_modules/isstream/.travis.yml lib/node_modules/npm/node_modules/request/node_modules/isstream/LICENSE.md @@ -1669,7 +1661,6 @@ lib/node_modules/npm/node_modules/request/node_modules/oauth-sign/index.js lib/node_modules/npm/node_modules/request/node_modules/oauth-sign/package.json lib/node_modules/npm/node_modules/request/node_modules/oauth-sign/test.js lib/node_modules/npm/node_modules/request/node_modules/qs/.jshintignore -lib/node_modules/npm/node_modules/request/node_modules/qs/.jshintrc lib/node_modules/npm/node_modules/request/node_modules/qs/.npmignore lib/node_modules/npm/node_modules/request/node_modules/qs/.travis.yml lib/node_modules/npm/node_modules/request/node_modules/qs/CHANGELOG.md @@ -1707,7 +1698,6 @@ lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/node_modules lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/package.json lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/public-suffix.txt lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/test.js -lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/.jshintrc lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/LICENSE lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/README.md lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/index.js @@ -1797,13 +1787,24 @@ lib/node_modules/npm/node_modules/sorted-object/LICENSE.txt lib/node_modules/npm/node_modules/sorted-object/README.md lib/node_modules/npm/node_modules/sorted-object/lib/sorted-object.js lib/node_modules/npm/node_modules/sorted-object/package.json +lib/node_modules/npm/node_modules/spdx/LICENSE.md +lib/node_modules/npm/node_modules/spdx/README.md +lib/node_modules/npm/node_modules/spdx/node_modules/spdx-license-ids/LICENSE +lib/node_modules/npm/node_modules/spdx/node_modules/spdx-license-ids/README.md +lib/node_modules/npm/node_modules/spdx/node_modules/spdx-license-ids/package.json +lib/node_modules/npm/node_modules/spdx/node_modules/spdx-license-ids/spdx-license-ids.json +lib/node_modules/npm/node_modules/spdx/package.json +lib/node_modules/npm/node_modules/spdx/source/exceptions.json +lib/node_modules/npm/node_modules/spdx/source/parser.generated.js +lib/node_modules/npm/node_modules/spdx/source/ranges.json +lib/node_modules/npm/node_modules/spdx/source/spdx.js lib/node_modules/npm/node_modules/strip-ansi/cli.js lib/node_modules/npm/node_modules/strip-ansi/index.js lib/node_modules/npm/node_modules/strip-ansi/package.json lib/node_modules/npm/node_modules/strip-ansi/readme.md lib/node_modules/npm/node_modules/tar/.npmignore lib/node_modules/npm/node_modules/tar/.travis.yml -lib/node_modules/npm/node_modules/tar/LICENCE +lib/node_modules/npm/node_modules/tar/LICENSE lib/node_modules/npm/node_modules/tar/README.md lib/node_modules/npm/node_modules/tar/examples/extracter.js lib/node_modules/npm/node_modules/tar/examples/packer.js @@ -1844,6 +1845,14 @@ lib/node_modules/npm/node_modules/umask/package.json lib/node_modules/npm/node_modules/which/LICENSE lib/node_modules/npm/node_modules/which/README.md lib/node_modules/npm/node_modules/which/bin/which +lib/node_modules/npm/node_modules/which/node_modules/is-absolute/LICENSE +lib/node_modules/npm/node_modules/which/node_modules/is-absolute/README.md +lib/node_modules/npm/node_modules/which/node_modules/is-absolute/index.js +lib/node_modules/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/LICENSE-MIT +lib/node_modules/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/README.md +lib/node_modules/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/index.js +lib/node_modules/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json +lib/node_modules/npm/node_modules/which/node_modules/is-absolute/package.json lib/node_modules/npm/node_modules/which/package.json lib/node_modules/npm/node_modules/which/which.js lib/node_modules/npm/node_modules/wrappy/LICENSE diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo index 7b1bd0d6637..c21539d313f 100644 --- a/lang/nodejs/distinfo +++ b/lang/nodejs/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.29 2015/05/19 14:31:16 fhajny Exp $ +$NetBSD: distinfo,v 1.30 2015/06/03 18:23:24 fhajny Exp $ -SHA1 (node-v0.12.3.tar.gz) = b0b02a254c06ebf2b1695900181baa3ffd206584 -RMD160 (node-v0.12.3.tar.gz) = e38052415db59c6b2cbc0c4b7d3343c0389ca13a -Size (node-v0.12.3.tar.gz) = 19622994 bytes +SHA1 (node-v0.12.4.tar.gz) = 147ff79947752399b870fcf3f1fc37102100b545 +RMD160 (node-v0.12.4.tar.gz) = 67880fa9887825ca400c11ab6eb59e0ecc8fa8c8 +Size (node-v0.12.4.tar.gz) = 19642076 bytes SHA1 (patch-common.gypi) = 07bab46c26a402d7a9a45e1f1cbe1805ca27b72f SHA1 (patch-deps_cares_cares.gyp) = 2235eb44bc984fa2e745fdf1786f1ae6de6ef80f SHA1 (patch-deps_npm_node__modules_node-gyp_gyp_pylib_gyp_generator_make.py) = 78d6ddd37ae30e869e0da666a78baad86a638c50 SHA1 (patch-deps_uv_common.gypi) = af1c707cbc02a4aeccebebf6691d5a8680646a0d SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = aae5e1649a3ea876e724cec95731989fb01ff008 -SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = a209357b885ef86540bce1b0563e8bfe90213a4a +SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = c78ecdc332996a93b7bf63093a461742eb814452 SHA1 (patch-deps_v8_tools_gyp_v8.gyp) = a7e13e7ef8cc078a812a1f6f37da71c84eedaf6f SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3 SHA1 (patch-src_cares__wrap.cc) = d9510afd0cd4b0156a604d9197d9f97d6e3b291f diff --git a/lang/nodejs/options.mk b/lang/nodejs/options.mk index 77b6d86f882..88e2fde8815 100644 --- a/lang/nodejs/options.mk +++ b/lang/nodejs/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.4 2014/05/08 09:15:40 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2015/06/03 18:23:24 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.node -PKG_SUPPORTED_OPTIONS= openssl dtrace +PKG_SUPPORTED_OPTIONS= openssl dtrace icu PKG_SUGGESTED_OPTIONS= openssl .if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin") \ @@ -20,6 +20,11 @@ PLIST.dtrace= yes CONFIGURE_ARGS+= --without-dtrace .endif +.if !empty(PKG_OPTIONS:Micu) +CONFIGURE_ARGS+= --with-intl=system-icu +.include "../../textproc/icu/buildlink3.mk" +.endif + .if !empty(PKG_OPTIONS:Mopenssl) .include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --shared-openssl diff --git a/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc b/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc index 31ef2842f5c..1f964153a86 100644 --- a/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc +++ b/lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc @@ -1,4 +1,4 @@ -$NetBSD: patch-deps_v8_src_base_platform_semaphore.cc,v 1.2 2015/05/14 20:36:37 joerg Exp $ +$NetBSD: patch-deps_v8_src_base_platform_semaphore.cc,v 1.3 2015/06/03 18:23:24 fhajny Exp $ Work around lack of sem_timedwait(3) in NetBSD < 6.99.4. Adapted from d4f11c0cf476dd854eaebec1cbacb1afc7bea18e of the Chromium V8 sources. @@ -23,7 +23,7 @@ Adapted from d4f11c0cf476dd854eaebec1cbacb1afc7bea18e of the Chromium V8 sources bool Semaphore::WaitFor(const TimeDelta& rel_time) { -+#if V8_OS_NACL || (V8_OS_NETBSD && __NetBSD_Version__ - 0 > 699000400) ++#if V8_OS_NACL || (V8_OS_NETBSD && __NetBSD_Version__ - 0 < 699000400) + // PNaCL and older NetBSD doesn't support sem_timedwait, do ugly busy waiting. + ElapsedTimer timer; + timer.Start(); |