[85317] trunk/dports/graphics/gimp2/Portfile

[devans at macports.org]

Revision: 85317
          http://trac.macports.org/changeset/85317
Author:   devans at macports.org
Date:     2011-10-12 12:06:20 -0700 (Wed, 12 Oct 2011)
Log Message:
-----------
gimp2: variants simplified as in gimp2-devel, no +no_x11 +x11 just +quartz, builds with X11 support by default.

Modified Paths:
--------------
    trunk/dports/graphics/gimp2/Portfile

Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile	2011-10-12 16:15:40 UTC (rev 85316)
+++ trunk/dports/graphics/gimp2/Portfile	2011-10-12 19:06:20 UTC (rev 85317)
@@ -53,12 +53,6 @@
                 port:libwmf \
                 port:lcms
 
-pre-fetch {
-    if {![variant_isset quartz] && ![variant_isset x11]} {
-        error "Either +x11 or +quartz is required"
-    }
-}
-
 patchfiles      patch-etc-gimprc.diff \
                 patch-plug-ins-twain-tw_mac.c.diff
 
@@ -74,9 +68,9 @@
         set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
         set gtk_not_x11 [catch {exec grep -q GDK_WINDOWING_X11 ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
         if {[variant_isset quartz] && ${gtk_not_quartz}} {
-            error "+quartz variant selected, but gtk2+x11 is installed"
-        } elseif {[variant_isset x11] && ${gtk_not_x11}} {
-            error "+x11 variant selected, but gtk2+quartz is installed"
+            error "+quartz variant selected, but gtk2+x11 is installed. Install gtk2+quartz."
+        } elseif {![variant_isset quartz] && ${gtk_not_x11}} {
+            error "+quartz variant is not selected, but gtk2+quartz is installed. Install gtk2+x11."
         }
     } else {
             error "Cannot find gdkconfig.h"
@@ -144,15 +138,11 @@
     configure.args-append  --enable-debug
 }
 
-if {[variant_isset no_x11]} {
-    default_variants    +quartz
-}
-
-if {![variant_isset quartz]} {
-    default_variants    +x11
-}
-
-variant quartz requires no_x11 conflicts x11 {
+variant quartz {
+    configure.args-delete --with-x \
+                          --x-includes=${prefix}/include \
+                          --x-libraries=${prefix}/lib
+    configure.args-append --without-x
     configure.ldflags-append   -framework Carbon
 
 #
@@ -164,16 +154,6 @@
     }
 }
 
-variant x11 conflicts quartz description {Enable rendering in X11} {
-}
-
-variant no_x11 {
-    configure.args-delete --with-x \
-                --x-includes=${prefix}/include \
-                --x-libraries=${prefix}/lib
-    configure.args-append --without-x
-}
-
 post-activate {
         system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111012/6d426774/attachment.html>