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

[pguyot at kallisys.net]

Revision: 41405
          http://trac.macports.org/changeset/41405
Author:   pguyot at kallisys.net
Date:     2008-11-01 16:13:27 -0700 (Sat, 01 Nov 2008)
Log Message:
-----------
Fix the quartz/x11 logic

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

Modified: trunk/dports/gnome/gnome-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-desktop/Portfile	2008-11-01 22:39:42 UTC (rev 41404)
+++ trunk/dports/gnome/gnome-desktop/Portfile	2008-11-01 23:13:27 UTC (rev 41405)
@@ -71,10 +71,11 @@
 
 pre-configure {
     if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
-        set gtk_quartz [exec grep -c GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h]
-        if {[variant_isset quartz] && ${gtk_quartz} == 0} {
+        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_quartz} == 1} {
+        } elseif {[variant_isset x11] && ${gtk_not_x11}} {
             error "+x11 variant selected, but gtk2+quartz is installed"
         }
     } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081101/e880a275/attachment.html>