<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/c1008fe86759d98b9dcc2d48d7348009429b3071">https://github.com/macports/macports-ports/commit/c1008fe86759d98b9dcc2d48d7348009429b3071</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 c1008fe8675 root6: update to 6.22.00
</span>c1008fe8675 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c1008fe86759d98b9dcc2d48d7348009429b3071
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Jul 6 20:13:23 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: update to 6.22.00
</span>---
science/root6/Portfile | 32 +++++++++++++++-----------------
science/root6/files/root6 | 6 +++---
2 files changed, 18 insertions(+), 20 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 b75ee8a1708..08215e2e875 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;'>@@ -11,7 +11,7 @@ PortGroup xcodeversion 1.0
</span> PortGroup legacysupport 1.0
# Please also check if Gate needs a revbump after root6 update
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup root-project root 6-20-06 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup root-project root 6-22-00 v
</span> version [string map {- .} ${github.version}]
revision 0
livecheck.version ${github.version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,9 @@ livecheck.url ${github.homepage}/tags
</span> # Also, skip anything with trailing rcX etc.
livecheck.regex {v(6[-.]\d[02468][-.]\d{2}).tar.gz}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 07a402a6a0a440fdab717c9464c92ab8c88866b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ae49258e456747d5125f33b1f2894e74372cd3c5a98c200c474899b8d068e70c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 168231776
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1424255d508ac109a3cf3fabd8d3211917dbea1c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 131a5328dbe33933673a28464411ef7c4c02251168f9a35a33ff8c3a6b77a06d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 173033036
</span>
name root${version_major}
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,6 +83,7 @@ depends_lib-append port:expat \
</span> port:vdt \
port:tbb \
port:git \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xxhashlib \
</span> path:lib/libopenblas.dylib:OpenBLAS \
path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +100,7 @@ select.group root
</span> select.file ${filespath}/${name}
# port specific location
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set install_prefix ${prefix}/libexec/root${version_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set install_prefix ${prefix}/libexec/root${version_major}
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +131,7 @@ configure.args-append \
</span> -Droofit=OFF \
-Dssl=ON \
-Dxml=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dpython=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpyroot=OFF \
</span> -Dfitsio=OFF \
-Dgsl_shared=OFF \
-Dbuiltin_gsl=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,18 +162,17 @@ configure.args-append \
</span> -Dastiff=ON \
-Dgeocad=OFF \
-Dr=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Droot7=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Droot7=ON \
</span> -Dbuiltin_veccore=OFF \
-DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
-DPNG_PNG_INCLUDE_DIR=${prefix}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# clad cling plugin fails to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://root-forum.cern.ch/t/build-failure-with-6-16-00/32434
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -Dclad=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://root-forum.cern.ch/t/v6-22-00-build-error-on-macos/40239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -Druntime_cxxmodules=OFF
</span>
# Enable C++17 on 10.14 (Darwin18+)
# C++14 on 10.9 (Darwin13+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# C+=11 otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# C++11 otherwise
</span> if { ${os.major} >= 18 } {
compiler.cxx_standard 2017
configure.args-replace -Dcxx17=OFF -Dcxx17=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,6 +268,8 @@ 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:#e0ffe0;'>+ # fix libGLEW.dylib install location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${install_prefix}/lib/libGLEW.dylib ${destroot}${install_prefix}/lib/root/
</span> }
set run_port_select "No"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,10 +302,6 @@ variant native description {Build with best native support for local CPU capabil
</span> configure.fflags-append -O3 -mtune=native
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant root7 description {Enable ROOT7 preview} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Droot7=OFF -Droot7=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant qt4 description {Enable QT4 support} {
configure.args-replace -Dqt=OFF -Dqt=ON
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -380,7 +378,7 @@ variant tmva description {Build the TMVA package} {
</span> }
variant opengl description {Build with opengl support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dopengl=OFF -Dopengl=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dopengl=OFF -Dopengl=ON
</span> configure.args-replace -Dbuiltin_glew=OFF -Dbuiltin_glew=ON
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -444,7 +442,7 @@ foreach py_ver ${python_versions} {
</span>
# Setup python
set mypydir ${frameworks_dir}/Python.framework/Versions/${py_ver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Dpython=OFF -Dpython=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dpyroot=OFF -Dpyroot=ON
</span> configure.args-append -DPYTHON_INCLUDE_DIR="${mypydir}/Headers" \
-DPYTHON_EXECUTABLE="${mypydir}/bin/python${py_ver}"
# Explicitly set python library
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/files/root6 b/science/root6/files/root6
</span><span style='display:block; white-space:pre;color:#808080;'>index 3198189c118..169b3b0eacd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/files/root6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/files/root6
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,8 @@ libexec/root6/bin/rootprint
</span> libexec/root6/bin/rootrm
-
libexec/root6/share/man/man1/g2root.1.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/root6/share/man/man1/g2rootold.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/root6/share/man/man1/genmap.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -
-
libexec/root6/share/man/man1/h2root.1.gz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ libexec/root6/share/man/man1/rmkdepend.1.gz
</span> libexec/root6/share/man/man1/root-config.1.gz
-
libexec/root6/share/man/man1/root.exe.1.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/root6/share/man/man1/roota.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -
-
libexec/root6/share/man/man1/rootn.exe.1.gz
</pre><pre style='margin:0'>
</pre>