[97797] trunk/dports/gnome/gtk3/Portfile

[cal at macports.org]

Revision: 97797
          http://trac.macports.org//changeset/97797
Author:   cal at macports.org
Date:     2012-09-15 15:38:30 -0700 (Sat, 15 Sep 2012)
Log Message:
-----------
gtk3: use the active_variants portgroup instead of checking for the existance of files

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

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2012-09-15 22:37:14 UTC (rev 97796)
+++ trunk/dports/gnome/gtk3/Portfile	2012-09-15 22:38:30 UTC (rev 97797)
@@ -5,6 +5,7 @@
 PortGroup           archcheck 1.0
 PortGroup           muniversal 1.0
 PortGroup           xcodeversion 1.0
+PortGroup           active_variants 1.0
 
 name                gtk3
 set real_name       gtk+
@@ -72,11 +73,9 @@
     }
 
     if {[variant_isset quartz]} {
-        if {![file exists ${prefix}/include/cairo/cairo-quartz.h]} {
-            error "cairo must be built with the +quartz variant enabled."
-        }
-    } elseif {![file exists ${prefix}/include/cairo/cairo-xlib.h]} {
-        error "cairo must be built without the +no_x11 variant."
+        require_active_variants cairo quartz
+    } else {
+        require_active_variants cairo x11 no_x11
     }
 }
 
@@ -202,10 +201,7 @@
 
 variant no_x11 {
     pre-fetch {
-        if {[file exists ${prefix}/lib/libpangox-1.0.dylib]} {
-            ui_error "Please uninstall or deactivate the pango port and reinstall it by running `port install pango +no_x11`."
-            error "pango must be installed with the no_x11 variant enabled."
-        }
+        require_active_variants pango {} x11
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120915/83e6c975/attachment.html>