[99787] trunk/dports/x11/tk/Portfile

[jeremyhu at macports.org]

Revision: 99787
          https://trac.macports.org/changeset/99787
Author:   jeremyhu at macports.org
Date:     2012-11-17 09:14:23 -0800 (Sat, 17 Nov 2012)
Log Message:
-----------
tk: Add an x11 variant which conflicts with quartz.

Modified Paths:
--------------
    trunk/dports/x11/tk/Portfile

Modified: trunk/dports/x11/tk/Portfile
===================================================================
--- trunk/dports/x11/tk/Portfile	2012-11-17 16:59:05 UTC (rev 99786)
+++ trunk/dports/x11/tk/Portfile	2012-11-17 17:14:23 UTC (rev 99787)
@@ -65,7 +65,7 @@
 }
 
 platform macosx {
-    variant quartz {
+    variant quartz conflicts x11 {
         depends_lib-delete port:Xft2 port:xorg-libXScrnSaver port:fontconfig
         # tk.h still includes and uses types from X11/Xlib.h
         depends_lib-append port:xorg-libX11
@@ -76,7 +76,11 @@
         }
     }
 
-    default_variants +quartz
+    variant x11 conflicts quartz {}
+
+    if {![variant_isset x11]} {
+        default_variants +quartz
+    }
 }
 
 platform darwin {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121117/14bed8b1/attachment.html>