<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/80e429b659adaff32a0eee4f842ae38d6cead3d9">https://github.com/macports/macports-ports/commit/80e429b659adaff32a0eee4f842ae38d6cead3d9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 80e429b textmate2: Fix Portfile parsing on older systems
</span>80e429b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 80e429b659adaff32a0eee4f842ae38d6cead3d9
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Thu Aug 2 23:27:24 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> textmate2: Fix Portfile parsing on older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Reading ${configure.sdkroot} throws an error if no suitable SDK is
</span><span style='display:block; white-space:pre;color:#404040;'> available. This means that ${configure.sdkroot} cannot be used without
</span><span style='display:block; white-space:pre;color:#404040;'> a catch clause outside of a phase in a Portfile, which is unfortunate.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Until this API deficiency is fixed, avoid parse problems by adding catch
</span><span style='display:block; white-space:pre;color:#404040;'> statements around uses of ${configure.sdkroot}.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56837
</span>---
editors/textmate2/Portfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/Portfile b/editors/textmate2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index af72c0b..bd42947 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/textmate2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,7 @@ compiler.blacklist {clang < 602}
</span> # Needs support for Objective-C lightweight generics.
if {[vercmp ${configure.sdk_version} 10.11] < 0} {
configure.sdk_version 10.11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set configure.sdkroot} sdkroot] || $sdkroot eq ""} {
</span> pre-fetch {
ui_error "${name} @${version} requires the OS X 10.11 SDK or later."
return -code error "incompatible SDK version"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,10 +96,10 @@ if {[vercmp ${configure.sdk_version} 10.11] < 0} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![catch {set configure.sdkroot} sdkroot] && $sdkroot ne ""} {
</span> # The configure script only passes along CC/CXX, not *FLAGS.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc-append -isysroot${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx-append -isysroot${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc-append -isysroot${sdkroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx-append -isysroot${sdkroot}
</span> }
# The build system forces the use of libc++. This is ok because the port
</pre><pre style='margin:0'>
</pre>