most recent changes, diff for gimp2

Index: graphics/gimp2/Portfile
--- graphics/gimp2/Portfile (revision 41520)
+++ graphics/gimp2/Portfile (revision 41521)
@@ -139,10 +139,10 @@
if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
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}} {
+ 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 "+x11 variant selected, but gtk2+quartz is installed"
}
} else {
error "Cannot find gdkconfig.h"
@@ -150,7 +150,7 @@
}

variant quartz requires no_x11 conflicts x11 description {Enable Quartz rendering} {
- configure.ldflags-append -framework Carbon"
+ configure.ldflags-append -framework Carbon
}

variant x11 conflicts quartz description {Enable rendering in X11 (default)} {