<!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>[69985] trunk/dports/aqua/qtpfsgui/Portfile</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="http://trac.macports.org/changeset/69985">69985</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2010-07-25 04:07:41 -0700 (Sun, 25 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>qtpfsgui: fix massively overcomplicated setting of CC/CXX</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqtpfsguiPortfile">trunk/dports/aqua/qtpfsgui/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqtpfsguiPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qtpfsgui/Portfile (69984 => 69985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qtpfsgui/Portfile 2010-07-25 09:34:28 UTC (rev 69984)
+++ trunk/dports/aqua/qtpfsgui/Portfile 2010-07-25 11:07:41 UTC (rev 69985)
</span><span class="lines">@@ -22,29 +22,10 @@
</span><span class="cx"> sha1 adf037c54f55be50d931fa484cca169c01d0384d \
</span><span class="cx"> rmd160 5188b2f1679d6788358067fe761d0c72c475bfe9
</span><span class="cx">
</span><del>-# This shouldn't be this hard. Taken from portconfigure.tcl because
-# I couldn't see any other way to set this.
-# Set pre-compiler filter to use (ccache/distcc), if any.
-if {[tbool configure.ccache] && [tbool configure.distcc]} {
- set filter "ccache "
- append_list_to_environment_value configure "CCACHE_PREFIX" "distcc"
-} elseif {[tbool configure.ccache]} {
- set filter "ccache "
-} elseif {[tbool configure.distcc]} {
- set filter "distcc "
-} else {
- set filter ""
-}
-
-# This also shouldn't be this hard. All I want to do is set QMAKE_CC to the
-# environment variable CC (and QMAKE_CXX to CXX) that are set in portconfigure.tcl.
-# However, I couldn't figure out how to get the environment variable here so
-# this is a kludge to replicate what's done in portconfigure.tcl. It should
-# be fixed as soon as possible.
-configure.pre_args PREFIX=${prefix}
</del><ins>+configure.pre_args PREFIX="${prefix}"
</ins><span class="cx"> configure.args APPLICATIONS_DIR="${applications_dir}" \
</span><del>- DOCDIR=${prefix}/share/doc/${name} \
- QMAKE_CC="${filter}gcc" \
- QMAKE_CXX="${filter}g++"
</del><ins>+ DOCDIR="${prefix}/share/doc/${name}" \
+ QMAKE_CC="\${CC}" \
+ QMAKE_CXX="\${CXX}"
</ins><span class="cx"> configure.cmd "LOCALSOFT=${prefix} ${prefix}/libexec/qt4-mac/bin/qmake"
</span><span class="cx"> destroot.destdir INSTALL_ROOT=${destroot}
</span></span></pre>
</div>
</div>
</body>
</html>