git: 2a5ca2411c18 - main - print/lilypond-devel: update 2.25.17 → 2.25.18

The branch main has been updated by vvd:

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

commit 2a5ca2411c186da6785fd597611f7bc82dd0cf20
Author:     Martin Neubauer <m.ne@gmx.net>
AuthorDate: 2024-08-11 16:17:08 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-11 16:17:08 +0000

    print/lilypond-devel: update 2.25.17 → 2.25.18
    
    News:
    https://lilypond.org/news.html#LilyPond-2_002e25_002e18-released-July-14_002c-2024
    
    While here remove GNU_CONFIGURE_MANPREFIX and fix align.
    
    PR:     280485
---
 print/lilypond-devel/Makefile  | 17 ++++++++---------
 print/lilypond-devel/distinfo  |  6 +++---
 print/lilypond-devel/pkg-plist |  4 ++++
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 5f8f3a7ccf6a..e7f4849d5260 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	lilypond
-DISTVERSION=	2.25.17
+DISTVERSION=	2.25.18
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 PKGNAMESUFFIX=	-devel
@@ -34,13 +34,12 @@ USE_CXXSTD=	c++17
 USE_GNOME=	cairo pango
 USE_PERL5=	build
 
-GNU_CONFIGURE=			yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-CONFIGURE_ENV+=			ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
-				FLEX=${FLEX} \
-				GUILE_FLAVOR=${GUILE_CMD} \
-				HOME=${WRKDIR} \
-				YACC=${YACC}
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
+		FLEX=${FLEX} \
+		GUILE_FLAVOR=${GUILE_CMD} \
+		HOME=${WRKDIR} \
+		YACC=${YACC}
 
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	all
@@ -75,7 +74,7 @@ GUILE3_USES=	guile:3.0
 NLS_USES=	gettext-runtime
 
 post-patch:
-	@${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|'  \
+	@${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|' \
 		${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf
 
 post-patch-NLS-off:
diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
index 99241a1e7bf6..73a6cb9c692f 100644
--- a/print/lilypond-devel/distinfo
+++ b/print/lilypond-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718528009
-SHA256 (lilypond-2.25.17.tar.gz) = 01519dfc7dbe950c546325c607674e054e2ba6a4792d2927de2b21bb9baa0d8b
-SIZE (lilypond-2.25.17.tar.gz) = 19340609
+TIMESTAMP = 1721085770
+SHA256 (lilypond-2.25.18.tar.gz) = 7429086fe7ebeb3b3fe45dc94f765ae0a2865840b0cc9377787832e046bf33f4
+SIZE (lilypond-2.25.18.tar.gz) = 19360933
diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist
index ae3545482d95..0d1e97ecf112 100644
--- a/print/lilypond-devel/pkg-plist
+++ b/print/lilypond-devel/pkg-plist
@@ -225,6 +225,8 @@ share/man/man1/musicxml2ly.1.gz
 %%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicexp.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml2ly_conversion.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml2ly_definitions%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml2ly_globvars%%PYTHON_EXT_SUFFIX%%.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/__pycache__/utilities.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/book_base.py
 %%DATADIR%%/%%DISTVERSION%%/python/book_docbook.py
@@ -239,6 +241,8 @@ share/man/man1/musicxml2ly.1.gz
 %%DATADIR%%/%%DISTVERSION%%/python/musicexp.py
 %%DATADIR%%/%%DISTVERSION%%/python/musicxml.py
 %%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.py
+%%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_definitions.py
+%%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_globvars.py
 %%DATADIR%%/%%DISTVERSION%%/python/utilities.py
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/accreg.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/auto-beam.scm