update to 2.10.2

This moves this pkg to the new stable gnome branch, too much to list here.

4 files changed, 38 insertions, 35 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index dc238e2ba8b..17f0cd1f6d4 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2007/03/21 12:05:47 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/04/11 18:08:54 drochner Exp $
 
-DISTNAME=		gthumb-2.8.1
-PKGREVISION=		1
+DISTNAME=		gthumb-2.10.2
 CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gthumb/2.8/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gthumb/2.10/}
 
 MAINTAINER=		minskim@NetBSD.org
 HOMEPAGE=		http://gthumb.sourceforge.net/
@@ -39,6 +38,7 @@ BUILDLINK_API_DEPENDS.libglade2+=   libglade2>=2.4.0
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gthumb/PLIST b/graphics/gthumb/PLIST
index ea340940bc9..41fe8e70d2a 100644
--- a/graphics/gthumb/PLIST
+++ b/graphics/gthumb/PLIST
@@ -1,29 +1,37 @@
-@comment $NetBSD: PLIST,v 1.6 2006/12/15 20:23:52 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/04/11 18:08:54 drochner Exp $
 bin/gthumb
-lib/bonobo/servers/GNOME_GThumb.server
-lib/bonobo/servers/GNOME_GThumb_CatalogView.server
-lib/bonobo/servers/GNOME_GThumb_Viewer.server
-lib/gthumb/libgthumb.la
 lib/gthumb/modules/libduplicates.la
 lib/gthumb/modules/libjpegtran.la
 lib/gthumb/modules/libphotoimporter.la
 lib/gthumb/modules/libpngexporter.la
 lib/gthumb/modules/libsearch.la
 lib/gthumb/modules/libwebexporter.la
-libexec/gthumb-catalog-view
-libexec/gthumb-image-viewer
+lib/libgthumb.la
 man/man1/gthumb.1
-share/application-registry/gthumb.applications
 share/applications/gthumb.desktop
 share/gconf/schemas/gthumb.schemas
-share/gnome-2.0/ui/GNOME_GThumb_CatalogView.xml
-share/gnome-2.0/ui/GNOME_GThumb_Viewer.xml
 share/gnome/help/gthumb/C/figures/comment.png
 share/gnome/help/gthumb/C/figures/main-win.png
 share/gnome/help/gthumb/C/figures/nav-button.png
 share/gnome/help/gthumb/C/figures/preferences.png
 share/gnome/help/gthumb/C/gthumb.xml
 share/gnome/help/gthumb/C/legal.xml
+share/gnome/help/gthumb/sv/figures/comment.png
+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/gthumb/albumthemes/BestFit/BestFit.css
+share/gthumb/albumthemes/BestFit/BestFit.js
+share/gthumb/albumthemes/BestFit/back.png
+share/gthumb/albumthemes/BestFit/image.gthtml
+share/gthumb/albumthemes/BestFit/index.gthtml
+share/gthumb/albumthemes/BestFit/index.js
+share/gthumb/albumthemes/BestFit/lib.js
+share/gthumb/albumthemes/BestFit/next.png
+share/gthumb/albumthemes/BestFit/prev.png
+share/gthumb/albumthemes/BestFit/preview.png
+share/gthumb/albumthemes/BestFit/thumbnail.gthtml
 share/gthumb/albumthemes/Classic/1.gif
 share/gthumb/albumthemes/Classic/back.png
 share/gthumb/albumthemes/Classic/background.gif
@@ -92,17 +100,11 @@ share/gthumb/glade/gthumb_edit.glade
 share/gthumb/glade/gthumb_png_exporter.glade
 share/gthumb/glade/gthumb_preferences.glade
 share/gthumb/glade/gthumb_print.glade
+share/gthumb/glade/gthumb_redeye.glade
 share/gthumb/glade/gthumb_search.glade
 share/gthumb/glade/gthumb_tools.glade
 share/gthumb/glade/gthumb_web_exporter.glade
 share/gthumb/glade/volume-mute.png
-share/gthumb/icons/black-white.png
-share/gthumb/icons/flip.png
-share/gthumb/icons/flip.xpm
-share/gthumb/icons/mirror.png
-share/gthumb/icons/mirror.xpm
-share/gthumb/icons/rotate.png
-share/gthumb/icons/rotate.xpm
 share/icons/hicolor/48x48/apps/gthumb.png
 share/locale/am/LC_MESSAGES/gthumb.mo
 share/locale/ar/LC_MESSAGES/gthumb.mo
@@ -120,6 +122,7 @@ share/locale/en_GB/LC_MESSAGES/gthumb.mo
 share/locale/es/LC_MESSAGES/gthumb.mo
 share/locale/et/LC_MESSAGES/gthumb.mo
 share/locale/eu/LC_MESSAGES/gthumb.mo
+share/locale/fa/LC_MESSAGES/gthumb.mo
 share/locale/fi/LC_MESSAGES/gthumb.mo
 share/locale/fr/LC_MESSAGES/gthumb.mo
 share/locale/ga/LC_MESSAGES/gthumb.mo
@@ -161,27 +164,27 @@ share/locale/zh_CN/LC_MESSAGES/gthumb.mo
 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-sv.omf
 @dirrm share/omf/gthumb
 @comment in scrollkeeper: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
-@dirrm share/gthumb/icons
 @dirrm share/gthumb/glade
 @dirrm share/gthumb/albumthemes/Wiki
 @dirrm share/gthumb/albumthemes/NeatRound
 @dirrm share/gthumb/albumthemes/Flicker
 @dirrm share/gthumb/albumthemes/ClassicClips
 @dirrm share/gthumb/albumthemes/Classic
+@dirrm share/gthumb/albumthemes/BestFit
 @dirrm share/gthumb/albumthemes
 @dirrm share/gthumb
+@dirrm share/gnome/help/gthumb/sv/figures
+@dirrm share/gnome/help/gthumb/sv
 @dirrm share/gnome/help/gthumb/C/figures
 @dirrm share/gnome/help/gthumb/C
 @dirrm share/gnome/help/gthumb
 @comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
 @comment in GConf2: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
-@comment in xdg-dirs: @dirrm share/application-registry
 @dirrm lib/gthumb/modules
 @dirrm lib/gthumb
-@comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index f5c96062c14..2a7c7adbd52 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2006/12/15 20:23:52 drochner Exp $
+$NetBSD: distinfo,v 1.13 2007/04/11 18:08:54 drochner Exp $
 
-SHA1 (gthumb-2.8.1.tar.gz) = 1f1f278ef1d978ae7478f4fb13d8bf99d267e05d
-RMD160 (gthumb-2.8.1.tar.gz) = 208af3970b1c4c0794999e9c14c3dcd682bee471
-Size (gthumb-2.8.1.tar.gz) = 2675739 bytes
-SHA1 (patch-aa) = 70f68f6d2f9a865bd12f6da1a93dfb149b80709b
+SHA1 (gthumb-2.10.2.tar.gz) = b6224efcce3281f5b182b26ff4cea6c3454652f0
+RMD160 (gthumb-2.10.2.tar.gz) = 78dd4c88c8ec50308587ea6421c1564c34ff8d51
+Size (gthumb-2.10.2.tar.gz) = 2975253 bytes
+SHA1 (patch-aa) = 782e9ce646cdb2d5fbc28675cffb75f7e059a071
diff --git a/graphics/gthumb/patches/patch-aa b/graphics/gthumb/patches/patch-aa
index 5fdbd1e2a21..03cac4e5e5e 100644
--- a/graphics/gthumb/patches/patch-aa
+++ b/graphics/gthumb/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2006/12/15 20:23:52 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2007/04/11 18:08:54 drochner Exp $
 
---- data/Makefile.in.orig	2006-12-07 18:45:22.000000000 +0100
+--- data/Makefile.in.orig	2007-03-27 20:24:36.000000000 +0200
 +++ data/Makefile.in
-@@ -752,7 +752,7 @@ $(server_in_files:.server.in.in=.server.
- 	sed -e "s|\@BONOBODIR\@|$(bonobodir)|" $< > $@
- @INTLTOOL_SERVER_RULE@
+@@ -702,7 +702,7 @@ install-data-hook:
+ 
+ @INTLTOOL_SCHEMAS_RULE@
  
 -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
 +install-data-local: