<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/5bfd31a01b0292e9f2b9422122f10c473d076b18">https://github.com/macports/macports-ports/commit/5bfd31a01b0292e9f2b9422122f10c473d076b18</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 5bfd31a ROOT6: Patch root to use correct jupyter command based on active python version
</span>5bfd31a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5bfd31a01b0292e9f2b9422122f10c473d076b18
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Sep 6 12:18:17 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> ROOT6: Patch root to use correct jupyter command based on active python version
</span>---
science/root6/Portfile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
<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 3d3ef25..6a6a186 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;'>@@ -12,7 +12,7 @@ PortGroup xcodeversion 1.0
</span> # don't forget to update both the git tag and the version
github.setup root-project root 6-10-04 v
version [string map {- .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> livecheck.version ${github.version}
# github.setup root-mirror root <sha>
# version 6.10.00
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,6 +450,12 @@ foreach py_ver ${python_versions} {
</span> ln -s ${install_prefix}/lib/root/libJupyROOT.so ${destroot}${mypysitedir}/
ln -s ${install_prefix}/lib/root/libJupyROOT.so ${destroot}${mypylibdir}/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch the command ROOT assumes to run for juypter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [ exec find ${worksrcpath} -type f -and -name "nbmain.cxx" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\"jupyter\"|\"jupyter-${active_python_version}\"|g" $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
}
}
</pre><pre style='margin:0'>
</pre>