Received: by mail.netbsd.org (Postfix, from userid 605) id D935184D13; Sat, 18 Feb 2023 01:52:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 124A684D08 for ; Sat, 18 Feb 2023 01:52:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id BiudYwRry5PJ for ; Sat, 18 Feb 2023 01:52:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 53F5F84C86 for ; Sat, 18 Feb 2023 01:52:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 40FC8FA90; Sat, 18 Feb 2023 01:52:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1676685170103630" MIME-Version: 1.0 Date: Sat, 18 Feb 2023 01:52:50 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/print/lilypond To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20230218015250.40FC8FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1676685170103630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Feb 18 01:52:50 UTC 2023 Modified Files: pkgsrc/print/lilypond: Makefile distinfo pkgsrc/print/lilypond/patches: patch-configure Log Message: Update to 2.24.1. From the changelog: - This version includes a number of fixes since the release of the previous stable version in December 2022, and we recommend all users to update. Scores converted to or written for 2.24.0 will continue to work with this release. To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 pkgsrc/print/lilypond/Makefile cvs rdiff -u -r1.33 -r1.34 pkgsrc/print/lilypond/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/lilypond/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1676685170103630 Content-Disposition: inline Content-Length: 18523 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/lilypond/Makefile diff -u pkgsrc/print/lilypond/Makefile:1.144 pkgsrc/print/lilypond/Makefile:1.145 --- pkgsrc/print/lilypond/Makefile:1.144 Sun Jan 29 21:17:36 2023 +++ pkgsrc/print/lilypond/Makefile Sat Feb 18 01:52:49 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.144 2023/01/29 21:17:36 ryoon Exp $ +# $NetBSD: Makefile,v 1.145 2023/02/18 01:52:49 schmonz Exp $ -DISTNAME= lilypond-2.24.0 -PKGREVISION= 1 +DISTNAME= lilypond-2.24.1 CATEGORIES= print MASTER_SITES= https://lilypond.org/download/sources/v2.24/ Index: pkgsrc/print/lilypond/distinfo diff -u pkgsrc/print/lilypond/distinfo:1.33 pkgsrc/print/lilypond/distinfo:1.34 --- pkgsrc/print/lilypond/distinfo:1.33 Tue Dec 27 15:57:01 2022 +++ pkgsrc/print/lilypond/distinfo Sat Feb 18 01:52:49 2023 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.33 2022/12/27 15:57:01 schmonz Exp $ +$NetBSD: distinfo,v 1.34 2023/02/18 01:52:49 schmonz Exp $ -BLAKE2s (lilypond-2.24.0.tar.gz) = a0c6874f66142608890625d2964e56bdb197f61a43e6a8e73f5f2b3990877fad -SHA512 (lilypond-2.24.0.tar.gz) = fc00736ae899519408781a7f1bf83065e493a857073d6f56cdadabc5817d4f41092dad12bfe210ec8a866f454b70f87ede6c7f1ba7aedc901134913b22c1431b -Size (lilypond-2.24.0.tar.gz) = 19430807 bytes +BLAKE2s (lilypond-2.24.1.tar.gz) = 4b8b1bc4fc32005184b6e328847a8b35b53d5b8a017fc8a9c5306279867ea0a0 +SHA512 (lilypond-2.24.1.tar.gz) = 121e1b4b70bc84948a6b51d2e7fb785d8abcf2585b9c463929021ba86a69ad34d24f14a5a7997a7428f02c0e9f102cfd348870cd67d9feb1f3b3040a96d25db0 +Size (lilypond-2.24.1.tar.gz) = 19438552 bytes SHA1 (patch-GNUmakefile.in) = 86e4d55ebf3b718178d019d7946943ae28d8e9b1 -SHA1 (patch-configure) = 67ce6a3b84942ee6821f41491d27e61a053e67c1 +SHA1 (patch-configure) = 198dd20364e829911efc45e30d42d7f90c949702 Index: pkgsrc/print/lilypond/patches/patch-configure diff -u pkgsrc/print/lilypond/patches/patch-configure:1.7 pkgsrc/print/lilypond/patches/patch-configure:1.8 --- pkgsrc/print/lilypond/patches/patch-configure:1.7 Tue Dec 27 15:57:01 2022 +++ pkgsrc/print/lilypond/patches/patch-configure Sat Feb 18 01:52:50 2023 @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.7 2022/12/27 15:57:01 schmonz Exp $ +$NetBSD: patch-configure,v 1.8 2023/02/18 01:52:50 schmonz Exp $ Ignore result of broken pkg-config version test. @@ -6,9 +6,9 @@ Fix various searches for executables: "t NetBSD's /bin/sh, nor does it work as expected on some other OSes (e.g. DragonFly). As discussed in NetBSD PR bin/54803. ---- configure.orig 2022-12-13 19:20:39.000000000 +0000 +--- configure.orig 2023-02-10 17:44:03.000000000 +0000 +++ configure -@@ -3072,7 +3072,7 @@ printf %s "checking $r version... " >&6; +@@ -3070,7 +3070,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -17,7 +17,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -3126,7 +3126,7 @@ printf %s "checking $r version... " >&6; +@@ -3124,7 +3124,7 @@ printf %s "checking $r version... " >&6; ` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 printf "%s\n" "$ver" >&6; } @@ -26,7 +26,7 @@ NetBSD's /bin/sh, nor does it work as ex eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= (installed: $ver)"\"`\" -@@ -3140,7 +3140,7 @@ printf "%s\n" "$ver" >&6; } +@@ -3138,7 +3138,7 @@ printf "%s\n" "$ver" >&6; } } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` @@ -35,7 +35,7 @@ NetBSD's /bin/sh, nor does it work as ex eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r <= (installed: $ver)"\"`\" -@@ -3236,7 +3236,7 @@ printf %s "checking $r version... " >&6; +@@ -3234,7 +3234,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -44,7 +44,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -3290,7 +3290,7 @@ printf %s "checking $r version... " >&6; +@@ -3288,7 +3288,7 @@ printf %s "checking $r version... " >&6; ` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 printf "%s\n" "$ver" >&6; } @@ -53,7 +53,7 @@ NetBSD's /bin/sh, nor does it work as ex eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= (installed: $ver)"\"`\" -@@ -3304,7 +3304,7 @@ printf "%s\n" "$ver" >&6; } +@@ -3302,7 +3302,7 @@ printf "%s\n" "$ver" >&6; } } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` @@ -62,7 +62,7 @@ NetBSD's /bin/sh, nor does it work as ex eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r <= (installed: $ver)"\"`\" -@@ -3401,7 +3401,7 @@ printf %s "checking $r version... " >&6; +@@ -3399,7 +3399,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -71,7 +71,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -3455,7 +3455,7 @@ printf %s "checking $r version... " >&6; +@@ -3453,7 +3453,7 @@ printf %s "checking $r version... " >&6; ` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5 printf "%s\n" "$ver" >&6; } @@ -80,7 +80,7 @@ NetBSD's /bin/sh, nor does it work as ex eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= (installed: $ver)"\"`\" -@@ -3469,7 +3469,7 @@ printf "%s\n" "$ver" >&6; } +@@ -3467,7 +3467,7 @@ printf "%s\n" "$ver" >&6; } } {printf "%.0f\n", $1*1000000 + $2*1000 + three}' ` @@ -89,7 +89,7 @@ NetBSD's /bin/sh, nor does it work as ex eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r <= (installed: $ver)"\"`\" -@@ -3500,7 +3500,7 @@ printf %s "checking for python... " >&6; +@@ -3498,7 +3498,7 @@ printf %s "checking for python... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -98,7 +98,7 @@ NetBSD's /bin/sh, nor does it work as ex ` if ! $exe -V > /dev/null 2>&1 ; then continue -@@ -5105,7 +5105,7 @@ printf %s "checking for python... " >&6; +@@ -5101,7 +5101,7 @@ printf %s "checking for python... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -107,7 +107,7 @@ NetBSD's /bin/sh, nor does it work as ex ` if ! $exe -V > /dev/null 2>&1 ; then continue -@@ -5731,7 +5731,7 @@ printf %s "checking $r version... " >&6; +@@ -5727,7 +5727,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -116,7 +116,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -6021,7 +6021,7 @@ printf %s "checking $r version... " >&6; +@@ -6017,7 +6017,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -125,7 +125,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -6115,7 +6115,7 @@ printf %s "checking $r version... " >&6; +@@ -6111,7 +6111,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -134,7 +134,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -6281,7 +6281,7 @@ printf %s "checking $r version... " >&6; +@@ -6277,7 +6277,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -143,7 +143,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -6594,7 +6594,7 @@ printf %s "checking $r version... " >&6; +@@ -6590,7 +6590,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -152,7 +152,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -6760,7 +6760,7 @@ printf %s "checking $r version... " >&6; +@@ -6756,7 +6756,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -161,7 +161,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -6924,7 +6924,7 @@ printf %s "checking $r version... " >&6; +@@ -6920,7 +6920,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -170,7 +170,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -7157,7 +7157,7 @@ printf %s "checking $r version... " >&6; +@@ -7153,7 +7153,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -179,7 +179,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -7880,7 +7880,7 @@ fi +@@ -7876,7 +7876,7 @@ fi test -n "$FONTFORGE" && break done @@ -188,7 +188,7 @@ NetBSD's /bin/sh, nor does it work as ex r="`eval echo '$'"FONTFORGE"`" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $r version" >&5 -@@ -7891,7 +7891,7 @@ printf %s "checking $r version... " >&6; +@@ -7887,7 +7887,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -197,7 +197,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -8125,7 +8125,7 @@ printf %s "checking $r version... " >&6; +@@ -8121,7 +8121,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -206,7 +206,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -9028,7 +9028,7 @@ printf %s "checking $r version... " >&6; +@@ -9024,7 +9024,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -215,7 +215,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -9247,7 +9247,7 @@ printf %s "checking $r version... " >&6; +@@ -9243,7 +9243,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -224,7 +224,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -9471,7 +9471,7 @@ printf %s "checking $r version... " >&6; +@@ -9467,7 +9467,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -233,7 +233,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -9717,7 +9717,7 @@ printf %s "checking $r version... " >&6; +@@ -9713,7 +9713,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -242,7 +242,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -9882,7 +9882,7 @@ printf %s "checking $r version... " >&6; +@@ -9878,7 +9878,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -251,7 +251,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -10078,7 +10078,7 @@ printf %s "checking $r version... " >&6; +@@ -10074,7 +10074,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -260,7 +260,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -10247,7 +10247,7 @@ printf %s "checking $r version... " >&6; +@@ -10243,7 +10243,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -269,7 +269,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -10411,7 +10411,7 @@ printf %s "checking $r version... " >&6; +@@ -10407,7 +10407,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -278,7 +278,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -10575,7 +10575,7 @@ printf %s "checking $r version... " >&6; +@@ -10571,7 +10571,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -287,7 +287,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -10739,7 +10739,7 @@ printf %s "checking $r version... " >&6; +@@ -10735,7 +10735,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -296,7 +296,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -10904,7 +10904,7 @@ printf %s "checking $r version... " >&6; +@@ -10900,7 +10900,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -305,7 +305,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -11074,7 +11074,7 @@ printf %s "checking $r version... " >&6; +@@ -11070,7 +11070,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -314,7 +314,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -11239,7 +11239,7 @@ printf %s "checking $r version... " >&6; +@@ -11235,7 +11235,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -323,7 +323,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -11403,7 +11403,7 @@ printf %s "checking $r version... " >&6; +@@ -11399,7 +11399,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -332,7 +332,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -11582,7 +11582,7 @@ printf %s "checking $r version... " >&6; +@@ -11578,7 +11578,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -341,7 +341,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -11788,7 +11788,7 @@ printf %s "checking $r version... " >&6; +@@ -11784,7 +11784,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh @@ -350,16 +350,7 @@ NetBSD's /bin/sh, nor does it work as ex ` ver=` ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -11952,7 +11952,7 @@ printf %s "checking $r version... " >&6; - ## command -v doesn't work in zsh - ## command -v "$r" 2>&1 - ## this test should work in ash, bash, pdksh (ksh), zsh -- type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}' -+ command -v $r 2>/dev/null | tail -n 1 | awk '{print $NF}' - ` - ver=` - ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}' -@@ -12116,7 +12116,7 @@ printf %s "checking $r version... " >&6; +@@ -11948,7 +11948,7 @@ printf %s "checking $r version... " >&6; ## command -v doesn't work in zsh ## command -v "$r" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh --_----------=_1676685170103630--