[pkgsrc/trunk]: pkgsrc/devel/jsonnet update devel/jsonnet to version 0.13.0

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/097d6a82d4fb
branches:  trunk
changeset: 399644:097d6a82d4fb
user:      seb <seb%pkgsrc.org@localhost>
date:      Tue Aug 13 18:04:28 2019 +0000

description:
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

diffstat:

 devel/jsonnet/Makefile               |   5 +++--
 devel/jsonnet/PLIST                  |   3 ++-
 devel/jsonnet/distinfo               |  12 ++++++------
 devel/jsonnet/patches/patch-Makefile |  33 +++++++++++++++++++--------------
 4 files changed, 30 insertions(+), 23 deletions(-)

diffs (125 lines):

diff -r fbd18649f755 -r 097d6a82d4fb devel/jsonnet/Makefile
--- a/devel/jsonnet/Makefile    Tue Aug 13 16:53:06 2019 +0000
+++ b/devel/jsonnet/Makefile    Tue Aug 13 18:04:28 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/06/21 20:55:29 seb Exp $
+# $NetBSD: Makefile,v 1.5 2019/08/13 18:04:28 seb Exp $
 
-DISTNAME=      jsonnet-0.10.0
+DISTNAME=      jsonnet-0.13.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -37,5 +37,6 @@
        ${INSTALL_DATA} ${WRKSRC}/include/libjsonnet.h ${DESTDIR}${PREFIX}/include
        ${INSTALL_DATA} ${WRKSRC}/include/libjsonnet++.h ${DESTDIR}${PREFIX}/include
        ${INSTALL_PROGRAM} ${WRKSRC}/jsonnet ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/jsonnetfmt ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r fbd18649f755 -r 097d6a82d4fb devel/jsonnet/PLIST
--- a/devel/jsonnet/PLIST       Tue Aug 13 16:53:06 2019 +0000
+++ b/devel/jsonnet/PLIST       Tue Aug 13 18:04:28 2019 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/05 19:40:35 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/08/13 18:04:28 seb Exp $
 bin/jsonnet
+bin/jsonnetfmt
 include/libjsonnet++.h
 include/libjsonnet.h
 lib/libjsonnet++.so
diff -r fbd18649f755 -r 097d6a82d4fb devel/jsonnet/distinfo
--- a/devel/jsonnet/distinfo    Tue Aug 13 16:53:06 2019 +0000
+++ b/devel/jsonnet/distinfo    Tue Aug 13 18:04:28 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2018/06/21 20:55:29 seb Exp $
+$NetBSD: distinfo,v 1.5 2019/08/13 18:04:28 seb Exp $
 
-SHA1 (jsonnet-0.10.0.tar.gz) = d1d17b2880c77284c874a68e69532b84dc40b587
-RMD160 (jsonnet-0.10.0.tar.gz) = 933ab6e3daa41ed53609b7c7edad914f3bf4f32e
-SHA512 (jsonnet-0.10.0.tar.gz) = 1154064e1f9238ab3eafdb1754e675bc0cdf5649f586b0cb667371e98d3cb61ca224e42be33dfcfb5030e254869bf9a3b29d72f2b22b4a50be8556ccbc424510
-Size (jsonnet-0.10.0.tar.gz) = 600377 bytes
-SHA1 (patch-Makefile) = d9d10b82704399bc115df785015c69f390a641aa
+SHA1 (jsonnet-0.13.0.tar.gz) = 73768680445b733abb24d11b5a9116c59137a77c
+RMD160 (jsonnet-0.13.0.tar.gz) = 9f60a30f4e3850a359eaeec009a358c8292b2421
+SHA512 (jsonnet-0.13.0.tar.gz) = d19e5398763e37b79b0ef02368f6bd6215d2df234b5ff7a6d98e2306a0d47290600061c9f868c0c262570b4f0ee9eee6c309bcc93937b12f6c14f8d12339a7d5
+Size (jsonnet-0.13.0.tar.gz) = 21850449 bytes
+SHA1 (patch-Makefile) = fc6dc54470c56b9ce4ccc6658b5ed70693a42967
 SHA1 (patch-test__suite_tests.source) = 14fc92f664269ab4012c7f90b337276de77110f5
diff -r fbd18649f755 -r 097d6a82d4fb devel/jsonnet/patches/patch-Makefile
--- a/devel/jsonnet/patches/patch-Makefile      Tue Aug 13 16:53:06 2019 +0000
+++ b/devel/jsonnet/patches/patch-Makefile      Tue Aug 13 18:04:28 2019 +0000
@@ -1,24 +1,24 @@
-$NetBSD: patch-Makefile,v 1.2 2017/10/08 11:23:24 seb Exp $
+$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      2017-09-30 07:43:05.000000000 +0000
+--- 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
+-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
++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
- 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 = \
+ 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 \
@@ -27,7 +27,7 @@
        $(LIB_OBJ)
  
  ALL_HEADERS = \
-@@ -107,17 +106,17 @@ MAKEDEPEND_SRCS = \
+@@ -111,21 +110,21 @@ MAKEDEPEND_SRCS = \
  
  depend:
        rm -f Makefile.depend
@@ -42,13 +42,18 @@
 +      $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
  
  # Commandline executable.
- jsonnet: cmd/jsonnet.cpp $(LIB_OBJ)
--      $(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_SRC:.cpp=.o) -o $@
-+      $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_SRC:.cpp=.o) -o $@
+ 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)
-@@ -143,7 +142,7 @@ LIBJSONNET_TEST_SNIPPET_SRCS = \
+@@ -154,7 +153,7 @@ LIBJSONNET_TEST_SNIPPET_SRCS = \
        include/libjsonnet.h
  
  libjsonnet_test_snippet: $(LIBJSONNET_TEST_SNIPPET_SRCS)
@@ -57,7 +62,7 @@
  
  LIBJSONNET_TEST_FILE_SRCS = \
        core/libjsonnet_test_file.c \
-@@ -151,13 +150,13 @@ LIBJSONNET_TEST_FILE_SRCS = \
+@@ -162,13 +161,13 @@ LIBJSONNET_TEST_FILE_SRCS = \
        include/libjsonnet.h
  
  libjsonnet_test_file: $(LIBJSONNET_TEST_FILE_SRCS)