Attachment 190128 Details for Bug 218147 – Patch for print/lilypond-devel to 2.19.80

[patch] Patch for print/lilypond-devel to 2.19.80

lilypond-devel-2.19.80.diff (text/plain), 4.13 KB, created by Martin Neubauer on 2018-01-28 11:37:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Neubauer

Created: 2018-01-28 11:37:41 UTC

Size: 4.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 460165)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	lilypond
>-PORTVERSION=	2.19.57
>+PORTVERSION=	2.19.80
> CATEGORIES=	print audio
> MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/
> PKGNAMESUFFIX=	-devel
>@@ -56,14 +56,12 @@
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \
>-		--with-python-include=${PYTHON_INCLUDEDIR}
>+		--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
>@@ -70,13 +68,17 @@
> OPTIONS_SUB=	yes
> 
> post-patch:
>-	${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} \
>+	@${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"|' \
>+	@${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
>+	@${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in
> 
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond
>Index: distinfo
>===================================================================
>--- distinfo	(revision 460165)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1489482521
>-SHA256 (lilypond-2.19.57.tar.gz) = be86019ae91cf78267081e96f35cf682931d0219215e160b16b03b907cac755a
>-SIZE (lilypond-2.19.57.tar.gz) = 17182103
>+TIMESTAMP = 1511017623
>+SHA256 (lilypond-2.19.80.tar.gz) = 3679db30a3f74ce8668691952fb0dd58d8ad6bad099017e815ca3e4312261453
>+SIZE (lilypond-2.19.80.tar.gz) = 17244725
>Index: files/fonts.conf
>===================================================================
>--- files/fonts.conf	(nonexistent)
>+++ files/fonts.conf	(working copy)
>@@ -0,0 +1,6 @@
>+<?xml version="1.0"?>
>+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
>+
>+<fontconfig>
>+	<cachedir>%%FONTDIR%%</cachedir>
>+</fontconfig>
>
>Property changes on: files/fonts.conf
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 460165)
>+++ files/patch-configure	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.orig	2017-02-12 12:13:29 UTC
>+--- configure.orig	2017-10-15 16:42:11 UTC
> +++ configure
>-@@ -11503,74 +11503,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
>+@@ -11527,75 +11527,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
>  
>      if test $? -eq 0 -a -n "0.9.0"; then
>  
>@@ -72,7 +72,11 @@
> -    { $as_echo "$as_me:$LINENO: result: $ver" >&5
> -$as_echo "$ver" >&6; }
> -    if test "$num" -lt "$req"; then
>-+    if $exe --atleast-pkgconfig-version 0.9.0; then
>- 
>+-
>++    $PKG_CONFIG --atleast-pkgconfig-version 0.9.0
>++    
>++    if test ! $?; then
>++    ver=`$PKG_CONFIG --version`
>      eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
>  
>+     fi
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 460165)
>+++ pkg-plist	(working copy)
>@@ -360,6 +360,7 @@
> %%DATADIR%%/%%PORTVERSION%%/scm/translation-functions.scm
> %%DATADIR%%/%%PORTVERSION%%/scm/x11-color.scm
> %%DATADIR%%/%%PORTVERSION%%/tex/lilypond-tex-metrics.tex
>+%%DATADIR%%/%%PORTVERSION%%/tex/texinfo-ja.tex
> %%DATADIR%%/%%PORTVERSION%%/vim/compiler/lilypond.vim
> %%DATADIR%%/%%PORTVERSION%%/vim/ftdetect/lilypond.vim
> %%DATADIR%%/%%PORTVERSION%%/vim/ftplugin/lilypond.vim

Actions: View | Diff

Attachments on bug 218147: 181215 | 189777 | 189808 | 189814 | 190110 | 190128 | 190194