Ticket #16803: patch-gimp2-Portfile.diff

Portfile

@@ -4 +4 @@
 PortSystem 1.0
 
 name            gimp2
-version         2.6.0
+version         2.6.1
 categories      graphics
 maintainers     gmail.com:dbevans
 homepage        http://www.gimp.org/
@@ -17 +17 @@
         The GIMP provides the user with a wide variety of image \
         manipulation, painting, processing, and rendering tools.
 
-set M.m         [join [lrange [split ${version} .] 0 1] .]
-master_sites    http://gimp.mirrors.hoobly.com/gimp/v${M.m}/ \
-                ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/v${M.m}/ \
-                ftp://ftp.gimp.org/pub/gimp/v${M.m}/
-
-checksums       md5     e5ac955fee8b376d431e4693027d7640 \
-                sha1    187effb5722a1d5943c48ec74a3be96c836215f6 \
-                rmd160  66dae43b362298314befc39916bb3e01b9098b50
+set branch      [join [lrange [split ${version} .] 0 1] .]
+master_sites    http://gimp.mirrors.hoobly.com/gimp/v${branch}/ \
+                ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/v${branch}/ \
+                ftp://ftp.gimp.org/pub/gimp/v${branch}/
+
+checksums       md5     2fa176d1da75575c88b01019d014744d \
+                sha1    c03c737496444c811c73772d356db3dbf886fd68 \
+                rmd160  4cf18ae63a813ccf35a0b33ede3b24a304b47b03
 
 distname        gimp-${version}
 use_bzip2       yes
@@ -40 +40 @@
                 port:libwmf \
                 port:p5-xml-parser \
                 port:poppler \
-                port:webkit-gtk \
                 port:py25-gtk
 
 platform darwin 7 {
     # poppler currently can't be built on 10.3 (see #15603)
     depends_lib-delete port:poppler
+    configure.args-append --without-poppler
 }
 
 platform darwin 9 {
@@ -62 +62 @@
                 --without-dbus \
                 --without-hal \
                 --without-alsa \
-                --without-gvfs
+                --without-gvfs \
+                --without-webkit
 
 variant no_python description {Disable Python scripts and filters} {
     depends_lib-delete      port:py25-gtk
@@ -78 +79 @@
     depends_lib-append      port:gvfs
     configure.args-delete   --without-gvfs
 }
+
+variant help_browser description {Enable Gimp help browser} {
+    depends_lib-append      port:gtk-webkit
+    configure.args-delete   --without-webkit
+}
+
+livecheck.check regex
+livecheck.url   http://www.gimp.org/downloads/
+livecheck.regex "gimp-(${branch}(?:\\.\\d+)*)${extract.suffix}"