update to 2.10.12

changes: bugfixes

4 files changed, 48 insertions, 18 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 81f3e467e78..58e2233e4e7 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2010/01/18 09:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2010/05/17 16:56:27 drochner Exp $
 
-DISTNAME=		gthumb-2.10.11
-PKGREVISION=		5
+DISTNAME=		gthumb-2.10.12
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gthumb/2.10/}
 
diff --git a/graphics/gthumb/PLIST b/graphics/gthumb/PLIST
index ce92ba252fd..4b69d4dfb0d 100644
--- a/graphics/gthumb/PLIST
+++ b/graphics/gthumb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:59:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2010/05/17 16:56:27 drochner Exp $
 bin/gthumb
 lib/bonobo/servers/GNOME_GThumb.server
 lib/gthumb/modules/libduplicates.la
@@ -23,6 +23,11 @@ share/gnome/help/gthumb/de/figures/main-win.png
 share/gnome/help/gthumb/de/figures/nav-button.png
 share/gnome/help/gthumb/de/figures/preferences.png
 share/gnome/help/gthumb/de/gthumb.xml
+share/gnome/help/gthumb/el/figures/comment.png
+share/gnome/help/gthumb/el/figures/main-win.png
+share/gnome/help/gthumb/el/figures/nav-button.png
+share/gnome/help/gthumb/el/figures/preferences.png
+share/gnome/help/gthumb/el/gthumb.xml
 share/gnome/help/gthumb/es/figures/comment.png
 share/gnome/help/gthumb/es/figures/main-win.png
 share/gnome/help/gthumb/es/figures/nav-button.png
@@ -38,6 +43,11 @@ share/gnome/help/gthumb/sv/figures/main-win.png
 share/gnome/help/gthumb/sv/figures/nav-button.png
 share/gnome/help/gthumb/sv/figures/preferences.png
 share/gnome/help/gthumb/sv/gthumb.xml
+share/gnome/help/gthumb/zh_CN/figures/comment.png
+share/gnome/help/gthumb/zh_CN/figures/main-win.png
+share/gnome/help/gthumb/zh_CN/figures/nav-button.png
+share/gnome/help/gthumb/zh_CN/figures/preferences.png
+share/gnome/help/gthumb/zh_CN/gthumb.xml
 share/gthumb/albumthemes/BestFit/BestFit.css
 share/gthumb/albumthemes/BestFit/BestFit.js
 share/gthumb/albumthemes/BestFit/back.png
@@ -152,13 +162,16 @@ share/locale/hu/LC_MESSAGES/gthumb.mo
 share/locale/id/LC_MESSAGES/gthumb.mo
 share/locale/it/LC_MESSAGES/gthumb.mo
 share/locale/ja/LC_MESSAGES/gthumb.mo
+share/locale/kn/LC_MESSAGES/gthumb.mo
 share/locale/ko/LC_MESSAGES/gthumb.mo
 share/locale/lt/LC_MESSAGES/gthumb.mo
 share/locale/lv/LC_MESSAGES/gthumb.mo
 share/locale/mk/LC_MESSAGES/gthumb.mo
 share/locale/ml/LC_MESSAGES/gthumb.mo
+share/locale/mr/LC_MESSAGES/gthumb.mo
 share/locale/ms/LC_MESSAGES/gthumb.mo
 share/locale/nb/LC_MESSAGES/gthumb.mo
+share/locale/nds/LC_MESSAGES/gthumb.mo
 share/locale/ne/LC_MESSAGES/gthumb.mo
 share/locale/nl/LC_MESSAGES/gthumb.mo
 share/locale/nn/LC_MESSAGES/gthumb.mo
@@ -175,6 +188,8 @@ share/locale/sq/LC_MESSAGES/gthumb.mo
 share/locale/sr/LC_MESSAGES/gthumb.mo
 share/locale/sr@Latn/LC_MESSAGES/gthumb.mo
 share/locale/sv/LC_MESSAGES/gthumb.mo
+share/locale/ta/LC_MESSAGES/gthumb.mo
+share/locale/te/LC_MESSAGES/gthumb.mo
 share/locale/th/LC_MESSAGES/gthumb.mo
 share/locale/tr/LC_MESSAGES/gthumb.mo
 share/locale/uk/LC_MESSAGES/gthumb.mo
@@ -185,6 +200,8 @@ share/locale/zh_HK/LC_MESSAGES/gthumb.mo
 share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 share/omf/gthumb/gthumb-C.omf
 share/omf/gthumb/gthumb-de.omf
+share/omf/gthumb/gthumb-el.omf
 share/omf/gthumb/gthumb-es.omf
 share/omf/gthumb/gthumb-fr.omf
 share/omf/gthumb/gthumb-sv.omf
+share/omf/gthumb/gthumb-zh_CN.omf
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 2e8bcbca647..c5ea331026f 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2009/04/07 11:43:57 drochner Exp $
+$NetBSD: distinfo,v 1.22 2010/05/17 16:56:27 drochner Exp $
 
-SHA1 (gthumb-2.10.11.tar.gz) = a71a8f7f8ab2497deea3a26d67122d99f3556cc4
-RMD160 (gthumb-2.10.11.tar.gz) = 7ec7b14ed68887aa5cb0aab550022ac275087803
-Size (gthumb-2.10.11.tar.gz) = 3824287 bytes
-SHA1 (patch-aa) = 782e9ce646cdb2d5fbc28675cffb75f7e059a071
+SHA1 (gthumb-2.10.12.tar.gz) = 4a91f8f5d20b8e47412ef0cdefdf301477167d77
+RMD160 (gthumb-2.10.12.tar.gz) = 8f39c42d60872b32ac56157e9ce250a1c599d9c5
+Size (gthumb-2.10.12.tar.gz) = 4514132 bytes
+SHA1 (patch-aa) = da1f2b470df135a0edca8367969a360f358b5b0f
diff --git a/graphics/gthumb/patches/patch-aa b/graphics/gthumb/patches/patch-aa
index 03cac4e5e5e..922307662dd 100644
--- a/graphics/gthumb/patches/patch-aa
+++ b/graphics/gthumb/patches/patch-aa
@@ -1,13 +1,27 @@
-$NetBSD: patch-aa,v 1.6 2007/04/11 18:08:54 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2010/05/17 16:56:27 drochner Exp $
 
---- data/Makefile.in.orig	2007-03-27 20:24:36.000000000 +0200
+--- data/Makefile.in.orig	2010-05-05 10:47:22.000000000 +0000
 +++ data/Makefile.in
-@@ -702,7 +702,7 @@ install-data-hook:
- 
+@@ -844,14 +844,14 @@ update-icon-cache:
  @INTLTOOL_SCHEMAS_RULE@
  
--@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
-+install-data-local:
- @GCONF_SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$(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.
+ install-schemas: $(schema_DATA)
+-@GCONF_SCHEMAS_INSTALL_TRUE@	if test -z "$(DESTDIR)" ; then \
+-@GCONF_SCHEMAS_INSTALL_TRUE@	for p in $^ ; do \
+-@GCONF_SCHEMAS_INSTALL_TRUE@		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+-@GCONF_SCHEMAS_INSTALL_TRUE@			$(GCONFTOOL) \
+-@GCONF_SCHEMAS_INSTALL_TRUE@			--makefile-install-rule \
+-@GCONF_SCHEMAS_INSTALL_TRUE@			$(top_builddir)/data/$$p; \
+-@GCONF_SCHEMAS_INSTALL_TRUE@	done \
+-@GCONF_SCHEMAS_INSTALL_TRUE@	fi
++	if test -z "$(DESTDIR)" ; then \
++	for p in $^ ; do \
++		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
++			$(GCONFTOOL) \
++			--makefile-install-rule \
++			$(top_builddir)/data/$$p; \
++	done \
++	fi
+ 
+ uninstall-schemas: $(schema_DATA)
+ @GCONF_SCHEMAS_INSTALL_TRUE@	if test -z "$(DESTDIR)" ; then \