Ticket #47547: root6.diff

Portfile

@@ -10 +10 @@
 PortGroup           select 1.0
 
 # don't forget to update both the git tag and the version
-github.setup        root-mirror root 9ab0642adeca5d3703783bdbfeebfca86ea22af9
-#github.setup       root-mirror root 6-03-02 v
-version             6.03.02.91
+#github.setup        root-mirror root 9ab0642adeca5d3703783bdbfeebfca86ea22af9
+github.setup        root-mirror root 6-03-04 v
+version             6.03.04
 
 # this could be a better way to set the version (unless we use a sha sum for the git tag ;)
 # version           [string map {- .} $version]
 set version_major   [lindex [split ${version} .] 0]
 
-checksums           rmd160  a4f3e4248b4e5be9540dab481e5e919e66e40142 \
-                    sha256  006dc44790d84eddfaaef90418a484e3cbb6d3978e731ea7a9b09e732f147c18
+checksums           rmd160  f00aa3a334790c9b7da7871c33015cd1d72d2c43 \
+                    sha256  ea3d11119cb7ff606178c777fdd4276ef6ee0424a99d196f41fbeb92c3c36bfd
 
 name                root${version_major}
 categories          science
@@ -57 +57 @@
 select.file         ${filespath}/${name}
 
 # Force a compatible compiler
-compiler.blacklist-append *gcc* {clang < 500} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2
-compiler.fallback-append macports-clang-3.4 macports-clang-3.5 macports-clang-3.6
+compiler.blacklist-append *gcc* {clang < 500} \
+                          macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 \
+                          macports-clang-3.2 macports-clang-3.3
+compiler.fallback-append  macports-clang-3.6 macports-clang-3.5 macports-clang-3.4
 
 # port specific location
 set install_prefix ${prefix}/libexec/root${version_major}
@@ -513 +515 @@
 # ========================================================================================
 
 # List of possible clang versions that work
-set clang_versions { 3.3 3.4 3.5 3.6 }
+set clang_versions { 3.4 3.5 3.6 3.7 }
 
 # Define the available variants
 foreach clang_ver ${clang_versions} {
@@ -530 +532 @@
 
 # make sure that the proper variant is automatically selected
 # (ROOT crashes if the compiler it was built with doesn't exist)
-if {![variant_isset clang33] && ![variant_isset clang34] && ![variant_isset clang35]} {
-    if { ${configure.compiler} eq "macports-clang-3.3" } {
+if { ![variant_isset clang33] && ![variant_isset clang34] &&
+     ![variant_isset clang35] && ![variant_isset clang36] &&
+     ![variant_isset clang37] } {
+    if       { ${configure.compiler} eq "macports-clang-3.3" } {
         default_variants-append +clang33
     } elseif { ${configure.compiler} eq "macports-clang-3.4" } {
         default_variants-append +clang34
@@ -539 +543 @@
         default_variants-append +clang35
     } elseif { ${configure.compiler} eq "macports-clang-3.6" } {
         default_variants-append +clang36
+    } elseif { ${configure.compiler} eq "macports-clang-3.7" } {
+        default_variants-append +clang37
     }
 }
 
@@ -553 +559 @@
 
 # If so, set it up.
 if { ${active_clang_variant} != "" } {
-    configure.compiler      macports-clang-${active_clang_variant}
+    configure.compiler  macports-clang-${active_clang_variant}
     # TODO
     # configure.args-append   --with-llvm-config="${prefix}/bin/llvm-config-mp-"${active_clang_variant}
-    depends_run-append      port:clang-${active_clang_variant}
+    depends_run-append  port:clang-${active_clang_variant}
 }
 
 # ========================================================================================