<!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>[119669] trunk/dports/editors/textmate2</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/119669">119669</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-05-03 09:43:07 -0700 (Sat, 03 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>textmate2: update to a9543, work around requirement for master ninja, use -isystem for the capnp headers to avoid a build failure when libplist is present</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportseditorstextmate2Portfile">trunk/dports/editors/textmate2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportseditorstextmate2filespatchbin__gen_buildavoidninjapoolconsolediff">trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff</a></li>
<li><a href="#trunkdportseditorstextmate2filespatchtargetisystemdiff">trunk/dports/editors/textmate2/files/patch-target-isystem.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportseditorstextmate2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/textmate2/Portfile (119668 => 119669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/textmate2/Portfile 2014-05-03 16:19:07 UTC (rev 119668)
+++ trunk/dports/editors/textmate2/Portfile 2014-05-03 16:43:07 UTC (rev 119669)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PortGroup xcodeversion 1.0
</span><span class="cx"> PortGroup conflicts_build 1.0
</span><span class="cx">
</span><del>-set app_revision 9537
</del><ins>+set app_revision 9543
</ins><span class="cx"> github.setup textmate textmate 2.0-alpha.${app_revision} v
</span><span class="cx"> epoch 2
</span><span class="cx">
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> TextMate is well-known for its large number of bundles adding support, snippets, completions \
</span><span class="cx"> and commands for a huge number of file types.
</span><span class="cx">
</span><del>-conflicts_build libc-headers libplist
</del><ins>+conflicts_build libc-headers
</ins><span class="cx"> platforms darwin
</span><span class="cx"> supported_archs x86_64
</span><span class="cx"> license GPL-3+
</span><span class="lines">@@ -35,7 +35,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure-versionnumber.diff \
</span><del>- patch-create_default_bundles_tbz-verbose.diff
</del><ins>+ patch-create_default_bundles_tbz-verbose.diff \
+ patch-bin__gen_build-avoid-ninja-pool-console.diff \
+ patch-target-isystem.diff
</ins><span class="cx">
</span><span class="cx"> # The build will fail with deployment target set to 10.8
</span><span class="cx"> macosx_deployment_target 10.7
</span></span></pre></div>
<a id="trunkdportseditorstextmate2filespatchbin__gen_buildavoidninjapoolconsolediff"></a>
<div class="addfile"><h4>Added: trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff (0 => 119669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff (rev 0)
+++ trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff 2014-05-03 16:43:07 UTC (rev 119669)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+--- bin/gen_build.orig 2014-05-03 18:05:12.000000000 +0200
++++ bin/gen_build 2014-05-03 18:05:21.000000000 +0200
+@@ -887,7 +887,6 @@
+
+ rule debug_executable
+ command = lldb $in
+- pool = console
+ description = Debug ‘$in’…
+
+ rule run_application
+@@ -920,7 +919,6 @@
+
+ rule upload
+ command = bin/upload -k$upload_keyfile -d$upload_destination -t'v$APP_VERSION' -m'{"version":"$APP_VERSION","revision":"$APP_REVISION"}' $in > $out~ && mv $out~ $out
+- pool = console
+ generator = true
+ description = Upload ‘$in’…
+
</ins></span></pre></div>
<a id="trunkdportseditorstextmate2filespatchtargetisystemdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/editors/textmate2/files/patch-target-isystem.diff (0 => 119669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/textmate2/files/patch-target-isystem.diff (rev 0)
+++ trunk/dports/editors/textmate2/files/patch-target-isystem.diff 2014-05-03 16:43:07 UTC (rev 119669)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- target.orig 2014-05-03 18:37:19.000000000 +0200
++++ target 2014-05-03 18:37:32.000000000 +0200
+@@ -26,7 +26,7 @@
+ LN_FLAGS += -Wl,-dead_strip_dylibs
+ LN_FLAGS += -rpath @executable_path/../Frameworks
+
+-CXX_FLAGS += -I"$capnp_prefix/include"
++CXX_FLAGS += -isystem"$capnp_prefix/include"
+ LN_FLAGS += -L"$capnp_prefix/lib"
+
+ PRELUDE = Shared/PCH/prelude.*
</ins></span></pre>
</div>
</div>
</body>
</html>