lilypond: fix builds with GNU grep >= 3.5

As of 3.5, GNU grep changed so by default, "The message that a binary
file matches is now sent to standard error", which broke the
expectations of the configure script, which was calling grep on font
files without using -a or equivalent options. If we change to use -a,
this will break non-GNU grep implementations that don't have it, so
also universally require GNU grep for consistency/simplicity.

We should be fine here, as -a was added to GNU grep 2.4.1 back twenty
years ago and pkgsrc sets 2.5.1 as its minimum tool version if building
it itself.

(Really this package should be updated to a newer stable release branch
but I don't have time right now.)

3 files changed, 21 insertions, 5 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 0b629abca35..020e819a921 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2022/06/28 23:56:18 gutteridge Exp $
+# $NetBSD: Makefile,v 1.140 2022/06/29 00:41:47 gutteridge Exp $
 
 DISTNAME=	lilypond-2.18.2
 PKGREVISION=	26
@@ -37,7 +37,11 @@ GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison flex gmake gs:run makeinfo perl pkg-config msgfmt
-USE_TOOLS+=		texi2html zip
+# GNU grep will likely not be required after this package is next updated,
+# assuming the package no longer greps binary files for strings. This is a
+# build fix workaround for GNU grep >= 3.5 changing its behaviour in this
+# regard.
+USE_TOOLS+=		ggrep texi2html zip
 MAKE_FILE=		GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 8657abe6447..13d65962fcb 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2022/03/27 17:21:11 riastradh Exp $
+$NetBSD: distinfo,v 1.32 2022/06/29 00:41:47 gutteridge Exp $
 
 BLAKE2s (lilypond-2.18.2.tar.gz) = 1796709114d8e63b1882e9563a695c355e4b67e1d14c86b3f07639e1630d8797
 SHA512 (lilypond-2.18.2.tar.gz) = 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 Size (lilypond-2.18.2.tar.gz) = 16027977 bytes
 SHA1 (patch-Documentation_common-macros.itexi) = f5ecaea1a495325c5536f8f718b7f900c64612dd
 SHA1 (patch-ab) = a1d327ab900cca18b9306846f137e1bbcfdca945
-SHA1 (patch-configure) = 7d9f9af2ed09d1355e2a4fb9b97236d67595f034
+SHA1 (patch-configure) = c8531fd50916a7a8b7dd0c3b250eab204b8de238
diff --git a/print/lilypond/patches/patch-configure b/print/lilypond/patches/patch-configure
index b1cd5cd81ab..a888ebb1e5c 100644
--- a/print/lilypond/patches/patch-configure
+++ b/print/lilypond/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.5 2019/12/28 21:48:09 gutteridge Exp $
+$NetBSD: patch-configure,v 1.6 2022/06/29 00:41:47 gutteridge Exp $
 
 Disable c/c++ version check; it fails e.g. with clang emulating gcc.
 Allow more metapost versions than upstream until pkgsrc contains
@@ -10,6 +10,9 @@ 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.
 
+Fix builds with GNU grep >= 3.5. That is, require GNU grep as a tool,
+and use the -a option, since it is operating on binary files.
+
 --- configure.orig	2014-03-17 15:29:16.000000000 +0000
 +++ configure
 @@ -2264,7 +2264,7 @@ $as_echo_n "checking $r version... " >&6
@@ -48,6 +51,15 @@ NetBSD's /bin/sh, nor does it work as expected on some other OSes
  `
  	if ! $exe -V > /dev/null 2>&1 ; then
  	    continue
+@@ -4272,7 +4272,7 @@ if test "$NCSB_DIR" != "" ;  then
+     if test ! -f "$NCSB_DIR/$f"; then
+       MISSING_NCSB_SOURCE_FILES="$f $MISSING_NCSB_SOURCE_FILES"
+     else
+-      if test "`grep Cyrillic "$NCSB_DIR/$f"`" = ""; then
++      if test "`grep -a Cyrillic "$NCSB_DIR/$f"`" = ""; then
+         INCOMPLETE_NCSB_SOURCE_FILES="$f $INCOMPLETE_NCSB_SOURCE_FILES"
+       else
+         NCSB_SOURCE_FILES="$NCSB_DIR/$f $NCSB_SOURCE_FILES"
 @@ -4331,7 +4331,7 @@ $as_echo_n "checking for python... " >&6
      ## command -v doesn't work in zsh
      ## command -v "$r" 2>&1