[48569] trunk/dports/x11

[ryandesign at macports.org]

Revision: 48569
          http://trac.macports.org/changeset/48569
Author:   ryandesign at macports.org
Date:     2009-03-25 03:15:20 -0700 (Wed, 25 Mar 2009)
Log Message:
-----------
pango, pango-devel: add fatal error message when trying to install with +no_x11 but cairo was not installed with +no_x11; see #18956

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

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2009-03-25 09:29:07 UTC (rev 48568)
+++ trunk/dports/x11/pango/Portfile	2009-03-25 10:15:20 UTC (rev 48569)
@@ -74,6 +74,19 @@
             return -code error "incompatible cairo installation"
         }
     }
+    
+    set cairo_xlib_pc ${prefix}/lib/pkgconfig/cairo-xlib.pc
+    if {[variant_isset no_x11]} {
+        if {[file exists ${cairo_xlib_pc}]} {
+            ui_msg "To install pango with the no_x11 variant, cairo must be installed with the no_x11 variant."
+            return -code error "incompatible cairo installation"
+        }
+    } else {
+        if {![file exists ${cairo_xlib_pc}]} {
+            ui_msg "To install pango without the no_x11 variant, cairo must be installed without the no_x11 variant."
+            return -code error "incompatible cairo installation"
+        }
+    }
 }
 
 configure.cppflags-append \

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2009-03-25 09:29:07 UTC (rev 48568)
+++ trunk/dports/x11/pango-devel/Portfile	2009-03-25 10:15:20 UTC (rev 48569)
@@ -77,6 +77,19 @@
             return -code error "incompatible cairo installation"
         }
     }
+    
+    set cairo_xlib_pc ${prefix}/lib/pkgconfig/cairo-xlib.pc
+    if {[variant_isset no_x11]} {
+        if {[file exists ${cairo_xlib_pc}]} {
+            ui_msg "To install pango with the no_x11 variant, cairo must be installed with the no_x11 variant."
+            return -code error "incompatible cairo installation"
+        }
+    } else {
+        if {![file exists ${cairo_xlib_pc}]} {
+            ui_msg "To install pango without the no_x11 variant, cairo must be installed without the no_x11 variant."
+            return -code error "incompatible cairo installation"
+        }
+    }
 }
 
 configure.cppflags-append \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090325/b5c91ce9/attachment-0001.html>