Attachment #221018 for bug #252215

View | Details | Raw Unified | Return to bug 252215
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	lilypond
DISTVERSION=	2.21.82
CATEGORIES=	print audio
MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/



LICENSE=	GPLv3

BUILD_DEPENDS=	bash:shells/bash \
		t1ascii:print/t1utils \
		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=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		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
RUN_DEPENDS=	mftrace:print/mftrace \
		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu

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
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
PLIST_SUB=	DISTVERSION=${DISTVERSION}

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
	@${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

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1587345646	1	TIMESTAMP = 1608651073
2	SHA256 (lilypond-2.20.0.tar.gz) = 595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661	2	SHA256 (lilypond-2.21.82.tar.gz) = f0bd17cccee771ed4a2e0db1ec81c98d9f52e47090e5dcc085de65dd8cc4bdd9
3	SIZE (lilypond-2.20.0.tar.gz) = 18100533	3	SIZE (lilypond-2.21.82.tar.gz) = 18017911




--- Documentation/GNUmakefile.orig	2020-08-16 10:58:56 UTC
+++ Documentation/GNUmakefile
@@ -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 \
-             lilypond-web
+INFO_DOCS += lilypond-web
 endif
 INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 ALL_INFO_FILES = $(ALL_INFO_DOCS:%=$(outdir)/%.info)




--- config.make.in.orig	2020-08-16 10:58:56 UTC
+++ config.make.in
@@ -94,7 +94,7 @@ mandir = @mandir@
 package = lilypond
 
 package_datadir = $(datadir)/$(package)
 package_docdir = $(docdir)/$(package)
-package_infodir = $(infodir)/$(package)
+package_infodir = $(infodir)
 prefix = @prefix@
 program_prefix = @program_prefix@
 program_suffix = @program_suffix@




--- configure.orig	2020-07-13 14:02:44 UTC
+++ configure
@@ -9035,71 +9035,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
     ## 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"
     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

-    }
-    {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
-

     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`




--- flower/include/std-string.hh.orig	2020-03-01 14:00:51 UTC
+++ flower/include/std-string.hh
@@ -38,6 +38,7 @@ using namespace std;
 typedef size_t ssize;
 #define NPOS string::npos
 
+#if _cplusplus <= 19971L
 string to_string (const string &);
 string to_string (char c, int n = 1);
 string to_string (int i, char const *format = 0);
@@ -49,6 +50,7 @@ string to_string (unsigned);
 string to_string (bool b);
 string to_string (char const *format, ...)
 __attribute__ ((format (printf, 1, 2)));
+#endif
 
 string &replace_all (string *str, string const &find, string const &replace);
 string &replace_all (string *str, char find, char replace);

Lines 1-10 Link Here

(-)files/patch-flower_include_std-vector.hh (-10 lines)
1	--- flower/include/std-vector.hh.orig 2020-02-04 16:12:57 UTC
2	+++ flower/include/std-vector.hh
3	@@ -224,6 +224,6 @@ junk_pointers (vector<T> &v)
4	vector<string> string_split (string str, char c);
5	string string_join (vector<string> const &strs, const string &infix);
6
7	-#define iterof(i,s) typeof((s).begin()) i((s).begin())
8	+#define iterof(i,s) auto i = ((s).begin())
9
10	#endif /* STD_VECTOR_HH */

Lines 1-11 Link Here

(-)files/patch-lily_include_lily-guile.hh (-11 lines)
1	--- lily/include/lily-guile.hh.orig 2020-02-04 16:12:57 UTC
2	+++ lily/include/lily-guile.hh
3	@@ -22,6 +22,8 @@
4
5	#include "config.hh"
6
7	+#include <cstddef>
8	+
9	#if __MINGW32__
10	#include "mingw-compatibility.hh"
11	#endif

Line 0 Link Here

(-)files/patch-lily_midi-item.cc (+11 lines)
	1	--- lily/midi-item.cc.orig 2020-04-29 11:39:18 UTC
	2	+++ lily/midi-item.cc
	3	@@ -319,7 +319,7 @@ Midi_text::Midi_text (Audio_text *a)
	4	string
	5	Midi_text::to_string () const
	6	{
	7	- uint8_t text_code[] = {0xff, audio_->type_};
	8	+ uint8_t text_code[] = {0xff, uint8_t (audio_->type_)};
	9	string str ((char *) text_code, sizeof (text_code));
	10	str += int2midi_varint_string (int (audio_->text_string_.length ()));
	11	str += audio_->text_string_;

Lines 1-10 Link Here

(-)files/patch-python_GNUmakefile (-10 lines)
1	--- python/GNUmakefile.orig 2020-02-04 16:12:57 UTC
2	+++ python/GNUmakefile
3	@@ -12,7 +12,6 @@ CONFIG_LDFLAGS=
4	INSTALLATION_OUT_SUFFIXES=1
5
6	INSTALLATION_OUT_FILES=$(OUT_SO_MODULES)
7	-INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python
8
9	INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python
10	INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)

Lines 1-6 Link Here

(-)files/patch-stepmake_stepmake_texinfo-vars.make (-2 / +2 lines)
1	--- stepmake/stepmake/texinfo-vars.make.orig 2020-03-01 14:00:51 UTC	1	--- stepmake/stepmake/texinfo-vars.make.orig 2020-04-26 09:45:49 UTC
2	+++ stepmake/stepmake/texinfo-vars.make	2	+++ stepmake/stepmake/texinfo-vars.make
3	@@ -31,7 +31,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(ba	3	@@ -26,7 +26,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(ba
4		4
5	TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)	5	TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
6		6




%%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

%%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

%%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

%%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

%%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

%%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

%%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

Return to bug 252215

Lines 2-8 Link Here

(-)Makefile (-34 / +46 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lilypond	4	PORTNAME= lilypond
5	DISTVERSION= 2.20.0	5	DISTVERSION= 2.21.82
6	CATEGORIES= print audio	6	CATEGORIES= print audio
7	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/	7	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/
8		8
Lines 11-75 Link Here
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13		13
14	BUILD_DEPENDS= pdftexi2dvi:print/texinfo \	14	BUILD_DEPENDS= bash:shells/bash \
15	t1ascii:print/t1utils \
16	bash:shells/bash \
17	convert:graphics/ImageMagick6 \	15	convert:graphics/ImageMagick6 \
18	dblatex:textproc/dblatex \	16	dblatex:textproc/dblatex \
19	fontforge:print/fontforge \	17	fontforge:print/fontforge \
20	help2man:misc/help2man \	18	help2man:misc/help2man \
		19	pdftexi2dvi:print/texinfo \
21	pngtopnm:graphics/netpbm \	20	pngtopnm:graphics/netpbm \
22	rsync:net/rsync \	21	rsync:net/rsync \
		22	t1ascii:print/t1utils \
23	texi2html:textproc/texi2html \	23	texi2html:textproc/texi2html \
24	zip:archivers/zip	24	zip:archivers/zip
25	LIB_DEPENDS= libltdl.so:devel/libltdl \	25	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
		26	libfreetype.so:print/freetype2 \
		27	libgmp.so:math/gmp \
26	libguile.so:lang/guile1 \	28	libguile.so:lang/guile1 \
27	libgmp.so:math/gmp \	29	libltdl.so:devel/libltdl
28	libfreetype.so:print/freetype2 \	30	RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
29	libfontconfig.so:x11-fonts/fontconfig	31	mftrace:print/mftrace
30	RUN_DEPENDS= mftrace:print/mftrace \
31	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
32		32
33	USES= bison:build compiler:gcc-c++11-lib gettext ghostscript gmake \	33	USES= bison:build compiler:c++11-lib ghostscript gmake gnome \
34	gnome perl5 pkgconfig python:2.7	34	perl5 pkgconfig python:3.5+
35	USE_CXXSTD= c++11	35	USE_CXXSTD= c++11
36	USE_GNOME= pango	36	USE_GNOME= pango
37	USE_PERL5= build	37	USE_PERL5= build
38	USE_TEX= latex texmf	38	USE_TEX= latex texmf
39		39
40	GNU_CONFIGURE= yes	40	GNU_CONFIGURE= yes
41	CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \	41	CONFIGURE_ARGS+= --with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre
42	--with-python-include=${PYTHON_INCLUDEDIR} --without-urwotf-dir	42	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
43	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \	43	FLEX=${FLEX} \
44	FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}	44	HOME=${WRKDIR} \
		45	YACC=${YACC}
45		46
46	MAKEFILE= GNUmakefile	47	MAKEFILE= GNUmakefile
47	ALL_TARGET= all	48	ALL_TARGET= all
48		49
		50	BINARY_ALIAS= python=${PYTHON_VERSION}
		51
49	INFO= internals \	52	INFO= internals \
50	lilypond-changes \	53	lilypond-changes \
51	lilypond-contributor \	54	lilypond-contributor \
52	lilypond-essay \	55	lilypond-essay \
53	lilypond-extending \	56	lilypond-extending \
54	lilypond-internals \	57	lilypond-internals \
55	lilypond-learning \	58	lilypond-learning \
56	lilypond-notation \	59	lilypond-notation \
57	lilypond-snippets \	60	lilypond-snippets \
58	lilypond-usage \	61	lilypond-usage \
59	lilypond-web \	62	lilypond-web \
60	music-glossary	63	music-glossary
61	PLIST_SUB= DISTVERSION=${DISTVERSION}	64	PLIST_SUB= DISTVERSION=${DISTVERSION}
62		65
63	OPTIONS_DEFINE= NLS	66	OPTIONS_DEFINE= URW NLS
64	OPTIONS_SUB= yes	67	OPTIONS_SUB= yes
65		68
		69	URW_DESC= Use bundled URW fonts
		70
		71	NLS_USES= gettext
		72
		73	URW_BUILD_DEPENDS= urw-core35-fonts>0:x11-fonts/urw-core35-fonts
		74	URW_RUN_DEPENDS_OFF= urw-core35-fonts>0:x11-fonts/urw-core35-fonts
		75
		76	URW_CONFIGURE_WITH= urwotf-dir=${LOCALBASE}/share/fonts/urw-core35-fonts
		77
66	post-patch:	78	post-patch:
67	@${FIND} ${WRKSRC} -name "*.cc" \| ${XARGS} \
68	${REINPLACE_CMD} -e 's\|isinf[ ]*(\|::isinf(\|g' -e 's\|isnan\|::isnan\|g'
69	@${REINPLACE_CMD} -e 's\|<FlexLexer.h>\|"/usr/include/FlexLexer.h"\|' \	79	@${REINPLACE_CMD} -e 's\|<FlexLexer.h>\|"/usr/include/FlexLexer.h"\|' \
70	${WRKSRC}/lily/include/includable-lexer.hh	80	${WRKSRC}/lily/include/includable-lexer.hh
71	${SED} -e 's\|%%FONTDIR%%\|${WRKDIR}/fontconfig/cache/\|' \	81	@${REINPLACE_CMD} -e 's\|$save_CXXFLAGS -Werror=suggest-override\|$save_CXXFLAGS\|' \
72	${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf	82	${WRKSRC}/configure
		83	@${SED} -e 's\|%%FONTDIR%%\|${WRKDIR}/fontconfig/cache/\|' \
		84	${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf
73		85
74	post-patch-NLS-off:	86	post-patch-NLS-off:
75	@${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in	87	@${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in

Lines 1-14 Link Here

(-)files/patch-Documentation_GNUmakefile (-10 / +19 lines)
1	--- Documentation/GNUmakefile.orig 2020-02-04 16:12:57 UTC	1	--- Documentation/GNUmakefile.orig 2020-08-16 10:58:56 UTC
2	+++ Documentation/GNUmakefile	2	+++ Documentation/GNUmakefile
3	@@ -74,9 +74,9 @@ source-links = $(outdir)/source\	3	@@ -147,6 +147,7 @@ INFO_DOCS = \
4	MAIN_INFO_DOC = lilypond-web	4	lilypond-internals \
5	INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \	5	lilypond-learning \
6	lilypond-essay lilypond-learning lilypond-notation music-glossary \	6	lilypond-notation \
7	- lilypond-web lilypond-extending	7	+ lilypond-snippets \
8	+ lilypond-web lilypond-extending lilypond-snippets internals	8	lilypond-usage \
		9	music-glossary
		10	# Some info files should only be processed if `$(out)` is equal to
		11	@@ -156,11 +157,9 @@ INFO_DOCS = \
		12	# more entries that are no longer present.
		13	ALL_INFO_DOCS = \
		14	$(INFO_DOCS) \
		15	- lilypond-snippets \
		16	lilypond-web
9	ifeq ($(out),www)	17	ifeq ($(out),www)
10	-INFO_DOCS += lilypond-snippets	18	-INFO_DOCS += lilypond-snippets \
11	+INFO_DOCS +=	19	- lilypond-web
		20	+INFO_DOCS += lilypond-web
12	endif	21	endif
13	INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)	22	INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
14		23	ALL_INFO_FILES = $(ALL_INFO_DOCS:%=$(outdir)/%.info)

Lines 1-11 Link Here

(-)files/patch-config.make.in (-7 / +7 lines)
1	--- config.make.in.orig 2020-02-04 16:12:57 UTC	1	--- config.make.in.orig 2020-08-16 10:58:56 UTC
2	+++ config.make.in	2	+++ config.make.in
3	@@ -73,7 +73,7 @@ sharedstatedir = @sharedstatedir@	3	@@ -94,7 +94,7 @@ mandir = @mandir@
4	stepmake = @stepmake@	4	package = lilypond
5
6	package_datadir = $(datadir)/$(package)	5	package_datadir = $(datadir)/$(package)
		6	package_docdir = $(docdir)/$(package)
7	-package_infodir = $(infodir)/$(package)	7	-package_infodir = $(infodir)/$(package)
8	+package_infodir = $(infodir)	8	+package_infodir = $(infodir)
9	package_libdir = $(libdir)/$(package)	9	prefix = @prefix@
10	package_docdir = $(docdir)/$(package)	10	program_prefix = @program_prefix@
11	package_omfdir = $(omfdir)/$(package)	11	program_suffix = @program_suffix@

Lines 1-27 Link Here

(-)files/patch-configure (-42 / +4 lines)
1	--- configure.orig 2020-03-01 14:00:51 UTC	1	--- configure.orig 2020-07-13 14:02:44 UTC
2	+++ configure	2	+++ configure
3	@@ -2298,13 +2298,8 @@ $as_echo_n "checking $r version... " >&6; }	3	@@ -9035,71 +9035,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"
4	## for compatibility reasons.
5
6	## grab the first version number in --version output.
7	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \|
8	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
9	- head -n 1 \|
10	- tr ' ' '\n' \|
11	- sed 's/\([0-9][0-9]\.[0-9][0-9.]\).*/\1/g' \|
12	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
13	- head -n 1\`\"
14	+ eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>/dev/null \|
15	+ awk '$1 ~ "fontforge" { print $2 }'\`\"
16
17	if test -z "$_ver"; then
18	## If empty, try date [fontforge]
19	@@ -11631,71 +11626,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"
20	if test $? -eq 0; then	4	if test $? -eq 0; then
21	if test -n "0.9.0" -o -n ""; then	5	if test -n "0.9.0" -o -n ""; then
22		6
23	- r="`eval echo '$'"PKG_CONFIG"`"	7	- r="`eval echo '$'"PKG_CONFIG"`"
24	- { $as_echo "$as_me:$LINENO: checking $r version" >&5	8	- { $as_echo "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
25	-$as_echo_n "checking $r version... " >&6; }	9	-$as_echo_n "checking $r version... " >&6; }
26	- exe=`	10	- exe=`
27	- ## which doesn't work in ash, if /usr/bin/which isn't installed	11	- ## which doesn't work in ash, if /usr/bin/which isn't installed
Lines 82-88 Link Here
82	- }	66	- }
83	- {printf "%.0f\n", $11000000 + $21000 + three}'	67	- {printf "%.0f\n", $11000000 + $21000 + three}'
84	-`	68	-`
85	- { $as_echo "$as_me:$LINENO: result: $ver" >&5	69	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
86	-$as_echo "$ver" >&6; }	70	-$as_echo "$ver" >&6; }
87	- if test "$num" -lt "$min"; then	71	- if test "$num" -lt "$min"; then
88	-	72	-
Lines 91-115 Link Here
91	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"	75	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
92		76
93	fi	77	fi
94	@@ -15001,21 +14935,6 @@ $as_echo "$ver" >&6; }
95
96	eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 1.82 (installed: $ver)"\"`\"
97
98	- fi
99	- if test -n "1.82"; then
100	- max=`
101	- echo "1.82" \| awk -F. '
102	- {
103	- if ($3) {three = $3}
104	- else {three = 0}
105	- }
106	- {printf "%.0f\n", $11000000 + $21000 + three}'
107	-`
108	- if test "$num" -gt "$max"; then
109	-
110	- eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r <= 1.82 (installed: $ver)"\"`\"
111	-
112	- fi
113	fi
114	vervar="`echo TEXI2HTML \| tr 'a-z' 'A-Z'`_VERSION"
115	eval `echo $vervar=$num`

Lines 1-18 Link Here

(-)files/patch-flower_include_std-string.hh (-18 lines)
1	--- flower/include/std-string.hh.orig 2020-03-01 14:00:51 UTC
2	+++ flower/include/std-string.hh
3	@@ -38,6 +38,7 @@ using namespace std;
4	typedef size_t ssize;
5	#define NPOS string::npos
6
7	+#if _cplusplus <= 19971L
8	string to_string (const string &);
9	string to_string (char c, int n = 1);
10	string to_string (int i, char const *format = 0);
11	@@ -49,6 +50,7 @@ string to_string (unsigned);
12	string to_string (bool b);
13	string to_string (char const *format, ...)
14	__attribute__ ((format (printf, 1, 2)));
15	+#endif
16
17	string &replace_all (string *str, string const &find, string const &replace);
18	string &replace_all (string *str, char find, char replace);

Lines 193-198 Link Here

(-)pkg-plist (-25 / +31 lines)
193	%%DATADIR%%/%%DISTVERSION%%/ly/graphviz-init.ly	193	%%DATADIR%%/%%DISTVERSION%%/ly/graphviz-init.ly
194	%%DATADIR%%/%%DISTVERSION%%/ly/gregorian.ly	194	%%DATADIR%%/%%DISTVERSION%%/ly/gregorian.ly
195	%%DATADIR%%/%%DISTVERSION%%/ly/guile-debugger.ly	195	%%DATADIR%%/%%DISTVERSION%%/ly/guile-debugger.ly
		196	%%DATADIR%%/%%DISTVERSION%%/ly/hel-arabic.ly
196	%%DATADIR%%/%%DISTVERSION%%/ly/init.ly	197	%%DATADIR%%/%%DISTVERSION%%/ly/init.ly
197	%%DATADIR%%/%%DISTVERSION%%/ly/italiano.ly	198	%%DATADIR%%/%%DISTVERSION%%/ly/italiano.ly
198	%%DATADIR%%/%%DISTVERSION%%/ly/lilypond-book-preamble.ly	199	%%DATADIR%%/%%DISTVERSION%%/ly/lilypond-book-preamble.ly
Lines 222-230 Link Here
222	%%DATADIR%%/%%DISTVERSION%%/ly/string-tunings-init.ly	223	%%DATADIR%%/%%DISTVERSION%%/ly/string-tunings-init.ly
223	%%DATADIR%%/%%DISTVERSION%%/ly/suomi.ly	224	%%DATADIR%%/%%DISTVERSION%%/ly/suomi.ly
224	%%DATADIR%%/%%DISTVERSION%%/ly/svenska.ly	225	%%DATADIR%%/%%DISTVERSION%%/ly/svenska.ly
		226	%%DATADIR%%/%%DISTVERSION%%/ly/swing.ly
225	%%DATADIR%%/%%DISTVERSION%%/ly/text-replacements.ly	227	%%DATADIR%%/%%DISTVERSION%%/ly/text-replacements.ly
226	%%DATADIR%%/%%DISTVERSION%%/ly/titling-init.ly	228	%%DATADIR%%/%%DISTVERSION%%/ly/titling-init.ly
227	%%DATADIR%%/%%DISTVERSION%%/ly/toc-init.ly	229	%%DATADIR%%/%%DISTVERSION%%/ly/toc-init.ly
		230	%%DATADIR%%/%%DISTVERSION%%/ly/turkish-makam.ly
228	%%DATADIR%%/%%DISTVERSION%%/ly/vlaams.ly	231	%%DATADIR%%/%%DISTVERSION%%/ly/vlaams.ly
229	%%DATADIR%%/%%DISTVERSION%%/ly/vocal-tkit.ly	232	%%DATADIR%%/%%DISTVERSION%%/ly/vocal-tkit.ly
230	%%DATADIR%%/%%DISTVERSION%%/ly/voice-tkit.ly	233	%%DATADIR%%/%%DISTVERSION%%/ly/voice-tkit.ly
Lines 231-270 Link Here
231	%%DATADIR%%/%%DISTVERSION%%/ps/encodingdefs.ps	234	%%DATADIR%%/%%DISTVERSION%%/ps/encodingdefs.ps
232	%%DATADIR%%/%%DISTVERSION%%/ps/lilyponddefs.ps	235	%%DATADIR%%/%%DISTVERSION%%/ps/lilyponddefs.ps
233	%%DATADIR%%/%%DISTVERSION%%/ps/music-drawing-routines.ps	236	%%DATADIR%%/%%DISTVERSION%%/ps/music-drawing-routines.ps
		237	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_base.cpython-%%PYTHON_SUFFIX%%.pyc
		238	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_docbook.cpython-%%PYTHON_SUFFIX%%.pyc
		239	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_html.cpython-%%PYTHON_SUFFIX%%.pyc
		240	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_latex.cpython-%%PYTHON_SUFFIX%%.pyc
		241	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_snippets.cpython-%%PYTHON_SUFFIX%%.pyc
		242	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/book_texinfo.cpython-%%PYTHON_SUFFIX%%.pyc
		243	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/convertrules.cpython-%%PYTHON_SUFFIX%%.pyc
		244	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/fontextract.cpython-%%PYTHON_SUFFIX%%.pyc
		245	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/langdefs.cpython-%%PYTHON_SUFFIX%%.pyc
		246	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/lilylib.cpython-%%PYTHON_SUFFIX%%.pyc
		247	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/midi.cpython-%%PYTHON_SUFFIX%%.pyc
		248	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicexp.cpython-%%PYTHON_SUFFIX%%.pyc
		249	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml.cpython-%%PYTHON_SUFFIX%%.pyc
		250	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/musicxml2ly_conversion.cpython-%%PYTHON_SUFFIX%%.pyc
		251	%%DATADIR%%/%%DISTVERSION%%/python/__pycache__/utilities.cpython-%%PYTHON_SUFFIX%%.pyc
234	%%DATADIR%%/%%DISTVERSION%%/python/book_base.py	252	%%DATADIR%%/%%DISTVERSION%%/python/book_base.py
235	%%DATADIR%%/%%DISTVERSION%%/python/book_base.pyc
236	%%DATADIR%%/%%DISTVERSION%%/python/book_docbook.py	253	%%DATADIR%%/%%DISTVERSION%%/python/book_docbook.py
237	%%DATADIR%%/%%DISTVERSION%%/python/book_docbook.pyc
238	%%DATADIR%%/%%DISTVERSION%%/python/book_html.py	254	%%DATADIR%%/%%DISTVERSION%%/python/book_html.py
239	%%DATADIR%%/%%DISTVERSION%%/python/book_html.pyc
240	%%DATADIR%%/%%DISTVERSION%%/python/book_latex.py	255	%%DATADIR%%/%%DISTVERSION%%/python/book_latex.py
241	%%DATADIR%%/%%DISTVERSION%%/python/book_latex.pyc
242	%%DATADIR%%/%%DISTVERSION%%/python/book_snippets.py	256	%%DATADIR%%/%%DISTVERSION%%/python/book_snippets.py
243	%%DATADIR%%/%%DISTVERSION%%/python/book_snippets.pyc
244	%%DATADIR%%/%%DISTVERSION%%/python/book_texinfo.py	257	%%DATADIR%%/%%DISTVERSION%%/python/book_texinfo.py
245	%%DATADIR%%/%%DISTVERSION%%/python/book_texinfo.pyc
246	%%DATADIR%%/%%DISTVERSION%%/python/convertrules.py	258	%%DATADIR%%/%%DISTVERSION%%/python/convertrules.py
247	%%DATADIR%%/%%DISTVERSION%%/python/convertrules.pyc
248	%%DATADIR%%/%%DISTVERSION%%/python/fontextract.py	259	%%DATADIR%%/%%DISTVERSION%%/python/fontextract.py
249	%%DATADIR%%/%%DISTVERSION%%/python/fontextract.pyc
250	%%DATADIR%%/%%DISTVERSION%%/python/langdefs.py	260	%%DATADIR%%/%%DISTVERSION%%/python/langdefs.py
251	%%DATADIR%%/%%DISTVERSION%%/python/langdefs.pyc
252	%%DATADIR%%/%%DISTVERSION%%/python/lilylib.py	261	%%DATADIR%%/%%DISTVERSION%%/python/lilylib.py
253	%%DATADIR%%/%%DISTVERSION%%/python/lilylib.pyc
254	%%DATADIR%%/%%DISTVERSION%%/python/midi.py	262	%%DATADIR%%/%%DISTVERSION%%/python/midi.py
255	%%DATADIR%%/%%DISTVERSION%%/python/midi.pyc
256	%%DATADIR%%/%%DISTVERSION%%/python/musicexp.py	263	%%DATADIR%%/%%DISTVERSION%%/python/musicexp.py
257	%%DATADIR%%/%%DISTVERSION%%/python/musicexp.pyc
258	%%DATADIR%%/%%DISTVERSION%%/python/musicxml.py	264	%%DATADIR%%/%%DISTVERSION%%/python/musicxml.py
259	%%DATADIR%%/%%DISTVERSION%%/python/musicxml.pyc
260	%%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.py	265	%%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.py
261	%%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.pyc
262	%%DATADIR%%/%%DISTVERSION%%/python/rational.py
263	%%DATADIR%%/%%DISTVERSION%%/python/rational.pyc
264	%%DATADIR%%/%%DISTVERSION%%/python/safeeval.py
265	%%DATADIR%%/%%DISTVERSION%%/python/safeeval.pyc
266	%%DATADIR%%/%%DISTVERSION%%/python/utilities.py	266	%%DATADIR%%/%%DISTVERSION%%/python/utilities.py
267	%%DATADIR%%/%%DISTVERSION%%/python/utilities.pyc
268	%%DATADIR%%/%%DISTVERSION%%/scm/accreg.scm	267	%%DATADIR%%/%%DISTVERSION%%/scm/accreg.scm
269	%%DATADIR%%/%%DISTVERSION%%/scm/auto-beam.scm	268	%%DATADIR%%/%%DISTVERSION%%/scm/auto-beam.scm
270	%%DATADIR%%/%%DISTVERSION%%/scm/autochange.scm	269	%%DATADIR%%/%%DISTVERSION%%/scm/autochange.scm
Lines 273-282 Link Here
273	%%DATADIR%%/%%DISTVERSION%%/scm/bezier-tools.scm	272	%%DATADIR%%/%%DISTVERSION%%/scm/bezier-tools.scm
274	%%DATADIR%%/%%DISTVERSION%%/scm/c++.scm	273	%%DATADIR%%/%%DISTVERSION%%/scm/c++.scm
275	%%DATADIR%%/%%DISTVERSION%%/scm/chord-entry.scm	274	%%DATADIR%%/%%DISTVERSION%%/scm/chord-entry.scm
276	%%DATADIR%%/%%DISTVERSION%%/scm/chord-generic-names.scm
277	%%DATADIR%%/%%DISTVERSION%%/scm/chord-ignatzek-names.scm	275	%%DATADIR%%/%%DISTVERSION%%/scm/chord-ignatzek-names.scm
278	%%DATADIR%%/%%DISTVERSION%%/scm/chord-name.scm	276	%%DATADIR%%/%%DISTVERSION%%/scm/chord-name.scm
279	%%DATADIR%%/%%DISTVERSION%%/scm/clip-region.scm	277	%%DATADIR%%/%%DISTVERSION%%/scm/clip-region.scm
		278	%%DATADIR%%/%%DISTVERSION%%/scm/color.scm
280	%%DATADIR%%/%%DISTVERSION%%/scm/define-context-properties.scm	279	%%DATADIR%%/%%DISTVERSION%%/scm/define-context-properties.scm
281	%%DATADIR%%/%%DISTVERSION%%/scm/define-event-classes.scm	280	%%DATADIR%%/%%DISTVERSION%%/scm/define-event-classes.scm
282	%%DATADIR%%/%%DISTVERSION%%/scm/define-grob-interfaces.scm	281	%%DATADIR%%/%%DISTVERSION%%/scm/define-grob-interfaces.scm
Lines 311-317 Link Here
311	%%DATADIR%%/%%DISTVERSION%%/scm/framework-null.scm	310	%%DATADIR%%/%%DISTVERSION%%/scm/framework-null.scm
312	%%DATADIR%%/%%DISTVERSION%%/scm/framework-ps.scm	311	%%DATADIR%%/%%DISTVERSION%%/scm/framework-ps.scm
313	%%DATADIR%%/%%DISTVERSION%%/scm/framework-scm.scm	312	%%DATADIR%%/%%DISTVERSION%%/scm/framework-scm.scm
314	%%DATADIR%%/%%DISTVERSION%%/scm/framework-socket.scm
315	%%DATADIR%%/%%DISTVERSION%%/scm/framework-svg.scm	313	%%DATADIR%%/%%DISTVERSION%%/scm/framework-svg.scm
316	%%DATADIR%%/%%DISTVERSION%%/scm/fret-diagrams.scm	314	%%DATADIR%%/%%DISTVERSION%%/scm/fret-diagrams.scm
317	%%DATADIR%%/%%DISTVERSION%%/scm/graphviz.scm	315	%%DATADIR%%/%%DISTVERSION%%/scm/graphviz.scm
Lines 325-337 Link Here
325	%%DATADIR%%/%%DISTVERSION%%/scm/ly-syntax-constructors.scm	323	%%DATADIR%%/%%DISTVERSION%%/scm/ly-syntax-constructors.scm
326	%%DATADIR%%/%%DISTVERSION%%/scm/markup-macros.scm	324	%%DATADIR%%/%%DISTVERSION%%/scm/markup-macros.scm
327	%%DATADIR%%/%%DISTVERSION%%/scm/markup.scm	325	%%DATADIR%%/%%DISTVERSION%%/scm/markup.scm
328	%%DATADIR%%/%%DISTVERSION%%/scm/memory-trace.scm
329	%%DATADIR%%/%%DISTVERSION%%/scm/midi.scm	326	%%DATADIR%%/%%DISTVERSION%%/scm/midi.scm
330	%%DATADIR%%/%%DISTVERSION%%/scm/modal-transforms.scm	327	%%DATADIR%%/%%DISTVERSION%%/scm/modal-transforms.scm
331	%%DATADIR%%/%%DISTVERSION%%/scm/music-functions.scm	328	%%DATADIR%%/%%DISTVERSION%%/scm/music-functions.scm
332	%%DATADIR%%/%%DISTVERSION%%/scm/output-lib.scm	329	%%DATADIR%%/%%DISTVERSION%%/scm/output-lib.scm
333	%%DATADIR%%/%%DISTVERSION%%/scm/output-ps.scm	330	%%DATADIR%%/%%DISTVERSION%%/scm/output-ps.scm
334	%%DATADIR%%/%%DISTVERSION%%/scm/output-socket.scm
335	%%DATADIR%%/%%DISTVERSION%%/scm/output-svg.scm	331	%%DATADIR%%/%%DISTVERSION%%/scm/output-svg.scm
336	%%DATADIR%%/%%DISTVERSION%%/scm/page.scm	332	%%DATADIR%%/%%DISTVERSION%%/scm/page.scm
337	%%DATADIR%%/%%DISTVERSION%%/scm/paper-system.scm	333	%%DATADIR%%/%%DISTVERSION%%/scm/paper-system.scm
Lines 351-363 Link Here
351	%%DATADIR%%/%%DISTVERSION%%/scm/standalone.scm	347	%%DATADIR%%/%%DISTVERSION%%/scm/standalone.scm
352	%%DATADIR%%/%%DISTVERSION%%/scm/stencil.scm	348	%%DATADIR%%/%%DISTVERSION%%/scm/stencil.scm
353	%%DATADIR%%/%%DISTVERSION%%/scm/tablature.scm	349	%%DATADIR%%/%%DISTVERSION%%/scm/tablature.scm
354	%%DATADIR%%/%%DISTVERSION%%/scm/text.scm
355	%%DATADIR%%/%%DISTVERSION%%/scm/time-signature-settings.scm	350	%%DATADIR%%/%%DISTVERSION%%/scm/time-signature-settings.scm
356	%%DATADIR%%/%%DISTVERSION%%/scm/time-signature.scm	351	%%DATADIR%%/%%DISTVERSION%%/scm/time-signature.scm
357	%%DATADIR%%/%%DISTVERSION%%/scm/titling.scm	352	%%DATADIR%%/%%DISTVERSION%%/scm/titling.scm
358	%%DATADIR%%/%%DISTVERSION%%/scm/to-xml.scm	353	%%DATADIR%%/%%DISTVERSION%%/scm/to-xml.scm
359	%%DATADIR%%/%%DISTVERSION%%/scm/translation-functions.scm	354	%%DATADIR%%/%%DISTVERSION%%/scm/translation-functions.scm
360	%%DATADIR%%/%%DISTVERSION%%/scm/x11-color.scm
361	%%DATADIR%%/%%DISTVERSION%%/tex/lilypond-tex-metrics.tex	355	%%DATADIR%%/%%DISTVERSION%%/tex/lilypond-tex-metrics.tex
362	%%DATADIR%%/%%DISTVERSION%%/tex/texinfo-ja.tex	356	%%DATADIR%%/%%DISTVERSION%%/tex/texinfo-ja.tex
363	%%DATADIR%%/%%DISTVERSION%%/vim/compiler/lilypond.vim	357	%%DATADIR%%/%%DISTVERSION%%/vim/compiler/lilypond.vim
Lines 386-388 Link Here
386	%%NLS%%share/locale/uk/LC_MESSAGES/lilypond.mo	380	%%NLS%%share/locale/uk/LC_MESSAGES/lilypond.mo
387	%%NLS%%share/locale/vi/LC_MESSAGES/lilypond.mo	381	%%NLS%%share/locale/vi/LC_MESSAGES/lilypond.mo
388	%%NLS%%share/locale/zh_TW/LC_MESSAGES/lilypond.mo	382	%%NLS%%share/locale/zh_TW/LC_MESSAGES/lilypond.mo
		383	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-BdIta.otf
		384	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Bold.otf
		385	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Italic.otf
		386	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Roman.otf
		387	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Bold.otf
		388	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-BoldItalic.otf
		389	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Italic.otf
		390	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Regular.otf
		391	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Bold.otf
		392	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-BoldItalic.otf
		393	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Italic.otf
		394	%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Regular.otf