[103034] trunk/dports/x11
g5pw at macports.org
g5pw at macports.org
Tue Feb 12 01:37:13 PST 2013
Revision: 103034
https://trac.macports.org/changeset/103034
Author: g5pw at macports.org
Date: 2013-02-12 01:37:13 -0800 (Tue, 12 Feb 2013)
Log Message:
-----------
x11/pango{,-devel}:
Use active_variants portgroup
Modified Paths:
--------------
trunk/dports/x11/pango/Portfile
trunk/dports/x11/pango-devel/Portfile
Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2013-02-12 08:41:28 UTC (rev 103033)
+++ trunk/dports/x11/pango/Portfile 2013-02-12 09:37:13 UTC (rev 103034)
@@ -2,6 +2,7 @@
# $Id$
PortSystem 1.0
+PortGroup active_variants 1.1
name pango
conflicts pango-devel
@@ -90,17 +91,10 @@
}
}
- set cairo_xlib_pc ${prefix}/lib/pkgconfig/cairo-xlib.pc
if {[variant_isset x11]} {
- if {![file exists ${cairo_xlib_pc}]} {
- ui_error "To install pango with the x11 variant, cairo must be installed with the x11 variant."
- return -code error "incompatible cairo installation"
- }
+ require_active_variants cairo x11 ""
} else {
- if {[file exists ${cairo_xlib_pc}]} {
- ui_error "To install pango without the x11 variant, cairo must be installed without the x11 variant."
- return -code error "incompatible cairo installation"
- }
+ require_active_variants cairo "" x11
}
}
Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile 2013-02-12 08:41:28 UTC (rev 103033)
+++ trunk/dports/x11/pango-devel/Portfile 2013-02-12 09:37:13 UTC (rev 103034)
@@ -2,6 +2,7 @@
# $Id$
PortSystem 1.0
+PortGroup active_variants 1.1
name pango-devel
conflicts pango
@@ -89,17 +90,10 @@
}
}
- set cairo_xlib_pc ${prefix}/lib/pkgconfig/cairo-xlib.pc
if {[variant_isset x11]} {
- if {![file exists ${cairo_xlib_pc}]} {
- ui_error "To install pango with the x11 variant, cairo must be installed with the x11 variant."
- return -code error "incompatible cairo installation"
- }
+ require_active_variants cairo x11 ""
} else {
- if {[file exists ${cairo_xlib_pc}]} {
- ui_error "To install pango without the x11 variant, cairo must be installed without the x11 variant."
- return -code error "incompatible cairo installation"
- }
+ require_active_variants cairo "" x11
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130212/44ec3255/attachment-0001.html>
More information about the macports-changes
mailing list