<!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>[121269] 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/121269">121269</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-06-21 13:18:42 -0700 (Sat, 21 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>misc: Cleanup configure.cxx_stdlib related logic now that we can assume base 2.3 or newer</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt4macPortfile">trunk/dports/aqua/qt4-mac/Portfile</a></li>
<li><a href="#trunkdportsarchiversunrarPortfile">trunk/dports/archivers/unrar/Portfile</a></li>
<li><a href="#trunkdportsaudiofaacPortfile">trunk/dports/audio/faac/Portfile</a></li>
<li><a href="#trunkdportsaudioid3v2Portfile">trunk/dports/audio/id3v2/Portfile</a></li>
<li><a href="#trunkdportscrossarmelfgccPortfile">trunk/dports/cross/arm-elf-gcc/Portfile</a></li>
<li><a href="#trunkdportsdatabasesdb44Portfile">trunk/dports/databases/db44/Portfile</a></li>
<li><a href="#trunkdportsdatabasesdb46Portfile">trunk/dports/databases/db46/Portfile</a></li>
<li><a href="#trunkdportsdatabasesdb47Portfile">trunk/dports/databases/db47/Portfile</a></li>
<li><a href="#trunkdportsdatabasesdb48Portfile">trunk/dports/databases/db48/Portfile</a></li>
<li><a href="#trunkdportsdatabasesdb51Portfile">trunk/dports/databases/db51/Portfile</a></li>
<li><a href="#trunkdportsdatabasesdb52Portfile">trunk/dports/databases/db52/Portfile</a></li>
<li><a href="#trunkdportsdatabasesdb53Portfile">trunk/dports/databases/db53/Portfile</a></li>
<li><a href="#trunkdportsdevelboostPortfile">trunk/dports/devel/boost/Portfile</a></li>
<li><a href="#trunkdportsdevelcctoolsPortfile">trunk/dports/devel/cctools/Portfile</a></li>
<li><a href="#trunkdportsdevelgmpPortfile">trunk/dports/devel/gmp/Portfile</a></li>
<li><a href="#trunkdportsdevelld64Portfile">trunk/dports/devel/ld64/Portfile</a></li>
<li><a href="#trunkdportsdevelwebkitsharpPortfile">trunk/dports/devel/webkit-sharp/Portfile</a></li>
<li><a href="#trunkdportsgnomebalsaPortfile">trunk/dports/gnome/balsa/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="#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="#trunkdportsgraphicsfreeimagePortfile">trunk/dports/graphics/freeimage/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgimp2Portfile">trunk/dports/graphics/gimp2/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgimp2develPortfile">trunk/dports/graphics/gimp2-devel/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgimp3develPortfile">trunk/dports/graphics/gimp3-devel/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgraphvizPortfile">trunk/dports/graphics/graphviz/Portfile</a></li>
<li><a href="#trunkdportsgraphicsgraphvizdevelPortfile">trunk/dports/graphics/graphviz-devel/Portfile</a></li>
<li><a href="#trunkdportsgraphicslensfunPortfile">trunk/dports/graphics/lensfun/Portfile</a></li>
<li><a href="#trunkdportsgraphicsmakeicnsPortfile">trunk/dports/graphics/makeicns/Portfile</a></li>
<li><a href="#trunkdportslangdragonegg30Portfile">trunk/dports/lang/dragonegg-3.0/Portfile</a></li>
<li><a href="#trunkdportslangdragonegg31Portfile">trunk/dports/lang/dragonegg-3.1/Portfile</a></li>
<li><a href="#trunkdportslangdragonegg32Portfile">trunk/dports/lang/dragonegg-3.2/Portfile</a></li>
<li><a href="#trunkdportslangdragonegg33Portfile">trunk/dports/lang/dragonegg-3.3/Portfile</a></li>
<li><a href="#trunkdportslangdragonegg34Portfile">trunk/dports/lang/dragonegg-3.4/Portfile</a></li>
<li><a href="#trunkdportslanggcc43Portfile">trunk/dports/lang/gcc43/Portfile</a></li>
<li><a href="#trunkdportslanggcc44Portfile">trunk/dports/lang/gcc44/Portfile</a></li>
<li><a href="#trunkdportslanggcc45Portfile">trunk/dports/lang/gcc45/Portfile</a></li>
<li><a href="#trunkdportslanggcc46Portfile">trunk/dports/lang/gcc46/Portfile</a></li>
<li><a href="#trunkdportslanggcc47Portfile">trunk/dports/lang/gcc47/Portfile</a></li>
<li><a href="#trunkdportslanggcc48Portfile">trunk/dports/lang/gcc48/Portfile</a></li>
<li><a href="#trunkdportslanggcc49Portfile">trunk/dports/lang/gcc49/Portfile</a></li>
<li><a href="#trunkdportslangllvm35Portfile">trunk/dports/lang/llvm-3.5/Portfile</a></li>
<li><a href="#trunkdportsmailclawsmailPortfile">trunk/dports/mail/claws-mail/Portfile</a></li>
<li><a href="#trunkdportsmultimediaVLCPortfile">trunk/dports/multimedia/VLC/Portfile</a></li>
<li><a href="#trunkdportsmultimediaVLCdevelPortfile">trunk/dports/multimedia/VLC-devel/Portfile</a></li>
<li><a href="#trunkdportsmultimediagtkpodPortfile">trunk/dports/multimedia/gtkpod/Portfile</a></li>
<li><a href="#trunkdportsmultimedialibmatroskaPortfile">trunk/dports/multimedia/libmatroska/Portfile</a></li>
<li><a href="#trunkdportsmultimedialive555Portfile">trunk/dports/multimedia/live555/Portfile</a></li>
<li><a href="#trunkdportsnetdibblerPortfile">trunk/dports/net/dibbler/Portfile</a></li>
<li><a href="#trunkdportsnetgpsdPortfile">trunk/dports/net/gpsd/Portfile</a></li>
<li><a href="#trunkdportsprintlcdftypetoolsPortfile">trunk/dports/print/lcdf-typetools/Portfile</a></li>
<li><a href="#trunkdportspythonpypysvnPortfile">trunk/dports/python/py-pysvn/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="#trunkdportssciencegildasPortfile">trunk/dports/science/gildas/Portfile</a></li>
<li><a href="#trunkdportssciencegqrxPortfile">trunk/dports/science/gqrx/Portfile</a></li>
<li><a href="#trunkdportsscienceroot5Portfile">trunk/dports/science/root5/Portfile</a></li>
<li><a href="#trunkdportstextexlivebinPortfile">trunk/dports/tex/texlive-bin/Portfile</a></li>
<li><a href="#trunkdportstextprocbibleditPortfile">trunk/dports/textproc/bibledit/Portfile</a></li>
<li><a href="#trunkdportstextprocdoxygenPortfile">trunk/dports/textproc/doxygen/Portfile</a></li>
<li><a href="#trunkdportstextproclibebmlPortfile">trunk/dports/textproc/libebml/Portfile</a></li>
<li><a href="#trunkdportstextproclibxlPortfile">trunk/dports/textproc/libxl/Portfile</a></li>
<li><a href="#trunkdportstextprocopenjadePortfile">trunk/dports/textproc/openjade/Portfile</a></li>
<li><a href="#trunkdportstextprocsdcvPortfile">trunk/dports/textproc/sdcv/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>
<li><a href="#trunkdportswwwwebkitgtkPortfile">trunk/dports/www/webkit-gtk/Portfile</a></li>
<li><a href="#trunkdportswwwwebkitgtk20Portfile">trunk/dports/www/webkit-gtk-2.0/Portfile</a></li>
<li><a href="#trunkdportswwwwebkitgtkdevelPortfile">trunk/dports/www/webkit-gtk-devel/Portfile</a></li>
<li><a href="#trunkdportsx11mesaPortfile">trunk/dports/x11/mesa/Portfile</a></li>
<li><a href="#trunkdportsx11rxvtunicodePortfile">trunk/dports/x11/rxvt-unicode/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqt4macPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt4-mac/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/aqua/qt4-mac/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -578,18 +578,9 @@
</span><span class="cx">
</span><span class="cx"> configure.env-append PKG_CONFIG=${prefix}/bin/pkg-config
</span><span class="cx">
</span><del>- # set which stdlib to use; clang only; use configure.cxx_stdlib if
- # that exists, and otherwise use libc++ on 10.9 or libstdc++ on
- # 10.8 or earler.
-
</del><ins>+ # set which stdlib to use; clang only
</ins><span class="cx"> if {[string match *clang* ${configure.compiler}]} {
</span><del>- if {[info exists configure.cxx_stdlib]} {
- configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
- } elseif {${MINOR} == 9} {
- configure.env-append QMAKE_STDLIB="-stdlib=libc++"
- } else {
- configure.env-append QMAKE_STDLIB="-stdlib=libstdc++"
- }
</del><ins>+ configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsarchiversunrarPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/archivers/unrar/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/archivers/unrar/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/archivers/unrar/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -38,9 +38,8 @@
</span><span class="cx"> configure.cxx "ccache ${configure.cxx}"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsaudiofaacPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/faac/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/faac/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/audio/faac/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -23,28 +23,12 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure.in.diff
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
</del><ins>+post-patch {
+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
+ reinplace "s:-lstdc\+\+:-lc++:" \
+ ${worksrcpath}/frontend/Makefile.am \
+ ${worksrcpath}/frontend/Makefile.in
</ins><span class="cx"> }
</span><del>-
- post-patch {
- if {${cxxstdlib} == "libc++"} {
- reinplace "s:-lstdc\+\+:-lc++:" \
- ${worksrcpath}/frontend/Makefile.am \
- ${worksrcpath}/frontend/Makefile.in
- }
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure.cflags-append "-D__unix__"
</span></span></pre></div>
<a id="trunkdportsaudioid3v2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/id3v2/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/id3v2/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/audio/id3v2/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -30,9 +30,8 @@
</span><span class="cx"> system "cd ${worksrcpath} && make clean"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportscrossarmelfgccPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/cross/arm-elf-gcc/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/cross/arm-elf-gcc/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/cross/arm-elf-gcc/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -182,9 +182,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # the bootstrap compiler doesn't accept -stdlib
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
</del><ins>+configure.cxx_stdlib
</ins><span class="cx">
</span><span class="cx"> build.dir ${workpath}/build
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdatabasesdb44Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/db44/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db44/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db44/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -59,9 +59,8 @@
</span><span class="cx"> --includedir=\\\${prefix}/include/db${branch} \
</span><span class="cx"> --libdir=\\\${prefix}/lib/db${branch}
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span></span></pre></div>
<a id="trunkdportsdatabasesdb46Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/db46/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db46/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db46/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -72,9 +72,8 @@
</span><span class="cx"> --libdir=\\\${prefix}/lib/db${branch} \
</span><span class="cx"> --enable-dump185
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span></span></pre></div>
<a id="trunkdportsdatabasesdb47Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/db47/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db47/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db47/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -60,9 +60,8 @@
</span><span class="cx"> --includedir=\\\${prefix}/include/db${branch} \
</span><span class="cx"> --libdir=\\\${prefix}/lib/db${branch}
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span></span></pre></div>
<a id="trunkdportsdatabasesdb48Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/db48/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db48/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db48/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -40,9 +40,8 @@
</span><span class="cx"> --includedir=\\\${prefix}/include/db${branch} \
</span><span class="cx"> --libdir=\\\${prefix}/lib/db${branch}
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span></span></pre></div>
<a id="trunkdportsdatabasesdb51Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/db51/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db51/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db51/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -39,9 +39,8 @@
</span><span class="cx"> --includedir=\\\${prefix}/include/db${branch} \
</span><span class="cx"> --libdir=\\\${prefix}/lib/db${branch}
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span></span></pre></div>
<a id="trunkdportsdatabasesdb52Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/db52/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db52/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db52/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -39,9 +39,8 @@
</span><span class="cx"> --includedir=\\\${prefix}/include/db${branch} \
</span><span class="cx"> --libdir=\\\${prefix}/lib/db${branch}
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span></span></pre></div>
<a id="trunkdportsdatabasesdb53Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/db53/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db53/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/databases/db53/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -39,9 +39,8 @@
</span><span class="cx"> --includedir=\\\${prefix}/include/db${branch} \
</span><span class="cx"> --libdir=\\\${prefix}/lib/db${branch}
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span></span></pre></div>
<a id="trunkdportsdevelboostPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/boost/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/boost/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/boost/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -130,9 +130,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set cxx_stdlibflags {}
</span><del>- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
</del><ins>+ if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelcctoolsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cctools/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cctools/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/cctools/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -129,9 +129,7 @@
</span><span class="cx"> build.target all
</span><span class="cx">
</span><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelgmpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/gmp/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gmp/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/gmp/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -52,10 +52,8 @@
</span><span class="cx"> #
</span><span class="cx"> # On PowerPC machines, CFLAGS must be empty to get -force_cpusubtype_ALL.
</span><span class="cx">
</span><del>-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]
-} then {
</del><ins>+set cxx_stdlibflags {}
+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> configure.cxx-append -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> configure.cxx_stdlib
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdevelld64Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/ld64/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ld64/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/ld64/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -82,25 +82,9 @@
</span><span class="cx">
</span><span class="cx"> set makefile "Makefile-133"
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {[string match *clang* ${configure.cxx}]} {
- set cxx_stdlibflags -stdlib=${cxxstdlib}
- }
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
+ set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${os.arch} eq "powerpc" || ${os.major} < 9} {
</span><span class="lines">@@ -145,7 +129,7 @@
</span><span class="cx"> # http://trac.macports.org/ticket/43737
</span><span class="cx"> compiler.blacklist-append *gcc*
</span><span class="cx">
</span><del>- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> patchfiles-append ld64-236-hash_set.patch
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdevelwebkitsharpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/webkit-sharp/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/webkit-sharp/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/devel/webkit-sharp/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -29,22 +29,8 @@
</span><span class="cx"> # mono is not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomebalsaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/balsa/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/balsa/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/balsa/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -68,22 +68,8 @@
</span><span class="cx">
</span><span class="cx"> configure.cflags-append -D_DARWIN_C_SOURCE
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomedevhelpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/devhelp/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/devhelp/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/devhelp/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -38,22 +38,8 @@
</span><span class="cx"> port:gtk3 \
</span><span class="cx"> path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomeempathyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/empathy/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/empathy/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/empathy/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -69,22 +69,8 @@
</span><span class="cx"> port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomegnomeonlineaccountsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-online-accounts/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-online-accounts/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/gnome-online-accounts/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -120,22 +120,8 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomegnucashPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnucash/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnucash/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/gnucash/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -56,22 +56,8 @@
</span><span class="cx"> depends_run port:yelp
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomegnucashdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnucash-devel/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnucash-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/gnucash-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -61,22 +61,8 @@
</span><span class="cx"> port:icu \
</span><span class="cx"> port:p5.12-finance-quote
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomelifereaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/liferea/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/liferea/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/liferea/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -34,22 +34,8 @@
</span><span class="cx"> path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
</span><span class="cx"> port:libglade2
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomeseedPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/seed/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/seed/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/seed/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -44,22 +44,8 @@
</span><span class="cx">
</span><span class="cx"> configure.args --disable-gettext-module
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomeyelpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/yelp/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/yelp/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/yelp/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -67,22 +67,8 @@
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomezenityPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/zenity/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/zenity/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/gnome/zenity/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -43,22 +43,8 @@
</span><span class="cx">
</span><span class="cx"> configure.args --disable-silent-rules
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgraphicsbirdfontPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/birdfont/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/birdfont/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/birdfont/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -58,22 +58,8 @@
</span><span class="cx"> file copy ${worksrcpath}/build/BirdFont.app ${destroot}${applications_dir}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgraphicsfreeimagePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/freeimage/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/freeimage/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/freeimage/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -71,10 +71,7 @@
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="cx"> # Reimplement parts of portconfigure.tcl
</span><del>-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]
-} then {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/gimp2/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -70,22 +70,6 @@
</span><span class="cx">
</span><span class="cx"> depends_run path:share/gimp/2.0/help:gimp-help-en
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-}
-
</del><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 class="lines">@@ -222,7 +206,7 @@
</span><span class="cx"> variant help_browser description {Enable Gimp help browser} {
</span><span class="cx"> configure.args-delete --without-webkit
</span><span class="cx">
</span><del>- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> } else {
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp2develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp2-devel/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp2-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/gimp2-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -73,22 +73,6 @@
</span><span class="cx">
</span><span class="cx"> depends_run path:share/gimp/2.0/help:gimp-help-en
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-}
-
</del><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><span class="cx"> patchfiles patch-etc-gimprc.diff \
</span><span class="lines">@@ -188,7 +172,7 @@
</span><span class="cx"> variant help_browser description {Enable Gimp help browser} {
</span><span class="cx"> configure.args-delete --without-webkit
</span><span class="cx">
</span><del>- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> } else {
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span></span></pre></div>
<a id="trunkdportsgraphicsgimp3develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/gimp3-devel/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/gimp3-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/gimp3-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -76,22 +76,6 @@
</span><span class="cx">
</span><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-}
-
</del><span class="cx"> patchfiles patch-configure.ac.diff \
</span><span class="cx"> patch-etc-gimprc.diff \
</span><span class="cx"> patch-plug-ins-twain-tw_mac.c.diff
</span><span class="lines">@@ -190,7 +174,7 @@
</span><span class="cx"> variant help_browser description {Enable Gimp help browser} {
</span><span class="cx"> configure.args-delete --without-webkit
</span><span class="cx">
</span><del>- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span><span class="cx"> } else {
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span></span></pre></div>
<a id="trunkdportsgraphicsgraphvizPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/graphviz/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/graphviz/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/graphviz/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -116,20 +116,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} == "libc++"} {
</del><ins>+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
</ins><span class="cx"> reinplace "s:-lstdc\+\+:-lc++:" \
</span><span class="cx"> ${worksrcpath}/configure.ac \
</span><span class="cx"> ${worksrcpath}/cmd/dot/Makefile.am \
</span></span></pre></div>
<a id="trunkdportsgraphicsgraphvizdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/graphviz-devel/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/graphviz-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/graphviz-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -116,20 +116,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} == "libc++"} {
</del><ins>+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
</ins><span class="cx"> reinplace "s:-lstdc\+\+:-lc++:" \
</span><span class="cx"> ${worksrcpath}/configure.ac \
</span><span class="cx"> ${worksrcpath}/cmd/dot/Makefile.am \
</span></span></pre></div>
<a id="trunkdportsgraphicslensfunPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/lensfun/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/lensfun/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/lensfun/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -39,9 +39,8 @@
</span><span class="cx"> reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/build/tibs/target/mac.mak
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsmakeicnsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/makeicns/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/makeicns/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/graphics/makeicns/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -34,25 +34,9 @@
</span><span class="cx"> patchfiles patch-IconFamily.m.diff
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {[string match *clang* ${configure.cxx}]} {
- configure.cxxflags-append -stdlib=${cxxstdlib}
- configure.ldflags-append -stdlib=${cxxstdlib}
- }
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
+ configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
+ configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> build.env-append CC=${configure.cc} \
</span></span></pre></div>
<a id="trunkdportslangdragonegg30Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/dragonegg-3.0/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/dragonegg-3.0/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.0/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> build.env-append \
</span></span></pre></div>
<a id="trunkdportslangdragonegg31Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/dragonegg-3.1/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/dragonegg-3.1/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.1/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> build.env-append \
</span></span></pre></div>
<a id="trunkdportslangdragonegg32Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/dragonegg-3.2/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/dragonegg-3.2/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.2/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> build.env-append \
</span></span></pre></div>
<a id="trunkdportslangdragonegg33Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/dragonegg-3.3/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/dragonegg-3.3/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.3/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> build.env-append \
</span></span></pre></div>
<a id="trunkdportslangdragonegg34Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/dragonegg-3.4/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/dragonegg-3.4/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/dragonegg-3.4/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx"> build.env-append \
</span></span></pre></div>
<a id="trunkdportslanggcc43Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc43/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc43/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc43/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -118,9 +118,7 @@
</span><span class="cx"> compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
</span><span class="cx">
</span><span class="cx"> # "-stdlib" would be passed on to the bootstrap compiler if present
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
</del><ins>+configure.cxx_stdlib
</ins><span class="cx">
</span><span class="cx"> # STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac
</span><span class="cx"> # BOOT_CFLAGS="-O2 -g" : from Makefile.tpl
</span></span></pre></div>
<a id="trunkdportslanggcc44Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc44/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc44/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc44/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -119,9 +119,7 @@
</span><span class="cx"> compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
</span><span class="cx">
</span><span class="cx"> # "-stdlib" would be passed on to the bootstrap compiler if present
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
</del><ins>+configure.cxx_stdlib
</ins><span class="cx">
</span><span class="cx"> # STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac
</span><span class="cx"> # BOOT_CFLAGS="-O2 -g" : from Makefile.tpl
</span></span></pre></div>
<a id="trunkdportslanggcc45Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc45/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc45/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc45/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -141,9 +141,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # "-stdlib" would be passed on to the bootstrap compiler if present
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
</del><ins>+configure.cxx_stdlib
</ins><span class="cx">
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx"> build.target bootstrap
</span></span></pre></div>
<a id="trunkdportslanggcc46Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc46/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc46/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc46/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -123,9 +123,7 @@
</span><span class="cx"> compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
</span><span class="cx">
</span><span class="cx"> # "-stdlib" would be passed on to the bootstrap compiler if present
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
</del><ins>+configure.cxx_stdlib
</ins><span class="cx">
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx"> build.target bootstrap
</span></span></pre></div>
<a id="trunkdportslanggcc47Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc47/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc47/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc47/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -122,9 +122,7 @@
</span><span class="cx"> compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
</span><span class="cx">
</span><span class="cx"> # "-stdlib" would be passed on to the bootstrap compiler if present
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
</del><ins>+configure.cxx_stdlib
</ins><span class="cx">
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx"> build.target bootstrap
</span></span></pre></div>
<a id="trunkdportslanggcc48Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc48/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc48/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc48/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -98,9 +98,7 @@
</span><span class="cx"> compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
</span><span class="cx">
</span><span class="cx"> # "-stdlib" would be passed on to the bootstrap compiler if present
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
</del><ins>+configure.cxx_stdlib
</ins><span class="cx">
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx"> build.target bootstrap
</span></span></pre></div>
<a id="trunkdportslanggcc49Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc49/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc49/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/gcc49/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -99,9 +99,7 @@
</span><span class="cx"> compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
</span><span class="cx">
</span><span class="cx"> # "-stdlib" would be passed on to the bootstrap compiler if present
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib
-}
</del><ins>+configure.cxx_stdlib
</ins><span class="cx">
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx"> build.target bootstrap
</span></span></pre></div>
<a id="trunkdportslangllvm35Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.5/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.5/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/lang/llvm-3.5/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -118,24 +118,19 @@
</span><span class="cx"> # llvm-3.5 and later requires a C++11 runtime
</span><span class="cx"> compiler.blacklist *gcc* {clang < 300}
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><span class="cx"> # Note that we are forcing this choice. This means that anything linking
</span><span class="cx"> # against llvm-3.5 needs to also be using libc++. This is possibly
</span><span class="cx"> # problematic, but luckily there is just a limited set of such dependents.
</span><span class="cx">
</span><del>- if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib libc++
- }
-
</del><ins>+ configure.cxx_stdlib libc++
</ins><span class="cx"> depends_lib-append port:libcxx
</span><del>-}
</del><span class="cx">
</span><del>-pre-fetch {
- if {(${os.major} < 13 && ! [info exists configure.cxx_stdlib]) ||
- (! [file exists /usr/lib/libc++.dylib])} {
- ui_error "$name requires a C++11 runtime, which your configuration does not allow"
- error "unsupported configuration"
</del><ins>+ pre-fetch {
+ if {![file exists /usr/lib/libc++.dylib]} {
+ ui_error "$name requires a C++11 runtime, which your configuration does not allow"
+ error "unsupported configuration"
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmailclawsmailPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/claws-mail/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/claws-mail/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/mail/claws-mail/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -47,20 +47,7 @@
</span><span class="cx">
</span><span class="cx"> # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</span><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsmultimediaVLCPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/VLC/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -81,20 +81,7 @@
</span><span class="cx"> reinplace "s:librsvg-2/librsvg:librsvg:" \
</span><span class="cx"> ${worksrcpath}/modules/text_renderer/svg.c
</span><span class="cx">
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} == "libc++"} {
</del><ins>+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
</ins><span class="cx"> reinplace "s:-lstdc\+\+:-lc++:" \
</span><span class="cx"> ${worksrcpath}/configure.ac \
</span><span class="cx"> ${worksrcpath}/modules/access/Makefile.am
</span></span></pre></div>
<a id="trunkdportsmultimediaVLCdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC-devel/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -85,20 +85,7 @@
</span><span class="cx"> reinplace "s:librsvg-2/librsvg:librsvg:" \
</span><span class="cx"> ${worksrcpath}/modules/text_renderer/svg.c
</span><span class="cx">
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} == "libc++"} {
</del><ins>+ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
</ins><span class="cx"> reinplace "s:-lstdc\+\+:-lc++:" \
</span><span class="cx"> ${worksrcpath}/configure.ac \
</span><span class="cx"> ${worksrcpath}/modules/access/Makefile.am
</span></span></pre></div>
<a id="trunkdportsmultimediagtkpodPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/gtkpod/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gtkpod/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/gtkpod/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -31,22 +31,8 @@
</span><span class="cx"> port:libvorbis \
</span><span class="cx"> path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsmultimedialibmatroskaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/libmatroska/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/libmatroska/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/libmatroska/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -39,9 +39,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimedialive555Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/live555/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/live555/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/multimedia/live555/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -29,10 +29,8 @@
</span><span class="cx"> configure.distcc no
</span><span class="cx"> patchfiles patch-config.macosx.diff
</span><span class="cx"> post-patch {
</span><del>- set cxx_stdlibflags {}
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
</del><ins>+set cxx_stdlibflags {}
+ if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsnetdibblerPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/dibbler/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/dibbler/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/net/dibbler/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -39,9 +39,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # TODO: Fix libc++ build.
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib libstdc++
-}
</del><ins>+configure.cxx_stdlib libstdc++
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -d -m 0755 ${destroot}${prefix}/share/examples
</span></span></pre></div>
<a id="trunkdportsnetgpsdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/gpsd/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/gpsd/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/net/gpsd/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -36,9 +36,8 @@
</span><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsprintlcdftypetoolsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/print/lcdf-typetools/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/print/lcdf-typetools/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/print/lcdf-typetools/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -27,8 +27,7 @@
</span><span class="cx"> patchfiles detect-endianness-universal.patch
</span><span class="cx"> patchfiles-append static_assert.patch
</span><span class="cx">
</span><del>-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} eq {libc++} &&
</del><ins>+if {${configure.cxx_stdlib} eq {libc++} &&
</ins><span class="cx"> [string match *clang* ${configure.cxx}]
</span><span class="cx"> } then {
</span><span class="cx"> patchfiles-append 0001-Avoid-implicit-initializer-narrowing.patch
</span></span></pre></div>
<a id="trunkdportspythonpypysvnPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pysvn/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pysvn/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/python/py-pysvn/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -26,9 +26,8 @@
</span><span class="cx">
</span><span class="cx"> python.versions 25 26 27
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpy26webkitgtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py26-webkitgtk/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py26-webkitgtk/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/python/py26-webkitgtk/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -26,22 +26,8 @@
</span><span class="cx">
</span><span class="cx"> set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportspythonpy27webkitgtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py27-webkitgtk/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py27-webkitgtk/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/python/py27-webkitgtk/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -24,22 +24,8 @@
</span><span class="cx"> sha1 74ff2222d9aa9af6ab0aa4279b28dd2b26f5824e \
</span><span class="cx"> rmd160 e857939e65a9a409390f1fd256310988f592935f
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportssciencegildasPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/science/gildas/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -59,24 +59,6 @@
</span><span class="cx"> default_variants-append +gcc48
</span><span class="cx"> }
</span><span class="cx">
</span><del>-set cxxstdlib {}
-platform darwin {
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {[string length ${cxxstdlib}]} {
- set cxxstdlib [string map {lib -l} ${cxxstdlib}]
- }
-}
-
</del><span class="cx"> post-extract {
</span><span class="cx"> if {![gcc_variant_isset]} {
</span><span class="cx"> reinplace -W ${worksrcpath}/admin "s|-Wrealloc-lhs-all||" define-system.sh
</span><span class="lines">@@ -84,6 +66,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure {
</span><ins>+ set cxxstdlib {}
+ if {[string match *clang* ${configure.cxx}]} {
+ set cxxstdlib [string map {lib -l} ${configure.cxx_stdlib}]
+ }
+
</ins><span class="cx"> reinplace -W ${worksrcpath}/admin "s|@CC@|${configure.cc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span class="cx"> reinplace -W ${worksrcpath}/admin "s|@CCFLAGS@|${configure.cflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span><span class="cx"> reinplace -W ${worksrcpath}/admin "s|@FC@|${configure.fc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
</span></span></pre></div>
<a id="trunkdportssciencegqrxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gqrx/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/science/gqrx/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -23,13 +23,7 @@
</span><span class="cx"> # libstdc++ and libc++ runtimes; this patch is included with the
</span><span class="cx"> # devel from upstream.
</span><span class="cx">
</span><del>- # configure.cxx_stdlib works with MacPorts SVN trunk, not release;
- # do something else until both work.
-
- # if {[info exists configure.cxx_stdlib] && [string match libc++ ${configure.cxx_stdlib}]}
-
</del><span class="cx"> patchfiles-append patch-fix-real-imag.diff
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span></span></pre></div>
<a id="trunkdportsscienceroot5Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root5/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root5/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/science/root5/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -117,22 +117,8 @@
</span><span class="cx"> --enable-gdml \
</span><span class="cx"> --enable-builtin-freetype
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libc++"} {
</ins><span class="cx"> configure.args-delete --disable-c++11
</span><span class="cx"> configure.args-append --enable-c++11
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportstextexlivebinPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/tex/texlive-bin/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/tex/texlive-bin/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/tex/texlive-bin/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -198,10 +198,7 @@
</span><span class="cx"> OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
</span><span class="cx"> OBJCXX=${configure.objcxx}
</span><span class="cx">
</span><del>-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]
-} then {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> build.env-append OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx] -stdlib=${configure.cxx_stdlib}"
</span><span class="cx"> } else {
</span><span class="cx"> build.env-append OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx]"
</span></span></pre></div>
<a id="trunkdportstextprocbibleditPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/bibledit/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/bibledit/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/bibledit/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -37,22 +37,8 @@
</span><span class="cx"> distname ${name}-gtk-${version}
</span><span class="cx"> worksrcdir ${name}-gtk-${version}
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportstextprocdoxygenPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/doxygen/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/doxygen/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/doxygen/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -73,9 +73,8 @@
</span><span class="cx"> delete ${worksrcpath}/src/vhdlparser.h
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportstextproclibebmlPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/libebml/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/libebml/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/libebml/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -37,9 +37,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportstextproclibxlPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/libxl/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/libxl/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/libxl/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -31,9 +31,7 @@
</span><span class="cx"> configure.universal_archs i386 x86_64
</span><span class="cx">
</span><span class="cx"> # The pre-compiled library is linked with libstdc++.
</span><del>-if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib libstdc++
-}
</del><ins>+configure.cxx_stdlib libstdc++
</ins><span class="cx">
</span><span class="cx"> set libxl lib/libxl.dylib
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportstextprocopenjadePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/openjade/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/openjade/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/openjade/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -46,10 +46,9 @@
</span><span class="cx"> # Fix build failure on Tiger due to use of -isystem
</span><span class="cx"> compiler.blacklist gcc-4.0 gcc-3.3
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
- set cxx_stdlibflags "-stdlib=${configure.cxx_stdlib}"
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
+ set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure.env-append LIBS="-L${prefix}/lib"
</span></span></pre></div>
<a id="trunkdportstextprocsdcvPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/sdcv/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/sdcv/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/textproc/sdcv/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -32,22 +32,8 @@
</span><span class="cx"> port:readline \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> # C++11 is required.
</span><span class="cx"> # https://sourceforge.net/p/sdcv/bugs/7/
</span><span class="cx"> configure.compiler macports-gcc-4.8
</span></span></pre></div>
<a id="trunkdportswwwmidoriPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/midori/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/midori/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/midori/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -46,22 +46,8 @@
</span><span class="cx"> # Needs zeitgeist-1.0, but we have zeitgeist-2.0 ... check a later version
</span><span class="cx"> configure.args-append --disable-zeitgeist
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportswwwuzblPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/uzbl/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/uzbl/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/uzbl/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -45,22 +45,8 @@
</span><span class="cx">
</span><span class="cx"> eval destroot.args ${build.args}
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportswwwwebkitgtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/webkit-gtk/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -89,23 +89,9 @@
</span><span class="cx"> --enable-webgl \
</span><span class="cx"> --disable-jit
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><span class="cx"> pre-configure {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> ui_error "${subport} is not supported for this installation of MacPorts. It requires libc++ be selected as your C++ runtime. Please use ${subport}-2.0 instead"
</span><span class="cx"> error "unsupported configuration"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportswwwwebkitgtk20Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk-2.0/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-2.0/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/webkit-gtk-2.0/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -82,23 +82,9 @@
</span><span class="cx"> --enable-geolocation \
</span><span class="cx"> --enable-webgl
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><span class="cx"> pre-configure {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libc++"} {
</ins><span class="cx"> ui_error "${name} is provided for configurations that are unable to use webkit-gtk. Since you are on Mavericks or later (or have configured MacPorts to use libc++), please use webkit-gtk or webkit-gtk-devel instead."
</span><span class="cx"> error "unsupported configuration"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportswwwwebkitgtkdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk-devel/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-devel/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/www/webkit-gtk-devel/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -89,23 +89,9 @@
</span><span class="cx"> --enable-webgl \
</span><span class="cx"> --disable-jit
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><span class="cx"> pre-configure {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] &&
- ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
- }
-
- if {${cxxstdlib} eq "libstdc++"} {
</del><ins>+ if {${configure.cxx_stdlib} eq "libstdc++"} {
</ins><span class="cx"> ui_error "${subport} is not supported for this installation of MacPorts. It requires libc++ be selected as your C++ runtime. Please use ${subport}-2.0 instead"
</span><span class="cx"> error "unsupported configuration"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsx11mesaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/mesa/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mesa/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/x11/mesa/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -62,9 +62,8 @@
</span><span class="cx"> configure.cppflags-append -I${filespath}/include
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
</del><span class="cx"> set cxx_stdlibflags {}
</span><del>-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11rxvtunicodePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/rxvt-unicode/Portfile (121268 => 121269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/rxvt-unicode/Portfile 2014-06-21 20:16:21 UTC (rev 121268)
+++ trunk/dports/x11/rxvt-unicode/Portfile 2014-06-21 20:18:42 UTC (rev 121269)
</span><span class="lines">@@ -54,8 +54,7 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-Makefile.in.diff
</span><span class="cx">
</span><del>-# TODO: Simplify once MacPorts 2.3 is released
-if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
</del><ins>+if {[string match *clang* ${configure.cxx}]} {
</ins><span class="cx"> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>