Index: Portfile
===================================================================
--- Portfile	(revision 121301)
+++ Portfile	(working copy)
@@ -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
@@ -127,6 +121,12 @@
 
 configure.post_args ${worksrcpath}
 
+# Work arounds for OSX 10.6
+platform darwin 10 {
+    # an ugly workaround for lack of __thread
+    patchfiles-append patch-montecarlo-vmc-inc-TMCtls.h.diff
+}
+
 platform darwin {
     # Note that we are forcing this choice.  This means that anything linking
     # against root6 needs to also be using libc++.  This is possibly
@@ -206,7 +206,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 +437,9 @@
 variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
     # Enable cocoa support in configure
     configure.args-append   -Dcocoa=ON -Dx11=OFF
+    # Enable the OpenGL variant by default when Cocoa backend is used.
+    # Do this here, as OpenGL conflicts with the X11 backend...
+    default_variants-append +opengl
 }
 
 variant x11 conflicts cocoa description {Enables X11 graphical backend} {