<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115730] trunk/dports/textproc/lilypond</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115730">115730</a></dd>
<dt>Author</dt> <dd>snc@macports.org</dd>
<dt>Date</dt> <dd>2014-01-09 15:08:44 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lilypond: update to 2.18.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextproclilypondPortfile">trunk/dports/textproc/lilypond/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportstextproclilypondfilespatchfreetype251diff">trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextproclilypondPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/lilypond/Portfile (115729 => 115730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/lilypond/Portfile 2014-01-09 23:06:11 UTC (rev 115729)
+++ trunk/dports/textproc/lilypond/Portfile 2014-01-09 23:08:44 UTC (rev 115730)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name lilypond
</span><del>-version 2.16.2
-revision 2
</del><ins>+version 2.18.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories textproc
</span><span class="cx"> maintainers snc openmaintainer
</span><span class="lines">@@ -18,18 +17,21 @@
</span><span class="cx"> similar to LaTeX. Lilypond can export sheet music to PDF, \
</span><span class="cx"> EPS, SVG, and PNG formats, and can also create MIDI files.
</span><span class="cx">
</span><del>-homepage http://lilypond.org
</del><ins>+homepage http://lilypond.org/
</ins><span class="cx"> platforms darwin
</span><span class="cx"> master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
</span><span class="cx"> #dist_subdir ${name}/${version}_${revision}
</span><del>-checksums rmd160 bbb68ef05e81d8d9f5cf7ac26cffb5ab3935c61a \
- sha256 1f4326cf8f9363076a83ce3cbe35f747188084f7492000ed3a7ccc3ce60aa1cb
</del><ins>+checksums rmd160 2f33ce20c6c1a82f9291482786c22d403d8949f4 \
+ sha256 89059139a560a4900305b52d9327969cfcdedb061ed7bae310fdf5d4ba2aa230
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> depends_build port:t1utils \
</span><span class="cx"> port:texi2html \
</span><span class="cx"> port:pkgconfig
</span><span class="cx"> depends_lib port:fontforge \
</span><ins>+ port:gettext \
+ port:gmp \
+ port:glib2 \
</ins><span class="cx"> port:ghostscript \
</span><span class="cx"> port:mftrace \
</span><span class="cx"> port:guile \
</span><span class="lines">@@ -43,20 +45,9 @@
</span><span class="cx"> port:libtool \
</span><span class="cx"> port:python27
</span><span class="cx">
</span><del>-# accidental-engraver.cc:508:1: error: cannot cast from type 'void (Accidental_engraver::*)()' to pointer type 'Translator_void_method_ptr' (aka 'void (*)(Translator *)')
-compiler.blacklist *clang*
-pre-fetch {
- if {${os.major} < 9} {
- # 10.4 is not supported
- ui_error "${name} requires Leopard or Snow Leopard"
- return -code error "unsupported OS X version"
- }
-}
-
</del><span class="cx"> configure.python ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
</span><span class="cx">
</span><span class="cx"> patchfiles patch-scripts-build-mf2pt1.pl.diff
</span><del>-patchfiles-append patch-freetype-2.5.1.diff
</del><span class="cx"> post-patch {
</span><span class="cx"> reinplace s|__vector|lily_vector|g ${worksrcpath}/flower/include/std-vector.hh
</span><span class="cx"> set files {Documentation/contributor/build-notes.itexi \
</span><span class="lines">@@ -75,13 +66,14 @@
</span><span class="cx"> scripts/auxiliar/node-menuify.py \
</span><span class="cx"> scripts/auxiliar/prepare-web-media.py \
</span><span class="cx"> scripts/auxiliar/readlink.py \
</span><ins>+ scripts/auxiliar/skyline_viewer.py \
</ins><span class="cx"> scripts/auxiliar/strip-whitespace.py \
</span><span class="cx"> scripts/auxiliar/tely-gettext.py \
</span><span class="cx"> scripts/auxiliar/texi-langutils.py \
</span><span class="cx"> scripts/auxiliar/texi-skeleton-update.py \
</span><span class="cx"> scripts/auxiliar/translations-status.py \
</span><span class="cx"> scripts/auxiliar/update-snippets.py \
</span><del>- scripts/build/pytt.py}
</del><ins>+ scripts/build/pytt.py }
</ins><span class="cx">
</span><span class="cx"> foreach file ${files} {
</span><span class="cx"> reinplace s|/usr/bin/env\\\ python|${configure.python}| ${worksrcpath}/$file
</span><span class="lines">@@ -89,7 +81,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-configure.args --with-ncsb-dir=${prefix}/share/fonts/urw-fonts \
</del><ins>+configure.args-append --with-ncsb-dir=${prefix}/share/fonts/urw-fonts \
</ins><span class="cx"> --disable-documentation
</span><span class="cx">
</span><span class="cx"> configure.env LTDL_LIBRARY_PATH=${prefix}/lib \
</span></span></pre></div>
<a id="trunkdportstextproclilypondfilespatchfreetype251diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff (115729 => 115730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff 2014-01-09 23:06:11 UTC (rev 115729)
+++ trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff 2014-01-09 23:08:44 UTC (rev 115730)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-Fix build with freetype 2.5.1.
-https://code.google.com/p/lilypond/issues/detail?id=3694
-http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff;h=fc455c4192d5c688a5728947c79a68e99b4de553
---- lily/freetype-error.cc.orig
-+++ lily/freetype-error.cc
-@@ -31,7 +31,7 @@ const struct Freetype_error_message
- const char *err_msg;
- } ft_errors[] =
-
--#include <freetype/fterrors.h>
-+#include FT_ERRORS_H
-
- ;
-
---- lily/open-type-font.cc.orig
-+++ lily/open-type-font.cc
-@@ -23,7 +23,7 @@
-
- using namespace std;
-
--#include <freetype/tttables.h>
-+#include FT_TRUETYPE_TABLES_H
-
- #include "dimensions.hh"
- #include "freetype.hh"
---- lily/pango-font.cc.orig
-+++ lily/pango-font.cc
-@@ -22,7 +22,7 @@
- #define PANGO_ENABLE_BACKEND
-
- #include <pango/pangoft2.h>
--#include <freetype/ftxf86.h>
-+#include FT_XFREE86_H
-
- #include <map>
- #include <cstdio>
---- lily/ttf.cc.orig
-+++ lily/ttf.cc
-@@ -20,7 +20,7 @@
- #include <cstdio>
- #include "freetype.hh"
-
--#include <freetype/tttables.h>
-+#include FT_TRUETYPE_TABLES_H
-
- #include "international.hh"
- #include "memory-stream.hh"
</del></span></pre>
</div>
</div>
</body>
</html>