Received: by mail.netbsd.org (Postfix, from userid 605)
	id 1072184D76; Sat, 28 Dec 2019 21:48:11 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 8A37384D3F
	for <pkgsrc-changes@NetBSD.org>; Sat, 28 Dec 2019 21:48:10 +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 lq8hQ_EDFtkE for <pkgsrc-changes@netbsd.org>;
	Sat, 28 Dec 2019 21:48:09 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 443FC84C81
	for <pkgsrc-changes@NetBSD.org>; Sat, 28 Dec 2019 21:48:09 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 391F7FA97; Sat, 28 Dec 2019 21:48:09 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_157756968974720"
MIME-Version: 1.0
Date: Sat, 28 Dec 2019 21:48:09 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/print/lilypond
To: pkgsrc-changes@NetBSD.org
Reply-To: gutteridge@netbsd.org
X-Mailer: log_accum
Message-Id: <20191228214809.391F7FA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_157756968974720
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Sat Dec 28 21:48:09 UTC 2019

Modified Files:
	pkgsrc/print/lilypond: Makefile distinfo
	pkgsrc/print/lilypond/patches: patch-configure

Log Message:
lilypond: fix building on NetBSD >8.0 and on some other OSes

NetBSD's /bin/sh no longer accepts "type -p". The same is true for some
other OSes (e.g. recent DragonFly BSD). Use "command -v" instead.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/print/lilypond/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/print/lilypond/distinfo
cvs rdiff -u -r1.4 -r1.5 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.


--_----------=_157756968974720
Content-Disposition: inline
Content-Length: 17742
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.126 pkgsrc/print/lilypond/Makefile:1.127
--- pkgsrc/print/lilypond/Makefile:1.126	Mon Nov  4 19:57:59 2019
+++ pkgsrc/print/lilypond/Makefile	Sat Dec 28 21:48:08 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.126 2019/11/04 19:57:59 rillig Exp $
+# $NetBSD: Makefile,v 1.127 2019/12/28 21:48:08 gutteridge Exp $
 
 DISTNAME=	lilypond-2.18.2
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	print
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v2.18/
 

Index: pkgsrc/print/lilypond/distinfo
diff -u pkgsrc/print/lilypond/distinfo:1.27 pkgsrc/print/lilypond/distinfo:1.28
--- pkgsrc/print/lilypond/distinfo:1.27	Tue Jun 19 08:46:41 2018
+++ pkgsrc/print/lilypond/distinfo	Sat Dec 28 21:48:08 2019
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2018/06/19 08:46:41 fhajny Exp $
+$NetBSD: distinfo,v 1.28 2019/12/28 21:48:08 gutteridge Exp $
 
 SHA1 (lilypond-2.18.2.tar.gz) = 09d3a1e0e9fadeb8ef6e279227a2b30812c7ee9b
 RMD160 (lilypond-2.18.2.tar.gz) = a355201334fd0beac36c96f844c75d8e27b4ea9d
 SHA512 (lilypond-2.18.2.tar.gz) = 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 Size (lilypond-2.18.2.tar.gz) = 16027977 bytes
 SHA1 (patch-ab) = a1d327ab900cca18b9306846f137e1bbcfdca945
-SHA1 (patch-configure) = e98c0b0e81dfa4ee2b593fd5eace444b8d58715d
+SHA1 (patch-configure) = 7d9f9af2ed09d1355e2a4fb9b97236d67595f034

Index: pkgsrc/print/lilypond/patches/patch-configure
diff -u pkgsrc/print/lilypond/patches/patch-configure:1.4 pkgsrc/print/lilypond/patches/patch-configure:1.5
--- pkgsrc/print/lilypond/patches/patch-configure:1.4	Tue Jun 19 08:46:41 2018
+++ pkgsrc/print/lilypond/patches/patch-configure	Sat Dec 28 21:48:09 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.4 2018/06/19 08:46:41 fhajny Exp $
+$NetBSD: patch-configure,v 1.5 2019/12/28 21:48:09 gutteridge Exp $
 
 Disable c/c++ version check; it fails e.g. with clang emulating gcc.
 Allow more metapost versions than upstream until pkgsrc contains
@@ -6,8 +6,66 @@ a new enough metapost.
 
 Ignore result of broken pkg-config version test.
 
+Fix various searches for executables: "type -p" no longer works in
+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	2014-03-17 15:29:16.000000000 +0000
 +++ configure
+@@ -2264,7 +2264,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -2413,7 +2413,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -2563,7 +2563,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -2820,7 +2820,7 @@ $as_echo_n "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
+-    type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
++    command -v $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
+ `
+ 	if ! $exe -V > /dev/null 2>&1 ; then
+ 	    continue
+@@ -4331,7 +4331,7 @@ $as_echo_n "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
+-    type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
++    command -v $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
+ `
+ 	if ! $exe -V > /dev/null 2>&1 ; then
+ 	    continue
+@@ -5240,7 +5240,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
 @@ -5297,7 +5297,7 @@ $as_echo_n "checking $r version... " >&6
  `
      { $as_echo "$as_me:$LINENO: result: $ver" >&5
@@ -17,6 +75,15 @@ Ignore result of broken pkg-config versi
  
      eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 3.4 (installed: $ver)"\"`\"
  
+@@ -5757,7 +5757,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
 @@ -5814,7 +5814,7 @@ $as_echo_n "checking $r version... " >&6
  `
      { $as_echo "$as_me:$LINENO: result: $ver" >&5
@@ -26,6 +93,69 @@ Ignore result of broken pkg-config versi
  
      eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 3.4 (installed: $ver)"\"`\"
  
+@@ -6063,7 +6063,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -6557,7 +6557,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -6638,7 +6638,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -6795,7 +6795,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -7676,7 +7676,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -7827,7 +7827,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -7976,7 +7976,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
 @@ -8087,11 +8087,11 @@ $as_echo "$ver" >&6; }
      {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
  `
@@ -41,6 +171,69 @@ Ignore result of broken pkg-config versi
      fi
  
      { $as_echo "$as_me:$LINENO: checking for working metafont mode" >&5
+@@ -8192,7 +8192,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -8292,7 +8292,7 @@ $as_echo_n "checking for guile-config...
+     ## 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}'
+ `
+ 	if ! $exe --version > /dev/null 2>&1 ; then
+ 	    continue
+@@ -8397,7 +8397,7 @@ $as_echo "$ver" >&6; }
+     ## command -v doesn't work in zsh
+     ## command -v "$guile_config" 2>&1
+     ## this test should work in ash, bash, pdksh (ksh), zsh
+-    type -p $guile_config 2>/dev/null | tail -n 1 | awk '{print $NF}'
++    command -v $guile_config 2>/dev/null | tail -n 1 | awk '{print $NF}'
+ `
+     if test -x $exe; then
+ 	{ $as_echo "$as_me:$LINENO: checking guile compile flags" >&5
+@@ -9298,7 +9298,7 @@ $as_echo_n "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
+-    type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
++    command -v $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
+ `
+ 	if ! $exe -V > /dev/null 2>&1 ; then
+ 	    continue
+@@ -9779,7 +9779,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -9976,7 +9976,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -10890,7 +10890,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
 @@ -10947,11 +10947,6 @@ $as_echo_n "checking $r version... " >&6
  `
      { $as_echo "$as_me:$LINENO: result: $ver" >&5
@@ -53,3 +246,156 @@ Ignore result of broken pkg-config versi
      vervar="`echo PKG_CONFIG | tr 'a-z' 'A-Z'`_VERSION"
      eval `echo $vervar=$num`
  ##    AC_SUBST(`eval echo $vervar`)
+@@ -11792,7 +11787,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -11876,7 +11871,7 @@ $as_echo_n "checking for guile... " >&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}'
+ `
+ 	if ! $exe --version > /dev/null 2>&1 ; then
+ 	    continue
+@@ -12092,7 +12087,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -12292,7 +12287,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -12497,7 +12492,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -12648,7 +12643,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -12797,7 +12792,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -12946,7 +12941,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -13095,7 +13090,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -13244,7 +13239,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -13393,7 +13388,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -13542,7 +13537,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -13691,7 +13686,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -13866,7 +13861,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -14015,7 +14010,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -14165,7 +14160,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""
+@@ -14314,7 +14309,7 @@ $as_echo_n "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}'
+ `
+     if test -n ""; then
+         ver=""


--_----------=_157756968974720--