3 files changed, 30 insertions, 1 deletions

diff --git a/www/node10/Makefile b/www/node10/Makefile
index 78784effacfe..75f64399082a 100644
--- a/www/node10/Makefile
+++ b/www/node10/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	node
 PORTVERSION=	10.20.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	10
diff --git a/www/node10/files/patch-common.gypi b/www/node10/files/patch-common.gypi
new file mode 100644
index 000000000000..3f24b48b797b
--- /dev/null
+++ b/www/node10/files/patch-common.gypi
@@ -0,0 +1,18 @@
+--- common.gypi.orig	2020-06-08 21:52:35 UTC
++++ common.gypi
+@@ -509,15 +509,6 @@
+         'libraries': [ '-lelf' ],
+       }],
+       ['OS=="freebsd"', {
+-        'conditions': [
+-          ['"0" < llvm_version < "4.0"', {
+-            # Use this flag because on FreeBSD std::pairs copy constructor is non-trivial.
+-            # Doesn't apply to llvm 4.0 (FreeBSD 11.1) or later.
+-            # Refs: https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html
+-            # Refs: https://svnweb.freebsd.org/ports/head/www/node/Makefile?revision=444555&view=markup
+-            'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ],
+-          }],
+-        ],
+         'ldflags': [
+           '-Wl,--export-dynamic',
+         ],
diff --git a/www/node10/files/patch-configure.py b/www/node10/files/patch-configure.py
new file mode 100644
index 000000000000..53c0e4dc9bcb
--- /dev/null
+++ b/www/node10/files/patch-configure.py
@@ -0,0 +1,11 @@
+--- configure.py.orig	2020-06-08 21:39:42 UTC
++++ configure.py
+@@ -705,7 +705,7 @@ def get_nasm_version(asm):
+ 
+ def get_llvm_version(cc):
+   return get_version_helper(
+-    cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([3-9]\.[0-9]+)")
++    cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([0-9]+\.[0-9]+)")
+ 
+ def get_xcode_version(cc):
+   return get_version_helper(