[47716] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Wed Mar 4 05:25:20 PST 2009
Revision: 47716
http://trac.macports.org/changeset/47716
Author: ryandesign at macports.org
Date: 2009-03-04 05:25:16 -0800 (Wed, 04 Mar 2009)
Log Message:
-----------
cairo, cairo-devel, pango, pango-devel: Quartz and ATSUI features are now optional via a new +quartz variant
Modified Paths:
--------------
trunk/dports/graphics/cairo/Portfile
trunk/dports/graphics/cairo-devel/Portfile
trunk/dports/x11/pango/Portfile
trunk/dports/x11/pango-devel/Portfile
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2009-03-04 12:55:42 UTC (rev 47715)
+++ trunk/dports/graphics/cairo/Portfile 2009-03-04 13:25:16 UTC (rev 47716)
@@ -6,7 +6,7 @@
name cairo
set my_name cairo
version 1.8.6
-revision 3
+revision 4
categories graphics
maintainers ryandesign
homepage http://cairographics.org/
@@ -107,6 +107,22 @@
--enable-glitz
}
+platform macosx {}
+variant quartz requires macosx description {Add Quartz graphics interface} {
+ if {${os.major} < 8} {
+ ui_msg "cairo's Quartz support is only available on Mac OS X 10.4 or greater"
+ return -code error "incompatible Mac OS X version"
+ }
+ configure.args-delete \
+ --disable-quartz \
+ --disable-quartz-font \
+ --disable-quartz-image
+ configure.args-append \
+ --enable-quartz \
+ --enable-quartz-font \
+ --enable-quartz-image
+}
+
variant no_x11 conflicts glitz x11_xcb {
depends_lib-delete \
port:xrender
@@ -127,20 +143,6 @@
port:xorg-xcb-util
}
-platform macosx {
- if {${os.major} > 7} {
- configure.args-delete \
- --disable-quartz \
- --disable-quartz-font \
- --disable-quartz-image \
-
- configure.args-append \
- --enable-quartz \
- --enable-quartz-font \
- --enable-quartz-image \
- }
-}
-
test.run yes
test.target check
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2009-03-04 12:55:42 UTC (rev 47715)
+++ trunk/dports/graphics/cairo-devel/Portfile 2009-03-04 13:25:16 UTC (rev 47716)
@@ -6,7 +6,7 @@
name cairo-devel
set my_name cairo
version 1.7.6
-revision 3
+revision 4
categories graphics
maintainers ryandesign
homepage http://cairographics.org/
@@ -107,6 +107,22 @@
--enable-glitz
}
+platform macosx {}
+variant quartz requires macosx description {Add Quartz graphics interface} {
+ if {${os.major} < 8} {
+ ui_msg "cairo's Quartz support is only available on Mac OS X 10.4 or greater"
+ return -code error "incompatible Mac OS X version"
+ }
+ configure.args-delete \
+ --disable-quartz \
+ --disable-quartz-font \
+ --disable-quartz-image
+ configure.args-append \
+ --enable-quartz \
+ --enable-quartz-font \
+ --enable-quartz-image
+}
+
variant no_x11 conflicts glitz x11_xcb {
depends_lib-delete \
port:xrender
@@ -127,20 +143,6 @@
port:xorg-xcb-util
}
-platform macosx {
- if {${os.major} > 7} {
- configure.args-delete \
- --disable-quartz \
- --disable-quartz-font \
- --disable-quartz-image \
-
- configure.args-append \
- --enable-quartz \
- --enable-quartz-font \
- --enable-quartz-image \
- }
-}
-
livecheck.check regex
livecheck.url ${homepage}news/
livecheck.regex ${my_name}-(\[0-9\]+\\.\[0-9\]*\[13579\]\\.\[0-9\]+)
Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2009-03-04 12:55:42 UTC (rev 47715)
+++ trunk/dports/x11/pango/Portfile 2009-03-04 13:25:16 UTC (rev 47716)
@@ -4,7 +4,7 @@
name pango
version 1.22.4
-revision 2
+revision 3
set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
maintainers ryandesign
@@ -40,6 +40,9 @@
configure.ccache no
+platform macosx {}
+variant quartz requires macosx description {Add Quartz graphics interface} {}
+
pre-configure {
set glib_minimum_version 2.17.3
set glib_installed_version [exec pkg-config glib-2.0 --modversion]
@@ -52,6 +55,19 @@
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}."
}
+
+ 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."
+ 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."
+ return -code error "incompatible cairo installation"
+ }
+ }
}
configure.cppflags-append \
Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile 2009-03-04 12:55:42 UTC (rev 47715)
+++ trunk/dports/x11/pango-devel/Portfile 2009-03-04 13:25:16 UTC (rev 47716)
@@ -5,7 +5,7 @@
name pango-devel
set my_name pango
version 1.21.6
-revision 2
+revision 3
set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
maintainers ryandesign
@@ -43,6 +43,9 @@
configure.ccache no
+platform macosx {}
+variant quartz requires macosx description {Add Quartz graphics interface} {}
+
pre-configure {
set glib_minimum_version 2.17.3
set glib_installed_version [exec pkg-config glib-2.0 --modversion]
@@ -55,6 +58,19 @@
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}."
}
+
+ 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."
+ 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."
+ 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/20090304/811b4598/attachment.html>
More information about the macports-changes
mailing list