Ticket #48376: 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-04-00 v
-version             6.04.00
+github.setup        root-mirror root b43f80bccfd6b67be37708c4a5a9386b7c850d29
+#github.setup        root-mirror root 6-04-02 v
+version             6.04.02.99
 
 # 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  41daa7cd2b04fd6a78bd60e626ad550383a87b05 \
-                    sha256  1fae9b33e18a613a90619b5c0a5c950e0897319db2f045d1414bd76628547a37
+checksums           rmd160  d4025bb6e0fe4157a145de142fd2f40490c68ac4 \
+                    sha256  9bf93ef6b52e3aaedbaf6c6b2aa78d6dba5c7ec9672d7d78fb173fbab7ac7b9a
 
 name                root${version_major}
 categories          science
@@ -60 +60 @@
 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
+compiler.fallback-append  macports-clang-3.7 macports-clang-3.6 macports-clang-3.5 \
+                          macports-clang-3.4
 
 # port specific location
 set install_prefix ${prefix}/libexec/root${version_major}
@@ -102 +103 @@
                     -Dbonjour=OFF \
                     -Dgviz=OFF \
                     -Dsoversion=OFF \
-                    -Dc++11=ON \
+                    -Dcxx11=ON \
                     -Dlibcxx=ON \
                     -Dxrootd=OFF \
                     -Dbuiltin_ftgl=ON \
@@ -126 +127 @@
             ui_error "${name} is not supported on this OSX release."
             return -code error "Unsupported OSX version"
         }
-    } 
-
+    }
+    
     # Note that we are forcing this choice.  This means that anything linking
     # against root6 needs to also be using libc++.  This is possibly
     # problematic, but luckily there is just a limited set of such dependents.
@@ -216 +217 @@
     set default_gui_variant +x11
 }
 
+variant cxx14 description {Enable c++14 compiler support} {
+    configure.args-append   -Dcxx14=ON
+}
+
 variant valgrind description {Build internal LLVM library with valgrind support} {
     depends_lib-append      port:valgrind
 }
@@ -566 +571 @@
 # ========================================================================================
 
 set gcc_versions { 4.7 4.8 4.9 5 }
-set default_fortran_variant +gcc48
+set default_fortran_variant +gcc5
 
 foreach gcc_ver ${gcc_versions} {
     set gcc_ver_no_dot [join [split ${gcc_ver} "."] ""]