Attachment #213567 for bug #243970




# $FreeBSD$

PORTNAME=	lilypond
DISTVERSION=	2.21.0
PORTREVISION=	1
CATEGORIES=	print audio
MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
PKGNAMESUFFIX=	-devel


LICENSE=	GPLv3

DEPRECATED=	Uses deprecated version of python
EXPIRATION_DATE=	2020-09-15

BUILD_DEPENDS=	pdftexi2dvi:print/texinfo \
		t1ascii:print/t1utils \
		bash:shells/bash \

		music-glossary

USES=		bison:build compiler:gcc-c++11-lib gettext ghostscript gmake \
		gnome perl5 pkgconfig python:3.5+
USE_CXXSTD=	c++11
USE_TEX=	latex texmf
USE_PERL5=	build
USE_GNOME=	pango
BINARY_ALIAS=	python=${PYTHON_VERSION}

MAKEFILE=	GNUmakefile

GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \
		--without-urwotf-dir
CONFIGURE_ENV+=	ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
		FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}


OPTIONS_SUB=	yes

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/|'  \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1554060216	1	TIMESTAMP = 1586886118
2	SHA256 (lilypond-2.19.83.tar.gz) = 96ba4f4b342d21057ad74d85d647aea7e47a5c24f895127c2b3553a252738fb3	2	SHA256 (lilypond-2.21.0.tar.gz) = 77ce155feba3871360b529d5d14ade7c8d41808769bee20fe66d918370a5ba4b
3	SIZE (lilypond-2.19.83.tar.gz) = 17996428	3	SIZE (lilypond-2.21.0.tar.gz) = 18152219

Lines 1-4 Link Here

(-)files/patch-Documentation_GNUmakefile (-1 / +1 lines)
1	--- Documentation/GNUmakefile.orig 2017-02-26 12:08:59 UTC	1	--- Documentation/GNUmakefile.orig 2020-04-09 12:55:56 UTC
2	+++ Documentation/GNUmakefile	2	+++ Documentation/GNUmakefile
3	@@ -73,9 +73,9 @@ source-links = $(outdir)/source\	3	@@ -73,9 +73,9 @@ source-links = $(outdir)/source\
4	MAIN_INFO_DOC = lilypond-web	4	MAIN_INFO_DOC = lilypond-web




--- config.make.in.orig	2020-04-09 12:55:56 UTC
+++ config.make.in
@@ -96,7 +96,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@

Lines 1-27 Link Here

(-)files/patch-configure (-39 / +50 lines)
1	--- configure.orig 2019-03-20 13:52:23 UTC	1	--- configure.orig 2020-04-09 12:55:56 UTC
2	+++ configure	2	+++ configure
3	@@ -10512,13 +10512,8 @@ $as_echo_n "checking $r version... " >&6; }	3	@@ -8392,7 +8392,7 @@ _ACEOF
4	## for compatibility reasons.	4	if ac_fn_cxx_try_compile "$LINENO"; then :
		5	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
		6	$as_echo "yes" >&6; }
		7	- CXXFLAGS="$save_CXXFLAGS -Werror=suggest-override"
		8	+ CXXFLAGS="$save_CXXFLAGS"
		9	else
		10	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
		11	$as_echo "no" >&6; }
		12	@@ -9084,71 +9084,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"
		13	if test $? -eq 0; then
		14	if test -n "0.9.0" -o -n ""; then
5		15
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	@@ -11595,75 +11590,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"
20
21	if test $? -eq 0 -a -n "0.9.0"; then
22
23	- r="`eval echo '$'"PKG_CONFIG"`"	16	- r="`eval echo '$'"PKG_CONFIG"`"
24	- { $as_echo "$as_me:$LINENO: checking $r version" >&5	17	- { $as_echo "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
25	-$as_echo_n "checking $r version... " >&6; }	18	-$as_echo_n "checking $r version... " >&6; }
26	- exe=`	19	- exe=`
27	- ## which doesn't work in ash, if /usr/bin/which isn't installed	20	- ## which doesn't work in ash, if /usr/bin/which isn't installed
Lines 31-40 Link Here
31	- ## this test should work in ash, bash, pdksh (ksh), zsh	24	- ## this test should work in ash, bash, pdksh (ksh), zsh
32	- type -p $r 2>/dev/null \| tail -n 1 \| awk '{print $NF}'	25	- type -p $r 2>/dev/null \| tail -n 1 \| awk '{print $NF}'
33	-`	26	-`
34	- if test -n ""; then	27	- ver=`
35	- ver=""
36	- else
37	- ver=`
38	- ## "$exe" --version 2>&1 \| grep -v '^$' \| head -n 1 \| awk '{print $NF}'	28	- ## "$exe" --version 2>&1 \| grep -v '^$' \| head -n 1 \| awk '{print $NF}'
39	- ##	29	- ##
40	- ## ARG.	30	- ## ARG.
Lines 50-75 Link Here
50	- ## use eval trickery, because we cannot use multi-level $() instead of ``	40	- ## use eval trickery, because we cannot use multi-level $() instead of ``
51	- ## for compatibility reasons.	41	- ## for compatibility reasons.
52	-	42	-
53	- ## grab the first version number in --version output.	43	- ## grab the first version number in --version output.
54	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \|	44	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \|
55	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|	45	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
56	- head -n 1 \|	46	- head -n 1 \|
57	- tr ' ' '\n' \|	47	- tr ' ' '\n' \|
58	- sed 's/$[0-9][0-9]\.[0-9][0-9.]$.*/\1/g' \|	48	- sed 's/$[0-9][0-9]\.[0-9][0-9.]$.*/\1/g' \|
59	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|	49	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
60	- head -n 1\`\"	50	- head -n 1\`\"
61	-	51	-
62	- if test -z "$_ver"; then	52	- if test -z "$_ver"; then
63	- ## If empty, try date [fontforge]	53	- ## If empty, try date [fontforge]
64	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \	54	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \
65	- \| grep '$^\\|[^0-9a-f]$[0-9]\{6,8\}$[^0-9a-f]\\|$$' \	55	- \| grep '$^\\|[^0-9a-f]$[0-9]\{6,8\}$[^0-9a-f]\\|$$' \
66	- \| head -n 1 \	56	- \| head -n 1 \
67	- \| sed -e 's/^[^.0-9]//' -e 's/[^.0-9]$//'\`\"	57	- \| sed -e 's/^[^.0-9]//' -e 's/[^.0-9]$//'\`\"
68	- fi	58	- fi
69	- echo "$_ver"	59	- echo "$_ver"
70	- #dnl	60	- #dnl
71	-`	61	-`
72	- fi
73	- num=`	62	- num=`
74	- echo "$ver" \| awk -F. '	63	- echo "$ver" \| awk -F. '
75	- {	64	- {
Lines 78-84 Link Here
78	- }	67	- }
79	- {printf "%.0f\n", $11000000 + $21000 + three}'	68	- {printf "%.0f\n", $11000000 + $21000 + three}'
80	-`	69	-`
81	- req=`	70	- min=`
82	- echo "0.9.0" \| awk -F. '	71	- echo "0.9.0" \| awk -F. '
83	- {	72	- {
84	- if ($3) {three = $3}	73	- if ($3) {three = $3}
Lines 86-94 Link Here
86	- }	75	- }
87	- {printf "%.0f\n", $11000000 + $21000 + three}'	76	- {printf "%.0f\n", $11000000 + $21000 + three}'
88	-`	77	-`
89	- { $as_echo "$as_me:$LINENO: result: $ver" >&5	78	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
90	-$as_echo "$ver" >&6; }	79	-$as_echo "$ver" >&6; }
91	- if test "$num" -lt "$req"; then	80	- if test "$num" -lt "$min"; then
92	-	81	-
93	+ if test ! $?; then	82	+ if test ! $?; then
94	+ ver=`$PKG_CONFIG --version`	83	+ ver=`$PKG_CONFIG --version`
Lines 95-97 Link Here
95	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"	84	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
96		85
97	fi	86	fi
		87	@@ -11576,21 +11515,7 @@ $as_echo "$ver" >&6; }
		88	eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r >= 1.82 (installed: $ver)"\"`\"
		89
		90	fi
		91	- if test -n "1.82"; then
		92	- max=`
		93	- echo "1.82" \| awk -F. '
		94	- {
		95	- if ($3) {three = $3}
		96	- else {three = 0}
		97	- }
		98	- {printf "%.0f\n", $11000000 + $21000 + three}'
		99	-`
		100	- if test "$num" -gt "$max"; then
		101
		102	- eval "$DOCUMENTATION_REQUIRED"=\"`eval echo \"'$'$DOCUMENTATION_REQUIRED\" \""$r <= 1.82 (installed: $ver)"\"`\"
		103	-
		104	- fi
		105	- fi
		106	vervar="`echo TEXI2HTML \| tr 'a-z' 'A-Z'`_VERSION"
		107	eval `echo $vervar=$num`
		108	## AC_SUBST(`eval echo $vervar`)




--- flower/include/std-string.hh.orig	2017-02-26 12:08:59 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 2017-02-26 12:08:59 UTC
2	+++ flower/include/std-vector.hh
3	@@ -212,6 +212,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-9 Link Here

(-)files/patch-lily_include_lily-guile.hh (-4 / +4 lines)
1	--- lily/include/lily-guile.hh.orig 2017-02-26 12:08:59 UTC	1	--- lily/include/lily-guile.hh.orig 2020-02-04 16:12:57 UTC
2	+++ lily/include/lily-guile.hh	2	+++ lily/include/lily-guile.hh
3	@@ -20,6 +20,8 @@	3	@@ -22,6 +22,8 @@
4	#ifndef LILY_GUILE_HH
5	#define LILY_GUILE_HH
6		4
		5	#include "config.hh"
		6
7	+#include <cstddef>	7	+#include <cstddef>
8	+	8	+
9	#if __MINGW32__	9	#if __MINGW32__

Lines 1-10 Link Here

(-)files/patch-python_GNUmakefile (-7 / +7 lines)
1	--- python/GNUmakefile.orig 2017-02-26 12:08:59 UTC	1	--- python/GNUmakefile.orig 2020-04-09 12:55:56 UTC
2	+++ python/GNUmakefile	2	+++ python/GNUmakefile
3	@@ -14,7 +14,6 @@ CONFIG_LDFLAGS=	3	@@ -20,7 +20,6 @@ default: $(OUT_PY_MODULES)
4	INSTALLATION_OUT_SUFFIXES=1	4	INSTALLATION_DIR = $(local_lilypond_datadir)/python
		5	INSTALLATION_FILES = $(filter-out $(call src-wildcard, *_test.py), $(PY_MODULES_IN))
5		6
6	INSTALLATION_OUT_FILES=$(OUT_SO_MODULES)	7	-INSTALLATION_OUT_DIR = $(local_lilypond_datadir)/python/__pycache__
7	-INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python	8	INSTALLATION_OUT_FILES = $(wildcard $(outdir)/__pycache__/*.pyc)
8		9
9	INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python	10	local-test: book_base_test.py
10	INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)

Lines 1-11 Link Here

(-)files/patch-stepmake_stepmake_texinfo-vars.make (-3 / +3 lines)
1	--- stepmake/stepmake/texinfo-vars.make.orig 2017-02-26 12:08:59 UTC	1	--- stepmake/stepmake/texinfo-vars.make.orig 2020-04-09 12:55:56 UTC
2	+++ stepmake/stepmake/texinfo-vars.make	2	+++ stepmake/stepmake/texinfo-vars.make
3	@@ -31,7 +31,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-t	3	@@ -27,7 +27,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
7	-MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)	7	-MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)	8	+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
9	MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)	9	MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
10		10
11	# texi2html xref map files	11	# texi2html xref map files

Lines 7-12 Link Here

(-)pkg-descr (-3 / +1 lines)
7	tool, midi2ly. Conversion tools for PMX, MUP, ABC, Finale and	7	tool, midi2ly. Conversion tools for PMX, MUP, ABC, Finale and
8	Musedata are also included.	8	Musedata are also included.
9		9
10	WWW: http://lilypond.org/	10	WWW: https://lilypond.org/
11
12	Patrick Atamaniuk




%%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/lilyponddefs.ps
%%DATADIR%%/%%DISTVERSION%%/ps/music-drawing-routines.ps
%%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/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/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

Return to bug 243970

Lines 2-9 Link Here

(-)Makefile (-9 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lilypond	4	PORTNAME= lilypond
5	DISTVERSION= 2.19.83	5	DISTVERSION= 2.21.0
6	PORTREVISION= 1
7	CATEGORIES= print audio	6	CATEGORIES= print audio
8	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/	7	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/
9	PKGNAMESUFFIX= -devel	8	PKGNAMESUFFIX= -devel
Lines 13-21 Link Here
13		12
14	LICENSE= GPLv3	13	LICENSE= GPLv3
15		14
16	DEPRECATED= Uses deprecated version of python
17	EXPIRATION_DATE= 2020-09-15
18
19	BUILD_DEPENDS= pdftexi2dvi:print/texinfo \	15	BUILD_DEPENDS= pdftexi2dvi:print/texinfo \
20	t1ascii:print/t1utils \	16	t1ascii:print/t1utils \
21	bash:shells/bash \	17	bash:shells/bash \
Lines 49-65 Link Here
49	music-glossary	45	music-glossary
50		46
51	USES= bison:build compiler:gcc-c++11-lib gettext ghostscript gmake \	47	USES= bison:build compiler:gcc-c++11-lib gettext ghostscript gmake \
52	gnome perl5 pkgconfig python:2.7	48	gnome perl5 pkgconfig python:3.5+
53	USE_CXXSTD= c++11	49	USE_CXXSTD= c++11
54	USE_TEX= latex texmf	50	USE_TEX= latex texmf
55	USE_PERL5= build	51	USE_PERL5= build
56	USE_GNOME= pango	52	USE_GNOME= pango
		53	BINARY_ALIAS= python=${PYTHON_VERSION}
57		54
58	MAKEFILE= GNUmakefile	55	MAKEFILE= GNUmakefile
59		56
60	GNU_CONFIGURE= yes	57	GNU_CONFIGURE= yes
61	CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \	58	CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \
62	--with-python-include=${PYTHON_INCLUDEDIR} --without-urwotf-dir	59	--without-urwotf-dir
63	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \	60	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
64	FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}	61	FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}
65		62
Lines 71-78 Link Here
71	OPTIONS_SUB= yes	68	OPTIONS_SUB= yes
72		69
73	post-patch:	70	post-patch:
74	@${FIND} ${WRKSRC} -name "*.cc" \| ${XARGS} \
75	${REINPLACE_CMD} -e 's\|isinf[ ]*(\|::isinf(\|g' -e 's\|isnan\|::isnan\|g'
76	@${REINPLACE_CMD} -e 's\|<FlexLexer.h>\|"/usr/include/FlexLexer.h"\|' \	71	@${REINPLACE_CMD} -e 's\|<FlexLexer.h>\|"/usr/include/FlexLexer.h"\|' \
77	${WRKSRC}/lily/include/includable-lexer.hh	72	${WRKSRC}/lily/include/includable-lexer.hh
78	${SED} -e 's\|%%FONTDIR%%\|${WRKDIR}/fontconfig/cache/\|' \	73	${SED} -e 's\|%%FONTDIR%%\|${WRKDIR}/fontconfig/cache/\|' \

Lines 1-11 Link Here

(-)files/patch-config.make.in (-6 / +6 lines)
1	--- config.make.in.orig 2017-02-26 12:08:59 UTC	1	--- config.make.in.orig 2020-04-09 12:55:56 UTC
2	+++ config.make.in	2	+++ config.make.in
3	@@ -69,7 +69,7 @@ sharedstatedir = @sharedstatedir@	3	@@ -96,7 +96,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	package_libdir = $(libdir)/$(package)
10	package_docdir = $(docdir)/$(package)	10	prefix = @prefix@
11	package_omfdir = $(omfdir)/$(package)	11	program_prefix = @program_prefix@

Lines 1-18 Link Here

(-)files/patch-flower_include_std-string.hh (-18 lines)
1	--- flower/include/std-string.hh.orig 2017-02-26 12:08:59 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 (-21 / +4 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 232-270 Link Here
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
234	%%DATADIR%%/%%DISTVERSION%%/python/book_base.py	237	%%DATADIR%%/%%DISTVERSION%%/python/book_base.py
235	%%DATADIR%%/%%DISTVERSION%%/python/book_base.pyc
236	%%DATADIR%%/%%DISTVERSION%%/python/book_docbook.py	238	%%DATADIR%%/%%DISTVERSION%%/python/book_docbook.py
237	%%DATADIR%%/%%DISTVERSION%%/python/book_docbook.pyc
238	%%DATADIR%%/%%DISTVERSION%%/python/book_html.py	239	%%DATADIR%%/%%DISTVERSION%%/python/book_html.py
239	%%DATADIR%%/%%DISTVERSION%%/python/book_html.pyc
240	%%DATADIR%%/%%DISTVERSION%%/python/book_latex.py	240	%%DATADIR%%/%%DISTVERSION%%/python/book_latex.py
241	%%DATADIR%%/%%DISTVERSION%%/python/book_latex.pyc
242	%%DATADIR%%/%%DISTVERSION%%/python/book_snippets.py	241	%%DATADIR%%/%%DISTVERSION%%/python/book_snippets.py
243	%%DATADIR%%/%%DISTVERSION%%/python/book_snippets.pyc
244	%%DATADIR%%/%%DISTVERSION%%/python/book_texinfo.py	242	%%DATADIR%%/%%DISTVERSION%%/python/book_texinfo.py
245	%%DATADIR%%/%%DISTVERSION%%/python/book_texinfo.pyc
246	%%DATADIR%%/%%DISTVERSION%%/python/convertrules.py	243	%%DATADIR%%/%%DISTVERSION%%/python/convertrules.py
247	%%DATADIR%%/%%DISTVERSION%%/python/convertrules.pyc
248	%%DATADIR%%/%%DISTVERSION%%/python/fontextract.py	244	%%DATADIR%%/%%DISTVERSION%%/python/fontextract.py
249	%%DATADIR%%/%%DISTVERSION%%/python/fontextract.pyc
250	%%DATADIR%%/%%DISTVERSION%%/python/langdefs.py	245	%%DATADIR%%/%%DISTVERSION%%/python/langdefs.py
251	%%DATADIR%%/%%DISTVERSION%%/python/langdefs.pyc
252	%%DATADIR%%/%%DISTVERSION%%/python/lilylib.py	246	%%DATADIR%%/%%DISTVERSION%%/python/lilylib.py
253	%%DATADIR%%/%%DISTVERSION%%/python/lilylib.pyc
254	%%DATADIR%%/%%DISTVERSION%%/python/midi.py	247	%%DATADIR%%/%%DISTVERSION%%/python/midi.py
255	%%DATADIR%%/%%DISTVERSION%%/python/midi.pyc
256	%%DATADIR%%/%%DISTVERSION%%/python/musicexp.py	248	%%DATADIR%%/%%DISTVERSION%%/python/musicexp.py
257	%%DATADIR%%/%%DISTVERSION%%/python/musicexp.pyc
258	%%DATADIR%%/%%DISTVERSION%%/python/musicxml.py	249	%%DATADIR%%/%%DISTVERSION%%/python/musicxml.py
259	%%DATADIR%%/%%DISTVERSION%%/python/musicxml.pyc
260	%%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.py	250	%%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.py
261	%%DATADIR%%/%%DISTVERSION%%/python/musicxml2ly_conversion.pyc
262	%%DATADIR%%/%%DISTVERSION%%/python/rational.py	251	%%DATADIR%%/%%DISTVERSION%%/python/rational.py
263	%%DATADIR%%/%%DISTVERSION%%/python/rational.pyc
264	%%DATADIR%%/%%DISTVERSION%%/python/safeeval.py	252	%%DATADIR%%/%%DISTVERSION%%/python/safeeval.py
265	%%DATADIR%%/%%DISTVERSION%%/python/safeeval.pyc
266	%%DATADIR%%/%%DISTVERSION%%/python/utilities.py	253	%%DATADIR%%/%%DISTVERSION%%/python/utilities.py
267	%%DATADIR%%/%%DISTVERSION%%/python/utilities.pyc
268	%%DATADIR%%/%%DISTVERSION%%/scm/accreg.scm	254	%%DATADIR%%/%%DISTVERSION%%/scm/accreg.scm
269	%%DATADIR%%/%%DISTVERSION%%/scm/auto-beam.scm	255	%%DATADIR%%/%%DISTVERSION%%/scm/auto-beam.scm
270	%%DATADIR%%/%%DISTVERSION%%/scm/autochange.scm	256	%%DATADIR%%/%%DISTVERSION%%/scm/autochange.scm
Lines 273-283 Link Here
273	%%DATADIR%%/%%DISTVERSION%%/scm/bezier-tools.scm	259	%%DATADIR%%/%%DISTVERSION%%/scm/bezier-tools.scm
274	%%DATADIR%%/%%DISTVERSION%%/scm/c++.scm	260	%%DATADIR%%/%%DISTVERSION%%/scm/c++.scm
275	%%DATADIR%%/%%DISTVERSION%%/scm/chord-entry.scm	261	%%DATADIR%%/%%DISTVERSION%%/scm/chord-entry.scm
276	%%DATADIR%%/%%DISTVERSION%%/scm/chord-generic-names.scm
277	%%DATADIR%%/%%DISTVERSION%%/scm/chord-ignatzek-names.scm	262	%%DATADIR%%/%%DISTVERSION%%/scm/chord-ignatzek-names.scm
278	%%DATADIR%%/%%DISTVERSION%%/scm/chord-name.scm	263	%%DATADIR%%/%%DISTVERSION%%/scm/chord-name.scm
279	%%DATADIR%%/%%DISTVERSION%%/scm/clip-region.scm	264	%%DATADIR%%/%%DISTVERSION%%/scm/clip-region.scm
280	%%DATADIR%%/%%DISTVERSION%%/scm/coverage.scm	265	%%DATADIR%%/%%DISTVERSION%%/scm/color.scm
281	%%DATADIR%%/%%DISTVERSION%%/scm/define-context-properties.scm	266	%%DATADIR%%/%%DISTVERSION%%/scm/define-context-properties.scm
282	%%DATADIR%%/%%DISTVERSION%%/scm/define-event-classes.scm	267	%%DATADIR%%/%%DISTVERSION%%/scm/define-event-classes.scm
283	%%DATADIR%%/%%DISTVERSION%%/scm/define-grob-interfaces.scm	268	%%DATADIR%%/%%DISTVERSION%%/scm/define-grob-interfaces.scm
Lines 326-332 Link Here
326	%%DATADIR%%/%%DISTVERSION%%/scm/ly-syntax-constructors.scm	311	%%DATADIR%%/%%DISTVERSION%%/scm/ly-syntax-constructors.scm
327	%%DATADIR%%/%%DISTVERSION%%/scm/markup-macros.scm	312	%%DATADIR%%/%%DISTVERSION%%/scm/markup-macros.scm
328	%%DATADIR%%/%%DISTVERSION%%/scm/markup.scm	313	%%DATADIR%%/%%DISTVERSION%%/scm/markup.scm
329	%%DATADIR%%/%%DISTVERSION%%/scm/memory-trace.scm
330	%%DATADIR%%/%%DISTVERSION%%/scm/midi.scm	314	%%DATADIR%%/%%DISTVERSION%%/scm/midi.scm
331	%%DATADIR%%/%%DISTVERSION%%/scm/modal-transforms.scm	315	%%DATADIR%%/%%DISTVERSION%%/scm/modal-transforms.scm
332	%%DATADIR%%/%%DISTVERSION%%/scm/music-functions.scm	316	%%DATADIR%%/%%DISTVERSION%%/scm/music-functions.scm
Lines 358-364 Link Here
358	%%DATADIR%%/%%DISTVERSION%%/scm/titling.scm	342	%%DATADIR%%/%%DISTVERSION%%/scm/titling.scm
359	%%DATADIR%%/%%DISTVERSION%%/scm/to-xml.scm	343	%%DATADIR%%/%%DISTVERSION%%/scm/to-xml.scm
360	%%DATADIR%%/%%DISTVERSION%%/scm/translation-functions.scm	344	%%DATADIR%%/%%DISTVERSION%%/scm/translation-functions.scm
361	%%DATADIR%%/%%DISTVERSION%%/scm/x11-color.scm
362	%%DATADIR%%/%%DISTVERSION%%/tex/lilypond-tex-metrics.tex	345	%%DATADIR%%/%%DISTVERSION%%/tex/lilypond-tex-metrics.tex
363	%%DATADIR%%/%%DISTVERSION%%/tex/texinfo-ja.tex	346	%%DATADIR%%/%%DISTVERSION%%/tex/texinfo-ja.tex
364	%%DATADIR%%/%%DISTVERSION%%/vim/compiler/lilypond.vim	347	%%DATADIR%%/%%DISTVERSION%%/vim/compiler/lilypond.vim