Attachment #230808 for bug #260998

Lines 2-8 Link Here

(-)b/devel/jsonnet/Makefile (-2 / +4 lines)
2		2
3	PORTNAME= jsonnet	3	PORTNAME= jsonnet
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.17.0	5	DISTVERSION= 0.18.0
6	CATEGORIES= devel	6	CATEGORIES= devel
7		7
8	MAINTAINER= gasol.wu@gmail.com	8	MAINTAINER= gasol.wu@gmail.com
Lines 12-19 LICENSE= APACHE20 Link Here
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	BUILD_DEPENDS= nlohmann-json>=3.6.1:devel/nlohmann-json	14	BUILD_DEPENDS= nlohmann-json>=3.6.1:devel/nlohmann-json
		15	LIB_DEPENDS= libryml.so:devel/rapidyaml \
		16	libc4core.so:devel/c4core
15		17
16	USES= compiler:c++11-lib cmake	18	USES= compiler:c++11-lib cmake localbase:ldflags
17		19
18	USE_GITHUB= yes	20	USE_GITHUB= yes
19	GH_ACCOUNT= google	21	GH_ACCOUNT= google

Lines 1-3 Link Here

(-)b/devel/jsonnet/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1623453189	1	TIMESTAMP = 1641409936
2	SHA256 (google-jsonnet-v0.17.0_GH0.tar.gz) = 076b52edf888c01097010ad4299e3b2e7a72b60a41abbc65af364af1ed3c8dbe	2	SHA256 (google-jsonnet-v0.18.0_GH0.tar.gz) = 85c240c4740f0c788c4d49f9c9c0942f5a2d1c2ae58b2c71068107bc80a3ced4
3	SIZE (google-jsonnet-v0.17.0_GH0.tar.gz) = 21854054	3	SIZE (google-jsonnet-v0.18.0_GH0.tar.gz) = 22472162

Added Link Here

(-)b/devel/jsonnet/files/patch-CMakeLists.txt (+10 lines)
1	--- CMakeLists.txt.orig 2021-12-21 17:55:49 UTC
2	+++ CMakeLists.txt
3	@@ -121,7 +121,6 @@ endif()
4	add_subdirectory(include)
5	add_subdirectory(stdlib)
6	add_subdirectory(third_party/md5)
7	-add_subdirectory(third_party/rapidyaml/rapidyaml ryml)
8	add_subdirectory(core)
9	add_subdirectory(cpp)
10	add_subdirectory(cmd)

Added Link Here

(-)b/devel/jsonnet/files/patch-core_CMakeLists.txt (+11 lines)
1	--- core/CMakeLists.txt.orig 2022-01-06 06:59:54 UTC
2	+++ core/CMakeLists.txt
3	@@ -30,7 +30,7 @@ set(LIBJSONNET_SOURCE
4
5	add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
6	add_dependencies(libjsonnet md5 stdlib)
7	-target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml)
8	+target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml c4core)
9
10	file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF
11	REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+")

Lines 1-4 Link Here

(-)b/devel/jsonnet/files/patch-core_vm.cpp (-2 / +2 lines)
1	--- core/vm.cpp.orig 2021-06-20 03:31:11 UTC	1	--- core/vm.cpp.orig 2021-12-21 17:55:49 UTC
2	+++ core/vm.cpp	2	+++ core/vm.cpp
3	@@ -23,7 +23,7 @@ limitations under the License.	3	@@ -23,7 +23,7 @@ limitations under the License.
4		4
Lines 8-11 Link Here
8	+#include "nlohmann/json.hpp"	8	+#include "nlohmann/json.hpp"
9	#include "md5.h"	9	#include "md5.h"
10	#include "parser.h"	10	#include "parser.h"
11	#include "state.h"	11	#include "ryml_std.hpp" // include this before any other ryml header

Lines 4-7 the same benefit to structured data that templating languages bring to plain Link Here

(-)b/devel/jsonnet/pkg-descr (-2 / +1 lines)
4	text. The example below illustrates a few features -- referring to another part	4	text. The example below illustrates a few features -- referring to another part
5	of the structure, overriding object fields, and string operations.	5	of the structure, overriding object fields, and string operations.
6		6
7	WWW: https://github.com/google/jsonnet	7	WWW: https://jsonnet.org
8	-

Return to bug 260998