[121304] trunk/dports/science/root6

[mojca at macports.org]

Revision: 121304
          https://trac.macports.org/changeset/121304
Author:   mojca at macports.org
Date:     2014-06-22 14:51:45 -0700 (Sun, 22 Jun 2014)
Log Message:
-----------
root6: remove +opengl when using +x11 to allow building on 10.6 (#44062)

Modified Paths:
--------------
    trunk/dports/science/root6/Portfile
    trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2014-06-22 21:38:13 UTC (rev 121303)
+++ trunk/dports/science/root6/Portfile	2014-06-22 21:51:45 UTC (rev 121304)
@@ -61,12 +61,6 @@
 
 patchfiles          patch-cmake-modules-SearchInstalledSoftware.cmake.diff
 
-# an ugly workaround for lack of __thread on 10.6
-platform darwin 10 {
-    patchfiles-append \
-                    patch-montecarlo-vmc-inc-TMCtls.h.diff
-}
-
 # Force a compatible compiler
 # (macports-clang-3.3 works; it's blacklisted only to give the preference to 3.4)
 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
@@ -128,6 +122,19 @@
 configure.post_args ${worksrcpath}
 
 platform darwin {
+
+    if {${os.major} < 10} {
+        pre-fetch {
+            ui_error "${name} requires C++11 and modifications of the package."
+            return -code error "C++11 needed"
+        }
+    } elseif {${os.major} == 10} {
+        # an ugly workaround for lack of __thread on 10.6 (and earlier)
+        # it has to be patched properly upstream
+        # https://sft.its.cern.ch/jira/browse/ROOT-6394
+        patchfiles-append patch-montecarlo-vmc-inc-TMCtls.h.diff
+    }
+
     # 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.
@@ -206,7 +213,7 @@
 
 universal_variant   no
 
-default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
+default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +soversion
 
 # Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
 # We also make it default on 10.7
@@ -437,6 +444,10 @@
 variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
     # Enable cocoa support in configure
     configure.args-append   -Dcocoa=ON -Dx11=OFF
+    # Some changes are needed to make OpenGL and X11 work properly together
+    # If these get fixed, make +opengl default also for X11
+    # https://sft.its.cern.ch/jira/browse/ROOT-6393
+    default_variants-append +opengl
 }
 
 variant x11 conflicts cocoa description {Enables X11 graphical backend} {

Modified: trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff
===================================================================
--- trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff	2014-06-22 21:38:13 UTC (rev 121303)
+++ trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff	2014-06-22 21:51:45 UTC (rev 121304)
@@ -1,4 +1,4 @@
-http://trac.macports.org/ticket/44062
+https://sft.its.cern.ch/jira/browse/ROOT-6394
 
 --- montecarlo/vmc/inc/TMCtls.h.orig
 +++ montecarlo/vmc/inc/TMCtls.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140622/f381ea37/attachment.html>