<!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>[117901] trunk/dports/science/root/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="https://trac.macports.org/changeset/117901">117901</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-03-16 13:13:10 -0700 (Sun, 16 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>root: Update to 5.34.18, clean up Clang variants (maintainer, #42867).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencerootPortfile">trunk/dports/science/root/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencerootPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root/Portfile (117900 => 117901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root/Portfile 2014-03-16 20:01:41 UTC (rev 117900)
+++ trunk/dports/science/root/Portfile 2014-03-16 20:13:10 UTC (rev 117901)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name root
</span><del>-version 5.34.17
</del><ins>+version 5.34.18
</ins><span class="cx">
</span><span class="cx"> categories science
</span><span class="cx"> maintainers gmail.com:mattiafrancescomoro hep.phy.cam.ac.uk:jonesc
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> master_sites http://root.cern.ch/download/ \
</span><span class="cx"> ftp://root.cern.ch/root/
</span><span class="cx">
</span><del>-checksums rmd160 0770aeb370699162c0f02c561060ee5388dd5ddb \
- sha256 8e7e13d41e13b6837a3bc784f86e491bed2ee37c157a3be8c74ead9b33c2be8a
</del><ins>+checksums rmd160 2fbaff8f831611779b42480fcb86cbde34ef72bd \
+ sha256 9196dce7d76b31e5bcabd985bd31bc4d9b7c8c4d0c7ce84f730efa4ef82a3567
</ins><span class="cx">
</span><span class="cx"> worksrcdir root
</span><span class="cx">
</span><span class="lines">@@ -389,8 +389,8 @@
</span><span class="cx"> variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
</span><span class="cx"> # Force a compatible clang compiler
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><del>- compiler.blacklist-append {clang < 425} *gcc* macports-clang-3.3 macports-clang-2.9 macports-clang-3.0
- compiler.fallback-append macports-clang-3.2 macports-clang-3.1
</del><ins>+ compiler.blacklist-append {clang < 425} *gcc* {macports-clang-3.[0-2]} macports-clang-2.9
+ compiler.fallback-append macports-clang-3.4 macports-clang-3.3
</ins><span class="cx"> # Enable cocoa support in configure
</span><span class="cx"> configure.args-delete --disable-cocoa
</span><span class="cx"> configure.args-append --enable-cocoa
</span><span class="lines">@@ -410,34 +410,44 @@
</span><span class="cx"> default_variants-append ${default_gui_variant}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant clang31 conflicts clang32 clang33 description {Compile using MacPorts clang 3.1} {
- configure.compiler macports-clang-3.1
-}
-if {[string match macports-clang-3.1 ${configure.compiler}]} {
- configure.args-append --with-llvm-config="${prefix}/bin/llvm-config-mp-3.1"
- depends_run-append port:clang-3.1
-}
</del><ins>+# ========================================================================================
+# Setup various clang variants, to provide alternative C++ compilers that support cocoa
+# ========================================================================================
</ins><span class="cx">
</span><del>-variant clang32 conflicts clang31 clang33 description {Compile using MacPorts clang 3.2} {
- configure.compiler macports-clang-3.2
</del><ins>+# List of possible clang versions that work
+set clang_versions { 3.3 3.4 3.5 }
+
+# Define the available variants
+foreach ver ${clang_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
+ set variant_line {variant clang${ver_no_dot} description "Compile using MacPorts clang ${ver}"}
+ foreach over ${clang_versions} {
+ if { ${ver} == ${over} } { continue }
+ set over_no_dot [join [split ${over} "."] ""]
+ append variant_line " conflicts clang${over_no_dot}"
+ }
+ append variant_line { { } }
+ eval $variant_line
</ins><span class="cx"> }
</span><del>-if {[string match macports-clang-3.2 ${configure.compiler}]} {
- configure.args-append --with-llvm-config="${prefix}/bin/llvm-config-mp-3.2"
- depends_run-append port:clang-3.2
-}
</del><span class="cx">
</span><del>-variant clang33 conflicts clang31 clang32 description {Compile using MacPorts clang 3.3} {
- configure.compiler macports-clang-3.3
</del><ins>+# Is a variant active ?
+set active_clang_variant ""
+foreach ver ${clang_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
+ if {[variant_isset clang${ver_no_dot}]} {
+ set active_clang_variant ${ver}
+ }
</ins><span class="cx"> }
</span><del>-if {[string match macports-clang-3.3 ${configure.compiler}]} {
- configure.args-append --with-llvm-config="${prefix}/bin/llvm-config-mp-3.3"
- depends_run-append port:clang-3.3
-}
</del><span class="cx">
</span><del>-if {[variant_isset qt_mac]} {
- PortGroup qt4 1.0
</del><ins>+# If so, set it up.
+if { ${active_clang_variant} != "" } {
+ configure.compiler macports-clang-${active_clang_variant}
+ configure.args-append --with-llvm-config="${prefix}/bin/llvm-config-mp-"${active_clang_variant}
+ depends_run-append port:clang-${active_clang_variant}
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+# ========================================================================================
+
</ins><span class="cx"> variant qt_mac description {Build with Qt support via Mac UI} {
</span><span class="cx"> post-patch {
</span><span class="cx"> # fix where "qglobal.h" is found in all files that use or reference it
</span><span class="lines">@@ -469,6 +479,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if {[variant_isset qt_mac]} {
+ PortGroup qt4 1.0
+}
+
</ins><span class="cx"> # ========================================================================================
</span><span class="cx"> # Following is for fortran support
</span><span class="cx"> # Might eventually move to a portgroup, or similar, so could be simplified.
</span></span></pre>
</div>
</div>
</body>
</html>