Ticket #36293: root.diff

science/root/Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                root
-version             5.34.01
-revision            2
+version             5.34.02
+revision            0
 categories          science
 maintainers         gmail.com:mattiafrancescomoro hep.phy.cam.ac.uk:jonesc
 license             LGPL-2.1+
@@ -19 +19 @@
 master_sites        http://root.cern.ch/download/ \
                     ftp://root.cern.ch/root/
 
-checksums           rmd160  b0f4b67c7def56e78addff18ce19553ed3e5e966 \
-                    sha256  8910333b73051225b05829c1603f5c89be2da9d8577fd646e7fdc0626ecd35be
+checksums           rmd160  fe5b66552e3b70a90add16a271d86a4a7a94d788 \
+                    sha256  401ae3b69a397e0ab557faf640a13f49f8aab41dc03b4e7ebddbe37be32fedb1
 
 worksrcdir          root
 
@@ -113 +113 @@
                     --enable-table \
                     --enable-fink
 
-# Seem to cause build problems with FTGL ...
-#                    --with-x11-libdir=${prefix}/lib \
-#                    --with-xpm-libdir=${prefix}/lib \
+universal_variant no
 
-pre-build {
-    build.args      CC=${configure.cc} \
-                    CXX=${configure.cxx} \
-                    F77=${configure.f77}
-}
-
-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
 
 variant soversion description {Builds port with soversion support} {
     configure.args-delete   --disable-soversion
@@ -188 +178 @@
     depends_lib-append      port:openldap
 }
 
-variant roofit description {Build the libRooFit advanced fitting package} {
+variant roofit description {Build the RooFit advanced fitting package} {
     configure.args-delete   --disable-roofit
     configure.args-append   --enable-roofit
 }
@@ -320 +310 @@
     depends_lib-append      port:pythia
 }
 
-variant cocoa description {Enables a native OSX cocoa graphical backend instead of using X11} {
+variant cocoa description {Enables (experimental) native OSX graphical backend instead of X11} {
     # Check we are using a clang compiler
     pre-fetch {
         if { ![string match "*clang*" ${configure.compiler}] } {
@@ -331 +321 @@
             return -code error "Unsupported compiler for cocoa support"
         }
     }
-    configure.args-append --enable-cocoa
+    # Disable asimage and astiff, as causes build failures with cocoa enabled ??
+    # Not clear why. To be looked into ...
+    configure.args-append --enable-cocoa --disable-asimage --disable-astiff
     # Fix a small issue with the cocoa backend where the 'root' command is not created ...
     post-destroot {
         system "( cd ${destroot}${prefix}/bin ; ln -s root.exe root )"
@@ -407 +399 @@
 # The following have build issues or are obsolete. Keep just for reference for the moment
 # ========================================================================================
 
+# Intefers with builtin freetype build (enforced by cocoa variant)
+# Also do not seem to be actually needed any more
+#pre-build {
+#    build.args      CC=${configure.cc} \
+#                    CXX=${configure.cxx} \
+#                    F77=${configure.f77}
+#}
+
 # variant cling requires clang31 description {EXPERIMENTAL - Enable cling interpreter backend} {
 #       configure.args-append --enable-cling
 # }