Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lang/nodejs/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.31 2015/01/29 08:44:44 fhajny Exp $
# $NetBSD: Makefile,v 1.36 2015/06/23 09:41:50 fhajny Exp $
DISTNAME= node-v0.10.36
DISTNAME= node-v0.12.5
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"

945
lang/nodejs/PLIST
View File

File diff suppressed because it is too large Load Diff

22
lang/nodejs/distinfo
View File

@@ -1,15 +1,17 @@
$NetBSD: distinfo,v 1.25 2015/01/29 08:44:44 fhajny Exp $
$NetBSD: distinfo,v 1.31 2015/06/23 09:41:50 fhajny Exp $
SHA1 (node-v0.10.36.tar.gz) = 7e89d33ad0e56f6ca517f43a4a7b56079db18420
RMD160 (node-v0.10.36.tar.gz) = 351fb9282355094fd6ec0afe5200d724e2352549
Size (node-v0.10.36.tar.gz) = 14410899 bytes
SHA1 (patch-common.gypi) = 0cffd29138431c982d9030b414cc26acd9407fbc
SHA1 (node-v0.12.5.tar.gz) = baecde8c2d297aa001a2a8ba2f2d086d970a13eb
RMD160 (node-v0.12.5.tar.gz) = 1ce3392b7182b8b67ad92e8857258ddae99cd519
Size (node-v0.12.5.tar.gz) = 19743102 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) = 13bc664b182f00f9674f87f4bd47e7e77f6e9e0d
SHA1 (patch-deps_uv_src_unix_netbsd.c) = c1d58eabed1c396b8d9455e3d54c88907ffd7bed
SHA1 (patch-deps_uv_src_unix_thread.c) = 13172adf2407eb40362cb4480a768816a7d98961
SHA1 (patch-deps_v8_tools_gyp_v8.gyp) = 8602b7858d2d238a165554dfb1feaeec31babfe9
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) = 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
SHA1 (patch-tools_gyp_pylib_gyp_common.py) = 132008f362ea696e43a4d19bf9d8a0ac754ef55c
SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = be3cc1aaa85c3d59b6f2758df813cb5ad8d8f74e
SHA1 (patch-tools_install.py) = 8f19cef5b4c90a752dd2c7550e9b70aa78d3c292
SHA1 (patch-tools_install.py) = 42e4c080f8384d03fd0ebaf091f8290150cf5c6c

9
lang/nodejs/options.mk
View File

@@ -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

18
lang/nodejs/patches/patch-common.gypi
View File

@@ -1,15 +1,15 @@
$NetBSD: patch-common.gypi,v 1.1 2013/05/22 15:17:07 mspo Exp $
$NetBSD: patch-common.gypi,v 1.2 2015/04/30 15:04:56 ryoon Exp $
Add support for NetBSD.
--- common.gypi.orig 2013-03-11 00:36:28.000000000 +0000
--- common.gypi.orig 2015-03-31 22:13:01.000000000 +0000
+++ common.gypi
@@ -159,7 +159,7 @@
'BUILDING_UV_SHARED=1',
],
@@ -171,7 +171,7 @@
'cflags': [ '-pthread', ],
'ldflags': [ '-pthread' ],
}],
- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+ [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="netbsd"', {
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', '-pthread', ],
- [ 'OS in "linux freebsd openbsd solaris android"', {
+ [ 'OS in "linux freebsd openbsd solaris android netbsd"', {
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
'ldflags': [ '-pthread', '-rdynamic' ],
'ldflags': [ '-rdynamic' ],

10
lang/nodejs/patches/patch-deps_uv_common.gypi
View File

@@ -1,15 +1,15 @@
$NetBSD: patch-deps_uv_common.gypi,v 1.1 2013/05/22 15:17:07 mspo Exp $
$NetBSD: patch-deps_uv_common.gypi,v 1.2 2015/04/30 15:04:56 ryoon Exp $
Add support for NetBSD.
--- deps/uv/common.gypi.orig 2013-04-11 16:39:16.000000000 +0000
--- deps/uv/common.gypi.orig 2015-03-31 22:13:01.000000000 +0000
+++ deps/uv/common.gypi
@@ -129,7 +129,7 @@
@@ -128,7 +128,7 @@
}]
]
}],
- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+ [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" OR OS=="netbsd"', {
- ['OS in "freebsd linux openbsd solaris android"', {
+ ['OS in "freebsd linux openbsd solaris android netbsd"', {
'cflags': [ '-Wall' ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
'target_conditions': [

13
lang/nodejs/patches/patch-deps_uv_src_unix_netbsd.c
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-deps_uv_src_unix_netbsd.c,v 1.2 2013/06/13 20:11:05 fhajny Exp $
Fix build on NetBSD-current.
--- deps/uv/src/unix/netbsd.c-orig 2013-06-05 12:34:12.000000000 +0000
+++ deps/uv/src/unix/netbsd.c
@@ -37,6 +37,7 @@
#include <sys/resource.h>
#include <sys/types.h>
#include <sys/sysctl.h>
+#include <uvm/uvm.h>
#include <unistd.h>
#include <time.h>

16
lang/nodejs/patches/patch-deps_uv_src_unix_thread.c
View File

@@ -1,16 +0,0 @@
$NetBSD: patch-deps_uv_src_unix_thread.c,v 1.1 2013/05/22 15:17:07 mspo Exp $
Older NetBSD does not have pthread_condattr_setclock.
--- deps/uv/src/unix/thread.c.orig 2013-03-14 11:27:01.000000000 +0900
+++ deps/uv/src/unix/thread.c 2013-03-14 11:45:57.000000000 +0900
@@ -283,8 +283,10 @@
if (pthread_condattr_init(&attr))
return -1;
+#if !(defined(__NetBSD__) && (__NetBSD_Version__ < 699001600))
if (pthread_condattr_setclock(&attr, CLOCK_MONOTONIC))
goto error2;
+#endif
if (pthread_cond_init(cond, &attr))
goto error2;

39
lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc Normal file
View File

@@ -0,0 +1,39 @@
$NetBSD: patch-deps_v8_src_base_platform_platform-posix.cc,v 1.1 2015/04/30 15:04:56 ryoon Exp $
Use sysconf(_SC_THREAD_STACK_MIN) instead of PTHREAD_STACK_MIN.
Cast explicitly.
--- deps/v8/src/base/platform/platform-posix.cc.orig 2015-03-31 22:13:01.000000000 +0000
+++ deps/v8/src/base/platform/platform-posix.cc
@@ -327,6 +327,8 @@ int OS::GetCurrentThreadId() {
return static_cast<int>(syscall(__NR_gettid));
#elif V8_OS_ANDROID
return static_cast<int>(gettid());
+#elif V8_OS_NETBSD
+ return static_cast<int>(reinterpret_cast<intptr_t>(pthread_self()));
#else
return static_cast<int>(pthread_self());
#endif
@@ -519,8 +521,13 @@ Thread::Thread(const Options& options)
: data_(new PlatformData),
stack_size_(options.stack_size()),
start_semaphore_(NULL) {
+#if defined(__NetBSD__)
+ if (stack_size_ > 0 && static_cast<size_t>(stack_size_) < sysconf(_SC_THREAD_STACK_MIN)) {
+ stack_size_ = sysconf(_SC_THREAD_STACK_MIN);
+#else
if (stack_size_ > 0 && static_cast<size_t>(stack_size_) < PTHREAD_STACK_MIN) {
stack_size_ = PTHREAD_STACK_MIN;
+#endif
}
set_name(options.name());
}
@@ -536,7 +543,7 @@ static void SetThreadName(const char* na
pthread_set_name_np(pthread_self(), name);
#elif V8_OS_NETBSD
STATIC_ASSERT(Thread::kMaxThreadNameLength <= PTHREAD_MAX_NAMELEN_NP);
- pthread_setname_np(pthread_self(), "%s", name);
+ pthread_setname_np(pthread_self(), "%s", (void *)name);
#elif V8_OS_MACOSX
// pthread_setname_np is only available in 10.6 or later, so test
// for it at runtime.

47
lang/nodejs/patches/patch-deps_v8_src_base_platform_semaphore.cc Normal file
View File

@@ -0,0 +1,47 @@
$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.
--- deps/v8/src/base/platform/semaphore.cc.orig 2015-03-31 22:13:01.000000000 +0000
+++ deps/v8/src/base/platform/semaphore.cc 2015-05-14 12:47:08.000000000 +0000
@@ -9,9 +9,14 @@
#include <mach/task.h>
#endif
+#if V8_OS_NETBSD
+#include <sys/param.h> // for __NetBSD_Version__
+#endif
+
#include <errno.h>
#include "src/base/logging.h"
+#include "src/base/platform/elapsed-timer.h"
#include "src/base/platform/time.h"
namespace v8 {
@@ -106,6 +111,17 @@
bool Semaphore::WaitFor(const TimeDelta& rel_time) {
+#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();
+ do {
+ int result = sem_trywait(&native_handle_);
+ if (result == 0) return true;
+ DCHECK(errno == EAGAIN || errno == EINTR);
+ } while (!timer.HasExpired(rel_time));
+ return false;
+#else
// Compute the time for end of timeout.
const Time time = Time::NowFromSystemTime() + rel_time;
const struct timespec ts = time.ToTimespec();
@@ -129,6 +145,7 @@
DCHECK_EQ(-1, result);
DCHECK_EQ(EINTR, errno);
}
+#endif
}
#elif V8_OS_WIN

67
lang/nodejs/patches/patch-deps_v8_tools_gyp_v8.gyp
View File

@@ -1,33 +1,42 @@
$NetBSD: patch-deps_v8_tools_gyp_v8.gyp,v 1.1 2013/05/22 15:17:07 mspo Exp $
$NetBSD: patch-deps_v8_tools_gyp_v8.gyp,v 1.2 2015/04/30 15:04:56 ryoon Exp $
Fix path to Python.
--- deps/v8/tools/gyp/v8.gyp.orig 2012-06-11 16:30:44.000000000 +0000
--- deps/v8/tools/gyp/v8.gyp.orig 2015-03-31 22:13:01.000000000 +0000
+++ deps/v8/tools/gyp/v8.gyp
@@ -796,7 +796,7 @@
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
],
'action': [
- 'python',
+ '@PYTHONBIN@',
'../../tools/js2c.py',
'<@(_outputs)',
'CORE',
@@ -814,7 +814,7 @@
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
],
'action': [
- 'python',
+ '@PYTHONBIN@',
'../../tools/js2c.py',
'<@(_outputs)',
'EXPERIMENTAL',
@@ -844,7 +844,7 @@
'<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
],
'action': [
- 'python',
+ '@PYTHONBIN@',
'../../tools/gen-postmortem-metadata.py',
'<@(_outputs)',
'<@(heapobject_files)'
@@ -1355,7 +1355,7 @@
'outputs': [
'<(PRODUCT_DIR)/natives_blob.bin',
],
- 'action': ['python', '<@(_inputs)', '<@(_outputs)'],
+ 'action': ['@PYTHONBIN@', '<@(_inputs)', '<@(_outputs)'],
}],
}],
['want_separate_host_toolset==1', {
@@ -1437,7 +1437,7 @@
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
],
'action': [
- 'python',
+ '@PYTHONBIN@',
'../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
'CORE',
@@ -1464,7 +1464,7 @@
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
],
'action': [
- 'python',
+ '@PYTHONBIN@',
'../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
'EXPERIMENTAL',
@@ -1502,7 +1502,7 @@
'<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
],
'action': [
- 'python',
+ '@PYTHONBIN@',
'../../tools/gen-postmortem-metadata.py',
'<@(_outputs)',
'<@(heapobject_files)'

15
lang/nodejs/patches/patch-deps_v8_tools_run-llprof.sh Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-deps_v8_tools_run-llprof.sh,v 1.1 2015/04/30 15:04:56 ryoon Exp $
POSIX shell portability.
--- deps/v8/tools/run-llprof.sh.orig 2015-03-31 22:13:01.000000000 +0000
+++ deps/v8/tools/run-llprof.sh
@@ -46,7 +46,7 @@ framework, then calls the low level tick
EOF
}
-if [ $# -eq 0 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ] ; then
+if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
usage
exit 1
fi

17
lang/nodejs/patches/patch-src_cares__wrap.cc Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-src_cares__wrap.cc,v 1.1 2015/04/30 15:04:56 ryoon Exp $
NetBSD has no AI_V4MAPPED.
--- src/cares_wrap.cc.orig 2015-03-31 22:13:01.000000000 +0000
+++ src/cares_wrap.cc
@@ -1301,8 +1301,10 @@ static void Initialize(Handle<Object> ta
Integer::New(env->isolate(), AF_UNSPEC));
target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "AI_ADDRCONFIG"),
Integer::New(env->isolate(), AI_ADDRCONFIG));
+#if defined(AI_V4MAPPED)
target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "AI_V4MAPPED"),
Integer::New(env->isolate(), AI_V4MAPPED));
+#endif
Local<FunctionTemplate> aiw =
FunctionTemplate::New(env->isolate(), NewGetAddrInfoReqWrap);

11
lang/nodejs/patches/patch-tools_install.py
View File

@@ -1,12 +1,15 @@
$NetBSD: patch-tools_install.py,v 1.1 2013/05/22 15:17:07 mspo Exp $
$NetBSD: patch-tools_install.py,v 1.2 2015/04/30 15:04:56 ryoon Exp $
Install man pages under the right directory.
--- tools/install.py.orig 2013-03-21 01:15:04.000000000 +0000
--- tools/install.py.orig 2015-03-31 22:13:01.000000000 +0000
+++ tools/install.py
@@ -129,7 +129,7 @@ def files(action):
@@ -136,9 +136,9 @@ def files(action):
action(['src/node.stp'], 'share/systemtap/tapset/')
if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
action(['doc/node.1'], 'man/man1/')
- action(['doc/node.1'], 'man/man1/')
+ action(['doc/node.1'], '@PKGMANDIR@/man1/')
else:
- action(['doc/node.1'], 'share/man/man1/')
+ action(['doc/node.1'], '@PKGMANDIR@/man1/')