4 files changed, 33 insertions, 22 deletions
diff --git a/devel/jsonnet/files/patch-CMakeLists.txt b/devel/jsonnet/files/patch-CMakeLists.txt
index 49c35302e18c..70cd698033db 100644
--- a/devel/jsonnet/files/patch-CMakeLists.txt
+++ b/devel/jsonnet/files/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
---- CMakeLists.txt.orig	2021-12-21 17:55:49 UTC
+--- CMakeLists.txt.orig	2025-05-07 12:28:56 UTC
 +++ CMakeLists.txt
-@@ -121,7 +121,6 @@ endif()
+@@ -122,7 +122,6 @@ add_subdirectory(third_party/md5)
  add_subdirectory(include)
  add_subdirectory(stdlib)
  add_subdirectory(third_party/md5)
--add_subdirectory(third_party/rapidyaml/rapidyaml ryml)
+-add_subdirectory(third_party/rapidyaml)
  add_subdirectory(core)
  add_subdirectory(cpp)
  add_subdirectory(cmd)
diff --git a/devel/jsonnet/files/patch-core_CMakeLists.txt b/devel/jsonnet/files/patch-core_CMakeLists.txt
index 5550a634f3bc..9f38751e9462 100644
--- a/devel/jsonnet/files/patch-core_CMakeLists.txt
+++ b/devel/jsonnet/files/patch-core_CMakeLists.txt
@@ -1,6 +1,6 @@
---- core/CMakeLists.txt.orig	2022-01-06 06:59:54 UTC
+--- core/CMakeLists.txt.orig	2025-05-07 12:28:56 UTC
 +++ core/CMakeLists.txt
-@@ -30,7 +30,7 @@ set(LIBJSONNET_SOURCE
+@@ -32,7 +32,7 @@ add_dependencies(libjsonnet md5 stdlib)
  
  add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
  add_dependencies(libjsonnet md5 stdlib)
diff --git a/devel/jsonnet/files/patch-core_vm.cpp b/devel/jsonnet/files/patch-core_vm.cpp
index 484824c11a9b..38596e332b44 100644
--- a/devel/jsonnet/files/patch-core_vm.cpp
+++ b/devel/jsonnet/files/patch-core_vm.cpp
@@ -1,22 +1,13 @@
---- core/vm.cpp.orig	2023-04-17 19:02:16 UTC
+--- core/vm.cpp.orig	2025-05-07 12:28:56 UTC
 +++ core/vm.cpp
-@@ -23,7 +23,7 @@ limitations under the License.
- 
- #include "desugarer.h"
- #include "json.h"
--#include "json.hpp"
-+#include "nlohmann/json.hpp"
- #include "md5.h"
- #include "parser.h"
- #include "ryml_std.hpp" // include this before any other ryml header
-@@ -1710,6 +1710,10 @@ class Interpreter {
-             } break;
+@@ -1726,6 +1726,10 @@ class Interpreter {
+                 abort();
+             }
  
-             case json::value_t::discarded: {
++            case json::value_t::binary: {
 +                abort();
 +            }
 +
-+            case json::value_t::binary: {
-                 abort();
-             }
-         }
+             default: {
+                 // Newer nlohmann json.hpp (from v3.8.0 https://github.com/nlohmann/json/pull/1662)
+                 // add a `value_t::binary` type, used when dealing with some JSON-adjacent binary
diff --git a/devel/jsonnet/files/patch-third__party_rapidyaml_ryml__all.hpp b/devel/jsonnet/files/patch-third__party_rapidyaml_ryml__all.hpp
new file mode 100644
index 000000000000..c423f235d94e
--- /dev/null
+++ b/devel/jsonnet/files/patch-third__party_rapidyaml_ryml__all.hpp
@@ -0,0 +1,20 @@
+--- third_party/rapidyaml/ryml_all.hpp.orig	2025-07-26 11:37:10 UTC
++++ third_party/rapidyaml/ryml_all.hpp
+@@ -20036,7 +20036,7 @@ constexpr const size_t char_traits< wchar_t >::num_whi
+ #if defined(C4_POSIX) || defined(C4_IOS) || defined(C4_MACOS) || defined(C4_ARM)
+ #   include <errno.h>
+ #endif
+-#if defined(C4_ARM)
++#if defined(C4_ARM) || defined(__FreeBSD__)
+ #   include <malloc.h>
+ #endif
+ 
+@@ -21407,7 +21407,7 @@ RYML_EXPORT int version_patch();
+ #endif /* C4_YML_EXPORT_HPP_ */
+ 
+ 
+-#if defined(C4_MSVC) || defined(C4_MINGW)
++#if defined(C4_MSVC) || defined(C4_MINGW) || defined(__FreeBSD__)
+ //included above:
+ //#include <malloc.h>
+ #else