CVS commit: pkgsrc/devel/jsonnet

["Stoned Elipot" <seb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   seb
Date:           Sun Oct  8 11:23:24 UTC 2017

Modified Files:
        pkgsrc/devel/jsonnet: Makefile distinfo
        pkgsrc/devel/jsonnet/patches: patch-Makefile
Added Files:
        pkgsrc/devel/jsonnet/patches: patch-test__suite_tests.source

Log Message:
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 [...]


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/jsonnet/Makefile \
    pkgsrc/devel/jsonnet/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/jsonnet/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/jsonnet/patches/patch-test__suite_tests.source

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/jsonnet/Makefile
diff -u pkgsrc/devel/jsonnet/Makefile:1.1 pkgsrc/devel/jsonnet/Makefile:1.2
--- pkgsrc/devel/jsonnet/Makefile:1.1   Thu Oct  5 19:40:35 2017
+++ pkgsrc/devel/jsonnet/Makefile       Sun Oct  8 11:23:24 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2017/10/05 19:40:35 seb Exp $
+# $NetBSD: Makefile,v 1.2 2017/10/08 11:23:24 seb Exp $
 
-DISTNAME=      v0.9.4
+DISTNAME=      v0.9.5
 PKGNAME=       ${GITHUB_PROJECT}-${DISTNAME:S/v//}
 #PKGREVISION=  1
 CATEGORIES=    devel local
@@ -14,17 +14,20 @@ LICENSE=    apache-2.0
 EXTRACT_USING= gtar
 
 GITHUB_PROJECT=        jsonnet
+GITHUB_TAG=    ${DISTNAME}
 DIST_SUBDIR=   ${GITHUB_PROJECT}
 
 USE_LANGUAGES= c c++11
 
-USE_TOOLS+=    gmake bash
+USE_TOOLS+=    gmake bash mktemp
 REPLACE_BASH+= examples/check.sh examples/terraform/check.sh
 REPLACE_BASH+= test_suite/run_tests.sh test_suite/run_fmt_tests.sh
+REPLACE_BASH+= test_suite/run_fmt_idempotence_tests.sh
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
 TEST_TARGET=   test
+TEST_ENV+=     MKTEMP=${TOOLS_PATH.mktemp}
 
 INSTALLATION_DIRS=     lib include bin
 
Index: pkgsrc/devel/jsonnet/distinfo
diff -u pkgsrc/devel/jsonnet/distinfo:1.1 pkgsrc/devel/jsonnet/distinfo:1.2
--- pkgsrc/devel/jsonnet/distinfo:1.1   Thu Oct  5 19:40:35 2017
+++ pkgsrc/devel/jsonnet/distinfo       Sun Oct  8 11:23:24 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2017/10/05 19:40:35 seb Exp $
+$NetBSD: distinfo,v 1.2 2017/10/08 11:23:24 seb Exp $
 
-SHA1 (jsonnet/v0.9.4.tar.gz) = 61a07521ec245a288f2fa24ba63f54b4de128b81
-RMD160 (jsonnet/v0.9.4.tar.gz) = 1f6125e1e361d3bdfd6e73bf0a1359159202b9f6
-SHA512 (jsonnet/v0.9.4.tar.gz) = 0a2945aa5b9fa5411b8d049a94e253399607b92b4a0439307cb4f5ba2cc22a8def4f12dd8c1fec3df30ed4e112682b056a805a673fab84bc083a74b7c71b59a4
-Size (jsonnet/v0.9.4.tar.gz) = 556697 bytes
-SHA1 (patch-Makefile) = c0072b993fc238ea72f287f5f5b64be9c9aee8e6
+SHA1 (jsonnet/v0.9.5.tar.gz) = d0a9ea7fbe0edf95276c9f4923f18e6334ee19d0
+RMD160 (jsonnet/v0.9.5.tar.gz) = 65781115ede9ac7ae0ef8f44501746a1258169bc
+SHA512 (jsonnet/v0.9.5.tar.gz) = 630941b0f9a86cf4697f242cbec3fdb565a194fa391c39b199c9adddac6994afbf45dccb1881c325d92e6729e1bd62915690363e8fb5b65a894f3e00dae4d47d
+Size (jsonnet/v0.9.5.tar.gz) = 573335 bytes
+SHA1 (patch-Makefile) = d9d10b82704399bc115df785015c69f390a641aa
+SHA1 (patch-test__suite_tests.source) = 14fc92f664269ab4012c7f90b337276de77110f5

Index: pkgsrc/devel/jsonnet/patches/patch-Makefile
diff -u pkgsrc/devel/jsonnet/patches/patch-Makefile:1.1 pkgsrc/devel/jsonnet/patches/patch-Makefile:1.2
--- pkgsrc/devel/jsonnet/patches/patch-Makefile:1.1     Thu Oct  5 19:40:35 2017
+++ pkgsrc/devel/jsonnet/patches/patch-Makefile Sun Oct  8 11:23:24 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.1 2017/10/05 19:40:35 seb Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/10/08 11:23:24 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-06-21 02:59:07.000000000 +0000
+--- Makefile.orig      2017-09-30 07:43:05.000000000 +0000
 +++ Makefile
 @@ -29,8 +29,9 @@ OD ?= od
  
@@ -16,7 +16,7 @@ $NetBSD: patch-Makefile,v 1.1 2017/10/05
 +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) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0
+ 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 = \
        libjsonnet++.so \
@@ -27,7 +27,7 @@ $NetBSD: patch-Makefile,v 1.1 2017/10/05
        $(LIB_OBJ)
  
  ALL_HEADERS = \
-@@ -108,17 +107,17 @@ MAKEDEPEND_SRCS = \
+@@ -107,17 +106,17 @@ MAKEDEPEND_SRCS = \
  
  depend:
        rm -f Makefile.depend
@@ -48,7 +48,7 @@ $NetBSD: patch-Makefile,v 1.1 2017/10/05
  
  # C binding.
  libjsonnet.so: $(LIB_OBJ)
-@@ -144,7 +143,7 @@ LIBJSONNET_TEST_SNIPPET_SRCS = \
+@@ -143,7 +142,7 @@ LIBJSONNET_TEST_SNIPPET_SRCS = \
        include/libjsonnet.h
  
  libjsonnet_test_snippet: $(LIBJSONNET_TEST_SNIPPET_SRCS)
@@ -57,7 +57,7 @@ $NetBSD: patch-Makefile,v 1.1 2017/10/05
  
  LIBJSONNET_TEST_FILE_SRCS = \
        core/libjsonnet_test_file.c \
-@@ -152,13 +151,13 @@ LIBJSONNET_TEST_FILE_SRCS = \
+@@ -151,13 +150,13 @@ LIBJSONNET_TEST_FILE_SRCS = \
        include/libjsonnet.h
  
  libjsonnet_test_file: $(LIBJSONNET_TEST_FILE_SRCS)

Added files:

Index: pkgsrc/devel/jsonnet/patches/patch-test__suite_tests.source
diff -u /dev/null pkgsrc/devel/jsonnet/patches/patch-test__suite_tests.source:1.1
--- /dev/null   Sun Oct  8 11:23:24 2017
+++ pkgsrc/devel/jsonnet/patches/patch-test__suite_tests.source Sun Oct  8 11:23:24 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-test__suite_tests.source,v 1.1 2017/10/08 11:23:24 seb Exp $
+
+try to use mktemp in a portable way; do not use python
+
+--- test_suite/tests.source.orig       2017-09-30 07:43:05.000000000 +0000
++++ test_suite/tests.source
+@@ -31,7 +31,9 @@ get_temp_dir() {
+     if [ -z "$TMP_DIR" ]; then
+         # We use Python to avoid portability problems with `mktemp`.
+         # See: https://unix.stackexchange.com/questions/30091/fix-or-alternative-for-mktemp-in-os-x
+-        TMP_DIR="`python2 -c "import tempfile; print(tempfile.mkdtemp(prefix='jsonnet_'))"`"
++        #TMP_DIR="`python2 -c "import tempfile; print(tempfile.mkdtemp(prefix='jsonnet_'))"`"
++      : ${MKTEMP=mktemp}
++        TMP_DIR="$(${MKTEMP} -d ${TMPDIR-/tmp}/jsonnet_${0##*/}.XXXXXX)"
+         $($VERBOSE) && echo "Created temporary directory $TMP_DIR"
+     fi
+ }