Ticket #44296: root5.diff

Portfile

@@ -8 +8 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                root5
-version             5.34.18
+version             5.34.19
 set version_major   [lindex [split ${version} .] 0]
 
 categories          science
@@ -24 +24 @@
 master_sites        http://root.cern.ch/download/ \
                     ftp://root.cern.ch/root/
 
-checksums           rmd160  2fbaff8f831611779b42480fcb86cbde34ef72bd \
-                    sha256  9196dce7d76b31e5bcabd985bd31bc4d9b7c8c4d0c7ce84f730efa4ef82a3567
+checksums           rmd160  8e8a92d8734bd3e30abae66794dac07085e9b7dc \
+                    sha256  c516d167434c7d6d9c6a2f44f7b4af4115d3d0e3389ba79999ae984aee61356d
 
 worksrcdir          root
 
@@ -107 +107 @@
                     --disable-c++11 \
                     --disable-xrootd \
                     --disable-oracle \
+                    --disable-http \
+                    --disable-vc \
                     --enable-builtin-ftgl \
                     --enable-mathmore \
                     --enable-genvector \
@@ -181 +183 @@
   ui_msg "======================================================================================"
 }
 
-universal_variant   no
+universal_variant  no
 
-default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
+default_variants   +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
 
 # Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
 # We also make it default on 10.7
@@ -193 +195 @@
     set default_gui_variant +x11
 }
 
+variant http description {Build with HTTP Server library support} {
+    configure.args-replace --disable-http --enable-http
+}
+
+variant vc description {Build with Vc library support} {
+    configure.args-replace --disable-vc --enable-vc
+}
+
 variant debug description {Enable a debug build} {
     configure.args-append --build=debug
 }
@@ -206 +216 @@
 }
 
 variant soversion description {Build with soversion support} {
-    configure.args-delete   --disable-soversion
-    configure.args-append   --enable-soversion
+    configure.args-replace --disable-soversion --enable-soversion
 }
 
 variant graphviz description {Build with graphviz support} {
@@ -267 +276 @@
 }
 
 variant roofit description {Build the RooFit advanced fitting package} {
-    configure.args-delete   --disable-roofit
-    configure.args-append   --enable-roofit
+    configure.args-replace  --disable-roofit --enable-roofit
 }
 
 variant tmva description {Build the TMVA package} {
-    configure.args-delete   --disable-tmva
-    configure.args-append   --enable-tmva
+    configure.args-replace  --disable-tmva --enable-tmva
     post-destroot {
         set tmvaTuts ${destroot}${install_prefix}/share/root/tutorial/tmva
         file mkdir ${tmvaTuts}
@@ -282 +289 @@
 }
 
 variant minuit2 description {Build with minuit2 support} {
-    configure.args-delete   --disable-minuit2
-    configure.args-append   --enable-minuit2
+    configure.args-replace  --disable-minuit2 --enable-minuit2
 }
 
 variant opengl description {Build with opengl support} {
@@ -487 +493 @@
     eval $variant_line
 }
 
+# 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" } {
+        default_variants-append +clang33
+    } elseif { ${configure.compiler} eq "macports-clang-3.4" } {
+        default_variants-append +clang34
+    } elseif { ${configure.compiler} eq "macports-clang-3.5" } {
+        default_variants-append +clang35
+    }
+}
+
 # Is a variant active ?
 set active_clang_variant ""
 foreach ver ${clang_versions} {