<!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>[121689] 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/121689">121689</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-07-04 02:50:09 -0700 (Fri, 04 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>root6: fix broken python support (#44230)</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 (121688 => 121689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/Portfile 2014-07-04 08:44:51 UTC (rev 121688)
+++ trunk/dports/science/root6/Portfile 2014-07-04 09:50:09 UTC (rev 121689)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> # don't forget to update both the git tag and the version
</span><span class="cx"> github.setup root-mirror root 6-00-02 v
</span><span class="cx"> version 6.00.02
</span><ins>+revision 1
</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><span class="lines">@@ -316,18 +317,18 @@
</span><span class="cx"> set default_python_variant +python27
</span><span class="cx">
</span><span class="cx"> # Define the available variants
</span><del>-foreach ver ${python_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
- set variant_line {variant python${ver_no_dot} description "Build with python ${ver} support"}
- foreach over ${python_versions} {
- if { ${ver} == ${over} } { continue }
- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts python${over_no_dot}"
</del><ins>+foreach py_ver ${python_versions} {
+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
+ set variant_line {variant python${py_ver_no_dot} description "Build with python ${py_ver} support"}
+ foreach py_over ${python_versions} {
+ if { ${py_ver} == ${py_over} } { continue }
+ set py_over_no_dot [join [split ${py_over} "."] ""]
+ append variant_line " conflicts python${py_over_no_dot}"
</ins><span class="cx"> }
</span><span class="cx"> append variant_line { { } }
</span><span class="cx"> eval $variant_line
</span><del>- if {[variant_isset python${ver_no_dot}]} {
- if {${default_python_variant} != "+python${ver_no_dot}"} {
</del><ins>+ if {[variant_isset python${py_ver_no_dot}]} {
+ if {${default_python_variant} != "+python${py_ver_no_dot}"} {
</ins><span class="cx"> set default_python_variant ""
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -338,28 +339,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # If a python variant is enabled, activate it
</span><del>-foreach ver ${python_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
- if {[variant_isset python${ver_no_dot}]} {
</del><ins>+set active_python_version ""
+foreach py_ver ${python_versions} {
+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
+ if {[variant_isset python${py_ver_no_dot}]} {
</ins><span class="cx">
</span><span class="cx"> # Check root5 variants
</span><span class="cx"> set portname root5
</span><del>- if {![catch {set result [active_variants ${portname} python${ver_no_dot}]}]} {
</del><ins>+ if {![catch {set result [active_variants ${portname} python${py_ver_no_dot}]}]} {
</ins><span class="cx"> if {$result} {
</span><del>- ui_error "Cannot install ${name} with +python${ver_no_dot} variant"
- return -code error "${portname} port is already installed with +python${ver_no_dot} and both cannot be active at once. Pick a different python variant."
</del><ins>+ ui_error "Cannot install ${name} with +python${py_ver_no_dot} variant"
+ return -code error "${portname} port is already installed with +python${py_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">
</span><span class="cx"> # Setup python
</span><del>- set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${ver}
</del><ins>+ set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${py_ver}
</ins><span class="cx"> configure.args-replace -Dpython=OFF -Dpython=ON
</span><span class="cx"> configure.args-append -DPYTHON_INCLUDE_DIR="${mypydir}/Headers" \
</span><del>- -DPYTHON_LIBRARY="${prefix}/lib/libpython${ver}.dylib" \
- -DPYTHON_EXECUTABLE="${prefix}/bin/python${ver}"
- depends_lib-append port:python${ver_no_dot}
</del><ins>+ -DPYTHON_LIBRARY="${prefix}/lib/libpython${py_ver}.dylib" \
+ -DPYTHON_EXECUTABLE="${prefix}/bin/python${py_ver}"
+ depends_lib-append port:python${py_ver_no_dot}
+ set active_python_version ${py_ver}
</ins><span class="cx"> post-destroot {
</span><del>- set mypylibdir ${prefix}/Library/Frameworks/Python.framework/Versions/${ver}/lib/python${ver}
</del><ins>+ set mypylibdir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_version}/lib/python${active_python_version}
</ins><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="lines">@@ -488,13 +491,13 @@
</span><span class="cx"> set clang_versions { 3.3 3.4 3.5 }
</span><span class="cx">
</span><span class="cx"> # Define the available variants
</span><del>-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}"
</del><ins>+foreach clang_ver ${clang_versions} {
+ set clang_ver_no_dot [join [split ${clang_ver} "."] ""]
+ set variant_line {variant clang${clang_ver_no_dot} description "Compile using MacPorts clang ${clang_ver}"}
+ foreach clang_over ${clang_versions} {
+ if { ${clang_ver} == ${clang_over} } { continue }
+ set clang_over_no_dot [join [split ${clang_over} "."] ""]
+ append variant_line " conflicts clang${clang_over_no_dot}"
</ins><span class="cx"> }
</span><span class="cx"> append variant_line { { } }
</span><span class="cx"> eval $variant_line
</span><span class="lines">@@ -514,10 +517,10 @@
</span><span class="cx">
</span><span class="cx"> # Is a variant active ?
</span><span class="cx"> set active_clang_variant ""
</span><del>-foreach ver ${clang_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
- if {[variant_isset clang${ver_no_dot}]} {
- set active_clang_variant ${ver}
</del><ins>+foreach clang_ver ${clang_versions} {
+ set clang_ver_no_dot [join [split ${clang_ver} "."] ""]
+ if {[variant_isset clang${clang_ver_no_dot}]} {
+ set active_clang_variant ${clang_ver}
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -539,25 +542,25 @@
</span><span class="cx"> set gcc_versions { 4.7 4.8 4.9 }
</span><span class="cx"> set default_fortran_variant +gcc48
</span><span class="cx">
</span><del>-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
</del><ins>+foreach gcc_ver ${gcc_versions} {
+ set gcc_ver_no_dot [join [split ${gcc_ver} "."] ""]
</ins><span class="cx">
</span><del>- set variant_line {variant gcc${ver_no_dot} description "Build with gfortran from gcc${ver_no_dot}"}
</del><ins>+ set variant_line {variant gcc${gcc_ver_no_dot} description "Build with gfortran from gcc${gcc_ver_no_dot}"}
</ins><span class="cx">
</span><del>- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
</del><ins>+ foreach gcc_over ${gcc_versions} {
+ if {${gcc_ver} == ${gcc_over}} {
</ins><span class="cx"> continue
</span><span class="cx"> }
</span><ins>+ set gcc_over_no_dot [join [split ${gcc_over} "."] ""]
+ append variant_line " conflicts gcc${gcc_over_no_dot}"
+ }
</ins><span class="cx">
</span><del>- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
- }
</del><span class="cx"> append variant_line { {} }
</span><span class="cx">
</span><span class="cx"> eval $variant_line
</span><span class="cx">
</span><del>- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
</del><ins>+ if {[variant_isset gcc${gcc_ver_no_dot}]} {
+ if {${default_fortran_variant} != "+gcc${gcc_ver_no_dot}"} {
</ins><span class="cx"> set default_fortran_variant ""
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -567,16 +570,16 @@
</span><span class="cx"> default_variants-append "${default_fortran_variant}"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
</del><ins>+foreach gcc_ver ${gcc_versions} {
+ set gcc_ver_no_dot [join [split ${gcc_ver} "."] ""]
</ins><span class="cx">
</span><del>- if {[variant_isset gcc${ver_no_dot}]} {
</del><ins>+ if {[variant_isset gcc${gcc_ver_no_dot}]} {
</ins><span class="cx"> depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><del>- depends_build-append port:gcc${ver_no_dot}
</del><ins>+ depends_build-append port:gcc${gcc_ver_no_dot}
</ins><span class="cx">
</span><del>- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver}
</del><ins>+ configure.fc ${prefix}/bin/gfortran-mp-${gcc_ver}
+ configure.f77 ${prefix}/bin/gfortran-mp-${gcc_ver}
+ configure.f90 ${prefix}/bin/gfortran-mp-${gcc_ver}
</ins><span class="cx">
</span><span class="cx"> configure.args-replace -Dfortran=OFF -Dfortran=ON
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>