Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Apr 2024 13:12:40 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 009bad353149 - main - print/lilypond-devel: Update to 2.25.14
Message-ID:  <202404041312.434DCeIC029142@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

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

commit 009bad353149a11f49bf51f3169eb79b8180c5bb
Author:     Martin Neubauer <m.ne@gmx.net>
AuthorDate: 2024-04-04 13:10:38 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-04-04 13:12:27 +0000

    print/lilypond-devel: Update to 2.25.14
    
    - Remove now non-functional URW option
    - Fix build when NLS is turned off
    
    ChangeLog:
    https://lilypond.org/news.html#LilyPond-2_002e25_002e14-released-March-23_002c-2024
    
    PR:             277914
---
 print/lilypond-devel/Makefile  | 18 +++++++-----------
 print/lilypond-devel/distinfo  |  6 +++---
 print/lilypond-devel/pkg-plist | 12 ------------
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 6dafddcba0ea..88367d54d99f 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	lilypond
-DISTVERSION=	2.25.13
+DISTVERSION=	2.25.14
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 PKGNAMESUFFIX=	-devel
@@ -25,10 +25,11 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libpng16.so:graphics/png
 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
+USES=		bison:build compiler:c++11-lib cpe gettext-tools ghostscript \
+		gmake gnome magick:7,build perl5 pkgconfig python
 USE_CXXSTD=	c++17
 USE_GNOME=	cairo pango
 USE_PERL5=	build
@@ -60,7 +61,7 @@ INFO=		lilypond-changes \
 		music-glossary
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-OPTIONS_DEFINE=		NLS URW
+OPTIONS_DEFINE=		NLS
 OPTIONS_DEFAULT=	GUILE3
 OPTIONS_SINGLE=		GUILE
 OPTIONS_SINGLE_GUILE=	GUILE2 GUILE3
@@ -68,15 +69,10 @@ 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
+NLS_USES=	gettext-runtime
 
 post-patch:
 	@${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|'  \
diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
index 064148f53c58..b58a9ee0fbe4 100644
--- a/print/lilypond-devel/distinfo
+++ b/print/lilypond-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707677286
-SHA256 (lilypond-2.25.13.tar.gz) = a23a16de1abe0ef80696f59244d93d542a284738b9b29a7ca3ca0aa9bef8b667
-SIZE (lilypond-2.25.13.tar.gz) = 19274596
+TIMESTAMP = 1711277164
+SHA256 (lilypond-2.25.14.tar.gz) = 6f4a9f363af98f11096c2608357dbf26111230e21ff4379f447238ee09f9662a
+SIZE (lilypond-2.25.14.tar.gz) = 19285434
diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist
index a6640810f197..ae3545482d95 100644
--- a/print/lilypond-devel/pkg-plist
+++ b/print/lilypond-devel/pkg-plist
@@ -357,15 +357,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404041312.434DCeIC029142>