diff options
Diffstat (limited to 'devel/jsonnet')
| -rw-r--r-- | devel/jsonnet/Makefile | 13 | ||||
| -rw-r--r-- | devel/jsonnet/distinfo | 8 | ||||
| -rw-r--r-- | devel/jsonnet/files/patch-CMakeLists.txt | 6 | ||||
| -rw-r--r-- | devel/jsonnet/files/patch-core_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | devel/jsonnet/files/patch-core_vm.cpp | 25 | ||||
| -rw-r--r-- | devel/jsonnet/files/patch-third__party_rapidyaml_ryml__all.hpp | 20 | ||||
| -rw-r--r-- | devel/jsonnet/pkg-plist | 4 |
7 files changed, 51 insertions, 29 deletions
diff --git a/devel/jsonnet/Makefile b/devel/jsonnet/Makefile index ba3db87e5c1d..35f91d5a0c23 100644 --- a/devel/jsonnet/Makefile +++ b/devel/jsonnet/Makefile @@ -1,7 +1,13 @@ PORTNAME= jsonnet DISTVERSIONPREFIX= v -DISTVERSION= 0.20.0 +DISTVERSION= 0.21.0 CATEGORIES= devel +# It is necessary to synchronize RY_VERSION with devel/rapidyaml port: +RY_VERSION= 0.9.0 +RY_FILE= rapidyaml-${RY_VERSION}.hpp +MASTER_SITES= https://github.com/biojppm/rapidyaml/releases/download/v${RY_VERSION}/:rapidyaml +DISTFILES+= ${RY_FILE}:rapidyaml +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gasol.wu@gmail.com COMMENT= JSON data templating language @@ -25,6 +31,9 @@ CMAKE_ON= BUILD_JSONNET BUILD_JSONNETFMT BUILD_STATIC_LIBS \ BUILD_SHARED_BINARIES USE_SYSTEM_JSON CMAKE_OFF= BUILD_TESTS -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= VERSION=${DISTVERSION} + +post-extract: + ${CP} ${DISTDIR}/${RY_FILE} ${WRKSRC}/third_party/rapidyaml/ryml_all.hpp .include <bsd.port.mk> diff --git a/devel/jsonnet/distinfo b/devel/jsonnet/distinfo index 77f96212e93b..79f4f92c0712 100644 --- a/devel/jsonnet/distinfo +++ b/devel/jsonnet/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1696949293 -SHA256 (google-jsonnet-v0.20.0_GH0.tar.gz) = 77bd269073807731f6b11ff8d7c03e9065aafb8e4d038935deb388325e52511b -SIZE (google-jsonnet-v0.20.0_GH0.tar.gz) = 22481277 +TIMESTAMP = 1753500000 +SHA256 (rapidyaml-0.9.0.hpp) = 07912e0a8b7da287c143b374e03879caec2dd4f8f011f5e8834aaf558d323ab8 +SIZE (rapidyaml-0.9.0.hpp) = 1587343 +SHA256 (google-jsonnet-v0.21.0_GH0.tar.gz) = a12ebca72e43e7061ffe4ef910e572b95edd7778a543d6bf85f6355bd290300e +SIZE (google-jsonnet-v0.21.0_GH0.tar.gz) = 22128398 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 diff --git a/devel/jsonnet/pkg-plist b/devel/jsonnet/pkg-plist index d34abb2527cb..a32a78272bf8 100644 --- a/devel/jsonnet/pkg-plist +++ b/devel/jsonnet/pkg-plist @@ -6,8 +6,8 @@ include/libjsonnet_fmt.h lib/libjsonnet++.a lib/libjsonnet++.so lib/libjsonnet++.so.0 -lib/libjsonnet++.so.%%PORTVERSION%% +lib/libjsonnet++.so.%%VERSION%%-rc2 lib/libjsonnet.a lib/libjsonnet.so lib/libjsonnet.so.0 -lib/libjsonnet.so.%%PORTVERSION%% +lib/libjsonnet.so.%%VERSION%% |