Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 May 2023 23:26:00 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 41234ceb6e1f - main - print/lilypond: update to 2.24.1
Message-ID:  <202305292326.34TNQ02V064084@gitrepo.freebsd.org>

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

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

commit 41234ceb6e1fa23aa50b5b680bf1e9d7333c8bcb
Author:     Martin Neubauer <m.ne@gmx.net>
AuthorDate: 2023-05-26 10:16:31 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-05-29 23:24:05 +0000

    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                            |  37 ++-
 print/lilypond/distinfo                            |   6 +-
 .../lilypond/files/patch-Documentation_GNUmakefile |  16 +-
 print/lilypond/files/patch-config.make.in          |   6 +-
 print/lilypond/files/patch-configure               |  77 -------
 .../files/patch-lily_include_includable-lexer.hh   |  11 +
 print/lilypond/files/patch-lily_midi-item.cc       |  11 -
 ...info-vars.make => patch-make_texinfo-vars.make} |   8 +-
 print/lilypond/pkg-plist                           | 248 ++++++++++-----------
 9 files changed, 161 insertions(+), 259 deletions(-)

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 7bb59047d762..1a51e6ddc1d6 100644
--- a/print/lilypond/Makefile
+++ b/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
 
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 5818aa10192f..104d3fdb5107 100644
--- a/print/lilypond/distinfo
+++ b/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
diff --git a/print/lilypond/files/patch-Documentation_GNUmakefile b/print/lilypond/files/patch-Documentation_GNUmakefile
index df8dba5740ee..fc70919262da 100644
--- a/print/lilypond/files/patch-Documentation_GNUmakefile
+++ b/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)
diff --git a/print/lilypond/files/patch-config.make.in b/print/lilypond/files/patch-config.make.in
index 1a5ed7480e7e..9c27386cfbe0 100644
--- a/print/lilypond/files/patch-config.make.in
+++ b/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@
diff --git a/print/lilypond/files/patch-configure b/print/lilypond/files/patch-configure
deleted file mode 100644
index af0a1056ec86..000000000000
--- a/print/lilypond/files/patch-configure
+++ /dev/null
@@ -1,77 +0,0 @@
---- configure.orig	2020-07-13 14:02:44 UTC
-+++ configure
-@@ -9035,71 +9035,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
-     if test $? -eq 0; then
-         if test -n "0.9.0" -o -n ""; then
- 
--    r="`eval echo '$'"PKG_CONFIG"`"
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
--$as_echo_n "checking $r version... " >&6; }
--    exe=`
--    ## which doesn't work in ash, if /usr/bin/which isn't installed
--    ## type -p doesn't work in ash
--    ## command -v doesn't work in zsh
--    ## command -v "$r" 2>&1
--    ## this test should work in ash, bash, pdksh (ksh), zsh
--    type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
--`
--    ver=`
--    ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}'
--    ##
--    ## ARG.
--    ## Workaround for broken Debian gcc version string:
--    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
--    ##
--    ## -V: Workaround for python
-+    $PKG_CONFIG --atleast-pkgconfig-version 0.9.0
- 
--    #dnl
--
--    ## Assume and hunt for dotted version multiplet.
--    ## use eval trickery, because we cannot use multi-level $() instead of ``
--    ## for compatibility reasons.
--
--    ## grab the first version number in --version output.
--    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 |
--        grep -E '(^| )[0-9][0-9]*\.[0-9]' |
--        head -n 1 |
--        tr ' ' '\n' |
--        sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' |
--        grep -E '(^| )[0-9][0-9]*\.[0-9]' |
--        head -n 1\`\"
--
--    if test -z "$_ver"; then
--        ## If empty, try date [fontforge]
--        eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \
--        | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
--        | head -n 1 \
--        | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
--    fi
--    echo "$_ver"
--    #dnl
--`
--    num=`
--    echo "$ver" | awk -F. '
--    {
--      if ($3) {three = $3}
--      else {three = 0}
--    }
--    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
--`
--    min=`
--    echo "0.9.0" | awk -F. '
--    {
--      if ($3) {three = $3}
--      else {three = 0}
--    }
--    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
--`
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
--$as_echo "$ver" >&6; }
--    if test "$num" -lt "$min"; then
--
-+    if test ! $?; then
-+    ver=`$PKG_CONFIG --version`
-     eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
- 
-     fi
diff --git a/print/lilypond/files/patch-lily_include_includable-lexer.hh b/print/lilypond/files/patch-lily_include_includable-lexer.hh
new file mode 100644
index 000000000000..eb443276028a
--- /dev/null
+++ b/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"
diff --git a/print/lilypond/files/patch-lily_midi-item.cc b/print/lilypond/files/patch-lily_midi-item.cc
deleted file mode 100644
index fc56a5ecc90b..000000000000
--- a/print/lilypond/files/patch-lily_midi-item.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- lily/midi-item.cc.orig	2020-04-29 11:39:18 UTC
-+++ lily/midi-item.cc
-@@ -319,7 +319,7 @@ Midi_text::Midi_text (Audio_text *a)
- string
- Midi_text::to_string () const
- {
--  uint8_t text_code[] = {0xff, audio_->type_};
-+  uint8_t text_code[] = {0xff, uint8_t (audio_->type_)};
-   string str ((char *) text_code, sizeof (text_code));
-   str += int2midi_varint_string (int (audio_->text_string_.length ()));
-   str += audio_->text_string_;
diff --git a/print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make b/print/lilypond/files/patch-make_texinfo-vars.make
similarity index 58%
rename from print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make
rename to print/lilypond/files/patch-make_texinfo-vars.make
index 2765792a6700..9778be230e4b 100644
--- a/print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make
+++ b/print/lilypond/files/patch-make_texinfo-vars.make
@@ -1,6 +1,6 @@
---- 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)
  
@@ -8,4 +8,4 @@
 +MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
  MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
  
- # texi2html xref map files
+ ###########
diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist
index 6e3d91c2992f..58f44e3d83bb 100644
--- a/print/lilypond/pkg-plist
+++ b/print/lilypond/pkg-plist
@@ -27,18 +27,6 @@ share/emacs/site-lisp/lilypond-what-beat.el
 share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/fonts/00-lilypond-fonts.conf
 %%DATADIR%%/%%DISTVERSION%%/fonts/99-lilypond-fonts.conf
-%%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
 %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-11.otf
 %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-13.otf
 %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-14.otf
@@ -48,18 +36,6 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-23.otf
 %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-26.otf
 %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-brace.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyrecursor-bold.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyrecursor-bolditalic.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyrecursor-italic.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyrecursor-regular.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyreheros-bold.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyreheros-bolditalic.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyreheros-italic.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyreheros-regular.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyreschola-bold.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyreschola-bolditalic.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyreschola-italic.otf
-%%DATADIR%%/%%DISTVERSION%%/fonts/otf/texgyreschola-regular.otf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/common-modules-and-initialization.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/debugging-settings.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/declare-autometric-parameters.mf
@@ -123,6 +99,7 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-rests.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-scripts.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-sharps.mf
+%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-sori-koron.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-ties.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-timesignatures.mf
 %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-trills.mf
@@ -180,7 +157,6 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-26.woff
 %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-brace.svg
 %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-brace.woff
-%%DATADIR%%/%%DISTVERSION%%/ly/Welcome-to-LilyPond-MacOS.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/Welcome_to_LilyPond.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/arabic.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/articulate.ly
@@ -200,7 +176,6 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/ly/event-listener.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/festival.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/generate-documentation.ly
-%%DATADIR%%/%%DISTVERSION%%/ly/generate-interface-doc-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/grace-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/graphviz-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/gregorian.ly
@@ -217,6 +192,7 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/ly/norsk.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/paper-defaults-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/performer-init.ly
+%%DATADIR%%/%%DISTVERSION%%/ly/persian.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/piano-tkit.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/portugues.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/predefined-fretboards-init.ly
@@ -246,21 +222,20 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/ps/encodingdefs.ps
 %%DATADIR%%/%%DISTVERSION%%/ps/lilyponddefs.ps
 %%DATADIR%%/%%DISTVERSION%%/ps/music-drawing-routines.ps
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_base%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_docbook%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_html%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_latex%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_snippets%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_texinfo%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/convertrules%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/fontextract%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/langdefs%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/lilylib%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/midi%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicexp%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml2ly_conversion%%PYTHON_EXT_SUFFIX%%.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/utilities%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_base.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_docbook.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_html.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_latex.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_snippets.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_texinfo.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/convertrules.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/langdefs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/lilylib.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/midi.cpython-%%PYTHON_SUFFIX%%.pyc
+%%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__/utilities.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/book_base.py
 %%DATADIR%%/%%DISTVERSION%%/python/book_docbook.py
 %%DATADIR%%/%%DISTVERSION%%/python/book_html.py
@@ -268,7 +243,6 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/python/book_snippets.py
 %%DATADIR%%/%%DISTVERSION%%/python/book_texinfo.py
 %%DATADIR%%/%%DISTVERSION%%/python/convertrules.py
-%%DATADIR%%/%%DISTVERSION%%/python/fontextract.py
 %%DATADIR%%/%%DISTVERSION%%/python/langdefs.py
 %%DATADIR%%/%%DISTVERSION%%/python/lilylib.py
 %%DATADIR%%/%%DISTVERSION%%/python/midi.py
@@ -276,96 +250,93 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/python/musicxml.py
 %%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.py
 %%DATADIR%%/%%DISTVERSION%%/python/utilities.py
-%%DATADIR%%/%%DISTVERSION%%/scm/accreg.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/auto-beam.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/autochange.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/backend-library.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/bar-line.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/bezier-tools.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/c++.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/chord-entry.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/chord-ignatzek-names.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/chord-name.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/clip-region.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/color.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-context-properties.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-event-classes.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-grob-interfaces.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-grob-properties.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-grobs.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-markup-commands.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-music-callbacks.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-music-display-methods.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-music-properties.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-music-types.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-note-names.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-stencil-commands.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/define-woodwind-diagrams.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/display-lily.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/display-woodwind-diagrams.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/document-backend.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/document-context-mods.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/document-functions.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/document-identifiers.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/document-markup.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/document-music.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/document-translation.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/document-type-predicates.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/documentation-generate.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/documentation-lib.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/editor.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/encoding.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/file-cache.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/flag-styles.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/font.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/framework-eps.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/framework-null.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/framework-ps.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/framework-scm.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/framework-svg.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/fret-diagrams.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/graphviz.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/guile-debugger.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/harp-pedals.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/layout-beam.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/layout-slur.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/lily-library.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/lily-sort.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/lily.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/ly-syntax-constructors.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/markup-macros.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/markup.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/midi.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/modal-transforms.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/music-functions.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/output-lib.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/output-ps.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/output-svg.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/page.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/paper-system.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/paper.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/parser-clef.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/parser-ly-from-scheme.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/part-combiner.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/predefined-fretboards.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/ps-to-png.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/safe-lily.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/safe-utility-defs.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/scheme-engravers.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/script.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/skyline.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/song-util.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/song.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/standalone.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/stencil.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/tablature.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/time-signature-settings.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/time-signature.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/titling.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/to-xml.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/translation-functions.scm
-%%DATADIR%%/%%DISTVERSION%%/tex/lilypond-tex-metrics.tex
-%%DATADIR%%/%%DISTVERSION%%/tex/texinfo-ja.tex
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/accreg.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/auto-beam.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/autochange.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/backend-library.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/bar-line.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/breath.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/c++.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-entry.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-ignatzek-names.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-name.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/clip-region.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/color.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/curried-definitions.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-context-properties.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-event-classes.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-grob-interfaces.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-grob-properties.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-grobs.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-markup-commands.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-music-callbacks.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-music-display-methods.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-music-properties.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-music-types.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-note-names.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-stencil-commands.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-woodwind-diagrams.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/display-lily.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/display-woodwind-diagrams.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-backend.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-context-mods.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-functions.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-identifiers.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-markup.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-music.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-outside-staff-priorities.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-paper-sizes.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-translation.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-type-predicates.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-generate.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-lib.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/file-cache.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/font-encodings.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-svg.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/fret-diagrams.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/graphviz.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/guile-debugger.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/harp-pedals.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/hyphenate-internal-words.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/layout-beam.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/layout-slur.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/lily-library.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/lily-sort.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/lily.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/ly-syntax-constructors.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/markup-macros.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/markup.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/midi.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/modal-transforms.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/music-functions.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/output-lib.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/output-ps.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/output-svg.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/page.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/paper-system.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/paper.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/parser-clef.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/parser-ly-from-scheme.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/part-combiner.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/predefined-fretboards.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/ps-to-png.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/skyline.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/song-util.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/song.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/stencil.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/tablature.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature-settings.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/to-xml.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/translation-functions.scm
 %%DATADIR%%/%%DISTVERSION%%/vim/compiler/lilypond.vim
 %%DATADIR%%/%%DISTVERSION%%/vim/ftdetect/lilypond.vim
 %%DATADIR%%/%%DISTVERSION%%/vim/ftplugin/lilypond.vim
@@ -391,4 +362,17 @@ share/emacs/site-lisp/lilypond-words.el
 %%NLS%%share/locale/tr/LC_MESSAGES/lilypond.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/lilypond.mo
 %%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?202305292326.34TNQ02V064084>