From 30d516ae58660f6f5f06a3fe5b2a89b1ddf33456 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 5 May 2021 17:48:41 +0200
Subject: [PATCH] nodejs16: bump to release

---
 ....0.0~git.recipe => nodejs16-16.1.0.recipe} | 11 +++++-----
 ....0~git.patchset => nodejs-16.1.0.patchset} | 22 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)
 rename net-libs/nodejs/{nodejs16-16.0.0~git.recipe => nodejs16-16.1.0.recipe} (87%)
 rename net-libs/nodejs/patches/{nodejs-16.0.0~git.patchset => nodejs-16.1.0.patchset} (97%)

diff --git a/net-libs/nodejs/nodejs16-16.0.0~git.recipe b/net-libs/nodejs/nodejs16-16.1.0.recipe
similarity index 87%
rename from net-libs/nodejs/nodejs16-16.0.0~git.recipe
rename to net-libs/nodejs/nodejs16-16.1.0.recipe
index 9e63e79cf..9c52de5f6 100644
--- a/net-libs/nodejs/nodejs16-16.0.0~git.recipe
+++ b/net-libs/nodejs/nodejs16-16.1.0.recipe
@@ -8,14 +8,13 @@ HOMEPAGE="https://nodejs.org/"
 COPYRIGHT="2006-2019 The Node.js Foundation"
 LICENSE="BSD (2-clause)"
 REVISION="1"
-gitCommit="a9cdeeda880a56de6dad10b24b3bfa45e2cccb5d"
-SOURCE_URI="https://github.com/nodejs/node/archive/$gitCommit.tar.gz"
-SOURCE_DIR="node-$gitCommit"
-CHECKSUM_SHA256="ced2e195341fadda87d7e6d8ef92cf1028080fb53275d211c81805504b433cbc"
+SOURCE_URI="https://github.com/nodejs/node/archive/v$portVersion/nodejs-$portVersion.tar.gz"
+SOURCE_DIR="node-$portVersion"
+CHECKSUM_SHA256="c82a47f858e63b2267a8783271d69626e3959884a5c84d152255b496c403c978"
 PATCHES="nodejs-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	nodejs16$secondaryArchSuffix = $portVersion
diff --git a/net-libs/nodejs/patches/nodejs-16.0.0~git.patchset b/net-libs/nodejs/patches/nodejs-16.1.0.patchset
similarity index 97%
rename from net-libs/nodejs/patches/nodejs-16.0.0~git.patchset
rename to net-libs/nodejs/patches/nodejs-16.1.0.patchset
index 4223fc593..751093ced 100644
--- a/net-libs/nodejs/patches/nodejs-16.0.0~git.patchset
+++ b/net-libs/nodejs/patches/nodejs-16.1.0.patchset
@@ -1,11 +1,11 @@
-From 7b6a3a86db18f55a9676dd5c62088f61af7cdfd2 Mon Sep 17 00:00:00 2001
+From a881d03bcf3d4db7cc66ec9ffdbb27a544cbcf33 Mon Sep 17 00:00:00 2001
 From: Calvin Hill <calvin@hakobaito.co.uk>
 Date: Wed, 22 May 2019 11:23:37 +0000
 Subject: Initial Haiku support for Node.js
 
 
 diff --git a/common.gypi b/common.gypi
-index 79a22ac..cf2ca6c 100644
+index be7c06d..f4d6598 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -258,6 +258,9 @@
@@ -74,7 +74,7 @@ index 79a22ac..cf2ca6c 100644
          # `OPENSSL_THREADS` is defined via GYP for openSSL for all architectures.
          'defines': [
 diff --git a/configure.py b/configure.py
-index b526507..6d96881 100755
+index 6798b4a..2678027 100755
 --- a/configure.py
 +++ b/configure.py
 @@ -45,7 +45,7 @@ from gyp_node import run_gyp
@@ -84,7 +84,7 @@ index b526507..6d96881 100755
 -            'android', 'aix', 'cloudabi')
 +            'android', 'aix', 'cloudabi', 'haiku')
  valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
-               'ppc64', 'x32','x64', 'x86', 'x86_64', 's390x')
+               'ppc64', 'x32','x64', 'x86', 'x86_64', 's390x', 'riscv64')
  valid_arm_float_abi = ('soft', 'softfp', 'hard')
 diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-cl.gypi
 index 76984d4..eda4459 100644
@@ -155,7 +155,7 @@ index d866630..52558d8 100644
        'cflags': ['-Wno-missing-field-initializers',],
        'defines': [
 diff --git a/node.gypi b/node.gypi
-index dde4f83..3ea543c 100644
+index a3c9279..ada02d5 100644
 --- a/node.gypi
 +++ b/node.gypi
 @@ -256,6 +256,16 @@
@@ -233,10 +233,10 @@ index 2bbb56a..ff3c466 100644
  
  
 diff --git a/src/node_report.cc b/src/node_report.cc
-index 13f87b1..de4455e 100644
+index 0144d22..34e481b 100644
 --- a/src/node_report.cc
 +++ b/src/node_report.cc
-@@ -688,16 +688,16 @@ static void PrintSystemInformation(JSONWriter* writer) {
+@@ -718,16 +718,16 @@ static void PrintSystemInformation(JSONWriter* writer) {
      {"core_file_size_blocks", RLIMIT_CORE},
      {"data_seg_size_kbytes", RLIMIT_DATA},
      {"file_size_blocks", RLIMIT_FSIZE},
@@ -273,7 +273,7 @@ index 9734836..94e4d8c 100644
 2.30.0
 
 
-From 5c88a61428cba2e630b3152fc3f3a82429a8bac3 Mon Sep 17 00:00:00 2001
+From 19f5ca5600488d78311515fd68bd7b74145f1f15 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 27 Mar 2021 14:01:44 +0100
 Subject: Haiku v8 patches
@@ -583,7 +583,7 @@ index 8ca9089..7615f31 100755
 2.30.0
 
 
-From d41e11ff7106444c7e08d50aaa96fd505bd2025f Mon Sep 17 00:00:00 2001
+From 54f5215d55d1e67ddb25419182140f36df8d8b8b Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 27 Mar 2021 18:23:32 +0100
 Subject: v8 gyp build for Haiku
@@ -606,10 +606,10 @@ index b21bf1d..00fd2cf 100644
          'is_android': 1,
        }, {
 diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
-index 2b2d423..bc95ecd 100644
+index 377e12d..ba3eba9 100644
 --- a/tools/v8_gypfiles/v8.gyp
 +++ b/tools/v8_gypfiles/v8.gyp
-@@ -946,6 +946,17 @@
+@@ -956,6 +956,17 @@
              '<(V8_ROOT)/src/base/platform/platform-fuchsia.cc',
            ]
          }],