Update gthumb to 2.6.9.

Changes:
Fixed bug #326879 - gthumb-2.6.8: fix compilation against libexif-0.6.13
Fixed bug #318828: Exif Orientation Tag Incorrectly Updated.
Fixed bug #305165: gthumb crash resize.
Fixed bug #321124: Confusing handling of --disable-schemas-install
Fixed bug #320947: Create Web Album Tool doesn't generate HTML pages with
  International characters
Fixed bug #321274: Incorrect log2 definition/detection
Fixed bug #317623: [PATCH] Enter a directory or a catalog with the ENTER key.
Fixed bug #317628: [PATCH] Zoom in/out with CTRL + scrollwheel
Fixed bug #317056: gthumb Cygwin build fixes.
Fixed bug #316952: [PATCH] bind DELETE key to move a folder to trash in
  directory list.

7 files changed, 13 insertions, 73 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 8998fdc017f..3646c6b44d8 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:09:33 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/27 21:45:21 minskim Exp $
 
-DISTNAME=		gthumb-2.6.8
-PKGREVISION=		3
+DISTNAME=		gthumb-2.6.9
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gthumb/2.6/}
 
diff --git a/graphics/gthumb/PLIST b/graphics/gthumb/PLIST
index fd1f8a81b95..83cc71c90f4 100644
--- a/graphics/gthumb/PLIST
+++ b/graphics/gthumb/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 11:40:40 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/02/27 21:45:21 minskim Exp $
 bin/gthumb
 lib/bonobo/servers/GNOME_GThumb_CatalogView.server
 lib/bonobo/servers/GNOME_GThumb_Viewer.server
-lib/gthumb/libgthumb.la
+lib/libgthumb.la
 lib/gthumb/modules/libduplicates.la
 lib/gthumb/modules/libjpegtran.la
 lib/gthumb/modules/libphotoimporter.la
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 264f2bba597..1de2e950602 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.9 2006/01/13 17:58:25 wiz Exp $
+$NetBSD: distinfo,v 1.10 2006/02/27 21:45:21 minskim Exp $
 
-SHA1 (gthumb-2.6.8.tar.gz) = 5dd338d0779e4adbe94db8c8f9813b110f054930
-RMD160 (gthumb-2.6.8.tar.gz) = f55a04b88272491199f7d153ed3364b3a9e0f637
-Size (gthumb-2.6.8.tar.gz) = 3448533 bytes
-SHA1 (patch-aa) = 05b09184f8dda2847a7658ff07add0ca382a1fcf
-SHA1 (patch-ab) = 2ae1f7031b8586a74c34026a617eec3f2b34e390
-SHA1 (patch-ac) = 4b4faf14677338e2f8bec2c9e4b62170912ed7aa
-SHA1 (patch-ad) = 9e94c7a30ea04a6aca6bae019e73a84087c0f5c4
+SHA1 (gthumb-2.6.9.tar.gz) = 215ebd1756da6184e44a67e7b12301b55c5e3632
+RMD160 (gthumb-2.6.9.tar.gz) = 8923cf99417d0923ff20d35ae6c79f5ca945b665
+Size (gthumb-2.6.9.tar.gz) = 2549346 bytes
diff --git a/graphics/gthumb/patches/patch-aa b/graphics/gthumb/patches/patch-aa
index e7f693f123b..8c295dbb994 100644
--- a/graphics/gthumb/patches/patch-aa
+++ b/graphics/gthumb/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2006/01/13 17:58:25 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2006/02/27 21:45:21 minskim Exp $
 
---- data/Makefile.in.orig	2005-09-21 07:58:48.000000000 +0000
+--- data/Makefile.in.orig	2006-02-17 01:04:46.000000000 -0800
 +++ data/Makefile.in
-@@ -686,7 +686,7 @@ uninstall-man: uninstall-man1
+@@ -688,7 +688,7 @@ uninstall-man: uninstall-man1
  
  @INTLTOOL_SCHEMAS_RULE@
  
--@SCHEMAS_INSTALL_TRUE@install-data-local:
+-@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
 +install-data-local:
- @SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+ @GCONF_SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/gthumb/patches/patch-ab b/graphics/gthumb/patches/patch-ab
deleted file mode 100644
index 154972dc996..00000000000
--- a/graphics/gthumb/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/13 17:58:25 wiz Exp $
-
---- src/dlg-jpegtran.c.orig	2005-09-21 07:56:17.000000000 +0000
-+++ src/dlg-jpegtran.c
-@@ -31,10 +31,10 @@
- #include <glade/glade.h>
- 
- #ifdef HAVE_LIBEXIF
--#include <exif-data.h>
--#include <exif-content.h>
--#include <exif-entry.h>
--#include <exif-utils.h>
-+#include <libexif/exif-data.h>
-+#include <libexif/exif-content.h>
-+#include <libexif/exif-entry.h>
-+#include <libexif/exif-utils.h>
- #include "jpegutils/jpeg-data.h"
- #endif /* HAVE_LIBEXIF */
- 
diff --git a/graphics/gthumb/patches/patch-ac b/graphics/gthumb/patches/patch-ac
deleted file mode 100644
index ed8d3da0d67..00000000000
--- a/graphics/gthumb/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/13 17:58:25 wiz Exp $
-
---- src/gth-exif-data-viewer.c.orig	2005-09-21 07:56:17.000000000 +0000
-+++ src/gth-exif-data-viewer.c
-@@ -34,9 +34,9 @@
- #include "image-viewer.h"
- 
- #ifdef HAVE_LIBEXIF
--#include <exif-data.h>
--#include <exif-content.h>
--#include <exif-entry.h>
-+#include <libexif/exif-data.h>
-+#include <libexif/exif-content.h>
-+#include <libexif/exif-entry.h>
- #endif /* HAVE_LIBEXIF */
- 
- 
diff --git a/graphics/gthumb/patches/patch-ad b/graphics/gthumb/patches/patch-ad
deleted file mode 100644
index 56b232d4622..00000000000
--- a/graphics/gthumb/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/01/13 17:58:25 wiz Exp $
-
---- src/gth-exif-utils.h.orig	2005-09-21 07:56:17.000000000 +0000
-+++ src/gth-exif-utils.h
-@@ -28,10 +28,10 @@
- 
- #ifdef HAVE_LIBEXIF
- 
--#include <exif-data.h>
--#include <exif-content.h>
--#include <exif-entry.h>
--#include <exif-utils.h>
-+#include <libexif/exif-data.h>
-+#include <libexif/exif-content.h>
-+#include <libexif/exif-entry.h>
-+#include <libexif/exif-utils.h>
- 
- 
- typedef enum { /*< skip >*/