<!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>[114419] trunk/dports/textproc/lilypond-devel</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/114419">114419</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2013-12-07 09:56:58 -0800 (Sat, 07 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>lilypond-devel: update to 2.17.96; add upstream patch to fix build with freetype 2.5.1 (#41719); make python27 a library dependency because it is also used at build time; add libtool dependency because it uses libltdl; remove unnecessary setting of configure.python to itself</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextproclilyponddevelPortfile">trunk/dports/textproc/lilypond-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportstextproclilyponddevelfilespatchfreetype251diff">trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextproclilyponddevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/lilypond-devel/Portfile (114418 => 114419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/lilypond-devel/Portfile 2013-12-07 17:29:06 UTC (rev 114418)
+++ trunk/dports/textproc/lilypond-devel/Portfile 2013-12-07 17:56:58 UTC (rev 114419)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name lilypond-devel
</span><span class="cx"> set my_name lilypond
</span><del>-version 2.17.28
</del><ins>+version 2.17.96
</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">@@ -22,8 +22,8 @@
</span><span class="cx"> platforms darwin
</span><span class="cx"> master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
</span><span class="cx"> distname ${my_name}-${version}
</span><del>-checksums rmd160 090c7c73ccf74a0aaa8d270517bbefbcd4e6695d \
- sha256 298a5c479ca07c3f2897a8dc13eb94ec97e948900417debb3e14351eb483db48
</del><ins>+checksums rmd160 b00cc6be07598d0cb28a0e0fb52b67472b00e3e1 \
+ sha256 c0dda829ebbe637ec9fee27c47928a2cc934a2b363e761040b0e04d9e4e97a3c
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> depends_build port:t1utils \
</span><span class="lines">@@ -40,12 +40,14 @@
</span><span class="cx"> port:texlive-lang-cyrillic \
</span><span class="cx"> port:texlive-metapost \
</span><span class="cx"> port:dblatex \
</span><del>- port:urw-fonts
-depends_run-append port:python27
</del><ins>+ port:urw-fonts \
+ port:libtool \
+ port:python27
</ins><span class="cx">
</span><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><ins>+patchfiles-append patch-freetype-2.5.1.diff
</ins><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">@@ -83,7 +85,6 @@
</span><span class="cx"> --disable-documentation
</span><span class="cx"> configure.env LTDL_LIBRARY_PATH=${prefix}/lib \
</span><span class="cx"> PYTHON_CONFIG=${configure.python}-config
</span><del>-configure.python ${configure.python}
</del><span class="cx">
</span><span class="cx"> build.env LTDL_LIBRARY_PATH=${prefix}/lib
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportstextproclilyponddevelfilespatchfreetype251diff"></a>
<div class="addfile"><h4>Added: trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff (0 => 114419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff (rev 0)
+++ trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff 2013-12-07 17:56:58 UTC (rev 114419)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+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/freetype.cc.orig
++++ lily/freetype.cc
+@@ -20,8 +20,8 @@
+ #include "freetype.hh"
+ #include "warn.hh"
+
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftbbox.h>
++#include FT_OUTLINE_H
++#include FT_BBOX_H
+
+ FT_Library freetype2_library;
+
+--- 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"
</ins></span></pre>
</div>
</div>
</body>
</html>