git: 5466c6ea6687 - main - print/lilypond: remove non-functional URW option

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5466c6ea6687667f9c19a5d9974f906f60b18fd2

commit 5466c6ea6687667f9c19a5d9974f906f60b18fd2
Author:     Martin Neubauer <m.ne@gmx.net>
AuthorDate: 2024-03-26 19:11:29 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2024-03-29 17:35:39 +0000

    print/lilypond: remove non-functional URW option
    
    ChangeLog:
    https://lilypond.org/doc/v2.24/Documentation/changes/index.html#notes-for-source-compilation-and-packagers
    
    The possibility to bundle text fonts was removed by upstream. The URW option
    therefore doesn't work anymore and might even result in a broken installation
    when building with non-default options.
    
    PR:             277917
    Reported by:    m.ne@gmx.net (maintainer)
---
 print/lilypond/Makefile  | 12 ++++--------
 print/lilypond/pkg-plist | 12 ------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 6d2458ab1dc9..b960847009a3 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lilypond
 DISTVERSION=	2.24.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 
@@ -24,7 +24,8 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
-		mftrace:print/mftrace
+		mftrace:print/mftrace \
+		urw-base35-fonts>0:x11-fonts/urw-base35-fonts
 
 USES=		bison:build compiler:c++11-lib cpe ghostscript gmake gnome \
 		magick:7,build perl5 pkgconfig python
@@ -59,7 +60,7 @@ INFO=		lilypond-changes \
 		music-glossary
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-OPTIONS_DEFINE=	NLS URW
+OPTIONS_DEFINE=	NLS
 OPTIONS_DEFAULT=	GUILE2
 OPTIONS_SINGLE=	GUILE
 OPTIONS_SINGLE_GUILE=	GUILE2 GUILE3
@@ -67,16 +68,11 @@ OPTIONS_SUB=		yes
 
 GUILE2_DESC=	Use guile2
 GUILE3_DESC=	Use guile3
-URW_DESC=	Use bundled URW fonts
 
 GUILE2_USES=	guile:2.2
 GUILE3_USES=	guile:3.0
 NLS_USES=	gettext
 
-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:
 	@${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|'  \
 		${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf
diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist
index 5b3bbd052647..3ea172177f79 100644
--- a/print/lilypond/pkg-plist
+++ b/print/lilypond/pkg-plist
@@ -365,15 +365,3 @@ share/man/man1/musicxml2ly.1.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/lilypond.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lilypond.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lilypond.mo
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-BdIta.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Bold.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Italic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Roman.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Bold.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-BoldItalic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Italic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Regular.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Bold.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-BoldItalic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Italic.otf
-%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Regular.otf