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

[rhwood at macports.org]

Revision: 31423
          http://trac.macosforge.org/projects/macports/changeset/31423
Author:   rhwood at macports.org
Date:     2007-11-22 12:45:17 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
Simplify variants structure since other structure was unnessarily complex

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

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2007-11-22 20:43:32 UTC (rev 31422)
+++ trunk/dports/x11/gtk2/Portfile	2007-11-22 20:45:17 UTC (rev 31423)
@@ -48,7 +48,9 @@
     port:render \
     port:zlib
 
-pre-configure {
+default_variants +x11
+
+pre-fetch {
     if {[variant_isset with_quartz]} {
         if { ![file exists ${prefix}/include/cairo/cairo-quartz.h] } {
             return -code 1 "\nYou must first build cairo with the quartz variant enabled.  Please\nuninstall (or deactivate) the cairo port and reinstall by running:\n\n\"port install cairo +quartz\"\n"
@@ -78,34 +80,17 @@
         port:cups-headers
 }
 
-default_variants    +with_x11   +without_quartz
-
-variant with_quartz conflicts without_quartz \
-    description { Enable Quartz rendering } {
+variant quartz description { Enable Quartz rendering } {
     configure.args-append --with-gdktarget=quartz
 }
 
-variant without_quartz requires with_x11 conflicts with_quartz \
-    description { Disable Quartz rendering } {
-}
-
-variant with_x11 conflicts without_x11 \
-    description { Enable rendering in X11 } {
+variant x11 description { Enable rendering in X11 } {
     depends_lib-append  \
         port:xrender \
         lib:libX11.6:xorg
     build.args  CFLAGS+="-I{x11prefix}/include"
 }
 
-variant without_x11 requires with_quartz conflicts with_x11 \
-    description { Disable rendering in X11 } {
-}
-
-# these variants are included for naming consistency with other similar ports
-# IMHO all ports should use with[out]_x or [en|dis]able_x as variant names 
-variant quartz requires with_quartz {}
-variant no_x11 requires without_x11 {}
-
 post-patch	{
     reinplace "s|xdg_data_dirs = \"/usr|xdg_data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/gtk/xdgmime/xdgmime.c
     reinplace "s|g_strdup (\"/usr|g_strdup (\"${prefix}|g" ${worksrcpath}/gtk/gtkicontheme.c }

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