[47577] trunk/dports/gnome/gnome-desktop/Portfile

[jeremyhu at macports.org]

Revision: 47577
          http://trac.macports.org/changeset/47577
Author:   jeremyhu at macports.org
Date:     2009-02-28 17:42:45 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
gnome_desktop: nuke noop x11 variant

Modified Paths:
--------------
    trunk/dports/gnome/gnome-desktop/Portfile

Modified: trunk/dports/gnome/gnome-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-desktop/Portfile	2009-03-01 01:37:21 UTC (rev 47576)
+++ trunk/dports/gnome/gnome-desktop/Portfile	2009-03-01 01:42:45 UTC (rev 47577)
@@ -64,39 +64,25 @@
     default_variants    +quartz
 }
 
-if {![variant_isset quartz]} {
-    default_variants    +x11
-}
-
-pre-fetch {
-    if {![variant_isset quartz] && ![variant_isset x11]} {
-        error "Either +x11 or +quartz is required"
-    }
-}
-
 pre-configure {
     if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
         set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
         set gtk_not_x11 [catch {exec grep -q GDK_WINDOWING_X11 ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
         if {[variant_isset quartz] && ${gtk_not_quartz}} {
             error "+quartz variant selected, but gtk2+x11 is installed"
-        } elseif {[variant_isset x11] && ${gtk_not_x11}} {
-            error "+x11 variant selected, but gtk2+quartz is installed"
+        } elseif {! [variant_isset quartz] && ${gtk_not_x11}} {
+            error "-quartz variant selected, but gtk2+quartz is installed"
         }
     } else {
         error "Cannot find gdkconfig.h"
     }
 }
 
-variant quartz requires no_x11 conflicts x11 description {Enable Quartz rendering} {
+variant quartz requires no_x11 description {Enable Quartz rendering} {
     depends_lib-delete      port:startup-notification
     patchfiles-append       patch-configure.diff
 }
 
-variant x11 conflicts quartz description {Enable rendering in X11 (default)} {
-	# GTK pulls in our dependencies
-}
-
 variant no_x11 {
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090228/1ce0b609/attachment.html>