Sun Feb 24 12:18:55 2019 UTC ()
- Fix OpenSSL support for NetBSD/amd64 (https works fine now)
- Fix NetBSD/i386 support (hopefully also works for other ILP32 archs)
- Add NetBSD/aarch64 support
- Bump revision


(rin)
diff -r1.154 -r1.155 pkgsrc/lang/nodejs/Makefile
diff -r1.144 -r1.145 pkgsrc/lang/nodejs/distinfo
diff -r0 -r1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_bn__conf__asm.h
diff -r0 -r1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_bn__conf__no-asm.h
diff -r0 -r1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_dso__conf__asm.h
diff -r0 -r1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_dso__conf__no-asm.h
diff -r1.3 -r1.4 pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h
diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h
diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi
diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi
diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi
diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi
cvs diff -r1.154 -r1.155 pkgsrc/lang/nodejs/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/Makefile 2019/01/31 13:38:49 1.154
+++ pkgsrc/lang/nodejs/Makefile 2019/02/24 12:18:55 1.155
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.154 2019/01/31 13:38:49 nia Exp $ 1# $NetBSD: Makefile,v 1.155 2019/02/24 12:18:55 rin Exp $
2 2
3DISTNAME= node-v10.15.1 3DISTNAME= node-v10.15.1
 4PKGREVISION= 1
4 5
5USE_LANGUAGES= c gnu++14 6USE_LANGUAGES= c gnu++14
6 7
7# Stated by the changelog as of 8.2.0 8# Stated by the changelog as of 8.2.0
8GCC_REQD+= 4.9.4 9GCC_REQD+= 4.9.4
9 10
10# Stated by the changelog 11# Stated by the changelog
11BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23 12BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23
12 13
13# Requires http_parser_set_max_header_size 14# Requires http_parser_set_max_header_size
14BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0 15BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0
15 16
16.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
cvs diff -r1.144 -r1.145 pkgsrc/lang/nodejs/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/distinfo 2019/01/31 08:46:37 1.144
+++ pkgsrc/lang/nodejs/distinfo 2019/02/24 12:18:55 1.145
@@ -1,28 +1,32 @@ @@ -1,28 +1,32 @@
1$NetBSD: distinfo,v 1.144 2019/01/31 08:46:37 adam Exp $ 1$NetBSD: distinfo,v 1.145 2019/02/24 12:18:55 rin Exp $
2 2
3SHA1 (node-v10.15.1.tar.gz) = ff5b314bf02dd8ca021567e033b480edc9baebe6 3SHA1 (node-v10.15.1.tar.gz) = ff5b314bf02dd8ca021567e033b480edc9baebe6
4RMD160 (node-v10.15.1.tar.gz) = 5ed37484dacf23c7850012ff06e18c9bd4b9070c 4RMD160 (node-v10.15.1.tar.gz) = 5ed37484dacf23c7850012ff06e18c9bd4b9070c
5SHA512 (node-v10.15.1.tar.gz) = 5570ff74924235f406186af26e7c5774cad9004f0c417345eb6d3e47d34b8284df004f64ee0c3dc14a84bf152d33f9e7e766aef099fd0172677759fc3309b1de 5SHA512 (node-v10.15.1.tar.gz) = 5570ff74924235f406186af26e7c5774cad9004f0c417345eb6d3e47d34b8284df004f64ee0c3dc14a84bf152d33f9e7e766aef099fd0172677759fc3309b1de
6Size (node-v10.15.1.tar.gz) = 36328287 bytes 6Size (node-v10.15.1.tar.gz) = 36328287 bytes
7SHA1 (patch-common.gypi) = de37949f38d9bd39a18b59d59ec74e528bd323ac 7SHA1 (patch-common.gypi) = de37949f38d9bd39a18b59d59ec74e528bd323ac
8SHA1 (patch-deps_cares_cares.gyp) = 2235eb44bc984fa2e745fdf1786f1ae6de6ef80f 8SHA1 (patch-deps_cares_cares.gyp) = 2235eb44bc984fa2e745fdf1786f1ae6de6ef80f
9SHA1 (patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi) = f92f5547728cf67de5ccfd652f23cc4ab8f5b207 9SHA1 (patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi) = f92f5547728cf67de5ccfd652f23cc4ab8f5b207
10SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = c43c7732164a107d7a294cac040708970ef0a212 10SHA1 (patch-deps_openssl_config_bn__conf__asm.h) = a4cf4f0771c96fb09a00b76b25d35000d65ef92f
11SHA1 (patch-deps_openssl_config_opensslconf__no-asm.h) = 9fd4acc86deb7da00cb501654713dfa2b26f412e 11SHA1 (patch-deps_openssl_config_bn__conf__no-asm.h) = 5b90403407f09f6d28729e2cff8fccc361145d0d
12SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = 3254dd37670faa19be8ac51e8195e30cc27ea42f 12SHA1 (patch-deps_openssl_config_dso__conf__asm.h) = ae8285306fd165dc881fd8c6783cf0977d73371a
13SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = 86592025ab1d04dbef23d1d2725196e5d5b6fc4e 13SHA1 (patch-deps_openssl_config_dso__conf__no-asm.h) = 7ea313e8f9ba74e9de4ea559f6fc993cc0454882
14SHA1 (patch-deps_openssl_openssl__asm.gypi) = 8d58f6177cc7b5b58f8ed1a69121da2685195d78 14SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = e9bb26b66431595d13d4173d3ed5f3e583bd009f
15SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = 588d5943c1ef24cafd0be182e080d67747a941d2 15SHA1 (patch-deps_openssl_config_opensslconf__no-asm.h) = 062f0227014df2d6cc45c84c9f348494c2f644e2
 16SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = addb5837ea7b8ea2732cd2f5aaa8a24289b1199f
 17SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = 73368f336dbe500e45f0ba6bbb7656416a27b294
 18SHA1 (patch-deps_openssl_openssl__asm.gypi) = b85e1f5a9f862d469afcb36ff6e1ad202bea704a
 19SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = b549ea34f51e26669a41a64da0db10e92f0d0a99
16SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3 20SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
17SHA1 (patch-deps_uv_src_unix_netbsd.c) = c19ff4024f828018364793d9dea013c991cfb93f 21SHA1 (patch-deps_uv_src_unix_netbsd.c) = c19ff4024f828018364793d9dea013c991cfb93f
18SHA1 (patch-deps_v8_src_arm_assembler-arm-inl.h) = 56a5d6539d31e19673ef61cc91f003109c69dc29 22SHA1 (patch-deps_v8_src_arm_assembler-arm-inl.h) = 56a5d6539d31e19673ef61cc91f003109c69dc29
19SHA1 (patch-deps_v8_src_arm_assembler-arm.cc) = f32d5d2a1096f822c813eaf6d02b9348564213f6 23SHA1 (patch-deps_v8_src_arm_assembler-arm.cc) = f32d5d2a1096f822c813eaf6d02b9348564213f6
20SHA1 (patch-deps_v8_src_arm_cpu-arm.cc) = d0d11ac474ab109a6f40b26fa457b12d742eb48d 24SHA1 (patch-deps_v8_src_arm_cpu-arm.cc) = d0d11ac474ab109a6f40b26fa457b12d742eb48d
21SHA1 (patch-deps_v8_src_base_atomicops.h) = 552d2b7781b39b93392fd00043b1cf4cb10802da 25SHA1 (patch-deps_v8_src_base_atomicops.h) = 552d2b7781b39b93392fd00043b1cf4cb10802da
22SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = 427c7712fc1c2872fc48e593f7ab491c69ee44e3 26SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = 427c7712fc1c2872fc48e593f7ab491c69ee44e3
23SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 5e593879dbab095f99e82593272a0de91043f9a8 27SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 5e593879dbab095f99e82593272a0de91043f9a8
24SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 0d80cc6587af9220832de112834e9f50242f819f 28SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 0d80cc6587af9220832de112834e9f50242f819f
25SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = aa84bf1dbaac5808529f6b01502d117c88751649 29SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = aa84bf1dbaac5808529f6b01502d117c88751649
26SHA1 (patch-deps_v8_src_compiler_types.h) = 711cc94535200374104c3cd1f0fbbd00994701a6 30SHA1 (patch-deps_v8_src_compiler_types.h) = 711cc94535200374104c3cd1f0fbbd00994701a6
27SHA1 (patch-deps_v8_src_globals.h) = 6695a381000844ad9837bdbc3edbe9040ec4d5ff 31SHA1 (patch-deps_v8_src_globals.h) = 6695a381000844ad9837bdbc3edbe9040ec4d5ff
28SHA1 (patch-deps_v8_src_log-utils.h) = 765e4e4af2cb11e38c033174ac92fbb6ee1fd480 32SHA1 (patch-deps_v8_src_log-utils.h) = 765e4e4af2cb11e38c033174ac92fbb6ee1fd480
File Added: pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_bn__conf__asm.h
$NetBSD: patch-deps_openssl_config_bn__conf__asm.h,v 1.1 2019/02/24 12:18:55 rin Exp $

Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)

--- deps/openssl/config/bn_conf_asm.h.orig	2019-01-29 16:20:45.000000000 +0900
+++ deps/openssl/config/bn_conf_asm.h	2019-02-24 10:23:14.508941933 +0900
@@ -9,9 +9,9 @@
 # include "./archs/linux-x32/asm/crypto/include/internal/bn_conf.h"
 #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
 # include "./archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h"
-#elif defined(OPENSSL_LINUX) && defined(__arm__)
+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
 # include "./archs/linux-armv4/asm/crypto/include/internal/bn_conf.h"
-#elif defined(OPENSSL_LINUX) && defined(__aarch64__)
+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__)
 # include "./archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h"
 #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__)
 # include "./archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h"
@@ -21,9 +21,10 @@
 # include "./archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h"
 #elif defined(_WIN32) && defined(_M_X64)
 # include "./archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h"
-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
-# include "./archs/BSD-x86/asm/crypto/include/internal/bn_conf.h"
-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
+// XXX missing
+//#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__)
+//# include "./archs/BSD-x86/asm/crypto/include/internal/bn_conf.h"
+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__)
 # include "./archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h"
 #elif defined(__sun) && defined(__i386__)
 # include "./archs/solaris-x86-gcc/asm/crypto/include/internal/bn_conf.h"
File Added: pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_bn__conf__no-asm.h
$NetBSD: patch-deps_openssl_config_bn__conf__no-asm.h,v 1.1 2019/02/24 12:18:55 rin Exp $

Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)

--- deps/openssl/config/bn_conf_no-asm.h.orig	2019-01-29 16:20:45.000000000 +0900
+++ deps/openssl/config/bn_conf_no-asm.h	2019-02-24 10:23:06.960730222 +0900
@@ -9,9 +9,9 @@
 # include "./archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h"
 #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
 # include "./archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h"
-#elif defined(OPENSSL_LINUX) && defined(__arm__)
+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
 # include "./archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h"
-#elif defined(OPENSSL_LINUX) && defined(__aarch64__)
+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__)
 # include "./archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h"
 #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__)
 # include "./archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h"
@@ -21,9 +21,10 @@
 # include "./archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h"
 #elif defined(_WIN32) && defined(_M_X64)
 # include "./archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h"
-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
-# include "./archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h"
-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
+// XXX missing
+//#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__)
+//# include "./archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h"
+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__)
 # include "./archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h"
 #elif defined(__sun) && defined(__i386__)
 # include "./archs/solaris-x86-gcc/no-asm/crypto/include/internal/bn_conf.h"
File Added: pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_dso__conf__asm.h
$NetBSD: patch-deps_openssl_config_dso__conf__asm.h,v 1.1 2019/02/24 12:18:55 rin Exp $

Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)

--- deps/openssl/config/dso_conf_asm.h.orig	2019-02-24 10:37:55.875191472 +0900
+++ deps/openssl/config/dso_conf_asm.h	2019-02-24 10:24:24.895671320 +0900
@@ -9,9 +9,9 @@
 # include "./archs/linux-x32/asm/crypto/include/internal/dso_conf.h"
 #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
 # include "./archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h"
-#elif defined(OPENSSL_LINUX) && defined(__arm__)
+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
 # include "./archs/linux-armv4/asm/crypto/include/internal/dso_conf.h"
-#elif defined(OPENSSL_LINUX) && defined(__aarch64__)
+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__)
 # include "./archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h"
 #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__)
 # include "./archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h"
@@ -21,9 +21,10 @@
 # include "./archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h"
 #elif defined(_WIN32) && defined(_M_X64)
 # include "./archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h"
-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
-# include "./archs/BSD-x86/asm/crypto/include/internal/dso_conf.h"
-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
+// XXX missing
+//#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__)
+//# include "./archs/BSD-x86/asm/crypto/include/internal/dso_conf.h"
+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__)
 # include "./archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h"
 #elif defined(__sun) && defined(__i386__)
 # include "./archs/solaris-x86-gcc/asm/crypto/include/internal/dso_conf.h"
File Added: pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_dso__conf__no-asm.h
$NetBSD: patch-deps_openssl_config_dso__conf__no-asm.h,v 1.1 2019/02/24 12:18:55 rin Exp $

Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)

--- deps/openssl/config/dso_conf_no-asm.h.orig	2019-01-29 16:20:45.000000000 +0900
+++ deps/openssl/config/dso_conf_no-asm.h	2019-02-24 10:24:59.496934700 +0900
@@ -9,9 +9,9 @@
 # include "./archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h"
 #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
 # include "./archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h"
-#elif defined(OPENSSL_LINUX) && defined(__arm__)
+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
 # include "./archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h"
-#elif defined(OPENSSL_LINUX) && defined(__aarch64__)
+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__)
 # include "./archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h"
 #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__)
 # include "./archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h"
@@ -21,9 +21,10 @@
 # include "./archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h"
 #elif defined(_WIN32) && defined(_M_X64)
 # include "./archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h"
-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
-# include "./archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h"
-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
+// XXX missing
+//#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__)
+//# include "./archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h"
+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__)
 # include "./archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h"
 #elif defined(__sun) && defined(__i386__)
 # include "./archs/solaris-x86-gcc/no-asm/crypto/include/internal/dso_conf.h"
cvs diff -r1.3 -r1.4 pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_opensslconf__asm.h (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_opensslconf__asm.h 2019/01/21 11:00:45 1.3
+++ pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_opensslconf__asm.h 2019/02/24 12:18:55 1.4
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.3 2019/01/21 11:00:45 ryoon Exp $ 1$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.4 2019/02/24 12:18:55 rin Exp $
2 2
3Add support for NetBSD. 3Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
4 4
5--- deps/openssl/config/opensslconf_asm.h.orig 2018-12-26 05:26:13.000000000 +0000 5--- deps/openssl/config/opensslconf_asm.h.orig 2019-01-29 16:20:45.000000000 +0900
6+++ deps/openssl/config/opensslconf_asm.h 6+++ deps/openssl/config/opensslconf_asm.h 2019-02-24 09:05:18.803688546 +0900
7@@ -96,7 +96,7 @@ 7@@ -96,9 +96,9 @@
8 # include "./archs/linux-x32/asm/include/openssl/opensslconf.h" 8 # include "./archs/linux-x32/asm/include/openssl/opensslconf.h"
9 #elif defined(OPENSSL_LINUX) && defined(__x86_64__) 9 #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
10 # include "./archs/linux-x86_64/asm/include/openssl/opensslconf.h" 10 # include "./archs/linux-x86_64/asm/include/openssl/opensslconf.h"
11-#elif defined(OPENSSL_LINUX) && defined(__arm__) 11-#elif defined(OPENSSL_LINUX) && defined(__arm__)
12+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__) 12+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
13 # include "./archs/linux-armv4/asm/include/openssl/opensslconf.h" 13 # include "./archs/linux-armv4/asm/include/openssl/opensslconf.h"
14 #elif defined(OPENSSL_LINUX) && defined(__aarch64__) 14-#elif defined(OPENSSL_LINUX) && defined(__aarch64__)
 15+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__)
15 # include "./archs/linux-aarch64/asm/include/openssl/opensslconf.h" 16 # include "./archs/linux-aarch64/asm/include/openssl/opensslconf.h"
 17 #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__)
 18 # include "./archs/darwin-i386-cc/asm/include/openssl/opensslconf.h"
16@@ -108,9 +108,7 @@ 19@@ -108,9 +108,7 @@
17 # include "./archs/VC-WIN32/asm/include/openssl/opensslconf.h" 20 # include "./archs/VC-WIN32/asm/include/openssl/opensslconf.h"
18 #elif defined(_WIN32) && defined(_M_X64) 21 #elif defined(_WIN32) && defined(_M_X64)
19 # include "./archs/VC-WIN64A/asm/include/openssl/opensslconf.h" 22 # include "./archs/VC-WIN64A/asm/include/openssl/opensslconf.h"
20-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) 23-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
21-# include "./archs/BSD-x86/asm/include/openssl/opensslconf.h" 24-# include "./archs/BSD-x86/asm/include/openssl/opensslconf.h"
22-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) 25-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
23+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__) 26+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__)
24 # include "./archs/BSD-x86_64/asm/include/openssl/opensslconf.h" 27 # include "./archs/BSD-x86_64/asm/include/openssl/opensslconf.h"
25 #elif defined(__sun) && defined(__i386__) 28 #elif defined(__sun) && defined(__i386__)
26 # include "./archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h" 29 # include "./archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h"
cvs diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_opensslconf__no-asm.h (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_opensslconf__no-asm.h 2019/01/10 13:02:41 1.2
+++ pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_config_opensslconf__no-asm.h 2019/02/24 12:18:55 1.3
@@ -1,27 +1,32 @@ @@ -1,27 +1,32 @@
1$NetBSD: patch-deps_openssl_config_opensslconf__no-asm.h,v 1.2 2019/01/10 13:02:41 ryoon Exp $ 1$NetBSD: patch-deps_openssl_config_opensslconf__no-asm.h,v 1.3 2019/02/24 12:18:55 rin Exp $
2 2
3Add support for NetBSD. 3Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
4 4
5--- deps/openssl/config/opensslconf_no-asm.h.orig 2018-12-10 21:19:03.000000000 +0000 5--- deps/openssl/config/opensslconf_no-asm.h.orig 2019-01-29 16:20:45.000000000 +0900
6+++ deps/openssl/config/opensslconf_no-asm.h 6+++ deps/openssl/config/opensslconf_no-asm.h 2019-02-24 10:26:51.159213732 +0900
7@@ -4,7 +4,7 @@ 7@@ -4,9 +4,9 @@
8 # include "./archs/linux-x32/no-asm/include/openssl/opensslconf.h" 8 # include "./archs/linux-x32/no-asm/include/openssl/opensslconf.h"
9 #elif defined(OPENSSL_LINUX) && defined(__x86_64__) 9 #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
10 # include "./archs/linux-x86_64/no-asm/include/openssl/opensslconf.h" 10 # include "./archs/linux-x86_64/no-asm/include/openssl/opensslconf.h"
11-#elif defined(OPENSSL_LINUX) && defined(__arm__) 11-#elif defined(OPENSSL_LINUX) && defined(__arm__)
12+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__) 12+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
13 # include "./archs/linux-armv4/no-asm/include/openssl/opensslconf.h" 13 # include "./archs/linux-armv4/no-asm/include/openssl/opensslconf.h"
14 #elif defined(OPENSSL_LINUX) && defined(__aarch64__) 14-#elif defined(OPENSSL_LINUX) && defined(__aarch64__)
 15+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__)
15 # include "./archs/linux-aarch64/no-asm/include/openssl/opensslconf.h" 16 # include "./archs/linux-aarch64/no-asm/include/openssl/opensslconf.h"
16@@ -16,9 +16,9 @@ 17 #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__)
 18 # include "./archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h"
 19@@ -16,9 +16,10 @@
17 # include "./archs/VC-WIN32/no-asm/include/openssl/opensslconf.h" 20 # include "./archs/VC-WIN32/no-asm/include/openssl/opensslconf.h"
18 #elif defined(_WIN32) && defined(_M_X64) 21 #elif defined(_WIN32) && defined(_M_X64)
19 # include "./archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h" 22 # include "./archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h"
20-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) 23-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
21+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__) 24-# include "./archs/BSD-x86/no-asm/include/openssl/opensslconf.h"
22 # include "./archs/BSD-x86/no-asm/include/openssl/opensslconf.h" 
23-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) 25-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
 26+// XXX missing
 27+//#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__)
 28+//# include "./archs/BSD-x86/no-asm/include/openssl/opensslconf.h"
24+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__) 29+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__)
25 # include "./archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h" 30 # include "./archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h"
26 #elif defined(__sun) && defined(__i386__) 31 #elif defined(__sun) && defined(__i386__)
27 # include "./archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h" 32 # include "./archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h"
cvs diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl-cl__asm.gypi (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl-cl__asm.gypi 2019/01/10 13:02:41 1.2
+++ pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl-cl__asm.gypi 2019/02/24 12:18:55 1.3
@@ -1,17 +1,30 @@ @@ -1,17 +1,30 @@
1$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $ 1$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
2 2
3Add support for NetBSD. 3Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
4 4
5--- deps/openssl/openssl-cl_asm.gypi.orig 2018-12-10 21:19:03.000000000 +0000 5XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
6+++ deps/openssl/openssl-cl_asm.gypi 6
7@@ -31,6 +31,10 @@ 7--- deps/openssl/openssl-cl_asm.gypi.orig 2019-01-29 16:20:45.000000000 +0900
 8+++ deps/openssl/openssl-cl_asm.gypi 2019-02-24 10:28:36.290301337 +0900
 9@@ -31,6 +31,12 @@
8 'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'], 10 'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'],
9 }, 'target_arch=="x64" and OS=="freebsd"', { 11 }, 'target_arch=="x64" and OS=="freebsd"', {
10 'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'], 12 'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'],
11+ }, 'target_arch=="arm" and OS=="netbsd"', { 13+ }, 'target_arch=="arm" and OS=="netbsd"', {
12+ 'includes': ['config/archs/linux-armv4/asm/openssl-cl.gypi'], 14+ 'includes': ['config/archs/linux-armv4/asm/openssl-cl.gypi'],
 15+ }, 'target_arch=="arm64" and OS=="netbsd"', {
 16+ 'includes': ['config/archs/linux-aarch64/asm/openssl-cl.gypi'],
13+ }, 'target_arch=="x64" and OS=="netbsd"', { 17+ }, 'target_arch=="x64" and OS=="netbsd"', {
14+ 'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'], 18+ 'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'],
15 }, 'target_arch=="x64" and OS=="mac"', { 19 }, 'target_arch=="x64" and OS=="mac"', {
16 'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi'], 20 'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi'],
17 }, 'target_arch=="x64" and OS=="solaris"', { 21 }, 'target_arch=="x64" and OS=="solaris"', {
 22@@ -41,7 +47,7 @@
 23 'includes': ['config/archs/linux-x86_64/asm/openssl-cl.gypi'],
 24 }, {
 25 # Other architectures don't use assembly
 26- 'includes': ['config/archs/linux-x86_64/asm/openssl-cl.gypi'],
 27+ 'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'],
 28 }],
 29 ],
 30 }
cvs diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl-cl__no__asm.gypi (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl-cl__no__asm.gypi 2019/01/10 13:02:41 1.2
+++ pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl-cl__no__asm.gypi 2019/02/24 12:18:55 1.3
@@ -1,17 +1,36 @@ @@ -1,17 +1,36 @@
1$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $ 1$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
2 2
3Add support for NetBSD. 3Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
4 4
5--- deps/openssl/openssl-cl_no_asm.gypi.orig 2018-12-10 21:19:03.000000000 +0000 5XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
6+++ deps/openssl/openssl-cl_no_asm.gypi 6
7@@ -31,6 +31,10 @@ 7--- deps/openssl/openssl-cl_no_asm.gypi.orig 2019-01-29 16:20:45.000000000 +0900
 8+++ deps/openssl/openssl-cl_no_asm.gypi 2019-02-24 10:28:59.344517509 +0900
 9@@ -1,4 +1,5 @@
 10 {
 11+ 'defines': ['OPENSSL_NO_ASM'],
 12 'conditions': [
 13 ['target_arch=="ppc" and OS=="aix"', {
 14 'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'],
 15@@ -31,6 +32,12 @@
8 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'], 16 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'],
9 }, 'target_arch=="x64" and OS=="freebsd"', { 17 }, 'target_arch=="x64" and OS=="freebsd"', {
10 'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'], 18 'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'],
11+ }, 'target_arch=="x64" and OS=="netbsd"', { 
12+ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'], 
13+ }, 'target_arch=="arm" and OS=="netbsd"', { 19+ }, 'target_arch=="arm" and OS=="netbsd"', {
14+ 'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'], 20+ 'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'],
 21+ }, 'target_arch=="arm64" and OS=="netbsd"', {
 22+ 'includes': ['config/archs/linux-aarch64/no-asm/openssl-cl.gypi'],
 23+ }, 'target_arch=="x64" and OS=="netbsd"', {
 24+ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'],
15 }, 'target_arch=="x64" and OS=="mac"', { 25 }, 'target_arch=="x64" and OS=="mac"', {
16 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi'], 26 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi'],
17 }, 'target_arch=="x64" and OS=="solaris"', { 27 }, 'target_arch=="x64" and OS=="solaris"', {
 28@@ -41,7 +48,7 @@
 29 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
 30 }, {
 31 # Other architectures don't use assembly
 32- 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
 33+ 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'],
 34 }],
 35 ],
 36 }
cvs diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl__asm.gypi (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl__asm.gypi 2019/01/10 13:02:41 1.2
+++ pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl__asm.gypi 2019/02/24 12:18:55 1.3
@@ -1,17 +1,30 @@ @@ -1,17 +1,30 @@
1$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $ 1$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
2 2
3Add support for NetBSD. 3Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
4 4
5--- deps/openssl/openssl_asm.gypi.orig 2018-12-10 21:19:04.000000000 +0000 5XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
6+++ deps/openssl/openssl_asm.gypi 6
7@@ -46,6 +46,10 @@ 7--- deps/openssl/openssl_asm.gypi.orig 2019-01-29 16:20:46.000000000 +0900
 8+++ deps/openssl/openssl_asm.gypi 2019-02-24 12:11:23.696088048 +0900
 9@@ -46,6 +46,12 @@
8 'includes': ['config/archs/linux-elf/asm/openssl.gypi'], 10 'includes': ['config/archs/linux-elf/asm/openssl.gypi'],
9 }, 'target_arch=="x64" and OS=="freebsd"', { 11 }, 'target_arch=="x64" and OS=="freebsd"', {
10 'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'], 12 'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'],
11+ }, 'target_arch=="arm" and OS=="netbsd"', { 13+ }, 'target_arch=="arm" and OS=="netbsd"', {
12+ 'includes': ['config/archs/linux-armv4/asm/openssl.gypi'], 14+ 'includes': ['config/archs/linux-armv4/asm/openssl.gypi'],
 15+ }, 'target_arch=="arm64" and OS=="netbsd"', {
 16+ 'includes': ['config/archs/linux-aarch64/asm/openssl.gypi'],
13+ }, 'target_arch=="x64" and OS=="netbsd"', { 17+ }, 'target_arch=="x64" and OS=="netbsd"', {
14+ 'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'], 18+ 'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'],
15 }, 'target_arch=="x64" and OS=="mac"', { 19 }, 'target_arch=="x64" and OS=="mac"', {
16 'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl.gypi'], 20 'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl.gypi'],
17 }, 'target_arch=="x64" and OS=="solaris"', { 21 }, 'target_arch=="x64" and OS=="solaris"', {
 22@@ -75,7 +81,7 @@
 23 'includes': ['config/archs/linux-x86_64/asm/openssl.gypi'],
 24 }, {
 25 # Other architectures don't use assembly
 26- 'includes': ['config/archs/linux-x86_64/asm/openssl.gypi'],
 27+ 'includes': ['config/archs/linux-elf/asm/openssl.gypi'],
 28 }],
 29 ],
 30 }
cvs diff -r1.2 -r1.3 pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl__no__asm.gypi (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl__no__asm.gypi 2019/01/10 13:02:41 1.2
+++ pkgsrc/lang/nodejs/patches/Attic/patch-deps_openssl_openssl__no__asm.gypi 2019/02/24 12:18:55 1.3
@@ -1,17 +1,30 @@ @@ -1,17 +1,30 @@
1$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $ 1$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
2 2
3Add support for NetBSD. 3Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
4 4
5--- deps/openssl/openssl_no_asm.gypi.orig 2018-12-10 21:19:04.000000000 +0000 5XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
6+++ deps/openssl/openssl_no_asm.gypi 6
7@@ -32,6 +32,10 @@ 7--- deps/openssl/openssl_no_asm.gypi.orig 2019-01-29 16:20:46.000000000 +0900
 8+++ deps/openssl/openssl_no_asm.gypi 2019-02-24 10:29:47.246812244 +0900
 9@@ -32,6 +32,12 @@
8 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'], 10 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
9 }, 'target_arch=="x64" and OS=="freebsd"', { 11 }, 'target_arch=="x64" and OS=="freebsd"', {
10 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'], 12 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'],
11+ }, 'target_arch=="arm" and OS=="netbsd"', { 13+ }, 'target_arch=="arm" and OS=="netbsd"', {
12+ 'includes': ['config/archs/linux-armv4/no-asm/openssl.gypi'], 14+ 'includes': ['config/archs/linux-armv4/no-asm/openssl.gypi'],
 15+ }, 'target_arch=="arm64" and OS=="netbsd"', {
 16+ 'includes': ['config/archs/linux-aarch64/no-asm/openssl.gypi'],
13+ }, 'target_arch=="x64" and OS=="netbsd"', { 17+ }, 'target_arch=="x64" and OS=="netbsd"', {
14+ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'], 18+ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'],
15 }, 'target_arch=="x64" and OS=="mac"', { 19 }, 'target_arch=="x64" and OS=="mac"', {
16 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi'], 20 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi'],
17 }, 'target_arch=="x64" and OS=="solaris"', { 21 }, 'target_arch=="x64" and OS=="solaris"', {
 22@@ -42,7 +48,7 @@
 23 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
 24 }, {
 25 # Other architectures don't use assembly
 26- 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
 27+ 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
 28 }],
 29 ],
 30 }