[48568] trunk/dports/x11

[ryandesign at macports.org]

Revision: 48568
          http://trac.macports.org/changeset/48568
Author:   ryandesign at macports.org
Date:     2009-03-25 02:29:07 -0700 (Wed, 25 Mar 2009)
Log Message:
-----------
pango, pango-devel: improve glib2 and cairo version check error messages.

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:22:34 UTC (rev 48567)
+++ trunk/dports/x11/pango/Portfile	2009-03-25 09:29:07 UTC (rev 48568)
@@ -51,13 +51,15 @@
     set glib_minimum_version 2.17.3
     set glib_installed_version [exec pkg-config glib-2.0 --modversion]
     if {[rpm-vercomp ${glib_installed_version} ${glib_minimum_version}] < 0} {
-        return -code error "pango ${version} requires glib ${glib_minimum_version} or later but you have glib ${glib_installed_version}."
+        ui_msg "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}."
+        return -code error "incompatible glib2 version"
     }
     
     set cairo_minimum_version 1.7.4
     set cairo_installed_version [exec pkg-config cairo --modversion]
     if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
-        return -code error "pango ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
+        ui_msg "${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

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2009-03-25 09:22:34 UTC (rev 48567)
+++ trunk/dports/x11/pango-devel/Portfile	2009-03-25 09:29:07 UTC (rev 48568)
@@ -54,13 +54,15 @@
     set glib_minimum_version 2.17.3
     set glib_installed_version [exec pkg-config glib-2.0 --modversion]
     if {[rpm-vercomp ${glib_installed_version} ${glib_minimum_version}] < 0} {
-        return -code error "pango ${version} requires glib ${glib_minimum_version} or later but you have glib ${glib_installed_version}."
+        ui_msg "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}."
+        return -code error "incompatible glib2 version"
     }
     
     set cairo_minimum_version 1.7.4
     set cairo_installed_version [exec pkg-config cairo --modversion]
     if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
-        return -code error "pango ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
+        ui_msg "${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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090325/f07e74d4/attachment.html>