Date: Sat, 8 Jan 2022 13:23:19 GMT From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 895728165688 - main - devel/jsonnet: Update to 0.18.0 Message-ID: <202201081323.208DNJXs041810@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=895728165688246e1d7729c42679e9ee31ed3d70 commit 895728165688246e1d7729c42679e9ee31ed3d70 Author: Gasol Wu <gasol.wu@gmail.com> AuthorDate: 2022-01-08 13:08:55 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2022-01-08 13:21:54 +0000 devel/jsonnet: Update to 0.18.0 ChangeLog: https://github.com/google/jsonnet/releases/tag/v0.18.0 PR: 260998 Reported by: gasol.wu@gmail.com (maintainer) --- devel/jsonnet/Makefile | 9 ++++++--- devel/jsonnet/distinfo | 6 +++--- devel/jsonnet/files/patch-CMakeLists.txt | 10 ++++++++++ devel/jsonnet/files/patch-core_CMakeLists.txt | 11 +++++++++++ devel/jsonnet/files/patch-core_vm.cpp | 4 ++-- devel/jsonnet/pkg-descr | 2 +- 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/devel/jsonnet/Makefile b/devel/jsonnet/Makefile index f143c2c69420..2ce38c28f924 100644 --- a/devel/jsonnet/Makefile +++ b/devel/jsonnet/Makefile @@ -2,7 +2,7 @@ PORTNAME= jsonnet DISTVERSIONPREFIX= v -DISTVERSION= 0.17.0 +DISTVERSION= 0.18.0 CATEGORIES= devel MAINTAINER= gasol.wu@gmail.com @@ -12,15 +12,18 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nlohmann-json>=3.6.1:devel/nlohmann-json +LIB_DEPENDS= libc4core.so:devel/c4core \ + libryml.so:devel/rapidyaml -USES= compiler:c++11-lib cmake +USES= compiler:c++11-lib cmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= google USE_LDCONFIG= yes -CMAKE_ON= BUILD_JSONNET BUILD_JSONNETFMT BUILD_STATIC_LIBS BUILD_SHARED_BINARIES USE_SYSTEM_JSON +CMAKE_ON= BUILD_JSONNET BUILD_JSONNETFMT BUILD_STATIC_LIBS \ + BUILD_SHARED_BINARIES USE_SYSTEM_JSON CMAKE_OFF= BUILD_TESTS PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/devel/jsonnet/distinfo b/devel/jsonnet/distinfo index b5c561aee0db..6b336c0ba352 100644 --- a/devel/jsonnet/distinfo +++ b/devel/jsonnet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623453189 -SHA256 (google-jsonnet-v0.17.0_GH0.tar.gz) = 076b52edf888c01097010ad4299e3b2e7a72b60a41abbc65af364af1ed3c8dbe -SIZE (google-jsonnet-v0.17.0_GH0.tar.gz) = 21854054 +TIMESTAMP = 1641409936 +SHA256 (google-jsonnet-v0.18.0_GH0.tar.gz) = 85c240c4740f0c788c4d49f9c9c0942f5a2d1c2ae58b2c71068107bc80a3ced4 +SIZE (google-jsonnet-v0.18.0_GH0.tar.gz) = 22472162 diff --git a/devel/jsonnet/files/patch-CMakeLists.txt b/devel/jsonnet/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..49c35302e18c --- /dev/null +++ b/devel/jsonnet/files/patch-CMakeLists.txt @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2021-12-21 17:55:49 UTC ++++ CMakeLists.txt +@@ -121,7 +121,6 @@ endif() + add_subdirectory(include) + add_subdirectory(stdlib) + add_subdirectory(third_party/md5) +-add_subdirectory(third_party/rapidyaml/rapidyaml ryml) + 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 new file mode 100644 index 000000000000..5550a634f3bc --- /dev/null +++ b/devel/jsonnet/files/patch-core_CMakeLists.txt @@ -0,0 +1,11 @@ +--- core/CMakeLists.txt.orig 2022-01-06 06:59:54 UTC ++++ core/CMakeLists.txt +@@ -30,7 +30,7 @@ set(LIBJSONNET_SOURCE + + add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet md5 stdlib) +-target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) ++target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml c4core) + + file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF + REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+") diff --git a/devel/jsonnet/files/patch-core_vm.cpp b/devel/jsonnet/files/patch-core_vm.cpp index ad918c4d2b69..29f1ae59a6d1 100644 --- a/devel/jsonnet/files/patch-core_vm.cpp +++ b/devel/jsonnet/files/patch-core_vm.cpp @@ -1,4 +1,4 @@ ---- core/vm.cpp.orig 2021-06-20 03:31:11 UTC +--- core/vm.cpp.orig 2021-12-21 17:55:49 UTC +++ core/vm.cpp @@ -23,7 +23,7 @@ limitations under the License. @@ -8,4 +8,4 @@ +#include "nlohmann/json.hpp" #include "md5.h" #include "parser.h" - #include "state.h" + #include "ryml_std.hpp" // include this before any other ryml header diff --git a/devel/jsonnet/pkg-descr b/devel/jsonnet/pkg-descr index 2131938a5462..de6876f413ef 100644 --- a/devel/jsonnet/pkg-descr +++ b/devel/jsonnet/pkg-descr @@ -4,4 +4,4 @@ the same benefit to structured data that templating languages bring to plain text. The example below illustrates a few features -- referring to another part of the structure, overriding object fields, and string operations. -WWW: https://github.com/google/jsonnet +WWW: https://jsonnet.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201081323.208DNJXs041810>