<!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>[126714] trunk/dports/science/root6</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/126714">126714</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-10-14 05:19:48 -0700 (Tue, 14 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>root6: upgrade to 6.02.00 + patches (#45265)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot6Portfile">trunk/dports/science/root6/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot6filespatchcmakemodulesSearchInstalledSoftwarecmakediff">trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff</a></li>
<li><a href="#trunkdportsscienceroot6filespatchmontecarlovmcincTMCtlshdiff">trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceroot6Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root6/Portfile (126713 => 126714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/Portfile 2014-10-14 12:16:18 UTC (rev 126713)
+++ trunk/dports/science/root6/Portfile 2014-10-14 12:19:48 UTC (rev 126714)
</span><span class="lines">@@ -9,17 +9,19 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><del>-
</del><span class="cx"> # don't forget to update both the git tag and the version
</span><del>-github.setup root-mirror root 6-00-02 v
-version 6.00.02
-revision 2
</del><ins>+#github.setup root-mirror root 6-02-00 v
+# tag below is 6.02/00 + a few minor fixes for installation issues.
+github.setup root-mirror root f460f42728305617c4978ced32bd030b1b4279e0
+version 6.02.00
+
</ins><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><del>-checksums rmd160 5efc28e5d68aaa4274d869c809c4d052d6011fe4 \
- sha256 6e6fa7fbe0fe72828a6a65f758af9e1fcb04b66dec7fae79ecbe06e81692b218
</del><span class="cx">
</span><ins>+checksums rmd160 46c38ab178b114794b2f53cfdd59b41e53470223 \
+ sha256 cfa9d3daadb05ff527d75ec5959bb1ca3d0ea2f200a09ec1959dc0ef9dba2389
+
</ins><span class="cx"> name root${version_major}
</span><span class="cx"> categories science
</span><span class="cx"> maintainers hep.phy.cam.ac.uk:jonesc mojca
</span><span class="lines">@@ -60,8 +62,6 @@
</span><span class="cx"> select.group root
</span><span class="cx"> select.file ${filespath}/${name}
</span><span class="cx">
</span><del>-patchfiles patch-cmake-modules-SearchInstalledSoftware.cmake.diff
-
</del><span class="cx"> # Force a compatible compiler
</span><span class="cx"> compiler.blacklist-append *gcc* {clang < 500} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2
</span><span class="cx"> compiler.fallback-append macports-clang-3.4 macports-clang-3.5
</span><span class="lines">@@ -125,17 +125,14 @@
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="cx">
</span><del>- if {${os.major} < 10} {
</del><ins>+ # No longer compiles on OSX10.6, due to update to internal LLVM version.
+ # Disable build on this platform.
+ if { ${os.major} < 11 } {
</ins><span class="cx"> pre-fetch {
</span><del>- ui_error "${name} requires C++11 and modifications of the package."
- return -code error "C++11 needed"
</del><ins>+ ui_error "${name} is not supported on this OSX release."
+ return -code error "Unsupported OSX version"
</ins><span class="cx"> }
</span><del>- } elseif {${os.major} == 10} {
- # an ugly workaround for lack of __thread on 10.6 (and earlier)
- # it has to be patched properly upstream
- # https://sft.its.cern.ch/jira/browse/ROOT-6394
- patchfiles-append patch-montecarlo-vmc-inc-TMCtls.h.diff
- }
</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">@@ -331,7 +328,7 @@
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><span class="cx"> # List of possible python versions
</span><del>-set python_versions { 2.6 2.7 3.1 3.2 3.3 3.4 }
</del><ins>+set python_versions { 2.6 2.7 3.3 3.4 }
</ins><span class="cx"> set default_python_variant +python27
</span><span class="cx">
</span><span class="cx"> # Define the available variants
</span><span class="lines">@@ -567,7 +564,7 @@
</span><span class="cx"> # Note that g95 does not work here, so that variant is removed
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><del>-set gcc_versions { 4.7 4.8 4.9 }
</del><ins>+set gcc_versions { 4.7 4.8 4.9 5 }
</ins><span class="cx"> set default_fortran_variant +gcc48
</span><span class="cx">
</span><span class="cx"> foreach gcc_ver ${gcc_versions} {
</span></span></pre></div>
<a id="trunkdportsscienceroot6filespatchcmakemodulesSearchInstalledSoftwarecmakediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff (126713 => 126714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff 2014-10-14 12:16:18 UTC (rev 126713)
+++ trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff 2014-10-14 12:19:48 UTC (rev 126714)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>---- cmake/modules/SearchInstalledSoftware.cmake.orig
-+++ cmake/modules/SearchInstalledSoftware.cmake
-@@ -592,6 +592,8 @@ if(builtin_xrootd)
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_CXX_FLAGS=${__cxxflags}
-+ -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
-+ -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
- )
- # We cannot call find_package(XROOTD) becuase the package is not yet built. So, we need to emulate what it defines....
- set(_LIBDIR_DEFAULT "lib")
-@@ -644,6 +646,8 @@ if(cling)
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
- -DLLVM_NOCLING=ON
-+ -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
-+ -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
- INSTALL_COMMAND ${CMAKE_COMMAND} -P <BINARY_DIR>/cmake_install.cmake
- LOG_INSTALL 1
- )
-@@ -724,6 +728,8 @@ if(cling)
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-+ -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
-+ -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
- INSTALL_COMMAND ${CMAKE_COMMAND} -P <BINARY_DIR>/cmake_install.cmake
- LOG_INSTALL 1
- )
</del></span></pre></div>
<a id="trunkdportsscienceroot6filespatchmontecarlovmcincTMCtlshdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff (126713 => 126714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff 2014-10-14 12:16:18 UTC (rev 126713)
+++ trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff 2014-10-14 12:19:48 UTC (rev 126714)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-https://sft.its.cern.ch/jira/browse/ROOT-6394
-
---- montecarlo/vmc/inc/TMCtls.h.orig
-+++ montecarlo/vmc/inc/TMCtls.h
-@@ -49,8 +49,8 @@
- ( defined(__MACH__) && defined(__GNUC__) && __GNUC__>=4 && __GNUC_MINOR__>=7 ) || \
- defined(__linux__) || defined(_AIX) ) && ( !defined(__CINT__) )
- // Multi-threaded build: for POSIX systems
-- #include <pthread.h>
-- #define TMCThreadLocal __thread
-+// #include <pthread.h>
-+ #define TMCThreadLocal
- #else
- //# error "No Thread Local Storage (TLS) technology supported for this platform. Use sequential build !"
- #define TMCThreadLocal
</del></span></pre>
</div>
</div>
</body>
</html>