update to 2.8.1

new major release - too much to list here

4 files changed, 43 insertions, 71 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index be64e6952c9..50a3cf953c8 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2006/09/16 12:20:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2006/12/15 20:23:52 drochner Exp $
 
-DISTNAME=		gthumb-2.6.9
-PKGREVISION=		4
+DISTNAME=		gthumb-2.8.1
 CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gthumb/2.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gthumb/2.8/}
 
 MAINTAINER=		minskim@NetBSD.org
 HOMEPAGE=		http://gthumb.sourceforge.net/
@@ -40,4 +39,5 @@ BUILDLINK_API_DEPENDS.libglade2+=   libglade2>=2.4.0
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gthumb/PLIST b/graphics/gthumb/PLIST
index bbb04774e04..ea340940bc9 100644
--- a/graphics/gthumb/PLIST
+++ b/graphics/gthumb/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/12/15 20:23:52 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/libgthumb.la
+lib/gthumb/libgthumb.la
 lib/gthumb/modules/libduplicates.la
 lib/gthumb/modules/libjpegtran.la
 lib/gthumb/modules/libphotoimporter.la
@@ -23,22 +24,6 @@ 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/gthumb/albumthemes/BlueStripes/back.png
-share/gthumb/albumthemes/BlueStripes/background.png
-share/gthumb/albumthemes/BlueStripes/bottom.png
-share/gthumb/albumthemes/BlueStripes/image.gthtml
-share/gthumb/albumthemes/BlueStripes/index.gthtml
-share/gthumb/albumthemes/BlueStripes/layout.css
-share/gthumb/albumthemes/BlueStripes/left.png
-share/gthumb/albumthemes/BlueStripes/next.png
-share/gthumb/albumthemes/BlueStripes/prev.png
-share/gthumb/albumthemes/BlueStripes/preview.png
-share/gthumb/albumthemes/BlueStripes/right.png
-share/gthumb/albumthemes/BlueStripes/style.css
-share/gthumb/albumthemes/BlueStripes/thumbnail.gthtml
-share/gthumb/albumthemes/BlueStripes/top.png
-share/gthumb/albumthemes/BlueStripes/transparent.png
-share/gthumb/albumthemes/BlueStripes/white-dot.png
 share/gthumb/albumthemes/Classic/1.gif
 share/gthumb/albumthemes/Classic/back.png
 share/gthumb/albumthemes/Classic/background.gif
@@ -69,22 +54,12 @@ share/gthumb/albumthemes/ClassicClips/right.png
 share/gthumb/albumthemes/ClassicClips/style.css
 share/gthumb/albumthemes/ClassicClips/thumbnail.gthtml
 share/gthumb/albumthemes/ClassicClips/top.png
-share/gthumb/albumthemes/Clean/1.gif
-share/gthumb/albumthemes/Clean/back.png
-share/gthumb/albumthemes/Clean/background.gif
-share/gthumb/albumthemes/Clean/bot.png
-share/gthumb/albumthemes/Clean/image.gthtml
-share/gthumb/albumthemes/Clean/index.gthtml
-share/gthumb/albumthemes/Clean/layout.css
-share/gthumb/albumthemes/Clean/left.png
-share/gthumb/albumthemes/Clean/left_arrow.png
-share/gthumb/albumthemes/Clean/preview.png
-share/gthumb/albumthemes/Clean/right.png
-share/gthumb/albumthemes/Clean/right_arrow.png
-share/gthumb/albumthemes/Clean/style.css
-share/gthumb/albumthemes/Clean/thumbnail.gthtml
-share/gthumb/albumthemes/Clean/top.png
-share/gthumb/albumthemes/Clean/up_arrow.png
+share/gthumb/albumthemes/Flicker/image.gthtml
+share/gthumb/albumthemes/Flicker/index.gthtml
+share/gthumb/albumthemes/Flicker/layout.css
+share/gthumb/albumthemes/Flicker/preview.png
+share/gthumb/albumthemes/Flicker/style.css
+share/gthumb/albumthemes/Flicker/thumbnail.gthtml
 share/gthumb/albumthemes/NeatRound/1.gif
 share/gthumb/albumthemes/NeatRound/back.png
 share/gthumb/albumthemes/NeatRound/background.gif
@@ -100,21 +75,12 @@ share/gthumb/albumthemes/NeatRound/right.png
 share/gthumb/albumthemes/NeatRound/style.css
 share/gthumb/albumthemes/NeatRound/thumbnail.gthtml
 share/gthumb/albumthemes/NeatRound/top.png
-share/gthumb/albumthemes/NeatSquare/1.gif
-share/gthumb/albumthemes/NeatSquare/back.png
-share/gthumb/albumthemes/NeatSquare/background.gif
-share/gthumb/albumthemes/NeatSquare/bot.png
-share/gthumb/albumthemes/NeatSquare/image.gthtml
-share/gthumb/albumthemes/NeatSquare/index.gthtml
-share/gthumb/albumthemes/NeatSquare/layout.css
-share/gthumb/albumthemes/NeatSquare/left.png
-share/gthumb/albumthemes/NeatSquare/next.png
-share/gthumb/albumthemes/NeatSquare/prev.png
-share/gthumb/albumthemes/NeatSquare/preview.png
-share/gthumb/albumthemes/NeatSquare/right.png
-share/gthumb/albumthemes/NeatSquare/style.css
-share/gthumb/albumthemes/NeatSquare/thumbnail.gthtml
-share/gthumb/albumthemes/NeatSquare/top.png
+share/gthumb/albumthemes/Wiki/image.gthtml
+share/gthumb/albumthemes/Wiki/index.gthtml
+share/gthumb/albumthemes/Wiki/layout.css
+share/gthumb/albumthemes/Wiki/preview.png
+share/gthumb/albumthemes/Wiki/style.css
+share/gthumb/albumthemes/Wiki/thumbnail.gthtml
 share/gthumb/glade/ftp-client-48.png
 share/gthumb/glade/gphoto-48.png
 share/gthumb/glade/gthumb.glade
@@ -137,7 +103,9 @@ 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
 share/locale/az/LC_MESSAGES/gthumb.mo
 share/locale/be/LC_MESSAGES/gthumb.mo
 share/locale/bg/LC_MESSAGES/gthumb.mo
@@ -145,14 +113,17 @@ share/locale/ca/LC_MESSAGES/gthumb.mo
 share/locale/cs/LC_MESSAGES/gthumb.mo
 share/locale/da/LC_MESSAGES/gthumb.mo
 share/locale/de/LC_MESSAGES/gthumb.mo
+share/locale/dz/LC_MESSAGES/gthumb.mo
 share/locale/el/LC_MESSAGES/gthumb.mo
 share/locale/en_CA/LC_MESSAGES/gthumb.mo
 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/fi/LC_MESSAGES/gthumb.mo
 share/locale/fr/LC_MESSAGES/gthumb.mo
 share/locale/ga/LC_MESSAGES/gthumb.mo
+share/locale/gl/LC_MESSAGES/gthumb.mo
 share/locale/gu/LC_MESSAGES/gthumb.mo
 share/locale/hi/LC_MESSAGES/gthumb.mo
 share/locale/hr/LC_MESSAGES/gthumb.mo
@@ -167,9 +138,9 @@ share/locale/mk/LC_MESSAGES/gthumb.mo
 share/locale/ml/LC_MESSAGES/gthumb.mo
 share/locale/ms/LC_MESSAGES/gthumb.mo
 share/locale/nb/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
-share/locale/no/LC_MESSAGES/gthumb.mo
 share/locale/pa/LC_MESSAGES/gthumb.mo
 share/locale/pl/LC_MESSAGES/gthumb.mo
 share/locale/pt/LC_MESSAGES/gthumb.mo
@@ -181,25 +152,26 @@ 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/th/LC_MESSAGES/gthumb.mo
 share/locale/tr/LC_MESSAGES/gthumb.mo
 share/locale/uk/LC_MESSAGES/gthumb.mo
+share/locale/vi/LC_MESSAGES/gthumb.mo
 share/locale/xh/LC_MESSAGES/gthumb.mo
 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/pixmaps/gthumb.png
-share/pixmaps/gthumb-logo.png
-@comment in xdg-dirs: @dirrm share/pixmaps
 @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/NeatSquare
+@dirrm share/gthumb/albumthemes/Wiki
 @dirrm share/gthumb/albumthemes/NeatRound
-@dirrm share/gthumb/albumthemes/Clean
+@dirrm share/gthumb/albumthemes/Flicker
 @dirrm share/gthumb/albumthemes/ClassicClips
 @dirrm share/gthumb/albumthemes/Classic
-@dirrm share/gthumb/albumthemes/BlueStripes
 @dirrm share/gthumb/albumthemes
 @dirrm share/gthumb
 @dirrm share/gnome/help/gthumb/C/figures
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 6a861ce3548..f5c96062c14 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2006/03/11 18:43:18 wiz Exp $
+$NetBSD: distinfo,v 1.12 2006/12/15 20:23:52 drochner Exp $
 
-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
-SHA1 (patch-aa) = 7d868a6ed9101b62f8e8671a615a45ac04452965
+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
diff --git a/graphics/gthumb/patches/patch-aa b/graphics/gthumb/patches/patch-aa
index 8c295dbb994..5fdbd1e2a21 100644
--- a/graphics/gthumb/patches/patch-aa
+++ b/graphics/gthumb/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2006/02/27 21:45:21 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2006/12/15 20:23:52 drochner Exp $
 
---- data/Makefile.in.orig	2006-02-17 01:04:46.000000000 -0800
+--- data/Makefile.in.orig	2006-12-07 18:45:22.000000000 +0100
 +++ data/Makefile.in
-@@ -688,7 +688,7 @@ uninstall-man: uninstall-man1
- 
- @INTLTOOL_SCHEMAS_RULE@
+@@ -752,7 +752,7 @@ $(server_in_files:.server.in.in=.server.
+ 	sed -e "s|\@BONOBODIR\@|$(bonobodir)|" $< > $@
+ @INTLTOOL_SERVER_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 $(srcdir)/$(schema_DATA)
+ @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.