Attachment #190110 for bug #218147




# $FreeBSD$

PORTNAME=	lilypond
PORTVERSION=	2.19.80
CATEGORIES=	print audio
MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/
PKGNAMESUFFIX=	-devel


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}

ALL_TARGET=	all

NO_CCACHE=	yes

PLIST_SUB=	PORTVERSION=${PORTVERSION}

OPTIONS_DEFINE=	NLS

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
	@${MKDIR} ${WRKDIR}/fontconfig/cache
	@${CP} ${FILESDIR}/fonts.conf ${WRKDIR}/.fonts.conf
	@${REINPLACE_CMD} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|' \
           ${WRKDIR}/.fonts.conf

post-patch-NLS-off:
	@${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1489482521	1	TIMESTAMP = 1511017623
2	SHA256 (lilypond-2.19.57.tar.gz) = be86019ae91cf78267081e96f35cf682931d0219215e160b16b03b907cac755a	2	SHA256 (lilypond-2.19.80.tar.gz) = 3679db30a3f74ce8668691952fb0dd58d8ad6bad099017e815ca3e4312261453
3	SIZE (lilypond-2.19.57.tar.gz) = 17182103	3	SIZE (lilypond-2.19.80.tar.gz) = 17244725

Line 0 Link Here

(-)files/fonts.conf (+6 lines)
	1	<?xml version="1.0"?>
	2	<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
	3	<!-- /etc/fonts/fonts.conf file to configure system font access -->
	4	<fontconfig>
	5	<cachedir>%%FONTDIR%%</cachedir>
	6	</fontconfig>

Lines 1-6 Link Here

(-)files/patch-configure (-4 / +7 lines)
1	--- configure.orig 2017-02-12 12:13:29 UTC	1	--- configure.orig 2017-10-15 16:42:11 UTC
2	+++ configure	2	+++ configure
3	@@ -11503,74 +11503,7 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"	3	@@ -11527,75 +11527,9 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"
4		4
5	if test $? -eq 0 -a -n "0.9.0"; then	5	if test $? -eq 0 -a -n "0.9.0"; then
6		6
Lines 72-78 Link Here
72	- { $as_echo "$as_me:$LINENO: result: $ver" >&5	72	- { $as_echo "$as_me:$LINENO: result: $ver" >&5
73	-$as_echo "$ver" >&6; }	73	-$as_echo "$ver" >&6; }
74	- if test "$num" -lt "$req"; then	74	- if test "$num" -lt "$req"; then
75	+ if $exe --atleast-pkgconfig-version 0.9.0; then	75	-
76		76	+ if test ! `$PKG_CONFIG --atleast-pkgconfig-version 0.9.0`; then
		77	+
		78	+ ver=`$PKG_CONFIG --version`
77	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"	79	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
78		80
		81	fi

Lines 360-365 Link Here

(-)pkg-plist (+1 lines)
360	%%DATADIR%%/%%PORTVERSION%%/scm/translation-functions.scm	360	%%DATADIR%%/%%PORTVERSION%%/scm/translation-functions.scm
361	%%DATADIR%%/%%PORTVERSION%%/scm/x11-color.scm	361	%%DATADIR%%/%%PORTVERSION%%/scm/x11-color.scm
362	%%DATADIR%%/%%PORTVERSION%%/tex/lilypond-tex-metrics.tex	362	%%DATADIR%%/%%PORTVERSION%%/tex/lilypond-tex-metrics.tex
		363	%%DATADIR%%/%%PORTVERSION%%/tex/texinfo-ja.tex
363	%%DATADIR%%/%%PORTVERSION%%/vim/compiler/lilypond.vim	364	%%DATADIR%%/%%PORTVERSION%%/vim/compiler/lilypond.vim
364	%%DATADIR%%/%%PORTVERSION%%/vim/ftdetect/lilypond.vim	365	%%DATADIR%%/%%PORTVERSION%%/vim/ftdetect/lilypond.vim
365	%%DATADIR%%/%%PORTVERSION%%/vim/ftplugin/lilypond.vim	366	%%DATADIR%%/%%PORTVERSION%%/vim/ftplugin/lilypond.vim

Return to bug 218147

Lines 2-8 Link Here

(-)Makefile (-7 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lilypond	4	PORTNAME= lilypond
5	PORTVERSION= 2.19.57	5	PORTVERSION= 2.19.80
6	CATEGORIES= print audio	6	CATEGORIES= print audio
7	MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/	7	MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/
8	PKGNAMESUFFIX= -devel	8	PKGNAMESUFFIX= -devel
Lines 56-69 Link Here
56		56
57	GNU_CONFIGURE= yes	57	GNU_CONFIGURE= yes
58	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 \
59	--with-python-include=${PYTHON_INCLUDEDIR}	59	--with-python-include=${PYTHON_INCLUDEDIR} --without-urwotf-dir
60	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \	60	CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
61	FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}	61	FLEX=${FLEX} YACC=${YACC} HOME=${WRKDIR}
62		62
63	ALL_TARGET= all	63	ALL_TARGET= all
64		64
65	NO_CCACHE= yes
66
67	PLIST_SUB= PORTVERSION=${PORTVERSION}	65	PLIST_SUB= PORTVERSION=${PORTVERSION}
68		66
69	OPTIONS_DEFINE= NLS	67	OPTIONS_DEFINE= NLS
Lines 70-82 Link Here
70	OPTIONS_SUB= yes	68	OPTIONS_SUB= yes
71		69
72	post-patch:	70	post-patch:
73	${FIND} ${WRKSRC} -name "*.cc" \| ${XARGS} \	71	@${FIND} ${WRKSRC} -name "*.cc" \| ${XARGS} \
74	${REINPLACE_CMD} -e 's\|isinf[ ]*(\|::isinf(\|g' -e 's\|isnan\|::isnan\|g'	72	${REINPLACE_CMD} -e 's\|isinf[ ]*(\|::isinf(\|g' -e 's\|isnan\|::isnan\|g'
75	${REINPLACE_CMD} -e 's\|<FlexLexer.h>\|"/usr/include/FlexLexer.h"\|' \	73	@${REINPLACE_CMD} -e 's\|<FlexLexer.h>\|"/usr/include/FlexLexer.h"\|' \
76	${WRKSRC}/lily/include/includable-lexer.hh	74	${WRKSRC}/lily/include/includable-lexer.hh
		75	@${MKDIR} ${WRKDIR}/fontconfig/cache
		76	@${CP} ${FILESDIR}/fonts.conf ${WRKDIR}/.fonts.conf
		77	@${REINPLACE_CMD} -e 's\|%%FONTDIR%%\|${WRKDIR}/fontconfig/cache/\|' \
		78	${WRKDIR}/.fonts.conf
77		79
78	post-patch-NLS-off:	80	post-patch-NLS-off:
79	${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in	81	@${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in
80		82
81	post-install:	83	post-install:
82	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond	84	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond