Changeset 97797

Timestamp:

Sep 15, 2012, 10:38:30 PM (12 years ago)

Author:

cal@…

Message:

gtk3: use the active_variants portgroup instead of checking for the existance of files

File:

• trunk/dports/gnome/gtk3/Portfile (modified) (3 diffs)

trunk/dports/gnome/gtk3/Portfile

@@ -6 +6 @@
 PortGroup           muniversal 1.0
 PortGroup           xcodeversion 1.0
+PortGroup           active_variants 1.0
 
 name                gtk3
@@ -73 +74 @@
 
     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
     }
 }
@@ -203 +202 @@
 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
     }
 }