git: cdd2f153090d - main - print/{lilypond, lilypond-devel}: fix DEPENDS

[Antoine Brodin]

The branch main has been updated by antoine:

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

commit cdd2f153090d8f87c414014226866d5f0f3f807c
Author:     Antoine Brodin <antoine at FreeBSD.org>
AuthorDate: 2021-06-15 21:10:57 +0000
Commit:     Antoine Brodin <antoine at FreeBSD.org>
CommitDate: 2021-06-15 21:10:57 +0000

    print/{lilypond,lilypond-devel}: fix DEPENDS
---
 print/lilypond-devel/Makefile | 7 ++++---
 print/lilypond/Makefile       | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 60838f3d2a43..4e7f016f2ac5 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	lilypond
 DISTVERSION=	2.23.2
+PORTREVISION=	1
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 PKGNAMESUFFIX=	-devel
@@ -72,10 +73,10 @@ GUILE2_LIB_DEPENDS_OFF=	libguile.so:lang/guile1
 
 NLS_USES=	gettext
 
-URW_BUILD_DEPENDS=	urw-core35-fonts>0:x11-fonts/urw-core35-fonts
-URW_RUN_DEPENDS_OFF=	urw-core35-fonts>0:x11-fonts/urw-core35-fonts
+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-core35-fonts
+URW_CONFIGURE_WITH=	urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<FlexLexer.h>|"/usr/include/FlexLexer.h"|' \
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 280661a5b2da..2f43ee9c26ae 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	lilypond
 DISTVERSION=	2.22.1
+PORTREVISION=	1
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 
@@ -72,9 +73,9 @@ GUILE2_LIB_DEPENDS_OFF=	libguile.so:lang/guile1
 NLS_USES=	gettext
 NLS_USES_OFF=	gettext-tools
 
-URW_BUILD_DEPENDS=	urw-core35-fonts>0:x11-fonts/urw-core35-fonts
-URW_RUN_DEPENDS_OFF=	urw-core35-fonts>0:x11-fonts/urw-core35-fonts
-URW_CONFIGURE_WITH=	urwotf-dir=${LOCALBASE}/share/fonts/urw-core35-fonts
+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"|' \