Changes 2.6.9:

* Bugs fixed:
 - Font selection remains visible
 - gimp.desktop: image/x-psd in MimeTypes twice
 - Unportable test(1) construct in configure script
 - Description of "histogram" procedure is slightly inaccurate
 - Tool options not saved/loaded correctly?
 - Importing PDF files with long titles
 - blur-gauss-selective.exe crashes
 - Dialog of "Save as BMP" ignores changes which are not made
   with a mous
 - Text-Tool crashes when edit a 2.4.2 version xcf
 - Text-Tool crashes when edit a 2.4.2 version xcf
 - Layer preview suddenly stops getting updated
 - leaks shared memory
 - Exporting to Alias PIX format fails
 - a few strings in Save as... > Raw image data dialog are always
   in English
 - GEGL Operation "path" crashes GIMP
 - Crashes when using path tool
 - GIMP 2.7.0 fails to build against libpng 1.4.0
 - Saving to .ppm fails on indexed colorspace
 - the "Antialiasing..." message in the progress bar does not show
   translated
 - gimp-layer-new-from-visible should work from updated projection
* Updated and new translations

7 files changed, 37 insertions, 59 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 9cb0e7ab369..12aac16f6f9 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.192 2010/06/20 14:02:03 wiz Exp $
+# $NetBSD: Makefile,v 1.193 2010/07/04 05:36:49 adam Exp $
 
-DISTNAME=	gimp-2.6.8
-PKGREVISION=	3
+DISTNAME=	gimp-2.6.9
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.6/ \
 		${MASTER_SITE_GNU:=gimp/v2.6/} \
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index 76fb0d9915b..29ffb51e66a 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2010/04/09 15:45:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.44 2010/07/04 05:36:49 adam Exp $
 bin/gimp
 bin/gimp-2.6
 bin/gimp-console
@@ -1179,12 +1179,12 @@ share/gtk-doc/html/libgimpmath/libgimpmath.html
 share/gtk-doc/html/libgimpmath/right.png
 share/gtk-doc/html/libgimpmath/style.css
 share/gtk-doc/html/libgimpmath/up.png
-share/gtk-doc/html/libgimpmodule/GimpModule.html
-share/gtk-doc/html/libgimpmodule/GimpModuleDB.html
 share/gtk-doc/html/libgimpmodule/home.png
 share/gtk-doc/html/libgimpmodule/index.html
 share/gtk-doc/html/libgimpmodule/index.sgml
 share/gtk-doc/html/libgimpmodule/left.png
+share/gtk-doc/html/libgimpmodule/libgimpmodule-gimpmodule.html
+share/gtk-doc/html/libgimpmodule/libgimpmodule-gimpmoduledb.html
 share/gtk-doc/html/libgimpmodule/libgimpmodule-index-deprecated.html
 share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-2.html
 share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-4.html
@@ -1644,6 +1644,10 @@ share/locale/ar/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ar/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ar/LC_MESSAGES/gimp20-tips.mo
 share/locale/ar/LC_MESSAGES/gimp20.mo
+share/locale/ast/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ast/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ast/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ast/LC_MESSAGES/gimp20.mo
 share/locale/az/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/az/LC_MESSAGES/gimp20-python.mo
 share/locale/az/LC_MESSAGES/gimp20-script-fu.mo
@@ -1853,12 +1857,19 @@ share/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ms/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ms/LC_MESSAGES/gimp20-tips.mo
 share/locale/ms/LC_MESSAGES/gimp20.mo
+share/locale/my/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/my/LC_MESSAGES/gimp20-python.mo
+share/locale/my/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/my/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/my/LC_MESSAGES/gimp20-tips.mo
+share/locale/my/LC_MESSAGES/gimp20.mo
 share/locale/nb/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/nb/LC_MESSAGES/gimp20-python.mo
 share/locale/nb/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nb/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/nb/LC_MESSAGES/gimp20-tips.mo
 share/locale/nb/LC_MESSAGES/gimp20.mo
+share/locale/nds/LC_MESSAGES/gimp20.mo
 share/locale/ne/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ne/LC_MESSAGES/gimp20-python.mo
 share/locale/ne/LC_MESSAGES/gimp20-script-fu.mo
@@ -1993,6 +2004,9 @@ share/locale/zh_CN/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-tips.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20.mo
+share/locale/zh_HK/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/zh_HK/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/zh_HK/LC_MESSAGES/gimp20-tips.mo
 share/locale/zh_HK/LC_MESSAGES/gimp20.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-python.mo
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 493de8b31fe..5570e55b403 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.53 2010/06/20 14:01:59 wiz Exp $
+$NetBSD: distinfo,v 1.54 2010/07/04 05:36:49 adam Exp $
 
-SHA1 (gimp-2.6.8.tar.bz2) = a550943f086abc9bf6b96d576741337b7186a4f4
-RMD160 (gimp-2.6.8.tar.bz2) = da02fedcc00ebaac04bfd21c153a7130d3ff5e08
-Size (gimp-2.6.8.tar.bz2) = 16342377 bytes
-SHA1 (patch-aa) = 52d9b1995e47b3ae34510fef074c7000f2527adb
-SHA1 (patch-ab) = bdcb7d4608563d7fc698ff876910371dadf8fb76
-SHA1 (patch-ac) = b1f4b802eebbb2d2145e0e282e65d48a0409a6b8
-SHA1 (patch-ad) = ec43ee2379c3d632f8f64fe85bb93fb6b61c8f95
+SHA1 (gimp-2.6.9.tar.bz2) = df263086b92d093f1db65704f6945a2e69ae4ef3
+RMD160 (gimp-2.6.9.tar.bz2) = 6d2f975c3cb22a371744abd147aaa2996f63f558
+Size (gimp-2.6.9.tar.bz2) = 16442347 bytes
+SHA1 (patch-aa) = 0775c8037748bfc27eb610f3667ddaa92d710681
+SHA1 (patch-ab) = 80e7235178e53e873efa0b16098b74fa0b981f76
+SHA1 (patch-ac) = 42f44b45640bdde305c1e52b95ee633360ebccb8
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index be7ab7d87cf..6fe733d13a8 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.25 2009/08/21 19:46:27 adam Exp $
+$NetBSD: patch-aa,v 1.26 2010/07/04 05:36:49 adam Exp $
 
---- etc/Makefile.in.orig	2009-08-13 21:37:06.000000000 +0200
+--- etc/Makefile.in.orig	2010-06-21 20:00:58.000000000 +0000
 +++ etc/Makefile.in
-@@ -320,7 +320,7 @@ gimpdatadir = @gimpdatadir@
+@@ -342,7 +342,7 @@ gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimplocaledir = @gimplocaledir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index 68b80854826..4ad4347f957 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.31 2010/06/20 14:01:59 wiz Exp $
+$NetBSD: patch-ab,v 1.32 2010/07/04 05:36:49 adam Exp $
 
-enable_print chunk sent upstream as https://bugzilla.gnome.org/show_bug.cgi?id=622196
-
---- configure.orig	2009-08-13 21:37:15.000000000 +0200
+--- configure.orig	2010-06-21 20:01:08.000000000 +0000
 +++ configure
-@@ -17595,13 +17595,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -17706,13 +17706,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
    gimp_ok=yes
  fi
  rm -f conftest*
@@ -19,16 +17,7 @@ enable_print chunk sent upstream as https://bugzilla.gnome.org/show_bug.cgi?id=6
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gimp_ok" >&5
  $as_echo "$gimp_ok" >&6; }
    if test "x$gimp_ok" = xno; then
-@@ -18930,7 +18930,7 @@ if test "x$with_print" != xno; then
-   enable_print="yes"
- fi
- 
-- if test "x$enable_print" == xyes; then
-+ if test "x$enable_print" = xyes; then
-   BUILD_PRINT_TRUE=
-   BUILD_PRINT_FALSE='#'
- else
-@@ -21126,7 +21126,7 @@ fi
+@@ -21381,7 +21381,7 @@ fi
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"
diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac
index de9265fc7b1..f26f8de7b5e 100644
--- a/graphics/gimp/patches/patch-ac
+++ b/graphics/gimp/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.17 2009/01/24 20:55:06 adam Exp $
+$NetBSD: patch-ac,v 1.18 2010/07/04 05:36:49 adam Exp $
 
---- plug-ins/twain/Makefile.in.orig	2008-08-30 19:55:20.000000000 +0100
-+++ plug-ins/twain/Makefile.in	2008-08-30 20:02:01.000000000 +0100
-@@ -67,7 +67,7 @@
+--- plug-ins/twain/Makefile.in.orig	2010-06-21 20:01:06.000000000 +0000
++++ plug-ins/twain/Makefile.in
+@@ -69,7 +69,7 @@ twain_DEPENDENCIES = $(libgimp) $(libgim
  	$(am__DEPENDENCIES_1)
  twain_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(twain_LDFLAGS) \
diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad
deleted file mode 100644
index 7df9d660ace..00000000000
--- a/graphics/gimp/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2010/06/20 14:01:59 wiz Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=622198
-
---- plug-ins/file-ico/ico-load.c.orig	2009-07-20 20:20:51.000000000 +0000
-+++ plug-ins/file-ico/ico-load.c
-@@ -287,14 +287,14 @@ ico_read_png (FILE    *fp,
-   switch (color_type)
-     {
-     case PNG_COLOR_TYPE_GRAY:
--      png_set_gray_1_2_4_to_8 (png_ptr);
-+      png_set_expand_gray_1_2_4_to_8 (png_ptr);
-       if ( bit_depth == 16 )
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
-       png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
-       break;
-     case PNG_COLOR_TYPE_GRAY_ALPHA:
--      png_set_gray_1_2_4_to_8 (png_ptr);
-+      png_set_expand_gray_1_2_4_to_8 (png_ptr);
-       if ( bit_depth == 16 )
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);