From owner-svn-ports-all@FreeBSD.ORG Tue Jan 7 15:32:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1B7F18D; Tue, 7 Jan 2014 15:32:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DCF1B1238; Tue, 7 Jan 2014 15:32:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07FWPhG067278; Tue, 7 Jan 2014 15:32:25 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07FWPrL067275; Tue, 7 Jan 2014 15:32:25 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401071532.s07FWPrL067275@svn.freebsd.org> From: Pietro Cerutti Date: Tue, 7 Jan 2014 15:32:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339008 - in head/print/lilypond: . files X-SVN-Group: ports-head 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.17 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: Tue, 07 Jan 2014 15:32:26 -0000 Author: gahr Date: Tue Jan 7 15:32:24 2014 New Revision: 339008 URL: http://svnweb.freebsd.org/changeset/ports/339008 Log: - Update to 2.18.0 Changes: http://lilypond.org/doc/v2.18/Documentation/changes/ Deleted: head/print/lilypond/files/patch-lily_freetype-error.cc head/print/lilypond/files/patch-lily_open-type-font.cc head/print/lilypond/files/patch-lily_pango-font.cc head/print/lilypond/files/patch-lily_ttf.cc Modified: head/print/lilypond/Makefile head/print/lilypond/distinfo head/print/lilypond/pkg-plist (contents, props changed) Modified: head/print/lilypond/Makefile ============================================================================== --- head/print/lilypond/Makefile Tue Jan 7 14:43:54 2014 (r339007) +++ head/print/lilypond/Makefile Tue Jan 7 15:32:24 2014 (r339008) @@ -2,67 +2,69 @@ # $FreeBSD$ PORTNAME= lilypond -PORTVERSION= 2.16.1 +PORTVERSION= 2.18.0 CATEGORIES= print audio MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/ MAINTAINER= gahr@FreeBSD.org COMMENT= The GNU music typesetter +LICENSE= GPLv3 + BUILD_DEPENDS= pdftexi2dvi:${PORTSDIR}/print/texinfo \ t1ascii:${PORTSDIR}/print/t1utils \ bash:${PORTSDIR}/shells/bash \ + convert:${PORTSDIR}/graphics/ImageMagick \ + dblatex:${PORTSDIR}/textproc/dblatex \ fontforge:${PORTSDIR}/print/fontforge \ + help2man:${PORTSDIR}/misc/help2man \ + pngtopnm:${PORTSDIR}/graphics/netpbm \ + rsync:${PORTSDIR}/net/rsync \ + zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts -LIB_DEPENDS= guile:${PORTSDIR}/lang/guile \ - gmp:${PORTSDIR}/math/gmp \ - freetype:${PORTSDIR}/print/freetype2 - RUN_DEPENDS= mftrace:${PORTSDIR}/print/mftrace \ ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu -MAN1= lilymidi.1 lilypond-book.1 lilypond-invoke-editor.1 \ - lilypond.1 lilysong.1 convert-ly.1 abc2ly.1 etf2ly.1 \ - midi2ly.1 musicxml2ly.1 +LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile \ + libgmp.so:${PORTSDIR}/math/gmp \ + libfreetype.so:${PORTSDIR}/print/freetype2 -INFO= lilypond-notation \ - lilypond-usage \ - lilypond-internals \ - lilypond-learning \ +INFO= internals \ lilypond-changes \ lilypond-contributor \ lilypond-essay \ lilypond-extending \ - lilypond-snippets \ + lilypond-internals \ + lilypond-learning \ + lilypond-notation \ + lilypond-usage \ lilypond-web \ - music-glossary \ - internals + music-glossary USES= bison:build gettext gmake pkgconfig perl5 USE_GHOSTSCRIPT=9 USE_TEX= latex -USE_PYTHON= yes +USE_PYTHON= -3 USE_PERL5= build USE_GNOME= pango -USE_GCC= any MAKEFILE= GNUmakefile GNU_MAKEFILE= yes MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts +CONFIGURE_ARGS+=--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts \ + --with-python-include=${PYTHON_INCLUDEDIR} CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \ FLEX=${FLEX} YACC=${YACC} ALL_TARGET= all -NOCCACHE= yes +NO_CCACHE= yes PLIST_SUB= PORTVERSION=${PORTVERSION} -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} @@ -74,11 +76,14 @@ PLIST_SUB+= NLS="@comment " post-patch: ${REINPLACE_CMD} -e 's||"/usr/include/FlexLexer.h"|' \ ${WRKSRC}/lily/include/includable-lexer.hh -.if empty(${PORT_OPTIONS:MNLS}) +.if !${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e '/^PO_FILES/s|= |= #|' ${WRKSRC}/${MAKEFILE}.in .endif post-install: - @${LN} -fs ${DATADIR}/${PORTVERSION} ${DATADIR}/current + @${LN} -fs ${DATADIR}/${PORTVERSION} ${STAGEDIR}${DATADIR}/current + +regression-test: build + cd ${WRKSRC} && ${GMAKE} -f ${MAKEFILE} test .include Modified: head/print/lilypond/distinfo ============================================================================== --- head/print/lilypond/distinfo Tue Jan 7 14:43:54 2014 (r339007) +++ head/print/lilypond/distinfo Tue Jan 7 15:32:24 2014 (r339008) @@ -1,2 +1,2 @@ -SHA256 (lilypond-2.16.1.tar.gz) = f56e21fe92f29c88365eb6cf80b5be86a169e23cfb054ccbec457059f3df796e -SIZE (lilypond-2.16.1.tar.gz) = 16061427 +SHA256 (lilypond-2.18.0.tar.gz) = 89059139a560a4900305b52d9327969cfcdedb061ed7bae310fdf5d4ba2aa230 +SIZE (lilypond-2.18.0.tar.gz) = 16013863 Modified: head/print/lilypond/pkg-plist ============================================================================== --- head/print/lilypond/pkg-plist Tue Jan 7 14:43:54 2014 (r339007) +++ head/print/lilypond/pkg-plist Tue Jan 7 15:32:24 2014 (r339008) @@ -8,6 +8,16 @@ bin/abc2ly bin/convert-ly bin/etf2ly bin/midi2ly +man/man1/lilymidi.1.gz +man/man1/lilypond-book.1.gz +man/man1/lilypond-invoke-editor.1.gz +man/man1/lilypond.1.gz +man/man1/lilysong.1.gz +man/man1/convert-ly.1.gz +man/man1/abc2ly.1.gz +man/man1/etf2ly.1.gz +man/man1/midi2ly.1.gz +man/man1/musicxml2ly.1.gz lib/lilypond/%%PORTVERSION%%/python/midi.so %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Bold.otf %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-BoldItal.otf @@ -222,6 +232,7 @@ lib/lilypond/%%PORTVERSION%%/python/midi %%DATADIR%%/%%PORTVERSION%%/python/rational.pyc %%DATADIR%%/%%PORTVERSION%%/python/safeeval.py %%DATADIR%%/%%PORTVERSION%%/python/safeeval.pyc +%%DATADIR%%/%%PORTVERSION%%/scm/accreg.scm %%DATADIR%%/%%PORTVERSION%%/scm/auto-beam.scm %%DATADIR%%/%%PORTVERSION%%/scm/autochange.scm %%DATADIR%%/%%PORTVERSION%%/scm/backend-library.scm @@ -300,7 +311,9 @@ lib/lilypond/%%PORTVERSION%%/python/midi %%DATADIR%%/%%PORTVERSION%%/scm/ps-to-png.scm %%DATADIR%%/%%PORTVERSION%%/scm/safe-lily.scm %%DATADIR%%/%%PORTVERSION%%/scm/safe-utility-defs.scm +%%DATADIR%%/%%PORTVERSION%%/scm/scheme-engravers.scm %%DATADIR%%/%%PORTVERSION%%/scm/script.scm +%%DATADIR%%/%%PORTVERSION%%/scm/skyline.scm %%DATADIR%%/%%PORTVERSION%%/scm/song-util.scm %%DATADIR%%/%%PORTVERSION%%/scm/song.scm %%DATADIR%%/%%PORTVERSION%%/scm/standalone.scm @@ -328,6 +341,7 @@ share/emacs/site-lisp/lilypond-mode.el share/emacs/site-lisp/lilypond-song.el share/emacs/site-lisp/lilypond-what-beat.el share/emacs/site-lisp/lilypond-words.el +%%NLS%%share/locale/ca/LC_MESSAGES/lilypond.mo %%NLS%%share/locale/cs/LC_MESSAGES/lilypond.mo %%NLS%%share/locale/da/LC_MESSAGES/lilypond.mo %%NLS%%share/locale/de/LC_MESSAGES/lilypond.mo