[103153] trunk/dports/x11

[ryandesign at macports.org]

Revision: 103153
          https://trac.macports.org/changeset/103153
Author:   ryandesign at macports.org
Date:     2013-02-16 02:51:17 -0800 (Sat, 16 Feb 2013)
Log Message:
-----------
pango, pango-devel: use require_active_variants correctly, and for quartz as well as for x11

Modified Paths:
--------------
    trunk/dports/x11/pango/Portfile
    trunk/dports/x11/pango-devel/Portfile

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2013-02-16 10:49:21 UTC (rev 103152)
+++ trunk/dports/x11/pango/Portfile	2013-02-16 10:51:17 UTC (rev 103153)
@@ -53,6 +53,11 @@
     # the quartz variant. Therefore this variant is necessary to be able to
     # distinguish whether an installed pango has quartz support or not.
 }
+    if {[variant_isset quartz]} {
+        require_active_variants cairo quartz
+    } else {
+        require_active_variants cairo "" quartz
+    }
 }
 
 pre-configure {
@@ -76,25 +81,6 @@
         ui_error "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
         return -code error "incompatible cairo version"
     }
-    
-    set cairo_quartz_pc ${prefix}/lib/pkgconfig/cairo-quartz.pc
-    if {[variant_exists quartz] && [variant_isset quartz]} {
-        if {![file exists ${cairo_quartz_pc}]} {
-            ui_error "To install pango with the quartz variant, cairo must be installed with the quartz variant."
-            return -code error "incompatible cairo installation"
-        }
-    } else {
-        if {[file exists ${cairo_quartz_pc}]} {
-            ui_error "To install pango without the quartz variant, cairo must be installed without the quartz variant."
-            return -code error "incompatible cairo installation"
-        }
-    }
-    
-    if {[variant_isset x11]} {
-        require_active_variants cairo x11 ""
-    } else {
-        require_active_variants cairo "" x11
-    }
 }
 
 configure.args          --enable-static \
@@ -116,6 +102,11 @@
     configure.args-append   --x-include=${prefix}/include \
                             --x-lib=${prefix}/lib
 }
+if {[variant_isset x11]} {
+    require_active_variants cairo x11
+} else {
+    require_active_variants cairo "" x11
+}
 
 default_variants        +x11
 

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2013-02-16 10:49:21 UTC (rev 103152)
+++ trunk/dports/x11/pango-devel/Portfile	2013-02-16 10:51:17 UTC (rev 103153)
@@ -52,6 +52,11 @@
     # the quartz variant. Therefore this variant is necessary to be able to
     # distinguish whether an installed pango has quartz support or not.
 }
+    if {[variant_isset quartz]} {
+        require_active_variants cairo quartz
+    } else {
+        require_active_variants cairo "" quartz
+    }
 }
 
 pre-configure {
@@ -75,25 +80,6 @@
         ui_error "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
         return -code error "incompatible cairo version"
     }
-    
-    set cairo_quartz_pc ${prefix}/lib/pkgconfig/cairo-quartz.pc
-    if {[variant_exists quartz] && [variant_isset quartz]} {
-        if {![file exists ${cairo_quartz_pc}]} {
-            ui_error "To install pango with the quartz variant, cairo must be installed with the quartz variant."
-            return -code error "incompatible cairo installation"
-        }
-    } else {
-        if {[file exists ${cairo_quartz_pc}]} {
-            ui_error "To install pango without the quartz variant, cairo must be installed without the quartz variant."
-            return -code error "incompatible cairo installation"
-        }
-    }
-    
-    if {[variant_isset x11]} {
-        require_active_variants cairo x11 ""
-    } else {
-        require_active_variants cairo "" x11
-    }
 }
 
 configure.args          --enable-static \
@@ -115,6 +101,11 @@
     configure.args-append   --x-include=${prefix}/include \
                             --x-lib=${prefix}/lib
 }
+if {[variant_isset x11]} {
+    require_active_variants cairo x11
+} else {
+    require_active_variants cairo "" x11
+}
 
 default_variants        +x11
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130216/01fbeb12/attachment-0001.html>