Changes 2.3.9:

- better interpolation for "smooth" curves in the Curve tool
- added an Auto button to the Threshold tool that picks a suitable value
- simplified user installation, only display a dialog in case of an error
- added Red Eye Removal plug-in
- added thumbnail loader to GIF load plug-in
- declared even more data as const
- refactoring of the PDB and plug-in management code
- allow Merge to work on a single layer
- added a way to remove all keyboard shortcuts from the Preferences dialog
- added menu items for "Text to Path", "Text along Path" and "Text to
  Selection"
- allow to initialize a new layer mask with any of the image's channels
- added clipboard brush and clipboard pattern
- added scripts to sort color palettes
- swap meanings of "dilate" and	"erode" which have been wrong for a long time
- show Clone tool source location while painting
- use GtkFileChooserButton in place of GimpFileEntry
- added script to reverse the order of layers
- added "Sample merged" and "Selected Pixels only" options to Palette import
- added actions to select palette and colormap colors
- new environment variable to control which batch interpreter to use
- give plug-ins access to the CPU detection so that they can use MMX code
- speed up Selective Gaussian Blur plug-in
- improved tool cursors, added edge resizing cursors
- improved behaviour of new selection tools
- allow to reset all gimprc values from the Preferences dialog
- optionally show guides in the Crop tool
- bug fixes and code cleanup

9 files changed, 78 insertions, 67 deletions

diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index 4081dc5d82b..afa9b0d22dd 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2006/04/23 18:29:39 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/06/08 15:39:38 adam Exp $
 
-DISTNAME=	gimp-2.3.8
-PKGREVISION=	2
+DISTNAME=	gimp-2.3.9
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.3/ \
diff --git a/graphics/gimp24/PLIST b/graphics/gimp24/PLIST
index d7040417683..275e8a36cd5 100644
--- a/graphics/gimp24/PLIST
+++ b/graphics/gimp24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/05/10 16:50:45 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/06/08 15:39:38 adam Exp $
 bin/gimp-2.3
 bin/gimp-console-2.3
 bin/gimp-remote-2.3
@@ -100,6 +100,7 @@ include/gimp-2.0/libgimpbase/gimpbase.h
 include/gimp-2.0/libgimpbase/gimpbaseenums.h
 include/gimp-2.0/libgimpbase/gimpbasetypes.h
 include/gimp-2.0/libgimpbase/gimpchecks.h
+include/gimp-2.0/libgimpbase/gimpcpuaccel.h
 include/gimp-2.0/libgimpbase/gimpdatafiles.h
 include/gimp-2.0/libgimpbase/gimpenv.h
 include/gimp-2.0/libgimpbase/gimplimits.h
@@ -323,6 +324,7 @@ lib/gimp/2.0/plug-ins/psp
 lib/gimp/2.0/plug-ins/randomize
 lib/gimp/2.0/plug-ins/raw
 lib/gimp/2.0/plug-ins/rcm
+lib/gimp/2.0/plug-ins/redeye
 lib/gimp/2.0/plug-ins/retinex
 lib/gimp/2.0/plug-ins/ripple
 lib/gimp/2.0/plug-ins/rotate
@@ -470,6 +472,7 @@ share/doc/${PKGNAME}/libgimp/libgimp-gimpvectors.html
 share/doc/${PKGNAME}/libgimp/libgimp-image.html
 share/doc/${PKGNAME}/libgimp/libgimp-selectors.html
 share/doc/${PKGNAME}/libgimp/libgimp.devhelp
+share/doc/${PKGNAME}/libgimp/libgimp.devhelp2
 share/doc/${PKGNAME}/libgimp/libgimp.html
 share/doc/${PKGNAME}/libgimp/libgimpui-hierarchy.html
 share/doc/${PKGNAME}/libgimp/libgimpui.html
@@ -487,6 +490,7 @@ share/doc/${PKGNAME}/libgimpbase/left.png
 share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimpbaseenums.html
 share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimpbasetypes.html
 share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimpchecks.html
+share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimpcpuaccel.html
 share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimpdatafiles.html
 share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimpenv.html
 share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimplimits.html
@@ -499,6 +503,7 @@ share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimpunit.html
 share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimputils.html
 share/doc/${PKGNAME}/libgimpbase/libgimpbase-gimpversion.html
 share/doc/${PKGNAME}/libgimpbase/libgimpbase.devhelp
+share/doc/${PKGNAME}/libgimpbase/libgimpbase.devhelp2
 share/doc/${PKGNAME}/libgimpbase/libgimpbase.html
 share/doc/${PKGNAME}/libgimpbase/right.png
 share/doc/${PKGNAME}/libgimpbase/style.css
@@ -518,6 +523,7 @@ share/doc/${PKGNAME}/libgimpcolor/libgimpcolor-GimpColorSpace.html
 share/doc/${PKGNAME}/libgimpcolor/libgimpcolor-GimpHSV.html
 share/doc/${PKGNAME}/libgimpcolor/libgimpcolor-GimpRGB.html
 share/doc/${PKGNAME}/libgimpcolor/libgimpcolor.devhelp
+share/doc/${PKGNAME}/libgimpcolor/libgimpcolor.devhelp2
 share/doc/${PKGNAME}/libgimpcolor/libgimpcolor.html
 share/doc/${PKGNAME}/libgimpcolor/right.png
 share/doc/${PKGNAME}/libgimpcolor/style.css
@@ -541,6 +547,7 @@ share/doc/${PKGNAME}/libgimpconfig/libgimpconfig-gimpconfig-serialize.html
 share/doc/${PKGNAME}/libgimpconfig/libgimpconfig-gimpconfig-utils.html
 share/doc/${PKGNAME}/libgimpconfig/libgimpconfig-hierarchy.html
 share/doc/${PKGNAME}/libgimpconfig/libgimpconfig.devhelp
+share/doc/${PKGNAME}/libgimpconfig/libgimpconfig.devhelp2
 share/doc/${PKGNAME}/libgimpconfig/libgimpconfig.html
 share/doc/${PKGNAME}/libgimpconfig/right.png
 share/doc/${PKGNAME}/libgimpconfig/style.css
@@ -573,6 +580,7 @@ share/doc/${PKGNAME}/libgimpmodule/ix03.html
 share/doc/${PKGNAME}/libgimpmodule/ix04.html
 share/doc/${PKGNAME}/libgimpmodule/left.png
 share/doc/${PKGNAME}/libgimpmodule/libgimpmodule.devhelp
+share/doc/${PKGNAME}/libgimpmodule/libgimpmodule.devhelp2
 share/doc/${PKGNAME}/libgimpmodule/libgimpmodule.html
 share/doc/${PKGNAME}/libgimpmodule/right.png
 share/doc/${PKGNAME}/libgimpmodule/style.css
@@ -590,6 +598,7 @@ share/doc/${PKGNAME}/libgimpthumb/libgimpthumb-gimpthumb-enums.html
 share/doc/${PKGNAME}/libgimpthumb/libgimpthumb-gimpthumb-error.html
 share/doc/${PKGNAME}/libgimpthumb/libgimpthumb-gimpthumb-utils.html
 share/doc/${PKGNAME}/libgimpthumb/libgimpthumb.devhelp
+share/doc/${PKGNAME}/libgimpthumb/libgimpthumb.devhelp2
 share/doc/${PKGNAME}/libgimpthumb/libgimpthumb.html
 share/doc/${PKGNAME}/libgimpthumb/right.png
 share/doc/${PKGNAME}/libgimpthumb/style.css
@@ -676,6 +685,7 @@ share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-hierarchy.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-utils.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets-widgets.html
 share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets.devhelp
+share/doc/${PKGNAME}/libgimpwidgets/libgimpwidgets.devhelp2
 share/doc/${PKGNAME}/libgimpwidgets/right.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-anchor-16.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-cap-butt-16.png
@@ -862,6 +872,8 @@ share/doc/${PKGNAME}/libgimpwidgets/stock-toilet-paper-16.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-toilet-paper-24.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-tool-airbrush-16.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-tool-airbrush-22.png
+share/doc/${PKGNAME}/libgimpwidgets/stock-tool-align-16.png
+share/doc/${PKGNAME}/libgimpwidgets/stock-tool-align-22.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-tool-blend-16.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-tool-blend-22.png
 share/doc/${PKGNAME}/libgimpwidgets/stock-tool-blur-16.png
@@ -1444,6 +1456,7 @@ share/gimp/2.0/scripts/perspective-shadow.scm
 share/gimp/2.0/scripts/predator.scm
 share/gimp/2.0/scripts/pupi-button.scm
 share/gimp/2.0/scripts/rendermap.scm
+share/gimp/2.0/scripts/reverse-layers.scm
 share/gimp/2.0/scripts/ripply-anim.scm
 share/gimp/2.0/scripts/round-corners.scm
 share/gimp/2.0/scripts/script-fu-util.scm
@@ -1691,6 +1704,8 @@ share/gimp/2.0/themes/Default/images/stock-toilet-paper-16.png
 share/gimp/2.0/themes/Default/images/stock-toilet-paper-24.png
 share/gimp/2.0/themes/Default/images/stock-tool-airbrush-16.png
 share/gimp/2.0/themes/Default/images/stock-tool-airbrush-22.png
+share/gimp/2.0/themes/Default/images/stock-tool-align-16.png
+share/gimp/2.0/themes/Default/images/stock-tool-align-22.png
 share/gimp/2.0/themes/Default/images/stock-tool-blend-16.png
 share/gimp/2.0/themes/Default/images/stock-tool-blend-22.png
 share/gimp/2.0/themes/Default/images/stock-tool-blur-16.png
@@ -1941,11 +1956,6 @@ share/locale/nl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nl/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/nl/LC_MESSAGES/gimp20-tips.mo
 share/locale/nl/LC_MESSAGES/gimp20.mo
-share/locale/no/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/no/LC_MESSAGES/gimp20-script-fu.mo
-share/locale/no/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/no/LC_MESSAGES/gimp20-tips.mo
-share/locale/no/LC_MESSAGES/gimp20.mo
 share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/pa/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/pa/LC_MESSAGES/gimp20-std-plug-ins.mo
diff --git a/graphics/gimp24/buildlink3.mk b/graphics/gimp24/buildlink3.mk
index 664f75c73cb..bc7eb71db20 100644
--- a/graphics/gimp24/buildlink3.mk
+++ b/graphics/gimp24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/06/08 15:39:38 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gimp
 
 .if !empty(GIMP_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gimp+=	gimp>=2.3.4nb1
-BUILDLINK_ABI_DEPENDS.gimp?=	gimp>=2.3.8nb1
+BUILDLINK_ABI_DEPENDS.gimp+=	gimp>=2.3.8nb1
 BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp24
 .endif	# GIMP_BUILDLINK3_MK
 
diff --git a/graphics/gimp24/distinfo b/graphics/gimp24/distinfo
index cdb329e39cf..c50ad8a050c 100644
--- a/graphics/gimp24/distinfo
+++ b/graphics/gimp24/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2006/04/23 18:29:39 wiz Exp $
+$NetBSD: distinfo,v 1.6 2006/06/08 15:39:38 adam Exp $
 
-SHA1 (gimp-2.3.8.tar.bz2) = 32721b460582a3d3e267703c0f8829e24379306d
-RMD160 (gimp-2.3.8.tar.bz2) = db4bb4cd580efd8c06e8362935e9d98e74b057aa
-Size (gimp-2.3.8.tar.bz2) = 15135922 bytes
-SHA1 (patch-aa) = 83e6c5fe7b2efddd5aa1a6bca79821dbec09a123
-SHA1 (patch-ab) = 57fde7f50489fe16383ef85677670b38fd3cc089
-SHA1 (patch-ac) = 22e1d7c34486cf17ab2af3b01426b67a761078fa
-SHA1 (patch-ad) = 24c141e55321d36b45e0e17712882185fc5f04ac
-SHA1 (patch-ae) = 14ef2ed4ee4b3049b052ab4bf33bc60346c22b53
+SHA1 (gimp-2.3.9.tar.bz2) = 2dbd8e716fbf92c3999e80f3852bff23645e1fe6
+RMD160 (gimp-2.3.9.tar.bz2) = e2e8920d1f743a5b977f2f8102e9dbac346272fd
+Size (gimp-2.3.9.tar.bz2) = 15183977 bytes
+SHA1 (patch-aa) = 997a134a9f7bffdb288226885de9105b7e21ee1a
+SHA1 (patch-ab) = 0ced9922789bef1511b3f970c22e30e94eed9600
+SHA1 (patch-ac) = 2ccfeb32bf3a77fffcd854d64272e0ee1b6c3480
+SHA1 (patch-ad) = 2e47c5aad8ffadb49651caa238eee96f5e66fee6
+SHA1 (patch-ae) = 9a97da80740dcd732f01f836ae1e3179b8c5fd6f
diff --git a/graphics/gimp24/patches/patch-aa b/graphics/gimp24/patches/patch-aa
index 7c5ac6b2459..19ea147cd93 100644
--- a/graphics/gimp24/patches/patch-aa
+++ b/graphics/gimp24/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2006/04/14 10:49:41 adam Exp $
+$NetBSD: patch-aa,v 1.4 2006/06/08 15:39:38 adam Exp $
 
---- etc/Makefile.in.orig	2006-04-06 12:20:35.000000000 +0200
+--- etc/Makefile.in.orig	2006-06-05 17:17:41.000000000 +0200
 +++ etc/Makefile.in
-@@ -394,7 +394,7 @@ gimpdatadir = @gimpdatadir@
+@@ -393,7 +393,7 @@ gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimplocaledir = @gimplocaledir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp24/patches/patch-ab b/graphics/gimp24/patches/patch-ab
index bd3d3c09f42..511870f9411 100644
--- a/graphics/gimp24/patches/patch-ab
+++ b/graphics/gimp24/patches/patch-ab
@@ -1,17 +1,33 @@
-$NetBSD: patch-ab,v 1.3 2006/04/14 10:49:41 adam Exp $
+$NetBSD: patch-ab,v 1.4 2006/06/08 15:39:38 adam Exp $
 
---- configure.orig	2006-04-06 12:21:08.000000000 +0200
+--- configure.orig	2006-06-05 17:18:01.000000000 +0200
 +++ configure
-@@ -32139,7 +32139,7 @@ echo $ECHO_N "checking if libexif is ver
+@@ -30731,6 +30731,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+   gimp_ok=yes
+ fi
+ rm -f conftest*
++  fi
+ 
+       if test $gimp_ok = yes; then
+ 
+@@ -30739,7 +30740,6 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+ 
+       fi
+-  fi
+   { echo "$as_me:$LINENO: result: $gimp_ok" >&5
+ echo "${ECHO_T}$gimp_ok" >&6; }
+   if test $gimp_ok = no; then
+@@ -32731,7 +32731,7 @@ echo $ECHO_N "checking if libexif is ver
    fi
-   echo "$as_me:$LINENO: result: $have_exif_0_6" >&5
- echo "${ECHO_T}$have_exif_0_6" >&6
+   { echo "$as_me:$LINENO: result: $have_exif_0_6" >&5
+ echo "${ECHO_T}$have_exif_0_6" >&6; }
 -  if test x$have_exif_0_6 == xyes; then
 +  if test x$have_exif_0_6 = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_EXIF_0_6 1
-@@ -35489,7 +35489,7 @@ fi;
+@@ -36100,7 +36100,7 @@ fi
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"
diff --git a/graphics/gimp24/patches/patch-ac b/graphics/gimp24/patches/patch-ac
index 96b6614cfbf..a6c9aaef4e0 100644
--- a/graphics/gimp24/patches/patch-ac
+++ b/graphics/gimp24/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2006/04/14 10:49:59 adam Exp $
+$NetBSD: patch-ac,v 1.2 2006/06/08 15:39:38 adam Exp $
 
---- app/plug-in/plug-in-run.h.orig	2006-04-14 10:19:49.000000000 +0200
-+++ app/plug-in/plug-in-run.h
-@@ -22,7 +22,7 @@
- #define __PLUG_IN_RUN_H__
- 
- #ifndef __YES_I_NEED_PLUG_IN_RUN__
--#error Don't use plug_in_run*(), use gimp_procedure_execute*() instead.
-+#error Do not use plug_in_run*(), use gimp_procedure_execute*() instead.
- #endif
+--- libgimp/gimp.c.orig	2006-06-07 17:56:19.000000000 +0200
++++ libgimp/gimp.c
+@@ -23,6 +23,8 @@
  
+ #define _POSIX_SOURCE  /* all the sigaction stuff is POSIX */
+ #define _SVID_SOURCE   /* except for SA_RESTART, it seems  */
++#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE_EXTENDED
  
+ #include <errno.h>
+ #include <stdarg.h>
diff --git a/graphics/gimp24/patches/patch-ad b/graphics/gimp24/patches/patch-ad
index efe8448fee4..43b35f7ee71 100644
--- a/graphics/gimp24/patches/patch-ad
+++ b/graphics/gimp24/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2006/02/09 12:00:37 adam Exp $
+$NetBSD: patch-ad,v 1.3 2006/06/08 15:39:38 adam Exp $
 
---- app/base/cpu-accel.c.orig	2006-01-23 15:45:59.000000000 +0100
-+++ app/base/cpu-accel.c
-@@ -427,7 +427,7 @@ arch_accel (void)
-   canjump = 1;
+--- app/main.c.orig	2006-06-07 18:23:05.000000000 +0200
++++ app/main.c
+@@ -20,6 +20,8 @@
  
-   asm volatile ("mtspr 256, %0\n\t"
--                "vand %%v0, %%v0, %%v0"
-+                "vand v0, v0, v0"
-                 :
-                 : "r" (-1));
+ #define _POSIX_SOURCE  /* all the sigaction stuff is POSIX */
+ #define _SVID_SOURCE   /* except for SA_RESTART, it seems  */
++#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE_EXTENDED
  
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/graphics/gimp24/patches/patch-ae b/graphics/gimp24/patches/patch-ae
index 725748108e6..670e7ac11ea 100644
--- a/graphics/gimp24/patches/patch-ae
+++ b/graphics/gimp24/patches/patch-ae
@@ -1,13 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2006/04/23 18:29:39 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2006/06/08 15:39:38 adam Exp $
 
---- plug-ins/common/png.c.orig	2005-11-04 21:19:00.000000000 +0100
+--- plug-ins/common/png.c.orig	2006-06-05 16:51:24.000000000 +0200
 +++ plug-ins/common/png.c
-@@ -1095,12 +1095,10 @@ load_image (const gchar *filename,
-    * Done with the file...
-    */
- 
--  png_read_destroy (pp, info, NULL);
-+  png_destroy_read_struct (&pp, &info, NULL);
+@@ -1072,8 +1072,6 @@ load_image (const gchar *filename,
  
    g_free (pixel);
    g_free (pixels);
@@ -16,16 +11,7 @@ $NetBSD: patch-ae,v 1.1 2006/04/23 18:29:39 wiz Exp $
  
    fclose (fp);
  
-@@ -1553,7 +1551,7 @@ save_image (const gchar *filename,
-     }
- 
-   png_write_end (pp, info);
--  png_write_destroy (pp);
-+  png_destroy_read_struct (&pp, &info, NULL);
- 
-   g_free (pixel);
-   g_free (pixels);
-@@ -1568,9 +1566,6 @@ save_image (const gchar *filename,
+@@ -1531,9 +1529,6 @@ save_image (const gchar *filename,
        g_free (text);
      }