print/lilypond: update to 2.24.1

Changelog: http://lilypond.org/news.html#LilyPond-2_002e24_002e1-released_0021-February-12_002c-2023

PR:		271637

print/lilypond/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	lilypond
-DISTVERSION=	2.22.2
-PORTREVISION=	3
+DISTVERSION=	2.24.1
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 
@@ -22,23 +21,24 @@ BUILD_DEPENDS=	bash:shells/bash \
 		zip:archivers/zip
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
+		libgc-threaded.so:devel/boehm-gc-threaded \
 		libgmp.so:math/gmp \
+		libguile-2.2.so:lang/guile2 \
 		libharfbuzz.so:print/harfbuzz \
 		libltdl.so:devel/libltdl
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
 		mftrace:print/mftrace
 
 USES=		bison:build compiler:c++11-lib cpe ghostscript gmake gnome \
-		magick:7,build perl5 pkgconfig python:3.5+ tex
-USE_CXXSTD=	c++11
+		magick:7,build perl5 pkgconfig python:3.5+
+USE_CXXSTD=	c++14
 USE_GNOME=	pango
 USE_PERL5=	build
-USE_TEX=	latex
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre
 CONFIGURE_ENV+=		ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
 			FLEX=${FLEX} \
+			GUILE_FLAVOR=guile-2.2 \
 			HOME=${WRKDIR} \
 			YACC=${YACC}
 
@@ -49,35 +49,30 @@ CONFLICTS_INSTALL=	lilypond-devel
 
 BINARY_ALIAS=	python=${PYTHON_VERSION}
 
-INFO=		lilypond-changes lilypond-contributor lilypond-essay \
-		lilypond-extending lilypond-internals lilypond-learning \
-		lilypond-notation lilypond-snippets lilypond-usage \
+INFO=		lilypond-changes \
+		lilypond-contributor \
+		lilypond-essay \
+		lilypond-extending \
+		lilypond-internals \
+		lilypond-learning \
+		lilypond-notation \
+		lilypond-snippets \
+		lilypond-usage \
 		music-glossary
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-OPTIONS_DEFINE=	GUILE2 NLS URW
+OPTIONS_DEFINE=	NLS URW
 OPTIONS_SUB=	yes
 
-GUILE2_DESC=	guile2 instead guile (incurs performance penalty)
 URW_DESC=	Use bundled URW fonts
 
-GUILE2_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
-			libguile-2.2.so:lang/guile2
-GUILE2_LIB_DEPENDS_OFF=	libguile.so:lang/guile1
-GUILE2_CONFIGURE_ENV=	GUILE_FLAVOR=guile-2.2
-
 NLS_USES=	gettext
-NLS_USES_OFF=	gettext-tools
 
 URW_BUILD_DEPENDS=	urw-base35-fonts>0:x11-fonts/urw-base35-fonts
 URW_RUN_DEPENDS_OFF=	urw-base35-fonts>0:x11-fonts/urw-base35-fonts
 URW_CONFIGURE_WITH=	urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|<FlexLexer.h>|"/usr/include/FlexLexer.h"|' \
-		${WRKSRC}/lily/include/includable-lexer.hh
-	@${REINPLACE_CMD} -e 's|$save_CXXFLAGS -Werror=suggest-override|$save_CXXFLAGS|' \
-		${WRKSRC}/configure
 	@${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|'  \
 		${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf
 

print/lilypond/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1653158432
-SHA256 (lilypond-2.22.2.tar.gz) = dde90854fa7de1012f4e1304a68617aea9ab322932ec0ce76984f60d26aa23be
-SIZE (lilypond-2.22.2.tar.gz) = 18034586
+TIMESTAMP = 1677192463
+SHA256 (lilypond-2.24.1.tar.gz) = d5c59087564a5cd6f08a52ba80e7d6509b91c585e44385dcc0fa39265d181509
+SIZE (lilypond-2.24.1.tar.gz) = 19438552

print/lilypond/files/patch-Documentation_GNUmakefile

@@ -1,23 +1,23 @@
---- Documentation/GNUmakefile.orig	2020-08-16 10:58:56 UTC
+--- Documentation/GNUmakefile.orig	2022-03-26 15:12:51 UTC
 +++ Documentation/GNUmakefile
-@@ -147,6 +147,7 @@ INFO_DOCS = \
+@@ -188,6 +188,7 @@ INFO_DOCS = \
    lilypond-internals \
    lilypond-learning \
    lilypond-notation \
 +  lilypond-snippets \
    lilypond-usage \
    music-glossary
- # Some info files should only be processed if `$(out)` is equal to
-@@ -156,11 +157,9 @@ INFO_DOCS = \
- # more entries that are no longer present.
+ # Some info files should only be processed if `$(out)` is equal to `www`, but we
+@@ -196,11 +197,9 @@ INFO_DOCS = \
+ # older LilyPond versions inserted more entries that are no longer present.
  ALL_INFO_DOCS = \
    $(INFO_DOCS) \
 -  lilypond-snippets \
    lilypond-web
  ifeq ($(out),www)
--INFO_DOCS += lilypond-snippets \
--             lilypond-web
-+INFO_DOCS += lilypond-web
+-  INFO_DOCS += lilypond-snippets \
+-               lilypond-web
++  INFO_DOCS += lilypond-web
  endif
  INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
  ALL_INFO_FILES = $(ALL_INFO_DOCS:%=$(outdir)/%.info)

print/lilypond/files/patch-config.make.in

@@ -1,11 +1,11 @@
---- config.make.in.orig	2020-08-16 10:58:56 UTC
+--- config.make.in.orig	2023-02-10 17:44:03 UTC
 +++ config.make.in
-@@ -94,7 +94,7 @@ mandir = @mandir@
+@@ -92,7 +92,7 @@ mandir = @mandir@
  package = lilypond
  package_datadir = $(datadir)/$(package)
  package_docdir = $(docdir)/$(package)
 -package_infodir = $(infodir)/$(package)
 +package_infodir = $(infodir)
+ package_libdir = $(libdir)/$(package)
  prefix = @prefix@
  program_prefix = @program_prefix@
- program_suffix = @program_suffix@

print/lilypond/files/patch-lily_include_includable-lexer.hh

@@ -0,0 +1,11 @@
+--- lily/include/includable-lexer.hh.orig	2023-02-10 17:44:03 UTC
++++ lily/include/includable-lexer.hh
+@@ -21,7 +21,7 @@
+ #define INCLUDABLE_LEXER_HH
+
+ #ifndef LEXER_CC
+-#include <FlexLexer.h>
++#include "/usr/include/FlexLexer.h"
+ #endif
+
+ #include "std-string.hh"

print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make → print/lilypond/files/patch-make_texinfo-vars.make

@@ -1,11 +1,11 @@
---- stepmake/stepmake/texinfo-vars.make.orig	2020-04-26 09:45:49 UTC
-+++ stepmake/stepmake/texinfo-vars.make
-@@ -26,7 +26,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(ba
+--- make/texinfo-vars.make.orig	2022-05-20 13:40:50 UTC
++++ make/texinfo-vars.make
+@@ -3,7 +3,7 @@ TEXINFO_SOURCES = $(TEXI_FILES)
 
  TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
 
 -MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
 +MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
  MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
- # texi2html xref map files
+ ###########