CVS commit: pkgsrc/devel/jq

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/jq
From: "Leonardo Taccari" <leot%netbsd.org@localhost>
Date: Sat, 3 Nov 2018 12:47:16 +0000

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Nov  3 12:47:16 UTC 2018

Modified Files:
        pkgsrc/devel/jq: Makefile distinfo
        pkgsrc/devel/jq/patches: patch-builtin.c patch-compile.c
            patch-configure.ac patch-inject__errors.c patch-util.c
Added Files:
        pkgsrc/devel/jq/patches: patch-Makefile.am
Removed Files:
        pkgsrc/devel/jq/patches: patch-Makefile.in patch-src_jv__parse.c
            patch-src_jv__print.c

Log Message:
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!


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/jq/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/jq/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/jq/patches/patch-Makefile.am
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/jq/patches/patch-Makefile.in \
    pkgsrc/devel/jq/patches/patch-src_jv__parse.c \
    pkgsrc/devel/jq/patches/patch-src_jv__print.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/jq/patches/patch-builtin.c \
    pkgsrc/devel/jq/patches/patch-compile.c \
    pkgsrc/devel/jq/patches/patch-inject__errors.c \
    pkgsrc/devel/jq/patches/patch-util.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/jq/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/devel/jq/Makefile
diff -u pkgsrc/devel/jq/Makefile:1.16 pkgsrc/devel/jq/Makefile:1.17
--- pkgsrc/devel/jq/Makefile:1.16       Sun Aug 19 18:08:05 2018
+++ pkgsrc/devel/jq/Makefile    Sat Nov  3 12:47:16 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2018/08/19 18:08:05 leot Exp $
+# $NetBSD: Makefile,v 1.17 2018/11/03 12:47:16 leot Exp $
 
-DISTNAME=      jq-1.5
-PKGREVISION=   5
+DISTNAME=      jq-1.6
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=stedolan/}
-GITHUB_TAG=    ${DISTNAME}
+GITHUB_RELEASE=        ${DISTNAME}
 
 MAINTAINER=    leot%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/stedolan/jq/
@@ -16,12 +15,6 @@ USE_LIBTOOL= yes
 USE_TOOLS+=    autoreconf autoconf automake bison flex gmake
 GNU_CONFIGURE= yes
 
-SUBST_CLASSES+=                tag
-SUBST_STAGE.tag=       pre-configure
-SUBST_MESSAGE.tag=     Avoid to run `git describe' to fetch the tag
-SUBST_FILES.tag=       configure.ac scripts/version
-SUBST_SED.tag+=                -e 's/git describe .*|/echo "jq-1.5-1-g940132e-dirty" |/'
-
 TEST_TARGET=   check
 
 pre-configure:

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

Index: pkgsrc/devel/jq/patches/patch-builtin.c
diff -u pkgsrc/devel/jq/patches/patch-builtin.c:1.1 pkgsrc/devel/jq/patches/patch-builtin.c:1.2
--- pkgsrc/devel/jq/patches/patch-builtin.c:1.1 Sun Aug 19 18:08:05 2018
+++ pkgsrc/devel/jq/patches/patch-builtin.c     Sat Nov  3 12:47:16 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-builtin.c,v 1.1 2018/08/19 18:08:05 leot Exp $
+$NetBSD: patch-builtin.c,v 1.2 2018/11/03 12:47:16 leot Exp $
 
 Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
 because the result of the configure command may be inconsistent with it.
@@ -11,12 +11,18 @@ Part of pull request 1458, commit id `df
 
 Also shared via PR pkg/52460.
 
---- builtin.c.orig     2015-08-18 04:25:04.000000000 +0000
-+++ builtin.c
-@@ -1,6 +1,3 @@
+--- src/builtin.c.orig 2018-11-02 01:49:29.000000000 +0000
++++ src/builtin.c
+@@ -1,12 +1,3 @@
 -#define _BSD_SOURCE
 -#define _GNU_SOURCE
--#define _XOPEN_SOURCE
+-#ifndef __sun__
+-# define _XOPEN_SOURCE
+-# define _XOPEN_SOURCE_EXTENDED 1
+-#else
+-# define _XPG6
+-# define __EXTENSIONS__
+-#endif
  #include <sys/time.h>
  #include <stdlib.h>
  #include <stddef.h>
Index: pkgsrc/devel/jq/patches/patch-compile.c
diff -u pkgsrc/devel/jq/patches/patch-compile.c:1.1 pkgsrc/devel/jq/patches/patch-compile.c:1.2
--- pkgsrc/devel/jq/patches/patch-compile.c:1.1 Sun Aug 19 18:08:05 2018
+++ pkgsrc/devel/jq/patches/patch-compile.c     Sat Nov  3 12:47:16 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-compile.c,v 1.1 2018/08/19 18:08:05 leot Exp $
+$NetBSD: patch-compile.c,v 1.2 2018/11/03 12:47:16 leot Exp $
 
 Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
 because the result of the configure command may be inconsistent with it.
@@ -11,8 +11,8 @@ Part of pull request 1458, commit id `df
 
 Also shared via PR pkg/52460.
 
---- compile.c.orig     2015-08-18 04:25:04.000000000 +0000
-+++ compile.c
+--- src/compile.c.orig 2015-08-18 04:25:04.000000000 +0000
++++ src/compile.c
 @@ -1,6 +1,3 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE // for strdup
Index: pkgsrc/devel/jq/patches/patch-inject__errors.c
diff -u pkgsrc/devel/jq/patches/patch-inject__errors.c:1.1 pkgsrc/devel/jq/patches/patch-inject__errors.c:1.2
--- pkgsrc/devel/jq/patches/patch-inject__errors.c:1.1  Sun Aug 19 18:08:05 2018
+++ pkgsrc/devel/jq/patches/patch-inject__errors.c      Sat Nov  3 12:47:16 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-inject__errors.c,v 1.1 2018/08/19 18:08:05 leot Exp $
+$NetBSD: patch-inject__errors.c,v 1.2 2018/11/03 12:47:16 leot Exp $
 
 Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
 because the result of the configure command may be inconsistent with it.
@@ -11,8 +11,8 @@ Part of pull request 1458, commit id `df
 
 Also shared via PR pkg/52460.
 
---- inject_errors.c.orig       2015-08-18 04:25:04.000000000 +0000
-+++ inject_errors.c
+--- src/inject_errors.c.orig   2015-08-18 04:25:04.000000000 +0000
++++ src/inject_errors.c
 @@ -1,5 +1,3 @@
 -
 -#define _GNU_SOURCE /* for RTLD_NEXT */
Index: pkgsrc/devel/jq/patches/patch-util.c
diff -u pkgsrc/devel/jq/patches/patch-util.c:1.1 pkgsrc/devel/jq/patches/patch-util.c:1.2
--- pkgsrc/devel/jq/patches/patch-util.c:1.1    Sun Aug 19 18:08:05 2018
+++ pkgsrc/devel/jq/patches/patch-util.c        Sat Nov  3 12:47:16 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-util.c,v 1.1 2018/08/19 18:08:05 leot Exp $
+$NetBSD: patch-util.c,v 1.2 2018/11/03 12:47:16 leot Exp $
 
 Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
 because the result of the configure command may be inconsistent with it.
@@ -11,8 +11,8 @@ Part of pull request 1458, commit id `df
 
 Also shared via PR pkg/52460.
 
---- util.c.orig        2015-08-18 04:25:04.000000000 +0000
-+++ util.c
+--- src/util.c.orig    2015-08-18 04:25:04.000000000 +0000
++++ src/util.c
 @@ -1,8 +1,3 @@
 -
 -#ifdef HAVE_MEMMEM

Index: pkgsrc/devel/jq/patches/patch-configure.ac
diff -u pkgsrc/devel/jq/patches/patch-configure.ac:1.3 pkgsrc/devel/jq/patches/patch-configure.ac:1.4
--- pkgsrc/devel/jq/patches/patch-configure.ac:1.3      Sun Aug 19 18:08:05 2018
+++ pkgsrc/devel/jq/patches/patch-configure.ac  Sat Nov  3 12:47:16 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.3 2018/08/19 18:08:05 leot Exp $
+$NetBSD: patch-configure.ac,v 1.4 2018/11/03 12:47:16 leot Exp $
 
 Defining _GNU_SOURCE, _BSD_SOURCE etc. in C sources is problematic,
 because the result of the configure command may be inconsistent with it.
@@ -11,11 +11,11 @@ Part of pull request 1458, commit id `df
 
 Also shared via PR pkg/52460.
 
---- configure.ac.orig  2015-08-18 04:25:04.000000000 +0000
+--- configure.ac.orig  2018-11-02 14:52:43.000000000 +0000
 +++ configure.ac
 @@ -11,6 +11,7 @@ AC_PREREQ([2.64])
  AC_CONFIG_AUX_DIR([config])
- AM_INIT_AUTOMAKE([1.11.2 parallel-tests foreign -Wall])
+ AM_INIT_AUTOMAKE([1.11.2 subdir-objects parallel-tests foreign -Wall])
  AM_SILENT_RULES([yes])
 +AC_USE_SYSTEM_EXTENSIONS
  AM_PROG_AR

Added files:

Index: pkgsrc/devel/jq/patches/patch-Makefile.am
diff -u /dev/null pkgsrc/devel/jq/patches/patch-Makefile.am:1.1
--- /dev/null   Sat Nov  3 12:47:16 2018
+++ pkgsrc/devel/jq/patches/patch-Makefile.am   Sat Nov  3 12:47:16 2018
@@ -0,0 +1,15 @@
+$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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index