[31870] trunk/dports/x11/gtk2/Portfile

[ryandesign at macports.org]

Revision: 31870
          http://trac.macosforge.org/projects/macports/changeset/31870
Author:   ryandesign at macports.org
Date:     2007-12-10 09:25:19 -0800 (Mon, 10 Dec 2007)

Log Message:
-----------
gtk2: mark x11 and quartz as conflicting with one another. Since +x11 is the default variant if +quartz is not selected, it would be unlikely for anyone to have selected neither variant, therefore simplify the error message.

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2007-12-10 17:14:17 UTC (rev 31869)
+++ trunk/dports/x11/gtk2/Portfile	2007-12-10 17:25:19 UTC (rev 31870)
@@ -55,7 +55,7 @@
 
 pre-fetch {
     if { ![variant_isset quartz] && ![variant_isset x11] } {
-        return -code 1 "\n\nThe gtk2 port can be built and installed with support for either Quartz\n(Aqua) rendering or X11 rendering, but not both.\n\nPlease install the gtk2 port by running either:\n\t\"port install gtk2 +quartz\" or\n\t\"port install gtk2 +x11\"\n\nIf you are upgrading a port and see this message, use the X11 variant.\n\n"
+        return -code error "Either +x11 or +quartz is required"
     }
     if {[variant_isset quartz]} {
         if { ![file exists ${prefix}/include/cairo/cairo-quartz.h] } {
@@ -86,11 +86,11 @@
         port:cups-headers
 }
 
-variant quartz description {Enable Quartz rendering} {
+variant quartz conflicts x11 description {Enable Quartz rendering} {
     configure.args-append --with-gdktarget=quartz
 }
 
-variant x11 description {Enable rendering in X11 (default, if Quartz is not enabled)} {
+variant x11 conflicts quartz description {Enable rendering in X11 (default)} {
     depends_lib-append  \
         port:xrender \
         lib:libX11.6:xorg

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071210/4a7e3652/attachment.html