<!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>[121142] 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/121142">121142</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-18 11:01:53 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>root6: preliminary patches for 10.6 (#44062)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot6Portfile">trunk/dports/science/root6/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot6filespatchcmakemodulesSearchInstalledSoftwarecmakediff">trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.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 (121141 => 121142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/Portfile        2014-06-18 17:42:17 UTC (rev 121141)
+++ trunk/dports/science/root6/Portfile        2014-06-18 18:01:53 UTC (rev 121142)
</span><span class="lines">@@ -58,6 +58,8 @@
</span><span class="cx"> select.group root
</span><span class="cx"> select.file ${filespath}/${name}
</span><span class="cx">
</span><ins>+patchfiles patch-cmake-modules-SearchInstalledSoftware.cmake.diff
+
</ins><span class="cx"> # Force a compatible compiler
</span><span class="cx"> # (macports-clang-3.3 works; it's blacklisted only to give the preference to 3.4)
</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 macports-clang-3.3
</span><span class="lines">@@ -416,14 +418,15 @@
</span><span class="cx">
</span><span class="cx"> variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
</span><span class="cx"> # Enable cocoa support in configure
</span><del>- configure.args-append -Dcocoa=ON
</del><ins>+ configure.args-append -Dcocoa=ON -Dx11=OFF
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant x11 conflicts cocoa description {Enables X11 graphical backend} {
</span><span class="cx"> # Dependencies on X11 ports
</span><span class="cx"> depends_lib-append port:xorg-libX11 port:mesa port:Xft2 port:xpm
</span><span class="cx"> # Disable cocoa
</span><del>- configure.args-append -Dcocoa=OFF
</del><ins>+ configure.args-append -Dcocoa=OFF -Dx11=ON
+ # TODO: configuration to find X11 libraries from MacPorts instead of external ones
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # If neither graphical variant is set, use default
</span><span class="lines">@@ -480,6 +483,14 @@
</span><span class="cx"> depends_run-append port:clang-${active_clang_variant}
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# TODO:
+# 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"> # ========================================================================================
</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>
<a id="trunkdportsscienceroot6filespatchcmakemodulesSearchInstalledSoftwarecmakediff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff (0 => 121142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff         (rev 0)
+++ trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff        2014-06-18 18:01:53 UTC (rev 121142)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+--- 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
+ )
</ins></span></pre>
</div>
</div>
</body>
</html>