<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/7531e2cab21fa6caca058c5637e763a4c4b83912">https://github.com/macports/macports-ports/commit/7531e2cab21fa6caca058c5637e763a4c4b83912</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 7531e2c root6: Remove redundant lines
</span>7531e2c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7531e2cab21fa6caca058c5637e763a4c4b83912
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Apr 15 13:06:44 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: Remove redundant lines
</span>---
science/root6/Portfile | 37 -------------------------------------
1 file changed, 37 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 cc5d399..126a2ce 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;'>@@ -188,16 +188,6 @@ if { ${os.major} <= 12 && ${configure.cxx_stdlib} ne "libc++" } {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # Note that we are forcing this choice. This means that anything linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # against root6 needs to also be using libc++. This is possibly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # problematic, but luckily there is just a limited set of such dependents.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # Another problem is that all dependencies might need to be built-in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # to make sure that they all use libc++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if { ${configure.cxx_stdlib} ne "libc++" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.cxx_stdlib libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_lib-append port:libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span>
# Configure the C++ runtime to use
if { ${configure.cxx_stdlib} ne "libc++" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,9 +265,6 @@ post-destroot {
</span> # uncoment some settings
reinplace "s|#\*\.\*\.Root\.TTFontPath|\*\.\*\.Root\.TTFontPath|g" ${rootsystemrcfile}
reinplace "s|#Unix\.\*\.Gui.IconPath|Unix\.\*\.Gui\.IconPath|g" ${rootsystemrcfile}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Workaround for https://trac.macports.org/ticket/57007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #delete ${destroot}${install_prefix}/include/root/RConfig.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ln -s ${install_prefix}/include/root/ROOT/RConfig.h ${destroot}${install_prefix}/include/root/RConfig.h
</span> }
set run_port_select "No"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -368,8 +355,6 @@ variant fftw3 description {Build with fftw3 support} {
</span> }
variant gsl description {Build with gsl support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Builtin GSL library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #configure.args-replace -Dbuiltin_gsl=OFF -Dbuiltin_gsl=ON
</span> # External GSL library
configure.args-replace -Dgsl_shared=OFF -Dgsl_shared=ON
configure.args-append -DGSL_CONFIG_EXECUTABLE="${prefix}/bin/gsl-config"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -496,9 +481,6 @@ foreach py_ver ${python_versions} {
</span> 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;'>- #foreach f [ exec find ${destroot}${install_prefix}/bin -type f | xargs grep -Il ${pystringtoreplace} ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #}
</span> # Support for juypter
ln -s ${install_prefix}/lib/root/JupyROOT ${destroot}${mypysitedir}/
ln -s ${install_prefix}/lib/root/JsMVA ${destroot}${mypysitedir}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -739,22 +721,3 @@ foreach gcc_ver ${gcc_versions} {
</span>
# ========================================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Various variants etc. with problems. Work in progress...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant ruby description {Build with ruby support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-replace -Druby=OFF -Druby=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_lib-append port:ruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant geocad description {Enable CAD Interface} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-replace -Dgeocad=OFF -Dgeocad=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_lib-append port:oce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append -DOCC_INCLUDE_DIR="${prefix}/include/oce"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant r description {Enable R support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-replace -Dr=OFF -Dr=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_lib-append port:R
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>