From owner-svn-ports-all@freebsd.org Fri Feb 9 19:35:57 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7CDEF1E051; Fri, 9 Feb 2018 19:35:56 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9974574C61; Fri, 9 Feb 2018 19:35:56 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 943A6126D; Fri, 9 Feb 2018 19:35:56 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19JZuW1033634; Fri, 9 Feb 2018 19:35:56 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19JZtfu033629; Fri, 9 Feb 2018 19:35:55 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201802091935.w19JZtfu033629@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Fri, 9 Feb 2018 19:35:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461329 - in head/print/lilypond-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/print/lilypond-devel: . files X-SVN-Commit-Revision: 461329 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Feb 2018 19:35:57 -0000 Author: joneum Date: Fri Feb 9 19:35:55 2018 New Revision: 461329 URL: https://svnweb.freebsd.org/changeset/ports/461329 Log: print/lilypond-devel: Update to 2.19.81 -fix violation -add patch for fontconfig PR: 218147 Submitted by: m.ne@gmx.net (maintainer) Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D13913 Added: head/print/lilypond-devel/files/fonts.conf (contents, props changed) Modified: head/print/lilypond-devel/Makefile head/print/lilypond-devel/distinfo head/print/lilypond-devel/files/patch-configure head/print/lilypond-devel/pkg-plist Modified: head/print/lilypond-devel/Makefile ============================================================================== --- head/print/lilypond-devel/Makefile Fri Feb 9 19:15:42 2018 (r461328) +++ head/print/lilypond-devel/Makefile Fri Feb 9 19:35:55 2018 (r461329) @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= lilypond -PORTVERSION= 2.19.57 +DISTVERSION= 2.19.81 CATEGORIES= print audio -MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/ +MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/ \ + http://lilypond.org/downloads/sources/v${PORTVERSION:R}/ PKGNAMESUFFIX= -devel MAINTAINER= m.ne@gmx.net @@ -56,27 +57,27 @@ GNU_MAKEFILE= yes 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 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||"/usr/include/FlexLexer.h"|' \ + @${REINPLACE_CMD} -e 's||"/usr/include/FlexLexer.h"|' \ ${WRKSRC}/lily/include/includable-lexer.hh + ${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 + @${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond Modified: head/print/lilypond-devel/distinfo ============================================================================== --- head/print/lilypond-devel/distinfo Fri Feb 9 19:15:42 2018 (r461328) +++ head/print/lilypond-devel/distinfo Fri Feb 9 19:35:55 2018 (r461329) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489482521 -SHA256 (lilypond-2.19.57.tar.gz) = be86019ae91cf78267081e96f35cf682931d0219215e160b16b03b907cac755a -SIZE (lilypond-2.19.57.tar.gz) = 17182103 +TIMESTAMP = 1517308646 +SHA256 (lilypond-2.19.81.tar.gz) = 2ac299045dc4a8fa3bd7c67af7b06877b21cdb50321fec5baa558e3173ed646c +SIZE (lilypond-2.19.81.tar.gz) = 17303532 Added: head/print/lilypond-devel/files/fonts.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/lilypond-devel/files/fonts.conf Fri Feb 9 19:35:55 2018 (r461329) @@ -0,0 +1,6 @@ + + + + + %%FONTDIR%% + Modified: head/print/lilypond-devel/files/patch-configure ============================================================================== --- head/print/lilypond-devel/files/patch-configure Fri Feb 9 19:15:42 2018 (r461328) +++ head/print/lilypond-devel/files/patch-configure Fri Feb 9 19:35:55 2018 (r461329) @@ -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 Modified: head/print/lilypond-devel/pkg-plist ============================================================================== --- head/print/lilypond-devel/pkg-plist Fri Feb 9 19:15:42 2018 (r461328) +++ head/print/lilypond-devel/pkg-plist Fri Feb 9 19:35:55 2018 (r461329) @@ -360,6 +360,7 @@ share/emacs/site-lisp/lilypond-words.el %%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