- 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

12 files changed, 244 insertions, 45 deletions

diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile
index fc1ffe8cfc0..db05b272a37 100644
--- a/lang/nodejs/Makefile
+++ b/lang/nodejs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.154 2019/01/31 13:38:49 nia Exp $
+# $NetBSD: Makefile,v 1.155 2019/02/24 12:18:55 rin Exp $
 
 DISTNAME=	node-v10.15.1
+PKGREVISION=	1
 
 USE_LANGUAGES=	c gnu++14
 
diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo
index 138950053f5..ca908d2fbfa 100644
--- a/lang/nodejs/distinfo
+++ b/lang/nodejs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.144 2019/01/31 08:46:37 adam Exp $
+$NetBSD: distinfo,v 1.145 2019/02/24 12:18:55 rin Exp $
 
 SHA1 (node-v10.15.1.tar.gz) = ff5b314bf02dd8ca021567e033b480edc9baebe6
 RMD160 (node-v10.15.1.tar.gz) = 5ed37484dacf23c7850012ff06e18c9bd4b9070c
@@ -7,12 +7,16 @@ Size (node-v10.15.1.tar.gz) = 36328287 bytes
 SHA1 (patch-common.gypi) = de37949f38d9bd39a18b59d59ec74e528bd323ac
 SHA1 (patch-deps_cares_cares.gyp) = 2235eb44bc984fa2e745fdf1786f1ae6de6ef80f
 SHA1 (patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi) = f92f5547728cf67de5ccfd652f23cc4ab8f5b207
-SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = c43c7732164a107d7a294cac040708970ef0a212
-SHA1 (patch-deps_openssl_config_opensslconf__no-asm.h) = 9fd4acc86deb7da00cb501654713dfa2b26f412e
-SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = 3254dd37670faa19be8ac51e8195e30cc27ea42f
-SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = 86592025ab1d04dbef23d1d2725196e5d5b6fc4e
-SHA1 (patch-deps_openssl_openssl__asm.gypi) = 8d58f6177cc7b5b58f8ed1a69121da2685195d78
-SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = 588d5943c1ef24cafd0be182e080d67747a941d2
+SHA1 (patch-deps_openssl_config_bn__conf__asm.h) = a4cf4f0771c96fb09a00b76b25d35000d65ef92f
+SHA1 (patch-deps_openssl_config_bn__conf__no-asm.h) = 5b90403407f09f6d28729e2cff8fccc361145d0d
+SHA1 (patch-deps_openssl_config_dso__conf__asm.h) = ae8285306fd165dc881fd8c6783cf0977d73371a
+SHA1 (patch-deps_openssl_config_dso__conf__no-asm.h) = 7ea313e8f9ba74e9de4ea559f6fc993cc0454882
+SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = e9bb26b66431595d13d4173d3ed5f3e583bd009f
+SHA1 (patch-deps_openssl_config_opensslconf__no-asm.h) = 062f0227014df2d6cc45c84c9f348494c2f644e2
+SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = addb5837ea7b8ea2732cd2f5aaa8a24289b1199f
+SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = 73368f336dbe500e45f0ba6bbb7656416a27b294
+SHA1 (patch-deps_openssl_openssl__asm.gypi) = b85e1f5a9f862d469afcb36ff6e1ad202bea704a
+SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = b549ea34f51e26669a41a64da0db10e92f0d0a99
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
 SHA1 (patch-deps_uv_src_unix_netbsd.c) = c19ff4024f828018364793d9dea013c991cfb93f
 SHA1 (patch-deps_v8_src_arm_assembler-arm-inl.h) = 56a5d6539d31e19673ef61cc91f003109c69dc29
diff --git a/lang/nodejs/patches/patch-deps_openssl_config_bn__conf__asm.h b/lang/nodejs/patches/patch-deps_openssl_config_bn__conf__asm.h
new file mode 100644
index 00000000000..fc13e6f2d1b
--- /dev/null
+++ b/lang/nodejs/patches/patch-deps_openssl_config_bn__conf__asm.h
@@ -0,0 +1,32 @@
+$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"
diff --git a/lang/nodejs/patches/patch-deps_openssl_config_bn__conf__no-asm.h b/lang/nodejs/patches/patch-deps_openssl_config_bn__conf__no-asm.h
new file mode 100644
index 00000000000..b72a0b39f52
--- /dev/null
+++ b/lang/nodejs/patches/patch-deps_openssl_config_bn__conf__no-asm.h
@@ -0,0 +1,32 @@
+$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"
diff --git a/lang/nodejs/patches/patch-deps_openssl_config_dso__conf__asm.h b/lang/nodejs/patches/patch-deps_openssl_config_dso__conf__asm.h
new file mode 100644
index 00000000000..6d3a77c9fe6
--- /dev/null
+++ b/lang/nodejs/patches/patch-deps_openssl_config_dso__conf__asm.h
@@ -0,0 +1,32 @@
+$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"
diff --git a/lang/nodejs/patches/patch-deps_openssl_config_dso__conf__no-asm.h b/lang/nodejs/patches/patch-deps_openssl_config_dso__conf__no-asm.h
new file mode 100644
index 00000000000..f5b4efce7c7
--- /dev/null
+++ b/lang/nodejs/patches/patch-deps_openssl_config_dso__conf__no-asm.h
@@ -0,0 +1,32 @@
+$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"
diff --git a/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h
index 8afa29601db..5c3f9316383 100644
--- a/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h
+++ b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h
@@ -1,18 +1,21 @@
-$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.3 2019/01/21 11:00:45 ryoon Exp $
+$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.4 2019/02/24 12:18:55 rin Exp $
 
-Add support for NetBSD.
+Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
---- deps/openssl/config/opensslconf_asm.h.orig	2018-12-26 05:26:13.000000000 +0000
-+++ deps/openssl/config/opensslconf_asm.h
-@@ -96,7 +96,7 @@
+--- deps/openssl/config/opensslconf_asm.h.orig	2019-01-29 16:20:45.000000000 +0900
++++ deps/openssl/config/opensslconf_asm.h	2019-02-24 09:05:18.803688546 +0900
+@@ -96,9 +96,9 @@
  # include "./archs/linux-x32/asm/include/openssl/opensslconf.h"
  #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
  # include "./archs/linux-x86_64/asm/include/openssl/opensslconf.h"
 -#elif defined(OPENSSL_LINUX) && defined(__arm__)
 +#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
  # include "./archs/linux-armv4/asm/include/openssl/opensslconf.h"
- #elif defined(OPENSSL_LINUX) && defined(__aarch64__)
+-#elif defined(OPENSSL_LINUX) && defined(__aarch64__)
++#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__)
  # include "./archs/linux-aarch64/asm/include/openssl/opensslconf.h"
+ #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__)
+ # include "./archs/darwin-i386-cc/asm/include/openssl/opensslconf.h"
 @@ -108,9 +108,7 @@
  # include "./archs/VC-WIN32/asm/include/openssl/opensslconf.h"
  #elif defined(_WIN32) && defined(_M_X64)
diff --git a/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h
index b00d672feda..876a47b1045 100644
--- a/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h
+++ b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h
@@ -1,26 +1,31 @@
-$NetBSD: patch-deps_openssl_config_opensslconf__no-asm.h,v 1.2 2019/01/10 13:02:41 ryoon Exp $
+$NetBSD: patch-deps_openssl_config_opensslconf__no-asm.h,v 1.3 2019/02/24 12:18:55 rin Exp $
 
-Add support for NetBSD.
+Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
---- deps/openssl/config/opensslconf_no-asm.h.orig	2018-12-10 21:19:03.000000000 +0000
-+++ deps/openssl/config/opensslconf_no-asm.h
-@@ -4,7 +4,7 @@
+--- deps/openssl/config/opensslconf_no-asm.h.orig	2019-01-29 16:20:45.000000000 +0900
++++ deps/openssl/config/opensslconf_no-asm.h	2019-02-24 10:26:51.159213732 +0900
+@@ -4,9 +4,9 @@
  # include "./archs/linux-x32/no-asm/include/openssl/opensslconf.h"
  #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
  # include "./archs/linux-x86_64/no-asm/include/openssl/opensslconf.h"
 -#elif defined(OPENSSL_LINUX) && defined(__arm__)
 +#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
  # include "./archs/linux-armv4/no-asm/include/openssl/opensslconf.h"
- #elif defined(OPENSSL_LINUX) && defined(__aarch64__)
+-#elif defined(OPENSSL_LINUX) && defined(__aarch64__)
++#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__)
  # include "./archs/linux-aarch64/no-asm/include/openssl/opensslconf.h"
-@@ -16,9 +16,9 @@
+ #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__)
+ # include "./archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h"
+@@ -16,9 +16,10 @@
  # include "./archs/VC-WIN32/no-asm/include/openssl/opensslconf.h"
  #elif defined(_WIN32) && defined(_M_X64)
  # include "./archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h"
 -#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
-+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__)
- # include "./archs/BSD-x86/no-asm/include/openssl/opensslconf.h"
+-# include "./archs/BSD-x86/no-asm/include/openssl/opensslconf.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/include/openssl/opensslconf.h"
 +#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__)
  # include "./archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h"
  #elif defined(__sun) && defined(__i386__)
diff --git a/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi b/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi
index f6297f0013d..3a1ea17c8a6 100644
--- a/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi
+++ b/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi
@@ -1,17 +1,30 @@
-$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $
+$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
 
-Add support for NetBSD.
+Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
---- deps/openssl/openssl-cl_asm.gypi.orig	2018-12-10 21:19:03.000000000 +0000
-+++ deps/openssl/openssl-cl_asm.gypi
-@@ -31,6 +31,10 @@
+XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
+
+--- deps/openssl/openssl-cl_asm.gypi.orig	2019-01-29 16:20:45.000000000 +0900
++++ deps/openssl/openssl-cl_asm.gypi	2019-02-24 10:28:36.290301337 +0900
+@@ -31,6 +31,12 @@
        'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
        'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'],
 +    }, 'target_arch=="arm" and OS=="netbsd"', {
 +      'includes': ['config/archs/linux-armv4/asm/openssl-cl.gypi'],
++    }, 'target_arch=="arm64" and OS=="netbsd"', {
++      'includes': ['config/archs/linux-aarch64/asm/openssl-cl.gypi'],
 +    }, 'target_arch=="x64" and OS=="netbsd"', {
 +      'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="mac"', {
        'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="solaris"', {
+@@ -41,7 +47,7 @@
+       'includes': ['config/archs/linux-x86_64/asm/openssl-cl.gypi'],
+     }, {
+       # Other architectures don't use assembly
+-      'includes': ['config/archs/linux-x86_64/asm/openssl-cl.gypi'],
++      'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'],
+     }],
+   ],
+ }
diff --git a/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi b/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi
index fa93642d80d..7eb7b30af98 100644
--- a/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi
+++ b/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi
@@ -1,17 +1,36 @@
-$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $
+$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
 
-Add support for NetBSD.
+Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
---- deps/openssl/openssl-cl_no_asm.gypi.orig	2018-12-10 21:19:03.000000000 +0000
-+++ deps/openssl/openssl-cl_no_asm.gypi
-@@ -31,6 +31,10 @@
+XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
+
+--- deps/openssl/openssl-cl_no_asm.gypi.orig	2019-01-29 16:20:45.000000000 +0900
++++ deps/openssl/openssl-cl_no_asm.gypi	2019-02-24 10:28:59.344517509 +0900
+@@ -1,4 +1,5 @@
+ {
++  'defines': ['OPENSSL_NO_ASM'],
+   'conditions': [
+     ['target_arch=="ppc" and OS=="aix"', {
+       'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'],
+@@ -31,6 +32,12 @@
        'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
        'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'],
-+    }, 'target_arch=="x64" and OS=="netbsd"', {
-+      'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'],
 +    }, 'target_arch=="arm" and OS=="netbsd"', {
 +      'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'],
++    }, 'target_arch=="arm64" and OS=="netbsd"', {
++      'includes': ['config/archs/linux-aarch64/no-asm/openssl-cl.gypi'],
++    }, 'target_arch=="x64" and OS=="netbsd"', {
++      'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="mac"', {
        'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="solaris"', {
+@@ -41,7 +48,7 @@
+       'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
+     }, {
+       # Other architectures don't use assembly
+-      'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
++      'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'],
+     }],
+   ],
+ }
diff --git a/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi b/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi
index 8d36251fff8..78068ec5dc8 100644
--- a/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi
+++ b/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi
@@ -1,17 +1,30 @@
-$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $
+$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
 
-Add support for NetBSD.
+Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
---- deps/openssl/openssl_asm.gypi.orig	2018-12-10 21:19:04.000000000 +0000
-+++ deps/openssl/openssl_asm.gypi
-@@ -46,6 +46,10 @@
+XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
+
+--- deps/openssl/openssl_asm.gypi.orig	2019-01-29 16:20:46.000000000 +0900
++++ deps/openssl/openssl_asm.gypi	2019-02-24 12:11:23.696088048 +0900
+@@ -46,6 +46,12 @@
        'includes': ['config/archs/linux-elf/asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
        'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'],
 +    }, 'target_arch=="arm" and OS=="netbsd"', {
 +      'includes': ['config/archs/linux-armv4/asm/openssl.gypi'],
++    }, 'target_arch=="arm64" and OS=="netbsd"', {
++      'includes': ['config/archs/linux-aarch64/asm/openssl.gypi'],
 +    }, 'target_arch=="x64" and OS=="netbsd"', {
 +      'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="mac"', {
        'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="solaris"', {
+@@ -75,7 +81,7 @@
+       'includes': ['config/archs/linux-x86_64/asm/openssl.gypi'],
+     }, {
+       # Other architectures don't use assembly
+-      'includes': ['config/archs/linux-x86_64/asm/openssl.gypi'],
++      'includes': ['config/archs/linux-elf/asm/openssl.gypi'],
+     }],
+   ],
+ }
diff --git a/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi b/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi
index a9f950395af..7f932422cb8 100644
--- a/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi
+++ b/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi
@@ -1,17 +1,30 @@
-$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $
+$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.3 2019/02/24 12:18:55 rin Exp $
 
-Add support for NetBSD.
+Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs)
 
---- deps/openssl/openssl_no_asm.gypi.orig	2018-12-10 21:19:04.000000000 +0000
-+++ deps/openssl/openssl_no_asm.gypi
-@@ -32,6 +32,10 @@
+XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports)
+
+--- deps/openssl/openssl_no_asm.gypi.orig	2019-01-29 16:20:46.000000000 +0900
++++ deps/openssl/openssl_no_asm.gypi	2019-02-24 10:29:47.246812244 +0900
+@@ -32,6 +32,12 @@
        'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
        'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'],
 +    }, 'target_arch=="arm" and OS=="netbsd"', {
 +      'includes': ['config/archs/linux-armv4/no-asm/openssl.gypi'],
++    }, 'target_arch=="arm64" and OS=="netbsd"', {
++      'includes': ['config/archs/linux-aarch64/no-asm/openssl.gypi'],
 +    }, 'target_arch=="x64" and OS=="netbsd"', {
 +      'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="mac"', {
        'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="solaris"', {
+@@ -42,7 +48,7 @@
+       'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
+     }, {
+       # Other architectures don't use assembly
+-      'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
++      'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
+     }],
+   ],
+ }