<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/68f927856b9b295b78a40b3cd953e0f1032b779f">https://github.com/macports/macports-ports/commit/68f927856b9b295b78a40b3cd953e0f1032b779f</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 68f9278 root6: fix python import issue Closes: https://trac.macports.org/ticket/58942
</span>68f9278 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 68f927856b9b295b78a40b3cd953e0f1032b779f
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Sep 7 10:52:32 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: fix python import issue
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58942
</span>---
science/root6/Portfile | 11 +++++++++--
1 file changed, 9 insertions(+), 2 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 738f97d..441836c 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;'>@@ -14,7 +14,7 @@ PortGroup legacysupport 1.0
</span> # Please also check if Gate needs a revbump after root6 update
github.setup root-project root 6-18-02 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;'>@@ -461,7 +461,11 @@ foreach py_ver ${python_versions} {
</span> } elseif { [ file exists "${prefix}/lib/libpython${py_ver}.dylib" ] } {
configure.args-append -DPYTHON_LIBRARY="${prefix}/lib/libpython${py_ver}.dylib"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python${py_ver_no_dot} port:py${py_ver_no_dot}-numpy port:py${py_ver_no_dot}-jupyter port:py${py_ver_no_dot}-gnureadline port:py${py_ver_no_dot}-metakernel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${py_ver_no_dot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_no_dot}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_no_dot}-jupyter \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_no_dot}-gnureadline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_no_dot}-metakernel
</span>
post-destroot {
# Install PyROOT lib in the correct place
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -471,6 +475,9 @@ foreach py_ver ${python_versions} {
</span> foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypysitedir}/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/58942
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ${install_prefix}/lib/root/libPyROOT_rdict.pcm ${destroot}${mypylibdir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ${install_prefix}/lib/root/libPyROOT_rdict.pcm ${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" ] {
</pre><pre style='margin:0'>
</pre>