[121308] trunk/dports/science/root6/Portfile

[mojca at macports.org]

Revision: 121308
          https://trac.macports.org/changeset/121308
Author:   mojca at macports.org
Date:     2014-06-22 23:23:45 -0700 (Sun, 22 Jun 2014)
Log Message:
-----------
root6: fix handling of +opengl which should be default with cocoa (#44062)

Modified Paths:
--------------
    trunk/dports/science/root6/Portfile

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2014-06-23 03:51:56 UTC (rev 121307)
+++ trunk/dports/science/root6/Portfile	2014-06-23 06:23:45 UTC (rev 121308)
@@ -444,10 +444,6 @@
 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} {
@@ -478,6 +474,13 @@
     default_variants-append ${default_gui_variant}
 }
 
+if { [variant_isset cocoa] } {
+    # 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
+}
+
 # ========================================================================================
 # Setup various clang variants, to provide alternative C++ compilers that support cocoa
 # ========================================================================================
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140622/22edca5d/attachment.html>