head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.28 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.26 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.24 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.22 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.20 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.18 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.16 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.14 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.12 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.10 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.8 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.6 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.4 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.2 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.3.0.26 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.24 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.22 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.20 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.18 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.16 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.14 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.12 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.10 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.8 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.4 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.6 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.2 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.2.0.14 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.12 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.10 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.8 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.6 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.4 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.2 pkgsrc-2017Q4-base:1.2; locks; strict; comment @# @; 1.4 date 2022.12.15.14.45.57; author jperkin; state Exp; branches; next 1.3; commitid Af9fW5RxehlcdF5E; 1.3 date 2019.08.13.18.04.28; author seb; state Exp; branches; next 1.2; commitid ho7l8G50j62EwTyB; 1.2 date 2017.10.08.11.23.24; author seb; state Exp; branches; next 1.1; commitid 7x0M7kglsEl1YeaA; 1.1 date 2017.10.05.19.40.35; author seb; state Exp; branches; next ; commitid qs9IlnyYP9YKOT9A; desc @@ 1.4 log @jsonnet: Fix od(1) args. @ text @$NetBSD: patch-Makefile,v 1.3 2019/08/13 18:04:28 seb Exp $ - leverage pkgsrc CPPFLAGS, CFLAGS and CXXFLAGS handling - take care of 'od -t u1' output variations - do not build the JavaScript implementation --- Makefile.orig 2019-06-03 17:28:46.000000000 +0000 +++ Makefile @@@@ -29,8 +29,9 @@@@ OD ?= od OPT ?= -O3 -CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json -CFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude +CPPFLAGS += -Iinclude -Ithird_party/md5 -Ithird_party/json +CXXFLAGS += $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC +CFLAGS += $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC MAKEDEPENDFLAGS ?= -Iinclude -Ithird_party/md5 -Ithird_party/json EMCXXFLAGS = $(CXXFLAGS) -g0 -Os --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s OUTLINING_LIMIT=10000 -s RESERVED_FUNCTION_POINTERS=20 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 EMCFLAGS = $(CFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 @@@@ -68,8 +69,6 @@@@ ALL = \ libjsonnet++.so \ libjsonnet_test_snippet \ libjsonnet_test_file \ - libjsonnet.js \ - doc/js/libjsonnet.js \ $(LIB_OBJ) ALL_HEADERS = \ @@@@ -111,21 +110,21 @@@@ MAKEDEPEND_SRCS = \ depend: rm -f Makefile.depend - for FILE in $(LIB_SRC) $(MAKEDEPEND_SRCS) ; do $(CXX) -MM $(CXXFLAGS) $$FILE -MT $$(dirname $$FILE)/$$(basename $$FILE .cpp).o >> Makefile.depend ; done + for FILE in $(LIB_SRC) $(MAKEDEPEND_SRCS) ; do $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $$FILE -MT $$(dirname $$FILE)/$$(basename $$FILE .cpp).o >> Makefile.depend ; done core/desugarer.cpp: core/std.jsonnet.h # Object files %.o: %.cpp - $(CXX) -c $(CXXFLAGS) $< -o $@@ + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@@ # Commandline executable. jsonnet: cmd/jsonnet.cpp cmd/utils.cpp $(LIB_OBJ) - $(CXX) $(CXXFLAGS) $(LDFLAGS) $< cmd/utils.cpp $(LIB_SRC:.cpp=.o) -o $@@ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $< cmd/utils.cpp $(LIB_SRC:.cpp=.o) -o $@@ # Commandline executable (reformatter). jsonnetfmt: cmd/jsonnetfmt.cpp cmd/utils.cpp $(LIB_OBJ) - $(CXX) $(CXXFLAGS) $(LDFLAGS) $< cmd/utils.cpp $(LIB_SRC:.cpp=.o) -o $@@ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $< cmd/utils.cpp $(LIB_SRC:.cpp=.o) -o $@@ # C binding. libjsonnet.so: $(LIB_OBJ) @@@@ -154,7 +153,7 @@@@ LIBJSONNET_TEST_SNIPPET_SRCS = \ include/libjsonnet.h libjsonnet_test_snippet: $(LIBJSONNET_TEST_SNIPPET_SRCS) - $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@@ + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@@ LIBJSONNET_TEST_FILE_SRCS = \ core/libjsonnet_test_file.c \ @@@@ -162,13 +161,13 @@@@ LIBJSONNET_TEST_FILE_SRCS = \ include/libjsonnet.h libjsonnet_test_file: $(LIBJSONNET_TEST_FILE_SRCS) - $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@@ + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@@ # Encode standard library for embedding in C core/%.jsonnet.h: stdlib/%.jsonnet - (($(OD) -v -Anone -t u1 $< \ + (($(OD) -v -An -t u1 $< \ | tr " " "\n" \ - | grep -v "^$$" \ + | sed -e 's/^0//;/^$$/d' \ | tr "\n" "," ) && echo "0") > $@@ echo >> $@@ @ 1.3 log @update devel/jsonnet to version 0.13.0 Significant changes since last packaged version (0.10.0): - jsonnet fmt is now its own executable called jsonnetfmt... - Standard library additions: std.reverse, std.encodeUTF8 and std.decodeUTF8 - Standard dlibrary changes: - Fix std.parseHex that rejected certain correct inputs - Added std.find and std.findSubstr - Added std.parseJson - sort and set functions can now be given a "keyF" function for controlling the ordering - std.trace for debugging - std.parseHex and std.parseOctal - Language changes: - std.native("foo") now returns null if foo doesn't exist, instead of an error... Complete list of change is available from https://github.com/google/jsonnet/releases @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.2 2017/10/08 11:23:24 seb Exp $ d74 2 a75 1 (($(OD) -v -Anone -t u1 $< \ @ 1.2 log @update devel/jsonnet to version 0.9.5 - One major change: Import paths now are properly escaped [...] - Allow formatting of multiple files with a single jsonnet fmt invocation - jsonnet fmt will now sort your imports alphabetically - The Bazel Python build works again - jsonnet fmt fixes code with mismatched newlines in { } and similar start/end syntax - The Python bindings are now compatible with Python 3 - There is a VS2017 solution file - The default -J paths were broken [...] @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 --- Makefile.orig 2017-09-30 07:43:05.000000000 +0000 d13 1 a13 1 -CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5 d15 1 a15 1 +CPPFLAGS += -Iinclude -Ithird_party/md5 d18 4 a21 4 MAKEDEPENDFLAGS ?= -Iinclude -Ithird_party/md5 EMCXXFLAGS = $(CXXFLAGS) -Os --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s OUTLINING_LIMIT=10000 EMCFLAGS = $(CFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 @@@@ -67,8 +68,6 @@@@ ALL = \ d30 1 a30 1 @@@@ -107,17 +106,17 @@@@ MAKEDEPEND_SRCS = \ d45 8 a52 3 jsonnet: cmd/jsonnet.cpp $(LIB_OBJ) - $(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_SRC:.cpp=.o) -o $@@ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_SRC:.cpp=.o) -o $@@ d56 1 a56 1 @@@@ -143,7 +142,7 @@@@ LIBJSONNET_TEST_SNIPPET_SRCS = \ d65 1 a65 1 @@@@ -151,13 +150,13 @@@@ LIBJSONNET_TEST_FILE_SRCS = \ @ 1.1 log @Add devel/jsonnet version 0.9.4 to the NetBSD packages collection @ text @d7 1 a7 1 --- Makefile.orig 2017-06-21 02:59:07.000000000 +0000 d19 1 a19 1 EMCXXFLAGS = $(CXXFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 d30 1 a30 1 @@@@ -108,17 +107,17 @@@@ MAKEDEPEND_SRCS = \ d51 1 a51 1 @@@@ -144,7 +143,7 @@@@ LIBJSONNET_TEST_SNIPPET_SRCS = \ d60 1 a60 1 @@@@ -152,13 +151,13 @@@@ LIBJSONNET_TEST_FILE_SRCS = \ @