root6: update to 6.30.01

macports · Nov 13, 2023 · 54c9824 · 54c9824
1 parent cb27c14
commit 54c9824
Showing 1 changed file with 9 additions and 30 deletions.
diff --git a/science/root6/Portfile b/science/root6/Portfile
@@ -12,7 +12,7 @@ PortGroup           xcodeversion                  1.0
 PortGroup           legacysupport                 1.1
 
 # Please also check if Gate needs a revbump after root6 update
-github.setup        root-project root 6-28-08 v
+github.setup        root-project root 6-30-01 v
 version             [string map {- .} ${github.version}]
 revision            0
 livecheck.version   ${github.version}
@@ -24,9 +24,9 @@ livecheck.version   ${github.version}
 #livecheck.version   6-14-00
 #revision            0
 
-checksums           rmd160  b115f241a30e23dc2337622e30c15df291d75617 \
-                    sha256  55de31982af2c2226eddd111983b64e561c0796606e4aba37fe3793b8e9f962f \
-                    size    185356328
+checksums           rmd160  cac6a9436087c59268077e92a60295ae5499c686 \
+                    sha256  bdb05bffdb3b771510f90be672c579556f48514868d2663bc75c7f8e91285395 \
+                    size    184775280
 
 # extract major version
 set version_major   [lindex [split ${version} .] 0]
@@ -90,7 +90,7 @@ depends_lib-append  port:expat \
 depends_run-append  port:root_select
 
 cmake.out_of_source yes
-cmake.generator     Ninja
+#cmake.generator     Ninja
 
 # TODO: the file ${filespath}/${name} would have to be generated on the fly instead
 select.group        root
@@ -130,8 +130,6 @@ configure.args-append \
                     -Dxml=OFF \
                     -Dpyroot=OFF \
                     -Dfitsio=OFF \
-                    -Dgsl_shared=OFF \
-                    -Dbuiltin_gsl=OFF \
                     -Dpgsql=OFF \
                     -Ddcache=OFF \
                     -Dchirp=OFF \
@@ -143,9 +141,7 @@ configure.args-append \
                     -Dqtgsi=OFF \
                     -Dgviz=OFF \
                     -Dsoversion=ON \
-                    -Dcxx11=ON \
                     -Dcxx14=OFF \
-                    -Dcxx17=OFF \
                     -Dlibcxx=ON \
                     -Dxrootd=OFF \
                     -Dbuiltin_ftgl=ON \
@@ -170,17 +166,9 @@ configure.env-append \
 # https://root-forum.cern.ch/t/v6-22-00-build-error-on-macos/40239
 configure.args-append -Druntime_cxxmodules=OFF
 
-# Enable C++17 on 10.14 and newer (Darwin 18+)
-#        C++14 otherwise
-if {${os.platform} ne "darwin" || ${os.major} >= 18} {
-    compiler.cxx_standard 2017
-    configure.args-replace  -Dcxx17=OFF -Dcxx17=ON
-    configure.args-replace  -Droot7=OFF -Droot7=ON
-} else {
-    compiler.cxx_standard 2014
-    configure.args-replace  -Dcxx14=OFF -Dcxx14=ON
-}
-cmake.set_cxx_standard      yes
+# Enable C++17
+compiler.cxx_standard    2017
+cmake.set_cxx_standard   yes
 
 # Configure the C++ runtime to use
 if { ${configure.cxx_stdlib} ne "libc++" } {
@@ -312,7 +300,7 @@ post-activate {
 
 universal_variant no
 
-default_variants-append +xml +gsl +tmva +roofit +graphviz +opengl +davix
+default_variants-append +xml +tmva +roofit +graphviz +opengl +davix
 
 variant native description {Build with best native support for local CPU capabilities} {
     configure.cflags-append    -O3 -mtune=native
@@ -366,15 +354,6 @@ variant fftw3 description {Build with fftw3 support} {
     depends_lib-append      port:fftw-3
 }
 
-variant gsl description {Build with gsl support} {
-    # External GSL library
-    configure.args-replace  -Dgsl_shared=OFF -Dgsl_shared=ON
-    configure.args-append   -DGSL_CONFIG_EXECUTABLE="${prefix}/bin/gsl-config"
-    depends_lib-append      port:gsl
-    # Enable the MathMore library
-    configure.args-replace  -Dmathmore=OFF -Dmathmore=ON
-}
-
 variant fitsio description {Build with fitsio support} {
     configure.args-replace  -Dfitsio=OFF -Dfitsio=ON
     depends_lib-append      port:cfitsio