Ticket #45265: root.diff

Portfile

@@ -9 +9 @@
 PortGroup           github 1.0
 PortGroup           select 1.0
 
+# don't forget to update both the git tag and the version
+#github.setup        root-mirror root 6-02-00 v
+# tag below is 6.02/00 + a small fix for the GNU install option ...
+github.setup        root-mirror root 058aa8d4949b392da69ff496cfa9ac87fbec47e2
+version             6.02.00
 
-# don't forget to update both the git tag and the version
-github.setup        root-mirror root 6-00-02 v
-version             6.00.02
-revision            2
 # 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  5efc28e5d68aaa4274d869c809c4d052d6011fe4 \
-                    sha256  6e6fa7fbe0fe72828a6a65f758af9e1fcb04b66dec7fae79ecbe06e81692b218
 
+checksums           rmd160  900448b5e8ef39d763bee11224e7f40aa564a7f7 \
+                    sha256  63dd1b0ca3c511ffa9da2433ed085df3b12d1d5f48eb91da3709fe5a3cd56910
+
 name                root${version_major}
 categories          science
 maintainers         hep.phy.cam.ac.uk:jonesc mojca
@@ -60 +62 @@
 select.group        root
 select.file         ${filespath}/${name}
 
-patchfiles          patch-cmake-modules-SearchInstalledSoftware.cmake.diff
-
 # 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
@@ -160 +160 @@
 }
 
 post-destroot {
+    # Work around for bug in 6.02.00 that incorrectly installs some 'build' files ...
+    # Hopefully fixed in a future release, so this can be removed...
+    set dirToRemove ${destroot}${prefix}/var/macports/build
+    if { [ file exists ${dirToRemove} ] } { delete ${dirToRemove} }
     # create versioned symlinks for the content of libexec
     # bin dir
     foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
@@ -567 +571 @@
 # Note that g95 does not work here, so that variant is removed
 # ========================================================================================
 
-set gcc_versions { 4.7 4.8 4.9 }
+set gcc_versions { 4.7 4.8 4.9 4.10 }
 set default_fortran_variant +gcc48
 
 foreach gcc_ver ${gcc_versions} {

files/patch-montecarlo-vmc-inc-TMCtls.h.diff

@@ -1 @@
-https://sft.its.cern.ch/jira/browse/ROOT-6394
-
---- montecarlo/vmc/inc/TMCtls.h.orig
-+++ montecarlo/vmc/inc/TMCtls.h
-@@ -49,8 +49,8 @@
-         ( defined(__MACH__) && defined(__GNUC__) && __GNUC__>=4 && __GNUC_MINOR__>=7 ) || \
-         defined(__linux__) || defined(_AIX) ) && ( !defined(__CINT__) )
-       //  Multi-threaded build: for POSIX systems 
+--- ./montecarlo/vmc/inc/TMCtls.h.orig  2014-10-03 11:59:47.000000000 +0100
++++ ./montecarlo/vmc/inc/TMCtls.h       2014-10-03 12:00:24.000000000 +0100
+@@ -52,8 +52,8 @@
+ */
+   #if ( defined(__linux__) ) && ( !defined(__CINT__) )
+       //  Multi-threaded build: for POSIX systems
 -      #include <pthread.h>
 -      #define TMCThreadLocal __thread
-+//    #include <pthread.h>
++      //#include <pthread.h>
 +      #define TMCThreadLocal
    #else
        //#  error "No Thread Local Storage (TLS) technology supported for this platform. Use sequential build !"
-       #define TMCThreadLocal 
+       #define TMCThreadLocal