Sat Nov 3 12:47:16 2018 UTC ()
jq: Update devel/jq to 1.6

pkgsrc changes:
 - Use GITHUB_RELEASE instead of GITHUB_TAG because the former does not need
   auto* tools (despite we need auto* tools for patches/, hopefully one day they
   will be applied!)
 - Remove no longer needed SUBST_*, `git describe' is no longer used
 - Remove patch-src_jv__parse.c and patch-src_jv__print.c, they are
   present in 1.6
 - Rename and readjust patch-Makefile.in to patch-Makefile.am
   (pre-configure target rewrote it due `autoreconf')

Changes:
1.6
---
New in this release since 1.5:
- Destructuring Alternation
- New Builtins:
   * builtins/0
   * stderr/0
   * halt/0, halt_error/1
   * isempty/1
   * walk/1
   * utf8bytelength/1
   * localtime/0, strflocaltime/1
   * SQL-style builtins
   * and more!
- Add support for ASAN and UBSAN
- Make it easier to use jq with shebangs (8f6f28c)
- Add $ENV builtin variable to access environment
- Add JQ_COLORS env var for configuring the output colors

Bug fixes:
- Calling jq without a program argument now always assumes . for the program,
  regardless of stdin/stdout. (5fe0536)
- Make sorting stable regardless of qsort. (7835a72)
- Adds a local oniguruma submodule and the
  `./configure --with-oniguruma=builtin' option to make it easier to build
  with oniguruma support on systems where you can't install system-level
  libraries. (c6374b6 and 02bad4b)
- And much more!


(leot)
diff -r1.16 -r1.17 pkgsrc/devel/jq/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/jq/distinfo
diff -r0 -r1.1 pkgsrc/devel/jq/patches/patch-Makefile.am
diff -r1.1 -r0 pkgsrc/devel/jq/patches/patch-Makefile.in
diff -r1.1 -r0 pkgsrc/devel/jq/patches/patch-src_jv__parse.c
diff -r1.1 -r0 pkgsrc/devel/jq/patches/patch-src_jv__print.c
diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-builtin.c
diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-compile.c
diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-inject__errors.c
diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-util.c
diff -r1.3 -r1.4 pkgsrc/devel/jq/patches/patch-configure.ac
cvs diff -r1.16 -r1.17 pkgsrc/devel/jq/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/jq/Makefile 2018/08/19 18:08:05 1.16
+++ pkgsrc/devel/jq/Makefile 2018/11/03 12:47:16 1.17
@@ -1,32 +1,25 @@ @@ -1,32 +1,25 @@
1# $NetBSD: Makefile,v 1.16 2018/08/19 18:08:05 leot Exp $ 1# $NetBSD: Makefile,v 1.17 2018/11/03 12:47:16 leot Exp $
2 2
3DISTNAME= jq-1.5 3DISTNAME= jq-1.6
4PKGREVISION= 5 
5CATEGORIES= devel 4CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=stedolan/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=stedolan/}
7GITHUB_TAG= ${DISTNAME} 6GITHUB_RELEASE= ${DISTNAME}
8 7
9MAINTAINER= leot@NetBSD.org 8MAINTAINER= leot@NetBSD.org
10HOMEPAGE= https://github.com/stedolan/jq/ 9HOMEPAGE= https://github.com/stedolan/jq/
11COMMENT= Command-line JSON processor 10COMMENT= Command-line JSON processor
12LICENSE= mit 11LICENSE= mit
13 12
14USE_LANGUAGES= c99 13USE_LANGUAGES= c99
15USE_LIBTOOL= yes 14USE_LIBTOOL= yes
16USE_TOOLS+= autoreconf autoconf automake bison flex gmake 15USE_TOOLS+= autoreconf autoconf automake bison flex gmake
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18 17
19SUBST_CLASSES+= tag 
20SUBST_STAGE.tag= pre-configure 
21SUBST_MESSAGE.tag= Avoid to run `git describe' to fetch the tag 
22SUBST_FILES.tag= configure.ac scripts/version 
23SUBST_SED.tag+= -e 's/git describe .*|/echo "jq-1.5-1-g940132e-dirty" |/' 
24 
25TEST_TARGET= check 18TEST_TARGET= check
26 19
27pre-configure: 20pre-configure:
28 cd ${WRKSRC} && autoreconf -fi 21 cd ${WRKSRC} && autoreconf -fi
29 22
30.include "options.mk" 23.include "options.mk"
31 24
32.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/devel/jq/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/jq/distinfo 2018/08/19 18:08:05 1.10
+++ pkgsrc/devel/jq/distinfo 2018/11/03 12:47:16 1.11
@@ -1,14 +1,12 @@ @@ -1,14 +1,12 @@
1$NetBSD: distinfo,v 1.10 2018/08/19 18:08:05 leot Exp $ 1$NetBSD: distinfo,v 1.11 2018/11/03 12:47:16 leot Exp $
2 2
3SHA1 (jq-1.5.tar.gz) = 664638b560d9e734178e8cafb21d98817af5b5f3 3SHA1 (jq-1.6.tar.gz) = 02959bca30672e0dfe678e7b36464c8fb08ec389
4RMD160 (jq-1.5.tar.gz) = 33ac77ac93e0539f6d66d29cd717013cdab8cf61 4RMD160 (jq-1.6.tar.gz) = 10e3f0f280e6fd1de8cd67f3881fad02262d9a6b
5SHA512 (jq-1.5.tar.gz) = 3f9049321e8430b04dbccf81d7f2ab691b89383e91526eaf585bbeeb67698dea73a36b3aa179f6a95ef97cd73a8a9b6dc53cb1a5b0398b6422c11289b705de7b 5SHA512 (jq-1.6.tar.gz) = f5ae8be558ca2ff15324c378d623106b74bd0823be50835e23548584aa1eb24eb81f8f054693d5d3fe44f157d0735c5f0f40b9f21899ba068f2a11d1345ace19
6Size (jq-1.5.tar.gz) = 1118086 bytes 6Size (jq-1.6.tar.gz) = 1191856 bytes
7SHA1 (patch-Makefile.in) = 446be0fa3517fb6fc1e2f5761d1f8fb28339c79c 7SHA1 (patch-Makefile.am) = ae6d06d032f0ce1e165345b4f6440f14cb600dac
8SHA1 (patch-builtin.c) = ab8572304d39680b19337aec525beaa88e6506da 8SHA1 (patch-builtin.c) = b3ac3e4b98637ff6bcd4e28332e8b98a65864401
9SHA1 (patch-compile.c) = a9d2f8eadaddcd6bd3e467740f6826073b40720e 9SHA1 (patch-compile.c) = 0c58c5755857475deb613934140733eefa10f857
10SHA1 (patch-configure.ac) = 5ac2b2c744f554a716189239446a5c5a13c58bea 10SHA1 (patch-configure.ac) = a140c21a1a0268abf4b1f9bfc17a2c95099e1e2c
11SHA1 (patch-inject__errors.c) = 863086a96be3b81011a141bdf293d3ef5693ef10 11SHA1 (patch-inject__errors.c) = a325a3206dd738d4b3f4b2e1f30bb6db74a7e2bc
12SHA1 (patch-src_jv__parse.c) = efca86e70daf27291a01bf538487b745b7bd600c 12SHA1 (patch-util.c) = 49483951ae96e9b672f38b84aea955c0d189f822
13SHA1 (patch-src_jv__print.c) = 4d53dc1a1f0bb1cc827dd1adb62ecef2b7393970 
14SHA1 (patch-util.c) = c6b9062312206267b0e83bc7284646f64e133f58 
File Added: pkgsrc/devel/jq/patches/patch-Makefile.am
$NetBSD: patch-Makefile.am,v 1.1 2018/11/03 12:47:16 leot Exp $

Fix dynamic linking.

--- Makefile.am.orig	2018-11-02 01:49:29.000000000 +0000
+++ Makefile.am
@@ -106,7 +106,7 @@ src/builtin.o: src/builtin.inc
 
 bin_PROGRAMS = jq
 jq_SOURCES = src/main.c src/version.h
-jq_LDFLAGS = -static-libtool-libs
+jq_LDFLAGS = 
 jq_LDADD = libjq.la -lm
 
 if WIN32
File Deleted: pkgsrc/devel/jq/patches/Attic/patch-Makefile.in
File Deleted: pkgsrc/devel/jq/patches/Attic/patch-src_jv__parse.c
File Deleted: pkgsrc/devel/jq/patches/Attic/patch-src_jv__print.c
cvs diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-builtin.c (expand / switch to unified diff)

--- pkgsrc/devel/jq/patches/patch-builtin.c 2018/08/19 18:08:05 1.1
+++ pkgsrc/devel/jq/patches/patch-builtin.c 2018/11/03 12:47:16 1.2
@@ -1,22 +1,28 @@ @@ -1,22 +1,28 @@
1$NetBSD: patch-builtin.c,v 1.1 2018/08/19 18:08:05 leot Exp $ 1$NetBSD: patch-builtin.c,v 1.2 2018/11/03 12:47:16 leot Exp $
2 2
3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic, 3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
4because the result of the configure command may be inconsistent with it. 4because the result of the configure command may be inconsistent with it.
5to be consistent, such macros have to be defined in the early stage of 5to be consistent, such macros have to be defined in the early stage of
6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job. 6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job.
7 7
8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb': 8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb':
9 9
10 <https://github.com/stedolan/jq/pull/1458> 10 <https://github.com/stedolan/jq/pull/1458>
11 11
12Also shared via PR pkg/52460. 12Also shared via PR pkg/52460.
13 13
14--- builtin.c.orig 2015-08-18 04:25:04.000000000 +0000 14--- src/builtin.c.orig 2018-11-02 01:49:29.000000000 +0000
15+++ builtin.c 15+++ src/builtin.c
16@@ -1,6 +1,3 @@ 16@@ -1,12 +1,3 @@
17-#define _BSD_SOURCE 17-#define _BSD_SOURCE
18-#define _GNU_SOURCE 18-#define _GNU_SOURCE
19-#define _XOPEN_SOURCE 19-#ifndef __sun__
 20-# define _XOPEN_SOURCE
 21-# define _XOPEN_SOURCE_EXTENDED 1
 22-#else
 23-# define _XPG6
 24-# define __EXTENSIONS__
 25-#endif
20 #include <sys/time.h> 26 #include <sys/time.h>
21 #include <stdlib.h> 27 #include <stdlib.h>
22 #include <stddef.h> 28 #include <stddef.h>
cvs diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-compile.c (expand / switch to unified diff)

--- pkgsrc/devel/jq/patches/patch-compile.c 2018/08/19 18:08:05 1.1
+++ pkgsrc/devel/jq/patches/patch-compile.c 2018/11/03 12:47:16 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-compile.c,v 1.1 2018/08/19 18:08:05 leot Exp $ 1$NetBSD: patch-compile.c,v 1.2 2018/11/03 12:47:16 leot Exp $
2 2
3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic, 3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
4because the result of the configure command may be inconsistent with it. 4because the result of the configure command may be inconsistent with it.
5to be consistent, such macros have to be defined in the early stage of 5to be consistent, such macros have to be defined in the early stage of
6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job. 6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job.
7 7
8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb': 8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb':
9 9
10 <https://github.com/stedolan/jq/pull/1458> 10 <https://github.com/stedolan/jq/pull/1458>
11 11
12Also shared via PR pkg/52460. 12Also shared via PR pkg/52460.
13 13
14--- compile.c.orig 2015-08-18 04:25:04.000000000 +0000 14--- src/compile.c.orig 2015-08-18 04:25:04.000000000 +0000
15+++ compile.c 15+++ src/compile.c
16@@ -1,6 +1,3 @@ 16@@ -1,6 +1,3 @@
17-#ifndef _GNU_SOURCE 17-#ifndef _GNU_SOURCE
18-#define _GNU_SOURCE // for strdup 18-#define _GNU_SOURCE // for strdup
19-#endif 19-#endif
20 #include <assert.h> 20 #include <assert.h>
21 #include <math.h> 21 #include <math.h>
22 #include <string.h> 22 #include <string.h>
cvs diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-inject__errors.c (expand / switch to unified diff)

--- pkgsrc/devel/jq/patches/patch-inject__errors.c 2018/08/19 18:08:05 1.1
+++ pkgsrc/devel/jq/patches/patch-inject__errors.c 2018/11/03 12:47:16 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-inject__errors.c,v 1.1 2018/08/19 18:08:05 leot Exp $ 1$NetBSD: patch-inject__errors.c,v 1.2 2018/11/03 12:47:16 leot Exp $
2 2
3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic, 3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
4because the result of the configure command may be inconsistent with it. 4because the result of the configure command may be inconsistent with it.
5to be consistent, such macros have to be defined in the early stage of 5to be consistent, such macros have to be defined in the early stage of
6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job. 6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job.
7 7
8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb': 8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb':
9 9
10 <https://github.com/stedolan/jq/pull/1458> 10 <https://github.com/stedolan/jq/pull/1458>
11 11
12Also shared via PR pkg/52460. 12Also shared via PR pkg/52460.
13 13
14--- inject_errors.c.orig 2015-08-18 04:25:04.000000000 +0000 14--- src/inject_errors.c.orig 2015-08-18 04:25:04.000000000 +0000
15+++ inject_errors.c 15+++ src/inject_errors.c
16@@ -1,5 +1,3 @@ 16@@ -1,5 +1,3 @@
17- 17-
18-#define _GNU_SOURCE /* for RTLD_NEXT */ 18-#define _GNU_SOURCE /* for RTLD_NEXT */
19 #include <assert.h> 19 #include <assert.h>
20 #include <dlfcn.h> 20 #include <dlfcn.h>
21 #include <errno.h> 21 #include <errno.h>
cvs diff -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-util.c (expand / switch to unified diff)

--- pkgsrc/devel/jq/patches/patch-util.c 2018/08/19 18:08:05 1.1
+++ pkgsrc/devel/jq/patches/patch-util.c 2018/11/03 12:47:16 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-util.c,v 1.1 2018/08/19 18:08:05 leot Exp $ 1$NetBSD: patch-util.c,v 1.2 2018/11/03 12:47:16 leot Exp $
2 2
3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic, 3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
4because the result of the configure command may be inconsistent with it. 4because the result of the configure command may be inconsistent with it.
5to be consistent, such macros have to be defined in the early stage of 5to be consistent, such macros have to be defined in the early stage of
6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job. 6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job.
7 7
8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb': 8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb':
9 9
10 <https://github.com/stedolan/jq/pull/1458> 10 <https://github.com/stedolan/jq/pull/1458>
11 11
12Also shared via PR pkg/52460. 12Also shared via PR pkg/52460.
13 13
14--- util.c.orig 2015-08-18 04:25:04.000000000 +0000 14--- src/util.c.orig 2015-08-18 04:25:04.000000000 +0000
15+++ util.c 15+++ src/util.c
16@@ -1,8 +1,3 @@ 16@@ -1,8 +1,3 @@
17- 17-
18-#ifdef HAVE_MEMMEM 18-#ifdef HAVE_MEMMEM
19-#define _GNU_SOURCE 19-#define _GNU_SOURCE
20-#endif 20-#endif
21- 21-
22 #include <sys/types.h> 22 #include <sys/types.h>
23 #include <sys/stat.h> 23 #include <sys/stat.h>
24 #include <assert.h> 24 #include <assert.h>
cvs diff -r1.3 -r1.4 pkgsrc/devel/jq/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/devel/jq/patches/patch-configure.ac 2018/08/19 18:08:05 1.3
+++ pkgsrc/devel/jq/patches/patch-configure.ac 2018/11/03 12:47:16 1.4
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-configure.ac,v 1.3 2018/08/19 18:08:05 leot Exp $ 1$NetBSD: patch-configure.ac,v 1.4 2018/11/03 12:47:16 leot Exp $
2 2
3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic, 3Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
4because the result of the configure command may be inconsistent with it. 4because the result of the configure command may be inconsistent with it.
5to be consistent, such macros have to be defined in the early stage of 5to be consistent, such macros have to be defined in the early stage of
6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job. 6the configure command, and the AC_USE_SYSTEM_EXTENSIONS macro does the job.
7 7
8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb': 8Part of pull request 1458, commit id `df9a0963f8fa6fca773b059dce22c598152f3edb':
9 9
10 <https://github.com/stedolan/jq/pull/1458> 10 <https://github.com/stedolan/jq/pull/1458>
11 11
12Also shared via PR pkg/52460. 12Also shared via PR pkg/52460.
13 13
14--- configure.ac.orig 2015-08-18 04:25:04.000000000 +0000 14--- configure.ac.orig 2018-11-02 14:52:43.000000000 +0000
15+++ configure.ac 15+++ configure.ac
16@@ -11,6 +11,7 @@ AC_PREREQ([2.64]) 16@@ -11,6 +11,7 @@ AC_PREREQ([2.64])
17 AC_CONFIG_AUX_DIR([config]) 17 AC_CONFIG_AUX_DIR([config])
18 AM_INIT_AUTOMAKE([1.11.2 parallel-tests foreign -Wall]) 18 AM_INIT_AUTOMAKE([1.11.2 subdir-objects parallel-tests foreign -Wall])
19 AM_SILENT_RULES([yes]) 19 AM_SILENT_RULES([yes])
20+AC_USE_SYSTEM_EXTENSIONS 20+AC_USE_SYSTEM_EXTENSIONS
21 AM_PROG_AR 21 AM_PROG_AR
22 AM_MAINTAINER_MODE([enable]) 22 AM_MAINTAINER_MODE([enable])
23 AC_PROG_CC 23 AC_PROG_CC