<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/c003ddd417120e46a6a19c1790f3dad538c07357">https://github.com/macports/macports-ports/commit/c003ddd417120e46a6a19c1790f3dad538c07357</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 c003ddd4171 root6: Make jupyter support optional
</span>c003ddd4171 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c003ddd417120e46a6a19c1790f3dad538c07357
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Sep 20 15:01:05 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: Make jupyter support optional
</span>---
science/root6/Portfile | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 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 a90b15837b2..f46c022ed44 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.1
</span> # Please also check if Gate needs a revbump after root6 update
github.setup root-project root 6-26-06 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}
# Use git commit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -428,6 +428,8 @@ if {${default_python_variant} != ""} {
</span> default_variants-append "${default_python_variant}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant jupyter description {Enable Jupyter support} { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # If a python variant is enabled, activate it
set active_python_version ""
foreach py_ver ${python_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,9 +463,11 @@ foreach py_ver ${python_versions} {
</span> }
depends_lib-append port:python${py_ver_no_dot} \
port:py${py_ver_no_dot}-numpy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${py_ver_no_dot}-jupyter \
</span> port:py${py_ver_no_dot}-gnureadline \
port:py${py_ver_no_dot}-metakernel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset jupyter ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${py_ver_no_dot}-jupyter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-destroot {
# Install PyROOT in the correct place
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,13 +510,14 @@ foreach py_ver ${python_versions} {
</span> system "install_name_tool -add_rpath ${install_prefix}/lib/root ${f} > /dev/null 2>&1 ; true"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch the command ROOT assumes to run for juypter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><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:#ffe0e0;'>- reinplace "s|\"jupyter\"|\"jupyter-${active_python_version}\"|g" $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset jupyter ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch the command ROOT assumes to run for jupyter
</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:#ffe0e0;'>-
</span> }
}
</pre><pre style='margin:0'>
</pre>