[78343] trunk/dports/x11

[ryandesign at macports.org]

Revision: 78343
          http://trac.macports.org/changeset/78343
Author:   ryandesign at macports.org
Date:     2011-05-03 23:39:54 -0700 (Tue, 03 May 2011)
Log Message:
-----------
pango, pango-devel: ensure we're using MacPorts' pkg-config

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

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2011-05-04 06:36:06 UTC (rev 78342)
+++ trunk/dports/x11/pango/Portfile	2011-05-04 06:39:54 UTC (rev 78343)
@@ -57,14 +57,14 @@
 
 pre-configure {
     set glib_minimum_version 2.17.3
-    set glib_installed_version [exec pkg-config glib-2.0 --modversion]
+    set glib_installed_version [exec ${prefix}/bin/pkg-config glib-2.0 --modversion]
     if {[rpm-vercomp ${glib_installed_version} ${glib_minimum_version}] < 0} {
         ui_error "${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.6
-    set cairo_installed_version [exec pkg-config cairo --modversion]
+    set cairo_installed_version [exec ${prefix}/bin/pkg-config cairo --modversion]
     if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
         ui_error "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
         return -code error "incompatible cairo version"

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2011-05-04 06:36:06 UTC (rev 78342)
+++ trunk/dports/x11/pango-devel/Portfile	2011-05-04 06:39:54 UTC (rev 78343)
@@ -74,14 +74,14 @@
 
 pre-configure {
     set glib_minimum_version 2.17.3
-    set glib_installed_version [exec pkg-config glib-2.0 --modversion]
+    set glib_installed_version [exec ${prefix}/bin/pkg-config glib-2.0 --modversion]
     if {[rpm-vercomp ${glib_installed_version} ${glib_minimum_version}] < 0} {
         ui_error "${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]
+    set cairo_installed_version [exec ${prefix}/bin/pkg-config cairo --modversion]
     if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
         ui_error "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
         return -code error "incompatible cairo version"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110503/54f66e89/attachment.html>