CVS commit: pkgsrc/devel/jq

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun  2 08:07:34 UTC 2025

Modified Files:
        pkgsrc/devel/jq: distinfo
        pkgsrc/devel/jq/patches: patch-Makefile.am patch-Makefile.in
Removed Files:
        pkgsrc/devel/jq/patches: patch-src_main.c

Log Message:
jq: finish update


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/jq/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/jq/patches/patch-Makefile.am \
    pkgsrc/devel/jq/patches/patch-Makefile.in
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/jq/patches/patch-src_main.c

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/distinfo
diff -u pkgsrc/devel/jq/distinfo:1.19 pkgsrc/devel/jq/distinfo:1.20
--- pkgsrc/devel/jq/distinfo:1.19       Sun Jun  1 18:43:09 2025
+++ pkgsrc/devel/jq/distinfo    Mon Jun  2 08:07:34 2025
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.19 2025/06/01 18:43:09 leot Exp $
+$NetBSD: distinfo,v 1.20 2025/06/02 08:07:34 wiz Exp $
 
 BLAKE2s (jq-1.8.0.tar.gz) = 5c80da8304630ba309ff79275656dbc765e2786a15247aea838eef012fa5e366
 SHA512 (jq-1.8.0.tar.gz) = eaa991e43d3fc716dd57f6722a42d4119dcd8ba272eb2fcab882f83efb0b11c10a35c3dc8ad2067f30440dad988d34b5955601499eae1bb9e43db53db02bc4cf
 Size (jq-1.8.0.tar.gz) = 1908285 bytes
-SHA1 (patch-Makefile.am) = 956dd33679a07635e4682441e26973e0d12c3d4e
-SHA1 (patch-Makefile.in) = fc63d83ff4c2134ec7dbaa068dfa04ec54ecb85e
-SHA1 (patch-src_main.c) = ab7c5c54a980727e2040927ebaea771dec9800ba
+SHA1 (patch-Makefile.am) = 01886c0d7ea547367228a4d35c79c384682cf800
+SHA1 (patch-Makefile.in) = aef7aeb2ba4868dbd50b659221530d6c0beba110

Index: pkgsrc/devel/jq/patches/patch-Makefile.am
diff -u pkgsrc/devel/jq/patches/patch-Makefile.am:1.4 pkgsrc/devel/jq/patches/patch-Makefile.am:1.5
--- pkgsrc/devel/jq/patches/patch-Makefile.am:1.4       Sun Jun  1 18:43:09 2025
+++ pkgsrc/devel/jq/patches/patch-Makefile.am   Mon Jun  2 08:07:34 2025
@@ -1,10 +1,12 @@
-$NetBSD: patch-Makefile.am,v 1.4 2025/06/01 18:43:09 leot Exp $
+$NetBSD: patch-Makefile.am,v 1.5 2025/06/02 08:07:34 wiz Exp $
 
 Actually escape the "#".
 
 If "\x23d" is used it can get substituted with "=" and that will mess up
 src/version.h.
 
+Needed due to bin/59453: sed 's/^/\x23def/' output '=ef' instead of '#def'
+
 --- Makefile.am.orig   2025-06-01 18:07:55.412230053 +0000
 +++ Makefile.am
 @@ -99,7 +99,7 @@ endif
Index: pkgsrc/devel/jq/patches/patch-Makefile.in
diff -u pkgsrc/devel/jq/patches/patch-Makefile.in:1.4 pkgsrc/devel/jq/patches/patch-Makefile.in:1.5
--- pkgsrc/devel/jq/patches/patch-Makefile.in:1.4       Thu Dec 14 08:08:03 2023
+++ pkgsrc/devel/jq/patches/patch-Makefile.in   Mon Jun  2 08:07:34 2025
@@ -1,16 +1,20 @@
-$NetBSD: patch-Makefile.in,v 1.4 2023/12/14 08:08:03 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2025/06/02 08:07:34 wiz Exp $
 
-Do dynamic linking of libtool libraries too (otherwise bin/jq can
-end up being statically linked).
+Actually escape the "#".
 
---- Makefile.in.orig   2023-12-13 19:24:21.000000000 +0000
+If "\x23d" is used it can get substituted with "=" and that will mess up
+src/version.h.
+
+Needed due to bin/59453: sed 's/^/\x23def/' output '=ef' instead of '#def'
+
+--- Makefile.in.orig   2025-06-01 05:58:46.000000000 +0000
 +++ Makefile.in
-@@ -760,7 +760,7 @@ generate_ver = ver="`{ $(srcdir)/scripts
+@@ -754,7 +754,7 @@ AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir
+ @ENABLE_ERROR_INJECTION_TRUE@libinject_errors_la_SOURCES = src/inject_errors.c
+ @ENABLE_ERROR_INJECTION_TRUE@libinject_errors_la_LIBADD = -ldl
+ @ENABLE_ERROR_INJECTION_TRUE@libinject_errors_la_LDFLAGS = -module
+-generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\x23define JQ_VERSION \"&\"/'`"
++generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\#define JQ_VERSION \"&\"/'`"
  CLEANFILES = src/version.h .remake-version-h src/builtin.inc \
        src/config_opts.inc jq.1
- jq_SOURCES = src/main.c src/version.h
--jq_LDFLAGS = -static-libtool-libs $(am__append_8)
-+jq_LDFLAGS = $(am__append_8)
- jq_LDADD = libjq.la -lm
- 
- ### Tests (make check)
+ jq_SOURCES = src/main.c