[47090] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 47090
          http://trac.macports.org/changeset/47090
Author:   ryandesign at macports.org
Date:     2009-02-21 15:21:59 -0800 (Sat, 21 Feb 2009)
Log Message:
-----------
cairo, cairo-devel, libpixman, libpixman-devel: improve version error messages

Modified Paths:
--------------
    trunk/dports/graphics/cairo/Portfile
    trunk/dports/graphics/cairo-devel/Portfile
    trunk/dports/graphics/libpixman/Portfile
    trunk/dports/graphics/libpixman-devel/Portfile

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2009-02-21 23:17:19 UTC (rev 47089)
+++ trunk/dports/graphics/cairo/Portfile	2009-02-21 23:21:59 UTC (rev 47090)
@@ -50,13 +50,15 @@
         set minimum_xcodeversion 2.4.1
         set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
         if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-            return -code error "On Mac OS X ${macosx_version}, cairo ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+            ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+            return -code error "incompatible Xcode version"
         }
     }
     set pixman_minimum_version 0.12.0
     set pixman_installed_version [exec pkg-config pixman-1 --modversion]
     if {[rpm-vercomp ${pixman_installed_version} ${pixman_minimum_version}] < 0} {
-        return -code error "cairo ${version} requires pixman ${pixman_minimum_version} or later but you have pixman ${pixman_installed_version}."
+        ui_msg "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
+        return -code error "incompatible libpixman version"
     }
 }
 

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile	2009-02-21 23:17:19 UTC (rev 47089)
+++ trunk/dports/graphics/cairo-devel/Portfile	2009-02-21 23:21:59 UTC (rev 47090)
@@ -49,13 +49,15 @@
         set minimum_xcodeversion 2.4.1
         set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
         if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-            return -code error "On Mac OS X ${macosx_version}, cairo ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+            ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+            return -code error "incompatible Xcode version"
         }
     }
     set pixman_minimum_version 0.12.0
     set pixman_installed_version [exec pkg-config pixman-1 --modversion]
     if {[rpm-vercomp ${pixman_installed_version} ${pixman_minimum_version}] < 0} {
-        return -code error "cairo ${version} requires pixman ${pixman_minimum_version} or later but you have pixman ${pixman_installed_version}."
+        ui_msg "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
+        return -code error "incompatible libpixman version"
     }
 }
 

Modified: trunk/dports/graphics/libpixman/Portfile
===================================================================
--- trunk/dports/graphics/libpixman/Portfile	2009-02-21 23:17:19 UTC (rev 47089)
+++ trunk/dports/graphics/libpixman/Portfile	2009-02-21 23:21:59 UTC (rev 47090)
@@ -32,7 +32,8 @@
         set minimum_xcodeversion 1.5
         set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
         if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-            return -code error "On Mac OS X ${macosx_version}, pixman ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+            ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+            return -code error "incompatible Xcode version"
         }
     }
 }

Modified: trunk/dports/graphics/libpixman-devel/Portfile
===================================================================
--- trunk/dports/graphics/libpixman-devel/Portfile	2009-02-21 23:17:19 UTC (rev 47089)
+++ trunk/dports/graphics/libpixman-devel/Portfile	2009-02-21 23:21:59 UTC (rev 47090)
@@ -32,7 +32,8 @@
         set minimum_xcodeversion 1.5
         set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
         if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-            return -code error "On Mac OS X ${macosx_version}, pixman ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+            ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+            return -code error "incompatible Xcode version"
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090221/9ba064a2/attachment.html>