View | Details | Raw Unified | Return to bug 218147 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +8 lines)
Lines 2-8 Link Here
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 74-83 Link Here
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
	${REINPLACE_CMD} -e "s|%%WRKDIR%%|${WRKDIR}|" \
76
	    ${WRKSRC}/mf/00-lilypond-fonts.conf.in
77
77
78
post-patch-NLS-off:
78
post-patch-NLS-off:
79
	${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in
79
	${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in
80
80
81
post-build:
82
	${REINPLACE_CMD} -e '/cachedir/d' \
83
	    ${WRKSRC}/mf/00-lilypond-fonts.conf.in
84
81
post-install:
85
post-install:
82
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond
86
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond
83
	(cd ${STAGEDIR}/${DATADIR} && ${LN} -fs ${PORTVERSION} current)
87
	(cd ${STAGEDIR}/${DATADIR} && ${LN} -fs ${PORTVERSION} current)
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
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
(-)files/patch-mf_00-lilypond-fonts.conf.in (+10 lines)
Line 0 Link Here
1
--- mf/00-lilypond-fonts.conf.in.orig	2017-10-15 16:42:11 UTC
2
+++ mf/00-lilypond-fonts.conf.in
3
@@ -1,6 +1,7 @@
4
 <?xml version="1.0" encoding="UTF-8"?>
5
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
6
 <fontconfig>
7
+  <cachedir>%%WRKDIR%%</cachedir>
8
 
9
   <!--
10
   Define LilyPond default fonts. Where a character doesn't exist in the
(-)pkg-plist (+1 lines)
Lines 360-365 Link Here
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