[42517] trunk/dports/gnome/at-spi/Portfile

[ryandesign at macports.org]

Revision: 42517
          http://trac.macports.org/changeset/42517
Author:   ryandesign at macports.org
Date:     2008-11-23 02:00:30 -0800 (Sun, 23 Nov 2008)
Log Message:
-----------
at-spi:

 * Mark x11 and quartz variants as conflicting
 * Make sure either x11 or quartz is selected
 * Make the quartz variant bail out early since it does not work
 * Fix variant descriptions

See #15013.

Modified Paths:
--------------
    trunk/dports/gnome/at-spi/Portfile

Modified: trunk/dports/gnome/at-spi/Portfile
===================================================================
--- trunk/dports/gnome/at-spi/Portfile	2008-11-23 09:51:57 UTC (rev 42516)
+++ trunk/dports/gnome/at-spi/Portfile	2008-11-23 10:00:30 UTC (rev 42517)
@@ -36,17 +36,22 @@
 
 configure.env   PYTHON=${prefix}/bin/python2.5
 
-# --with-x is the default state for the configure file
-variant x11	{
+variant x11 conflicts quartz description {Use X11 (default)} {
 	configure.args-append	--with-x
 	configure.cflags-append	-I${x11prefix}/include
 }
 
-# currently does not work, see http://bugzilla.gnome.org/show_bug.cgi?id=500838
-variant quartz description "Use Quartz instead of X11" {
+variant quartz conflicts x11 description {Use Quartz (broken)} {
+	pre-fetch {
+		return -code error "The +quartz variant of ${name} does not work. See http://trac.macports.org/ticket/15013"
+	}
 	configure.args-append	--without-x
 }
 
+if {![variant_isset quartz]} {
+	default_variants +x11
+}
+
 livecheck.check regex
 livecheck.url   http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
 livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081123/4dc84894/attachment.html>