From 1d14fbf4d3709b66a602ca24f87e6254d8008bef Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Wed, 29 Nov 2023 16:58:05 +0000
Subject: [PATCH] lilypond: update to 2.24.3. Changes:

- Restore PDF conversion with the recent Ghostscript 10.02.1
- Add initial support for Guile 3.0 (2.2 remains recommended)
---
 print/lilypond/Makefile | 12 ++++++------
 print/lilypond/PLIST    |  3 ++-
 print/lilypond/distinfo |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index b1542f4a50d1..c122b8a1d4a0 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.150 2023/11/14 14:02:44 wiz Exp $
+# $NetBSD: Makefile,v 1.151 2023/11/29 16:58:05 schmonz Exp $
 
-DISTNAME=		lilypond-2.24.2
-PKGREVISION=		2
+DISTNAME=		lilypond-2.24.3
 CATEGORIES=		print
 MASTER_SITES=		https://lilypond.org/download/sources/v2.24/
 
@@ -34,14 +33,15 @@ DEPENDS+=		potrace>=1.8:../../graphics/potrace
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
-USE_LANGUAGES=		c c++11
+USE_LANGUAGES=		c c++
+USE_CXX_FEATURES=	c++14
 USE_TOOLS+=		bison gmake gs:run makeinfo perl pkg-config msgfmt
 USE_TOOLS+=		texi2html zip
 MAKE_FILE=		GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
 
-TEXINFO_REQD=		6.1
+TEXINFO_REQD+=		6.1
 
 GNU_CONFIGURE_INFODIR=	${PREFIX}/${PKGINFODIR}
 INFO_DIR=		${GNU_CONFIGURE_INFODIR}
@@ -62,7 +62,7 @@ post-install:
 .include "../../devel/boehm-gc/buildlink3.mk"
 # needs FlexLexer.h
 # make sure we use the same version for that file and the flex binary
-FLEX_REQD=		2.6.0
+FLEX_REQD+=		2.6.0
 BUILDLINK_API_DEPENDS.flex+=	flex>=2.6.0
 .include "../../devel/flex/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/print/lilypond/PLIST b/print/lilypond/PLIST
index d8b610dfb1b1..5ccd1d1a71eb 100644
--- a/print/lilypond/PLIST
+++ b/print/lilypond/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2022/12/27 15:57:01 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.20 2023/11/29 16:58:05 schmonz Exp $
 bin/abc2ly
 bin/convert-ly
 bin/etf2ly
@@ -297,6 +297,7 @@ share/lilypond/${PKGVERSION}/ly/voice-tkit.ly
 share/lilypond/${PKGVERSION}/ps/encodingdefs.ps
 share/lilypond/${PKGVERSION}/ps/lilyponddefs.ps
 share/lilypond/${PKGVERSION}/ps/music-drawing-routines.ps
+share/lilypond/${PKGVERSION}/ps/nocache.ps
 share/lilypond/${PKGVERSION}/python/book_base.py
 share/lilypond/${PKGVERSION}/python/book_docbook.py
 share/lilypond/${PKGVERSION}/python/book_html.py
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 6234636a586c..66ed75e3e3bb 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.35 2023/09/07 13:26:16 schmonz Exp $
+$NetBSD: distinfo,v 1.36 2023/11/29 16:58:05 schmonz Exp $
 
-BLAKE2s (lilypond-2.24.2.tar.gz) = e53be2284ded4e1a9a7ac7ba6b238cc797dfce57dbd98d50b77f6276b1cc9fab
-SHA512 (lilypond-2.24.2.tar.gz) = 14a37e3346cad2fe78a9ce7189d21797c9d78016c675b6a20ae25de7bf3de2916c6982ef753b0d051600c0ac15317a8ecb423746be4419db023b6eb829dfc3de
-Size (lilypond-2.24.2.tar.gz) = 19439984 bytes
+BLAKE2s (lilypond-2.24.3.tar.gz) = f1428e3ffc39c3dc196d99616a989062c4bbc3cb5f03ee026a6547f8dd3d2d33
+SHA512 (lilypond-2.24.3.tar.gz) = 5153f6cbe5e68e4b3dfcc03a8299ef6b82fbfb487eb3e4f9d631b9dc5a07a972168c3f141d6d50eac936f5c7aeeacd19837c0c9ab70f11dfd5c7efe085d5b56e
+Size (lilypond-2.24.3.tar.gz) = 19441299 bytes
 SHA1 (patch-GNUmakefile.in) = 86e4d55ebf3b718178d019d7946943ae28d8e9b1
 SHA1 (patch-configure) = 198dd20364e829911efc45e30d42d7f90c949702