<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a8e7dcaa0ce500e22d41e027abfe8594e943eb0b">https://github.com/macports/macports-ports/commit/a8e7dcaa0ce500e22d41e027abfe8594e943eb0b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a8e7dcaa0ce jq: update to 1.7
</span>a8e7dcaa0ce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a8e7dcaa0ce500e22d41e027abfe8594e943eb0b
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Thu Sep 7 11:39:27 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> jq: update to 1.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove already merged patch
</span><span style='display:block; white-space:pre;color:#404040;'> - add @herbygillot as co-maintainer
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/68133
</span>---
sysutils/jq/Portfile | 17 +++---
sysutils/jq/files/patch-autoconf-builtins.diff | 74 --------------------------
2 files changed, 7 insertions(+), 84 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/jq/Portfile b/sysutils/jq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b475242bbf8..0d2c8fde2ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/jq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/jq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,14 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup jqlang jq 1.6 jq-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup jqlang jq 1.7 jq-
</span> github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories sysutils
license MIT
maintainers {raimue @raimue} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ {gmail.com:herby.gillot @herbygillot} \
</span> openmaintainer
description A lightweight and flexible command-line JSON processor
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +21,11 @@ long_description\
</span>
homepage https://jqlang.github.io/jq/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:oniguruma6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8931882a8ded5a1d23e42039767ae10c3bf7a349 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 402a0d6975d946e6f4e484d1a84320414a0ff8eb6cf49d2c11d144d4d344db62 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1905863
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7ae650c881fa14ade87569b7e9cd25a62ee6e4e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1750584
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:oniguruma6
</span>
# The documentation requires some ruby dependencies which are not available as
# ports. However, the manpage is already distributed in compiled form and will
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,10 +37,6 @@ configure.args --disable-docs \
</span>
use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# from https://github.com/stedolan/jq/pull/2196
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-autoconf-builtins.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.regex ${name}-(\\d+(\.\\d+)+)\.tar
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/jq/files/patch-autoconf-builtins.diff b/sysutils/jq/files/patch-autoconf-builtins.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7b58167f8f4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/jq/files/patch-autoconf-builtins.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,74 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8e1a4c0405e555943ea78df4b57b423d705b078c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 21 Oct 2020 16:48:38 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix Autoconf checks on Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The Autoconf checks merely verify that the symbol is available and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-linkable, but not that it's actually defined and usable. This breaks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compilation on recent versions of macOS, where `lgamma_r()` is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-unavailable unless `_REENTRANT` is defined. Since this is rather
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-difficult to detect, I strengthened the check so that it simple omits
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-lgamma_r on macOS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-While at it, I added support for `exp10()` on macOS, which is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-available, but named `__exp10` due to its nonstandard nature.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config/m4/check-math-func.m4 | 12 +++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 3 ++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/libm.h | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 17 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/config/m4/check-math-func.m4 b/config/m4/check-math-func.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5677cede..739da671 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/config/m4/check-math-func.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/config/m4/check-math-func.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,9 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl AC_CHECK_MATH_FUNC(func)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFUN([AC_CHECK_MATH_FUNC], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_LANG(C)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_LIB([m],[$1],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_CHECKING(for $1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_LINK_IFELSE([AC_LANG_SOURCE([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void *x = $1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return !x;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_RESULT(yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval "ac_tr_func=HAVE_[]upcase($1)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE_UNQUOTED($ac_tr_func)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_RESULT(no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0441d4a2..ad784a54 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,7 +166,8 @@ AC_CHECK_MATH_FUNC(cosh)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_MATH_FUNC(drem)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_MATH_FUNC(erf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_MATH_FUNC(erfc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_CHECK_MATH_FUNC(exp10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_MATH_FUNC(exp10) # nonstandard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_MATH_FUNC(__exp10) # available on darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_MATH_FUNC(exp2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_MATH_FUNC(exp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_MATH_FUNC(expm1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/libm.h b/src/libm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b1db7882..4812947e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/libm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/libm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,6 +176,10 @@ LIBM_DD_NO(erfc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(HAVE_EXP10) && !defined(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBM_DD(exp10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(HAVE___EXP10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define exp10 __exp10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBM_DD(exp10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef exp10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBM_DD_NO(exp10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>
</pre>