<!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>[139082] trunk/dports/science/root6/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/139082">139082</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-07-31 06:07:18 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>root6: upgrade to version 6.04.02 (closes #48376)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot6Portfile">trunk/dports/science/root6/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceroot6Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root6/Portfile (139081 => 139082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/Portfile 2015-07-31 11:10:38 UTC (rev 139081)
+++ trunk/dports/science/root6/Portfile 2015-07-31 13:07:18 UTC (rev 139082)
</span><span class="lines">@@ -10,16 +10,16 @@
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><span class="cx"> # don't forget to update both the git tag and the version
</span><del>-#github.setup root-mirror root 9ab0642adeca5d3703783bdbfeebfca86ea22af9
-github.setup root-mirror root 6-04-00 v
-version 6.04.00
</del><ins>+github.setup root-mirror root b43f80bccfd6b67be37708c4a5a9386b7c850d29
+#github.setup root-mirror root 6-04-02 v
+version 6.04.02.99
</ins><span class="cx">
</span><span class="cx"> # this could be a better way to set the version (unless we use a sha sum for the git tag ;)
</span><span class="cx"> # version [string map {- .} $version]
</span><span class="cx"> set version_major [lindex [split ${version} .] 0]
</span><span class="cx">
</span><del>-checksums rmd160 41daa7cd2b04fd6a78bd60e626ad550383a87b05 \
- sha256 1fae9b33e18a613a90619b5c0a5c950e0897319db2f045d1414bd76628547a37
</del><ins>+checksums rmd160 d4025bb6e0fe4157a145de142fd2f40490c68ac4 \
+ sha256 9bf93ef6b52e3aaedbaf6c6b2aa78d6dba5c7ec9672d7d78fb173fbab7ac7b9a
</ins><span class="cx">
</span><span class="cx"> name root${version_major}
</span><span class="cx"> categories science
</span><span class="lines">@@ -60,7 +60,8 @@
</span><span class="cx"> compiler.blacklist-append *gcc* {clang < 500} \
</span><span class="cx"> macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 \
</span><span class="cx"> macports-clang-3.2 macports-clang-3.3
</span><del>-compiler.fallback-append macports-clang-3.6 macports-clang-3.5 macports-clang-3.4
</del><ins>+compiler.fallback-append macports-clang-3.7 macports-clang-3.6 macports-clang-3.5 \
+ macports-clang-3.4
</ins><span class="cx">
</span><span class="cx"> # port specific location
</span><span class="cx"> set install_prefix ${prefix}/libexec/root${version_major}
</span><span class="lines">@@ -102,7 +103,7 @@
</span><span class="cx"> -Dbonjour=OFF \
</span><span class="cx"> -Dgviz=OFF \
</span><span class="cx"> -Dsoversion=OFF \
</span><del>- -Dc++11=ON \
</del><ins>+ -Dcxx11=ON \
</ins><span class="cx"> -Dlibcxx=ON \
</span><span class="cx"> -Dxrootd=OFF \
</span><span class="cx"> -Dbuiltin_ftgl=ON \
</span><span class="lines">@@ -126,7 +127,7 @@
</span><span class="cx"> ui_error "${name} is not supported on this OSX release."
</span><span class="cx"> return -code error "Unsupported OSX version"
</span><span class="cx"> }
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> # Note that we are forcing this choice. This means that anything linking
</span><span class="cx"> # against root6 needs to also be using libc++. This is possibly
</span><span class="lines">@@ -138,15 +139,23 @@
</span><span class="cx"> depends_lib-append port:libcxx
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # replace
- # -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
- # -DCMAKE_OSX_DEPLOYMENT_TARGET="10.6"
- # with
- # -DCMAKE_OSX_SYSROOT="/"
- # -DCMAKE_OSX_DEPLOYMENT_TARGET=""
</del><span class="cx"> pre-configure {
</span><ins>+ # replace
+ # -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
+ # -DCMAKE_OSX_DEPLOYMENT_TARGET="10.6"
+ # with
+ # -DCMAKE_OSX_SYSROOT="/"
+ # -DCMAKE_OSX_DEPLOYMENT_TARGET=""
</ins><span class="cx"> configure.args-strsed "s|CMAKE_OSX_SYSROOT=\[^\[:blank:\]\]*|CMAKE_OSX_SYSROOT=\"/\"|"
</span><span class="cx"> configure.args-strsed "s|CMAKE_OSX_DEPLOYMENT_TARGET=\[^\[:blank:\]\]*|CMAKE_OSX_DEPLOYMENT_TARGET=\"\"|"
</span><ins>+
+ # Force use of system python in build scripts
+ # Find command finds text files containing the string to be replaced.
+ # shtest-encoding.py intentionally includes an unreadable character, so have to skip it ...
+ set pystringtoreplace "/usr/bin/env python"
+ foreach f [ exec find ${worksrcpath} -type f -and -not -name "shtest-encoding.py" -and -name "*.py" ] {
+ reinplace "s|${pystringtoreplace}|/usr/bin/python|g" $f
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -216,6 +225,10 @@
</span><span class="cx"> set default_gui_variant +x11
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant cxx14 description {Enable c++14 compiler support} {
+ configure.args-append -Dcxx14=ON
+}
+
</ins><span class="cx"> variant valgrind description {Build internal LLVM library with valgrind support} {
</span><span class="cx"> depends_lib-append port:valgrind
</span><span class="cx"> }
</span><span class="lines">@@ -376,11 +389,17 @@
</span><span class="cx"> depends_lib-append port:python${py_ver_no_dot}
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><ins>+ # Install PyROOT lib in the correct place
</ins><span class="cx"> set mypylibdir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_version}/lib/python${active_python_version}
</span><span class="cx"> set mypysitedir ${mypylibdir}/site-packages/
</span><span class="cx"> file mkdir ${destroot}${mypysitedir}
</span><span class="cx"> foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
</span><span class="cx"> ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
</span><ins>+ # Fix python version in scripts
+ set pystringtoreplace "/usr/bin/python"
+ foreach f [ exec find ${destroot}${install_prefix} -type f -and -name "*.py" ] {
+ reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -566,7 +585,7 @@
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><span class="cx"> set gcc_versions { 4.7 4.8 4.9 5 }
</span><del>-set default_fortran_variant +gcc48
</del><ins>+set default_fortran_variant +gcc5
</ins><span class="cx">
</span><span class="cx"> foreach gcc_ver ${gcc_versions} {
</span><span class="cx"> set gcc_ver_no_dot [join [split ${gcc_ver} "."] ""]
</span></span></pre>
</div>
</div>
</body>
</html>