svn commit: r559469 - in head/print/lilypond: . files

Fernando Apesteguía fernape at FreeBSD.org
Mon Dec 28 13:39:57 UTC 2020 

Author: fernape
Date: Mon Dec 28 13:39:55 2020
New Revision: 559469
URL: https://svnweb.freebsd.org/changeset/ports/559469

Log:
  print/lilypond:  update to 2.21.82
  
  Remove deprecated dependency on Python 2.7
  
  ChangeLog:
  http://lilypond.org/news.html#LilyPond-2_002e21_005e82-released-December-15_002c-2020
  
  PR:	252215
  Submitted by:	m.ne at gmx.net (maintainer)

Added:
  head/print/lilypond/files/patch-lily_midi-item.cc   (contents, props changed)
Deleted:
  head/print/lilypond/files/patch-flower_include_std-string.hh
  head/print/lilypond/files/patch-flower_include_std-vector.hh
  head/print/lilypond/files/patch-lily_include_lily-guile.hh
  head/print/lilypond/files/patch-python_GNUmakefile
Modified:
  head/print/lilypond/Makefile
  head/print/lilypond/distinfo
  head/print/lilypond/files/patch-Documentation_GNUmakefile
  head/print/lilypond/files/patch-config.make.in
  head/print/lilypond/files/patch-configure
  head/print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make
  head/print/lilypond/pkg-plist

Modified: head/print/lilypond/Makefile
==============================================================================
--- head/print/lilypond/Makefile	Mon Dec 28 13:15:58 2020	(r559468)
+++ head/print/lilypond/Makefile	Mon Dec 28 13:39:55 2020	(r559469)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lilypond
-DISTVERSION=	2.20.0
+DISTVERSION=	2.21.82
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 
@@ -11,65 +11,77 @@ COMMENT=	GNU music typesetter
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	pdftexi2dvi:print/texinfo \
-		t1ascii:print/t1utils \
-		bash:shells/bash \
+BUILD_DEPENDS=	bash:shells/bash \
 		convert:graphics/ImageMagick6 \
 		dblatex:textproc/dblatex \
 		fontforge:print/fontforge \
 		help2man:misc/help2man \
+		pdftexi2dvi:print/texinfo \
 		pngtopnm:graphics/netpbm \
 		rsync:net/rsync \
+		t1ascii:print/t1utils \
 		texi2html:textproc/texi2html \
 		zip:archivers/zip
-LIB_DEPENDS=	libltdl.so:devel/libltdl \
-		libguile.so:lang/guile1 \
-		libgmp.so:math/gmp \
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
-		libfontconfig.so:x11-fonts/fontconfig
-RUN_DEPENDS=	mftrace:print/mftrace \
-		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
+		libgmp.so:math/gmp \
+		libguile.so:lang/guile1 \
+		libltdl.so:devel/libltdl
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
+		mftrace:print/mftrace
 
-USES=		bison:build compiler:gcc-c++11-lib gettext ghostscript gmake \
-		gnome perl5 pkgconfig python:2.7
+USES=		bison:build compiler:c++11-lib ghostscript gmake gnome \
+		perl5 pkgconfig python:3.5+
 USE_CXXSTD=	c++11
 USE_GNOME=	pango
 USE_PERL5=	build
 USE_TEX=	latex texmf
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \
-		--with-python-include=${PYTHON_INCLUDEDIR} --without-urwotf-dir
-CONFIGURE_ENV+=	ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
-		FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}
+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} \
+			HOME=${WRKDIR} \
+			YACC=${YACC}
 
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	all
 
+BINARY_ALIAS=	python=${PYTHON_VERSION}
+
 INFO=		internals \
-		lilypond-changes \
-		lilypond-contributor \
-		lilypond-essay \
-		lilypond-extending \
-		lilypond-internals \
-		lilypond-learning \
-		lilypond-notation \
-		lilypond-snippets \
-		lilypond-usage \
-		lilypond-web \
-		music-glossary
+				lilypond-changes \
+				lilypond-contributor \
+				lilypond-essay \
+				lilypond-extending \
+				lilypond-internals \
+				lilypond-learning \
+				lilypond-notation \
+				lilypond-snippets \
+				lilypond-usage \
+				lilypond-web \
+				music-glossary
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	URW NLS
 OPTIONS_SUB=	yes
 
+URW_DESC=	Use bundled URW fonts
+
+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_CONFIGURE_WITH=	urwotf-dir=${LOCALBASE}/share/fonts/urw-core35-fonts
+
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} \
-	    ${REINPLACE_CMD} -e 's|isinf[ ]*(|::isinf(|g' -e 's|isnan|::isnan|g'
 	@${REINPLACE_CMD} -e 's|<FlexLexer.h>|"/usr/include/FlexLexer.h"|' \
-	    ${WRKSRC}/lily/include/includable-lexer.hh
-		${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|'  \
-			${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf
+		${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
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in

Modified: head/print/lilypond/distinfo
==============================================================================
--- head/print/lilypond/distinfo	Mon Dec 28 13:15:58 2020	(r559468)
+++ head/print/lilypond/distinfo	Mon Dec 28 13:39:55 2020	(r559469)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587345646
-SHA256 (lilypond-2.20.0.tar.gz) = 595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661
-SIZE (lilypond-2.20.0.tar.gz) = 18100533
+TIMESTAMP = 1608651073
+SHA256 (lilypond-2.21.82.tar.gz) = f0bd17cccee771ed4a2e0db1ec81c98d9f52e47090e5dcc085de65dd8cc4bdd9
+SIZE (lilypond-2.21.82.tar.gz) = 18017911

Modified: head/print/lilypond/files/patch-Documentation_GNUmakefile
==============================================================================
--- head/print/lilypond/files/patch-Documentation_GNUmakefile	Mon Dec 28 13:15:58 2020	(r559468)
+++ head/print/lilypond/files/patch-Documentation_GNUmakefile	Mon Dec 28 13:39:55 2020	(r559469)
@@ -1,14 +1,23 @@
---- Documentation/GNUmakefile.orig	2020-02-04 16:12:57 UTC
+--- Documentation/GNUmakefile.orig	2020-08-16 10:58:56 UTC
 +++ Documentation/GNUmakefile
-@@ -74,9 +74,9 @@ source-links = $(outdir)/source\
- MAIN_INFO_DOC = lilypond-web
- INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \
-  lilypond-essay lilypond-learning lilypond-notation music-glossary \
-- lilypond-web lilypond-extending
-+ lilypond-web lilypond-extending lilypond-snippets internals
+@@ -147,6 +147,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.
+ ALL_INFO_DOCS = \
+   $(INFO_DOCS) \
+-  lilypond-snippets \
+   lilypond-web
  ifeq ($(out),www)
--INFO_DOCS += lilypond-snippets
-+INFO_DOCS += 
+-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)

Modified: head/print/lilypond/files/patch-config.make.in
==============================================================================
--- head/print/lilypond/files/patch-config.make.in	Mon Dec 28 13:15:58 2020	(r559468)
+++ head/print/lilypond/files/patch-config.make.in	Mon Dec 28 13:39:55 2020	(r559469)
@@ -1,11 +1,11 @@
---- config.make.in.orig	2020-02-04 16:12:57 UTC
+--- config.make.in.orig	2020-08-16 10:58:56 UTC
 +++ config.make.in
-@@ -73,7 +73,7 @@ sharedstatedir = @sharedstatedir@
- stepmake = @stepmake@
- 
+@@ -94,7 +94,7 @@ mandir = @mandir@
+ package = lilypond
  package_datadir = $(datadir)/$(package)
+ package_docdir = $(docdir)/$(package)
 -package_infodir = $(infodir)/$(package)
 +package_infodir = $(infodir)
- package_libdir = $(libdir)/$(package)
- package_docdir = $(docdir)/$(package)
- package_omfdir = $(omfdir)/$(package)
+ prefix = @prefix@
+ program_prefix = @program_prefix@
+ program_suffix = @program_suffix@

Modified: head/print/lilypond/files/patch-configure
==============================================================================
--- head/print/lilypond/files/patch-configure	Mon Dec 28 13:15:58 2020	(r559468)
+++ head/print/lilypond/files/patch-configure	Mon Dec 28 13:39:55 2020	(r559469)
@@ -1,27 +1,11 @@
---- configure.orig	2020-03-01 14:00:51 UTC
+--- configure.orig	2020-07-13 14:02:44 UTC
 +++ configure
-@@ -2298,13 +2298,8 @@ $as_echo_n "checking $r version... " >&6; }
-     ## 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\`\"
-+    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>/dev/null |
-+        awk '$1 ~ "fontforge" { print $2 }'\`\"
- 
-     if test -z "$_ver"; then
-         ## If empty, try date [fontforge]
-@@ -11631,71 +11626,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
+@@ -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:$LINENO: checking $r version" >&5
+-    { $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
@@ -82,7 +66,7 @@
 -    }
 -    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
 -`
--    { $as_echo "$as_me:$LINENO: result: $ver" >&5
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
 -$as_echo "$ver" >&6; }
 -    if test "$num" -lt "$min"; then
 -
@@ -91,25 +75,3 @@
      eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
  
      fi
-@@ -15001,21 +14935,6 @@ $as_echo "$ver" >&6; }
- 
-     eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 1.82 (installed: $ver)"\"`\"
- 
--    fi
--    if test -n "1.82"; then
--        max=`
--    echo "1.82" | awk -F. '
--    {
--      if ($3) {three = $3}
--      else {three = 0}
--    }
--    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
--`
--        if test "$num" -gt "$max"; then
--
--    eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r <= 1.82 (installed: $ver)"\"`\"
--
--        fi
-     fi
-     vervar="`echo TEXI2HTML | tr 'a-z' 'A-Z'`_VERSION"
-     eval `echo $vervar=$num`

Added: head/print/lilypond/files/patch-lily_midi-item.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/lilypond/files/patch-lily_midi-item.cc	Mon Dec 28 13:39:55 2020	(r559469)
@@ -0,0 +1,11 @@
+--- 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_;

Modified: head/print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make
==============================================================================
--- head/print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make	Mon Dec 28 13:15:58 2020	(r559468)
+++ head/print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make	Mon Dec 28 13:39:55 2020	(r559469)
@@ -1,6 +1,6 @@
---- stepmake/stepmake/texinfo-vars.make.orig	2020-03-01 14:00:51 UTC
+--- stepmake/stepmake/texinfo-vars.make.orig	2020-04-26 09:45:49 UTC
 +++ stepmake/stepmake/texinfo-vars.make
-@@ -31,7 +31,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(ba
+@@ -26,7 +26,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(ba
  
  TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
  

Modified: head/print/lilypond/pkg-plist
==============================================================================
--- head/print/lilypond/pkg-plist	Mon Dec 28 13:15:58 2020	(r559468)
+++ head/print/lilypond/pkg-plist	Mon Dec 28 13:39:55 2020	(r559469)
@@ -193,6 +193,7 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/ly/graphviz-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/gregorian.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/guile-debugger.ly
+%%DATADIR%%/%%DISTVERSION%%/ly/hel-arabic.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/italiano.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/lilypond-book-preamble.ly
@@ -222,49 +223,47 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/ly/string-tunings-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/suomi.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/svenska.ly
+%%DATADIR%%/%%DISTVERSION%%/ly/swing.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/text-replacements.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/titling-init.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/toc-init.ly
+%%DATADIR%%/%%DISTVERSION%%/ly/turkish-makam.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/vlaams.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/vocal-tkit.ly
 %%DATADIR%%/%%DISTVERSION%%/ly/voice-tkit.ly
 %%DATADIR%%/%%DISTVERSION%%/ps/encodingdefs.ps
 %%DATADIR%%/%%DISTVERSION%%/ps/lilyponddefs.ps
 %%DATADIR%%/%%DISTVERSION%%/ps/music-drawing-routines.ps
+%%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__/fontextract.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_base.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/book_docbook.py
-%%DATADIR%%/%%DISTVERSION%%/python/book_docbook.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/book_html.py
-%%DATADIR%%/%%DISTVERSION%%/python/book_html.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/book_latex.py
-%%DATADIR%%/%%DISTVERSION%%/python/book_latex.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/book_snippets.py
-%%DATADIR%%/%%DISTVERSION%%/python/book_snippets.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/book_texinfo.py
-%%DATADIR%%/%%DISTVERSION%%/python/book_texinfo.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/convertrules.py
-%%DATADIR%%/%%DISTVERSION%%/python/convertrules.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/fontextract.py
-%%DATADIR%%/%%DISTVERSION%%/python/fontextract.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/langdefs.py
-%%DATADIR%%/%%DISTVERSION%%/python/langdefs.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/lilylib.py
-%%DATADIR%%/%%DISTVERSION%%/python/lilylib.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/midi.py
-%%DATADIR%%/%%DISTVERSION%%/python/midi.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/musicexp.py
-%%DATADIR%%/%%DISTVERSION%%/python/musicexp.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/musicxml.py
-%%DATADIR%%/%%DISTVERSION%%/python/musicxml.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.py
-%%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/rational.py
-%%DATADIR%%/%%DISTVERSION%%/python/rational.pyc
-%%DATADIR%%/%%DISTVERSION%%/python/safeeval.py
-%%DATADIR%%/%%DISTVERSION%%/python/safeeval.pyc
 %%DATADIR%%/%%DISTVERSION%%/python/utilities.py
-%%DATADIR%%/%%DISTVERSION%%/python/utilities.pyc
 %%DATADIR%%/%%DISTVERSION%%/scm/accreg.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/auto-beam.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/autochange.scm
@@ -273,10 +272,10 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/bezier-tools.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/c++.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/chord-entry.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/chord-generic-names.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
@@ -311,7 +310,6 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/framework-null.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/framework-ps.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/framework-scm.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/framework-socket.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/framework-svg.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/fret-diagrams.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/graphviz.scm
@@ -325,13 +323,11 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/ly-syntax-constructors.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/markup-macros.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/markup.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/memory-trace.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-socket.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/output-svg.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/page.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/paper-system.scm
@@ -351,13 +347,11 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/standalone.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/stencil.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/tablature.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/text.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%%/scm/x11-color.scm
 %%DATADIR%%/%%DISTVERSION%%/tex/lilypond-tex-metrics.tex
 %%DATADIR%%/%%DISTVERSION%%/tex/texinfo-ja.tex
 %%DATADIR%%/%%DISTVERSION%%/vim/compiler/lilypond.vim
@@ -386,3 +380,15 @@ share/emacs/site-lisp/lilypond-words.el
 %%NLS%%share/locale/uk/LC_MESSAGES/lilypond.mo
 %%NLS%%share/locale/vi/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

More information about the svn-ports-all mailing list