<!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>[118691] users/mojca/ports</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/118691">118691</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-04-07 23:15:50 -0700 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mojca/root: add root-config to port select, minor changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersmojcaportsscienceroot5Portfile">users/mojca/ports/science/root5/Portfile</a></li>
<li><a href="#usersmojcaportsscienceroot5filesroot5">users/mojca/ports/science/root5/files/root5</a></li>
<li><a href="#usersmojcaportsscienceroot6Portfile">users/mojca/ports/science/root6/Portfile</a></li>
<li><a href="#usersmojcaportsscienceroot6filesroot6">users/mojca/ports/science/root6/files/root6</a></li>
<li><a href="#usersmojcaportssysutilsroot_selectfilesbase">users/mojca/ports/sysutils/root_select/files/base</a></li>
<li><a href="#usersmojcaportssysutilsroot_selectfilesnone">users/mojca/ports/sysutils/root_select/files/none</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersmojcaportsscienceroot5Portfile"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/science/root5/Portfile (118690 => 118691)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/science/root5/Portfile 2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/science/root5/Portfile 2014-04-08 06:15:50 UTC (rev 118691)
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # port specific location. For 'port select'
</span><del>-set install_bindir "${prefix}/libexec/root${version_major}/bin"
-set install_mandir "${prefix}/libexec/root${version_major}/share/man"
</del><ins>+set install_bindir "libexec/root${version_major}/bin"
+set install_mandir "libexec/root${version_major}/share/man"
</ins><span class="cx">
</span><del>-configure.args --bindir=${install_bindir}\
</del><ins>+configure.args --bindir=${prefix}/${install_bindir}\
</ins><span class="cx"> --incdir=${prefix}/include/root${version_major}\
</span><span class="cx"> --docdir=${prefix}/share/doc/root${version_major}\
</span><span class="cx"> --libdir=${prefix}/lib/root${version_major} \
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> --tutdir=${prefix}/share/root${version_major}/tutorials \
</span><span class="cx"> --etcdir=${prefix}/etc/root${version_major} \
</span><span class="cx"> --datadir=${prefix}/share/root${version_major} \
</span><del>- --mandir=${install_mandir} \
</del><ins>+ --mandir=${prefix}/${install_mandir} \
</ins><span class="cx"> --disable-builtin-glew \
</span><span class="cx"> --disable-builtin-pcre \
</span><span class="cx"> --disable-builtin-zlib \
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- reinplace "s|lib/python/genreflex|lib/root5/python/genreflex|g" ${destroot}${install_bindir}/genreflex
</del><ins>+ reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${install_bindir}/genreflex
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant debug description {Enable a debug build} {
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> if {![catch {set result [active_variants root6 python${ver_no_dot}]}]} {
</span><span class="cx"> if {$result} {
</span><span class="cx"> ui_error "Cannot install ${name} with +python${ver_no_dot} variant"
</span><del>- return -code error "root5 port is already installed with +python${ver_no_dot} and both cannot be active at once. Pick a different python variant."
</del><ins>+ return -code error "root6 port is already installed with +python${ver_no_dot} and both cannot be active at once. Pick a different python variant."
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}
</span></span></pre></div>
<a id="usersmojcaportsscienceroot5filesroot5"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/science/root5/files/root5 (118690 => 118691)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/science/root5/files/root5 2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/science/root5/files/root5 2014-04-08 06:15:50 UTC (rev 118691)
</span><span class="lines">@@ -1 +1,2 @@
</span><span class="cx"> libexec/root5/bin/root
</span><ins>+libexec/root5/bin/root-config
</ins></span></pre></div>
<a id="usersmojcaportsscienceroot6Portfile"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/science/root6/Portfile (118690 => 118691)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/science/root6/Portfile 2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/science/root6/Portfile 2014-04-08 06:15:50 UTC (rev 118691)
</span><span class="lines">@@ -5,10 +5,10 @@
</span><span class="cx">
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx"> PortGroup cmake 1.0
</span><ins>+PortGroup compiler_blacklist_versions 1.0
</ins><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"> # TODO: try to figure out if one could also build root6 on < 10.9
</span><span class="cx"> # if {(${os.major} < 13 && ! [info exists configure.cxx_stdlib]) || (! [file exists /usr/lib/libc++.dylib])} {
</span><span class="cx"> if {${os.major} < 13 } {
</span><span class="lines">@@ -377,10 +377,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
</span><ins>+ # TODO: exact compiler fallback list
</ins><span class="cx"> # Force a compatible clang compiler
</span><del>- PortGroup compiler_blacklist_versions 1.0
- compiler.blacklist-append {clang < 425} *gcc* macports-clang-2.9
- compiler.fallback-append macports-clang-3.4 macports-clang-3.3 macports-clang-3.2 macports-clang-3.1 macports-clang-3.0
</del><ins>+ compiler.blacklist-append {clang < 425} 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-append -Dcocoa=ON
</span><span class="cx"> }
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> # ========================================================================================
</span><span class="cx">
</span><span class="cx"> # List of possible clang versions that work
</span><del>-set clang_versions { 3.0 3.1 3.2 3.3 3.4 3.5 }
</del><ins>+set clang_versions { 3.3 3.4 3.5 }
</ins><span class="cx">
</span><span class="cx"> # Define the available variants
</span><span class="cx"> foreach ver ${clang_versions} {
</span></span></pre></div>
<a id="usersmojcaportsscienceroot6filesroot6"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/science/root6/files/root6 (118690 => 118691)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/science/root6/files/root6 2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/science/root6/files/root6 2014-04-08 06:15:50 UTC (rev 118691)
</span><span class="lines">@@ -1 +1,2 @@
</span><span class="cx"> libexec/root6/bin/root
</span><ins>+libexec/root6/bin/root-config
</ins></span></pre></div>
<a id="usersmojcaportssysutilsroot_selectfilesbase"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/sysutils/root_select/files/base (118690 => 118691)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/sysutils/root_select/files/base 2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/sysutils/root_select/files/base 2014-04-08 06:15:50 UTC (rev 118691)
</span><span class="lines">@@ -1 +1,2 @@
</span><span class="cx"> bin/root
</span><ins>+bin/root-config
</ins></span></pre></div>
<a id="usersmojcaportssysutilsroot_selectfilesnone"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/sysutils/root_select/files/none (118690 => 118691)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/sysutils/root_select/files/none 2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/sysutils/root_select/files/none 2014-04-08 06:15:50 UTC (rev 118691)
</span><span class="lines">@@ -1 +1,2 @@
</span><span class="cx"> -
</span><ins>+-
</ins></span></pre>
</div>
</div>
</body>
</html>