<!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>[114237] 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/114237">114237</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2013-12-03 01:36:15 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>misc: Automatically prefer webkit-gtk-2.0 over webkit-gtk if using libstdc++</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelwebkitsharpPortfile">trunk/dports/devel/webkit-sharp/Portfile</a></li>
<li><a href="#trunkdportsgnomedevhelpPortfile">trunk/dports/gnome/devhelp/Portfile</a></li>
<li><a href="#trunkdportsgnomeempathyPortfile">trunk/dports/gnome/empathy/Portfile</a></li>
<li><a href="#trunkdportsgnomeepiphanyPortfile">trunk/dports/gnome/epiphany/Portfile</a></li>
<li><a href="#trunkdportsgnomegnomeonlineaccountsPortfile">trunk/dports/gnome/gnome-online-accounts/Portfile</a></li>
<li><a href="#trunkdportsgnomegnucashPortfile">trunk/dports/gnome/gnucash/Portfile</a></li>
<li><a href="#trunkdportsgnomegnucashdevelPortfile">trunk/dports/gnome/gnucash-devel/Portfile</a></li>
<li><a href="#trunkdportsgnomelifereaPortfile">trunk/dports/gnome/liferea/Portfile</a></li>
<li><a href="#trunkdportsgnomeseedPortfile">trunk/dports/gnome/seed/Portfile</a></li>
<li><a href="#trunkdportsgnomeyelpPortfile">trunk/dports/gnome/yelp/Portfile</a></li>
<li><a href="#trunkdportsgnomezenityPortfile">trunk/dports/gnome/zenity/Portfile</a></li>
<li><a href="#trunkdportsgraphicsbirdfontPortfile">trunk/dports/graphics/birdfont/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgimp2Portfile">trunk/dports/graphics/gimp2/Portfile</a></li>
<li><a href="#trunkdportsmailclawsmailPortfile">trunk/dports/mail/claws-mail/Portfile</a></li>
<li><a href="#trunkdportsmultimediagtkpodPortfile">trunk/dports/multimedia/gtkpod/Portfile</a></li>
<li><a href="#trunkdportspythonpy26webkitgtkPortfile">trunk/dports/python/py26-webkitgtk/Portfile</a></li>
<li><a href="#trunkdportspythonpy27webkitgtkPortfile">trunk/dports/python/py27-webkitgtk/Portfile</a></li>
<li><a href="#trunkdportstextprocbibleditPortfile">trunk/dports/textproc/bibledit/Portfile</a></li>
<li><a href="#trunkdportswwwmidoriPortfile">trunk/dports/www/midori/Portfile</a></li>
<li><a href="#trunkdportswwwuzblPortfile">trunk/dports/www/uzbl/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelwebkitsharpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/webkit-sharp/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/webkit-sharp/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/devel/webkit-sharp/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -28,3 +28,23 @@
</span><span class="cx">
</span><span class="cx"> # mono is not universal
</span><span class="cx"> universal_variant no
</span><ins>+
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
</ins></span></pre></div>
<a id="trunkdportsgnomedevhelpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/devhelp/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/devhelp/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/devhelp/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -35,6 +35,26 @@
</span><span class="cx"> port:gtk3 \
</span><span class="cx"> path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
</ins><span class="cx"> configure.args --with-webkit2=no \
</span><span class="cx"> --disable-schemas-compile
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomeempathyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/empathy/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/empathy/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/empathy/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -62,6 +62,26 @@
</span><span class="cx"> port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
</ins><span class="cx"> patchfiles patch-configure.diff
</span><span class="cx">
</span><span class="cx"> configure.args --x-includes=${prefix}/include \
</span></span></pre></div>
<a id="trunkdportsgnomeepiphanyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/epiphany/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/epiphany/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/epiphany/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -48,6 +48,26 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-settings-daemon
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
</ins><span class="cx"> patchfiles patch-configure.diff
</span><span class="cx">
</span><span class="cx"> configure.cflags-append -Wno-format-nonliteral
</span></span></pre></div>
<a id="trunkdportsgnomegnomeonlineaccountsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-online-accounts/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-online-accounts/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/gnome-online-accounts/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -37,5 +37,25 @@
</span><span class="cx"> configure.cflags-append -Wno-format-nonliteral
</span><span class="cx"> configure.args --enable-introspection=yes
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
</ins><span class="cx"> livecheck.type gnome
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomegnucashPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnucash/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnucash/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/gnucash/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -58,6 +58,26 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:yelp
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
</ins><span class="cx"> # aqbanking and libgtkhtml3 are not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomegnucashdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnucash-devel/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnucash-devel/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/gnucash-devel/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -60,6 +60,26 @@
</span><span class="cx"> port:icu \
</span><span class="cx"> port:p5.12-finance-quote
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
</ins><span class="cx"> # aqbanking and libgtkhtml3 are not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomelifereaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/liferea/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/liferea/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/liferea/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -34,6 +34,26 @@
</span><span class="cx"> path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
</span><span class="cx"> port:libglade2
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
</ins><span class="cx"> configure.args --disable-lua
</span><span class="cx">
</span><span class="cx"> variant lua description {LUA scripting support} {
</span></span></pre></div>
<a id="trunkdportsgnomeseedPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/seed/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/seed/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/seed/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -38,4 +38,24 @@
</span><span class="cx">
</span><span class="cx"> configure.args --disable-gettext-module
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
</ins><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="trunkdportsgnomeyelpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/yelp/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/yelp/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/yelp/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -59,4 +59,24 @@
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
</ins><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="trunkdportsgnomezenityPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/zenity/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/zenity/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/gnome/zenity/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -38,4 +38,24 @@
</span><span class="cx">
</span><span class="cx"> configure.args --disable-silent-rules
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
+ depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
+ }
+}
+
</ins><span class="cx"> livecheck.type gnome
</span></span></pre></div>
<a id="trunkdportsgraphicsbirdfontPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/birdfont/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/birdfont/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/graphics/birdfont/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -57,3 +57,23 @@
</span><span class="cx"> file attributes ${worksrcpath}/build/BirdFont.app/Contents/MacOS/birdfont.sh -permissions 0755
</span><span class="cx"> file copy ${worksrcpath}/build/BirdFont.app ${destroot}${applications_dir}
</span><span class="cx"> }
</span><ins>+
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
</ins></span></pre></div>
<a id="trunkdportsgraphicsgimp2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/graphics/gimp2/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -69,6 +69,26 @@
</span><span class="cx">
</span><span class="cx"> depends_run path:share/gimp/2.0/help:gimp-help-en
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
</ins><span class="cx"> patchfiles patch-etc-gimprc.diff \
</span><span class="cx"> patch-freetype-includes.diff \
</span><span class="cx"> patch-brush-outline-not-displayed-bz719593.diff \
</span></span></pre></div>
<a id="trunkdportsmailclawsmailPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/claws-mail/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/claws-mail/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/mail/claws-mail/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -45,6 +45,26 @@
</span><span class="cx"> require_active_variants \
</span><span class="cx"> gtk2 x11
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
</ins><span class="cx"> configure.args --disable-jpilot \
</span><span class="cx"> --disable-acpi_notifier-plugin \
</span><span class="cx"> --disable-archive-plugin \
</span></span></pre></div>
<a id="trunkdportsmultimediagtkpodPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/gtkpod/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gtkpod/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/multimedia/gtkpod/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -31,6 +31,26 @@
</span><span class="cx"> port:libvorbis \
</span><span class="cx"> path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
</ins><span class="cx"> use_autoconf yes
</span><span class="cx">
</span><span class="cx"> # python-related tweaks
</span></span></pre></div>
<a id="trunkdportspythonpy26webkitgtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py26-webkitgtk/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py26-webkitgtk/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/python/py26-webkitgtk/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -25,6 +25,26 @@
</span><span class="cx">
</span><span class="cx"> set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
</ins><span class="cx"> configure.pre_args-delete --prefix=${prefix}
</span><span class="cx"> configure.pre_args-append --prefix=${python_prefix}
</span><span class="cx"> configure.args-append --includedir=${python_prefix}/include/python2.6
</span></span></pre></div>
<a id="trunkdportspythonpy27webkitgtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py27-webkitgtk/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py27-webkitgtk/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/python/py27-webkitgtk/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -24,6 +24,26 @@
</span><span class="cx"> sha1 74ff2222d9aa9af6ab0aa4279b28dd2b26f5824e \
</span><span class="cx"> rmd160 e857939e65a9a409390f1fd256310988f592935f
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
</ins><span class="cx"> set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
</span><span class="cx">
</span><span class="cx"> configure.pre_args-delete --prefix=${prefix}
</span></span></pre></div>
<a id="trunkdportstextprocbibleditPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/bibledit/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/bibledit/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/textproc/bibledit/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -35,3 +35,23 @@
</span><span class="cx">
</span><span class="cx"> distname ${name}-gtk-${version}
</span><span class="cx"> worksrcdir ${name}-gtk-${version}
</span><ins>+
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
</ins></span></pre></div>
<a id="trunkdportswwwmidoriPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/midori/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/midori/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/www/midori/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -37,6 +37,26 @@
</span><span class="cx"> port:libnotify \
</span><span class="cx"> port:vala
</span><span class="cx">
</span><ins>+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
+
</ins><span class="cx"> # Not autoconf
</span><span class="cx"> configure.env-append LINKFLAGS="-L${prefix}/lib"
</span><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span></span></pre></div>
<a id="trunkdportswwwuzblPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/uzbl/Portfile (114236 => 114237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/uzbl/Portfile 2013-12-03 09:31:37 UTC (rev 114236)
+++ trunk/dports/www/uzbl/Portfile 2013-12-03 09:36:15 UTC (rev 114237)
</span><span class="lines">@@ -33,3 +33,23 @@
</span><span class="cx"> CC="${configure.cc} [get_canonical_archflags]"
</span><span class="cx">
</span><span class="cx"> eval destroot.args ${build.args}
</span><ins>+
+platform darwin {
+ set cxx_stdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxx_stdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxx_stdlib libc++
+ } else {
+ set cxx_stdlib libstdc++
+ }
+
+ if {${cxx_stdlib} == "libstdc++"} {
+ depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>