[48808] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Sun Mar 29 02:26:04 PDT 2009
Revision: 48808
http://trac.macports.org/changeset/48808
Author: ryandesign at macports.org
Date: 2009-03-29 02:26:00 -0700 (Sun, 29 Mar 2009)
Log Message:
-----------
Various ports of mine: use ui_error instead of ui_msg for fatal error messages
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/graphics/cairo/Portfile
trunk/dports/graphics/cairo-devel/Portfile
trunk/dports/graphics/graphviz/Portfile
trunk/dports/graphics/graphviz-devel/Portfile
trunk/dports/graphics/graphviz-gui/Portfile
trunk/dports/graphics/graphviz-gui-devel/Portfile
trunk/dports/graphics/libpixman/Portfile
trunk/dports/graphics/libpixman-devel/Portfile
trunk/dports/x11/pango/Portfile
trunk/dports/x11/pango-devel/Portfile
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/devel/glib2-devel/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -77,7 +77,7 @@
# cross-compiled configure phase runs, so ${build_arch} must be configured
# first.
if {${build_arch} != [lindex ${universal_archs} 0]} {
- ui_msg "When building a universal binary of ${name} on ${build_arch}, ${build_arch} must appear first in the list of universal_archs in ${prefix}/etc/macports/macports.conf"
+ ui_error "When building a universal binary of ${name} on ${build_arch}, ${build_arch} must appear first in the list of universal_archs in ${prefix}/etc/macports/macports.conf"
return -code error "incompatible universal_archs order"
}
}
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/graphics/cairo/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -50,14 +50,14 @@
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} {
- ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+ ui_error "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} {
- ui_msg "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
+ ui_error "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
return -code error "incompatible libpixman version"
}
}
@@ -111,7 +111,7 @@
variant quartz requires macosx description {Add Quartz graphics interface} {
pre-extract {
if {${os.major} < 8} {
- ui_msg "cairo's Quartz support is only available on Mac OS X 10.4 or greater"
+ ui_error "cairo's Quartz support is only available on Mac OS X 10.4 or greater"
return -code error "incompatible Mac OS X version"
}
}
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/graphics/cairo-devel/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -49,14 +49,14 @@
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} {
- ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+ ui_error "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} {
- ui_msg "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
+ ui_error "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
return -code error "incompatible libpixman version"
}
}
@@ -111,7 +111,7 @@
variant quartz requires macosx description {Add Quartz graphics interface} {
pre-extract {
if {${os.major} < 8} {
- ui_msg "cairo's Quartz support is only available on Mac OS X 10.4 or greater"
+ ui_error "cairo's Quartz support is only available on Mac OS X 10.4 or greater"
return -code error "incompatible Mac OS X version"
}
}
Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/graphics/graphviz/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -59,7 +59,7 @@
set minimum_xcodeversion 3.1.2
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
- ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+ ui_error "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"
}
}
Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/graphics/graphviz-devel/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -59,7 +59,7 @@
set minimum_xcodeversion 3.1.2
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
- ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+ ui_error "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"
}
}
Modified: trunk/dports/graphics/graphviz-gui/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-gui/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/graphics/graphviz-gui/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -43,7 +43,7 @@
set minimum_xcodeversion 3.1.2
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
- ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+ ui_error "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"
}
}
Modified: trunk/dports/graphics/graphviz-gui-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-gui-devel/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/graphics/graphviz-gui-devel/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -43,7 +43,7 @@
set minimum_xcodeversion 3.1.2
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
- ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+ ui_error "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"
}
}
Modified: trunk/dports/graphics/libpixman/Portfile
===================================================================
--- trunk/dports/graphics/libpixman/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/graphics/libpixman/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -32,7 +32,7 @@
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} {
- ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+ ui_error "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-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/graphics/libpixman-devel/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -32,7 +32,7 @@
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} {
- ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
+ ui_error "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/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/x11/pango/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -51,26 +51,26 @@
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} {
- ui_msg "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}."
+ 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]
if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
- ui_msg "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
+ 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_isset quartz]} {
if {![file exists ${cairo_quartz_pc}]} {
- ui_msg "To install pango with the quartz variant, cairo must be installed with the quartz variant."
+ 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_msg "To install pango without the quartz variant, cairo must be installed without the quartz variant."
+ ui_error "To install pango without the quartz variant, cairo must be installed without the quartz variant."
return -code error "incompatible cairo installation"
}
}
@@ -78,12 +78,12 @@
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."
+ ui_error "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."
+ ui_error "To install pango without the no_x11 variant, cairo must be installed without the no_x11 variant."
return -code error "incompatible cairo installation"
}
}
Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile 2009-03-29 09:14:57 UTC (rev 48807)
+++ trunk/dports/x11/pango-devel/Portfile 2009-03-29 09:26:00 UTC (rev 48808)
@@ -54,26 +54,26 @@
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} {
- ui_msg "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}."
+ 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]
if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
- ui_msg "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
+ 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_isset quartz]} {
if {![file exists ${cairo_quartz_pc}]} {
- ui_msg "To install pango with the quartz variant, cairo must be installed with the quartz variant."
+ 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_msg "To install pango without the quartz variant, cairo must be installed without the quartz variant."
+ ui_error "To install pango without the quartz variant, cairo must be installed without the quartz variant."
return -code error "incompatible cairo installation"
}
}
@@ -81,12 +81,12 @@
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."
+ ui_error "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."
+ ui_error "To install pango without the no_x11 variant, cairo must be installed without the no_x11 variant."
return -code error "incompatible cairo installation"
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090329/6e2e5d67/attachment-0001.html>
More information about the macports-changes
mailing list