<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/989660557451a6ec8232e7f486832358fa25e47a">https://github.com/macports/macports-ports/commit/989660557451a6ec8232e7f486832358fa25e47a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 98966055745 root6: fix PyRoot support
</span>98966055745 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 989660557451a6ec8232e7f486832358fa25e47a
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Jul 7 22:14:23 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: fix PyRoot support
</span>---
science/root6/Portfile | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/Portfile b/science/root6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08215e2e875..cf85fe41e8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ PortGroup legacysupport 1.0
</span> # Please also check if Gate needs a revbump after root6 update
github.setup root-project root 6-22-00 v
version [string map {- .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> livecheck.version ${github.version}
# Use git commit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -464,27 +464,29 @@ foreach py_ver ${python_versions} {
</span> file mkdir ${destroot}${mypysitedir}
# Move X.py files to site-packages
foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # link PyROOT files to site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix PyROOT....
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_dash [join [split ${py_ver} "."] "_"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [ exec find ${destroot}${install_prefix}/lib/root/ -name "libcppyy*${py_ver_dash}*" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fname [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fname_nover [string map "${py_ver_dash}. ." ${fname}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${fname} ${destroot}${install_prefix}/lib/root/${fname_nover}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> # See also https://trac.macports.org/ticket/58942
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [ exec find ${destroot}${install_prefix}/lib/root -name "*PyROOT*" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fname [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -sf ${install_prefix}/lib/root/${fname} ${destroot}${mypylibdir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -sf ${install_prefix}/lib/root/${fname} ${destroot}${mypysitedir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach fname { cppyy cppyy_backend JsMVA JupyROOT ROOT } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${install_prefix}/lib/root/${fname} ${destroot}${mypysitedir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach fname [ glob -tails -directory ${destroot}${install_prefix}/lib/root/ lib* ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${install_prefix}/lib/root/${fname} ${destroot}${mypysitedir}/
</span> }
# Fix python version in scripts
set pystringtoreplace "/usr/bin/python"
foreach f [ exec find ${destroot}${install_prefix} -type f -and -name "*.py" ] {
reinplace -q "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Support for juypter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${install_prefix}/lib/root/JupyROOT ${destroot}${mypysitedir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${install_prefix}/lib/root/JsMVA ${destroot}${mypysitedir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${install_prefix}/lib/root/libJupyROOT.so ${destroot}${mypysitedir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${install_prefix}/lib/root/libJupyROOT.so ${destroot}${mypylibdir}/
</span> }
# patch the command ROOT assumes to run for juypter
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [ exec find ${worksrcpath} -type f -and -name "nbmain.cxx" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [ exec find ${worksrcpath}/ -type f -and -name "nbmain.cxx" ] {
</span> reinplace "s|\"jupyter\"|\"jupyter-${active_python_version}\"|g" $f
}
}
</pre><pre style='margin:0'>
</pre>