<!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>[136648] trunk/dports</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/136648">136648</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-05-23 10:17:21 -0700 (Sat, 23 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>capnproto: update to 0.5.2, revump textmate2 to rebuild against new library</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcapnprotoPortfile">trunk/dports/devel/capnproto/Portfile</a></li>
<li><a href="#trunkdportseditorstextmate2Portfile">trunk/dports/editors/textmate2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/capnproto/files/</li>
<li><a href="#trunkdportsdevelcapnprotofiles0001AvoidincorrectlibraryversionwithBSDsedpatch">trunk/dports/devel/capnproto/files/0001-Avoid-incorrect-library-version-with-BSD-sed.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcapnprotoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/capnproto/Portfile (136647 => 136648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/capnproto/Portfile 2015-05-23 17:15:56 UTC (rev 136647)
+++ trunk/dports/devel/capnproto/Portfile 2015-05-23 17:17:21 UTC (rev 136648)
</span><span class="lines">@@ -5,9 +5,9 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name capnproto
</span><del>-version 0.5.1
-checksums rmd160 f288a0d9bf95bcf5e3bf311626d9be407335bb36 \
- sha256 6f47ea606d64452a2242010da9b0fdb79cdeb497dfec42b47fb7df397be732f2
</del><ins>+version 0.5.2
+checksums rmd160 e16d911f5383d0c422d8d3711032a5dc0caab8cc \
+ sha256 23145a0127c2b1629c4b72e6000e04991640e551947fa39fd06710d64bd942a8
</ins><span class="cx">
</span><span class="cx"> maintainers cal openmaintainer
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -24,6 +24,9 @@
</span><span class="cx"> master_sites ${homepage}
</span><span class="cx"> distname ${name}-c++-${version}
</span><span class="cx">
</span><ins>+patch.pre_args -p2
+patchfiles 0001-Avoid-incorrect-library-version-with-BSD-sed.patch
+
</ins><span class="cx"> use_autoreconf yes
</span><span class="cx">
</span><span class="cx"> # clang 3.2 - clang-3.5 and all clangs from Xcode < 5 crash while compiling this.
</span></span></pre></div>
<a id="trunkdportsdevelcapnprotofiles0001AvoidincorrectlibraryversionwithBSDsedpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/capnproto/files/0001-Avoid-incorrect-library-version-with-BSD-sed.patch (0 => 136648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/capnproto/files/0001-Avoid-incorrect-library-version-with-BSD-sed.patch (rev 0)
+++ trunk/dports/devel/capnproto/files/0001-Avoid-incorrect-library-version-with-BSD-sed.patch 2015-05-23 17:17:21 UTC (rev 136648)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+From 2cc62644f24947e50a6ce17a6c685e4a3af49af3 Mon Sep 17 00:00:00 2001
+Upstream-Status: Pending [https://github.com/sandstorm-io/capnproto/pull/210]
+From: Clemens Lang <neverpanic@gmail.com>
+Date: Sat, 23 May 2015 19:02:32 +0200
+Subject: [PATCH] Avoid incorrect library version with BSD sed
+
+BSD sed does not support GNU sed's -r switch, but uses -E instead for
+the same functionality. Because -r was used in Makefile.am to set the
+SO_VERSION and failed there on platforms with BSD sed (e.g. OS X and
+possibly some BSDs, too) SO_VERSION was empty, causing libtool to use
+the next given parameter as version number, which was -no-undefined.
+
+Fix this by testing for the regex flag in configure.ac (note that some
+implementations of sed support -E but do not document it).
+
+Signed-off-by: Clemens Lang <neverpanic@gmail.com>
+---
+ c++/Makefile.am | 2 +-
+ c++/configure.ac | 15 +++++++++++++++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/c++/Makefile.am b/c++/Makefile.am
+index 8e0d9dd..b149b78 100644
+--- a/c++/Makefile.am
++++ b/c++/Makefile.am
+@@ -189,7 +189,7 @@ endif
+
+ # Don't include security release in soname -- we want to replace old binaries
+ # in this case.
+-SO_VERSION = $(shell echo $(VERSION) | sed -re 's/^([0-9]+[.][0-9]+[.][0-9]+)([.][0-9]+)?(-.*)?$$/\1\3/g')
++SO_VERSION = $(shell echo $(VERSION) | $(ESED) -e 's/^([0-9]+[.][0-9]+[.][0-9]+)([.][0-9]+)?(-.*)?$$/\1\3/g')
+
+ libkj_la_LIBADD = $(PTHREAD_LIBS)
+ libkj_la_LDFLAGS = -release $(SO_VERSION) -no-undefined
+diff --git a/c++/configure.ac b/c++/configure.ac
+index 26d9dcf..fe579c8 100644
+--- a/c++/configure.ac
++++ b/c++/configure.ac
+@@ -52,6 +52,21 @@ AC_PROG_CXX
+ AC_LANG([C++])
+ AX_CXX_COMPILE_STDCXX_11
+
++AC_MSG_CHECKING([how to run sed with extended regex support])
++AS_IF(
++ [test "$(echo test | sed -E 's/([st]+)$/xx\1/' 2>/dev/null)" = "texxst"], [
++ AC_MSG_RESULT([sed -E])
++ ESED="sed -E"
++ ],
++ [test "$(echo test | sed -r 's/([st]+)$/xx\1/' 2>/dev/null)" = "texxst"], [
++ AC_MSG_RESULT([sed -r])
++ ESED="sed -r"
++ ],
++ [AC_MSG_ERROR([cannot find sed with extended regex support (neither -r nor -E work)])]
++)
++AC_SUBST([ESED])
++
++
+ AS_CASE("${host_os}", *mingw*, [
+ # We don't use pthreads on MinGW.
+ PTHREAD_CFLAGS="-mthreads"
+--
+2.4.1
+
</ins></span></pre></div>
<a id="trunkdportseditorstextmate2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/textmate2/Portfile (136647 => 136648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/textmate2/Portfile 2015-05-23 17:15:56 UTC (rev 136647)
+++ trunk/dports/editors/textmate2/Portfile 2015-05-23 17:17:21 UTC (rev 136648)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> PortGroup xcodeversion 1.0
</span><span class="cx">
</span><span class="cx"> github.setup textmate textmate 2.0-beta.6.8 v
</span><ins>+revision 1
</ins><span class="cx"> epoch 4
</span><span class="cx">
</span><span class="cx"> maintainers cal openmaintainer
</span></span></pre>
</div>
</div>
</body>
</html>