Modified: trunk/dports/graphics/gimp2/Portfile (70258 => 70259)

--- trunk/dports/graphics/gimp2/Portfile	2010-08-03 23:37:43 UTC (rev 70258)
+++ trunk/dports/graphics/gimp2/Portfile	2010-08-03 23:40:05 UTC (rev 70259)
@@ -4,9 +4,10 @@
 PortSystem 1.0
 
 name            gimp2
+conflicts       gimp2-devel
 # please remember to update the gimp metapackage to match
 version         2.6.10
-revision        1
+revision        2
 categories      graphics
 maintainers     devans
 homepage        http://www.gimp.org/
@@ -52,7 +53,7 @@
                 port:libwmf \
                 port:lcms \
                 port:dbus-glib \
-                port:py25-gtk
+                port:py26-gtk
 
 platform darwin 9 {
     post-patch {
@@ -62,7 +63,7 @@
 }
 
 use_parallel_build  yes
-configure.python    ${prefix}/bin/python2.5
+configure.python    ${prefix}/bin/python2.6
 configure.args  --build=${configure.build_arch}-apple-${os.platform}${os.version} \
                 --enable-mp \
                 --with-pdbgen \
@@ -73,7 +74,7 @@
                 --without-webkit
 
 variant no_python description {Disable Python scripts and filters} {
-    depends_lib-delete      port:py25-gtk
+    depends_lib-delete      port:py26-gtk
     configure.args-append   --disable-python
 }