[133035] trunk/dports/math/octave/Portfile

[michaelld at macports.org]

Revision: 133035
          https://trac.macports.org/changeset/133035
Author:   michaelld at macports.org
Date:     2015-02-18 05:49:51 -0800 (Wed, 18 Feb 2015)
Log Message:
-----------
octave:
+ make +glgui and +x11 conflict with each other, which hopefully addresses ticket #46895;
+ make +glgui a default variant only if +x11 is not specified.

Modified Paths:
--------------
    trunk/dports/math/octave/Portfile

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2015-02-18 13:16:10 UTC (rev 133034)
+++ trunk/dports/math/octave/Portfile	2015-02-18 13:49:51 UTC (rev 133035)
@@ -194,7 +194,7 @@
 
 }
 
-variant x11 description {Enable use of X11} {}
+variant x11 conflicts glgui description {Enable use of X11} {}
 
 if {[variant_isset x11]} {
 
@@ -206,10 +206,14 @@
 
 }
 
-default_variants +glgui
+if {![variant_isset x11]} {
 
-variant glgui description {Enable OpenGL GUI (via FLTK) as the default graphical front-end} {
+    default_variants +glgui
 
+}
+
+variant glgui conflicts x11 description {Enable OpenGL GUI (via FLTK) as the default graphical front-end} {
+
     depends_lib-append path:lib/libfltk.dylib:fltk \
                        port:fontconfig \
                        port:freetype \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150218/3ee355ac/attachment-0001.html>