update to 2.14.1

this switches to the new 2.14 release branch -- many new features
and UI improvements

4 files changed, 180 insertions, 118 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 336d31cb395..92b4aef2ae4 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.64 2011/11/23 15:40:27 joerg Exp $
+# $NetBSD: Makefile,v 1.65 2011/12/17 13:50:38 drochner Exp $
 
-DISTNAME=	gthumb-2.12.4
+DISTNAME=	gthumb-2.14.1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gthumb/2.12/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gthumb/2.14/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://gthumb.sourceforge.net/
diff --git a/graphics/gthumb/PLIST b/graphics/gthumb/PLIST
index d8d6ccdd370..c16e6414e8f 100644
--- a/graphics/gthumb/PLIST
+++ b/graphics/gthumb/PLIST
@@ -1,104 +1,113 @@
-@comment $NetBSD: PLIST,v 1.17 2011/11/17 12:59:14 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2011/12/17 13:50:38 drochner Exp $
 bin/gthumb
-include/gthumb-2.12/gthumb.h
-include/gthumb-2.12/gthumb/dom.h
-include/gthumb-2.12/gthumb/egg-macros.h
-include/gthumb-2.12/gthumb/eggfileformatchooser.h
-include/gthumb-2.12/gthumb/gconf-utils.h
-include/gthumb-2.12/gthumb/gedit-message-area.h
-include/gthumb-2.12/gthumb/gio-utils.h
-include/gthumb-2.12/gthumb/glib-utils.h
-include/gthumb-2.12/gthumb/gnome-desktop-thumbnail.h
-include/gthumb-2.12/gthumb/gsignature.h
-include/gthumb-2.12/gthumb/gth-async-task.h
-include/gthumb-2.12/gthumb/gth-browser.h
-include/gthumb-2.12/gthumb/gth-buffer-data.h
-include/gthumb-2.12/gthumb/gth-cell-renderer-thumbnail.h
-include/gthumb-2.12/gthumb/gth-cursors.h
-include/gthumb-2.12/gthumb/gth-dumb-notebook.h
-include/gthumb-2.12/gthumb/gth-duplicable.h
-include/gthumb-2.12/gthumb/gth-embedded-dialog.h
-include/gthumb-2.12/gthumb/gth-empty-list.h
-include/gthumb-2.12/gthumb/gth-enum-types.h
-include/gthumb-2.12/gthumb/gth-error.h
-include/gthumb-2.12/gthumb/gth-extensions.h
-include/gthumb-2.12/gthumb/gth-file-chooser-dialog.h
-include/gthumb-2.12/gthumb/gth-file-data.h
-include/gthumb-2.12/gthumb/gth-file-list.h
-include/gthumb-2.12/gthumb/gth-file-properties.h
-include/gthumb-2.12/gthumb/gth-file-selection.h
-include/gthumb-2.12/gthumb/gth-file-source-vfs.h
-include/gthumb-2.12/gthumb/gth-file-source.h
-include/gthumb-2.12/gthumb/gth-file-store.h
-include/gthumb-2.12/gthumb/gth-file-tool.h
-include/gthumb-2.12/gthumb/gth-file-view.h
-include/gthumb-2.12/gthumb/gth-filter-editor-dialog.h
-include/gthumb-2.12/gthumb/gth-filter-file.h
-include/gthumb-2.12/gthumb/gth-filter.h
-include/gthumb-2.12/gthumb/gth-filterbar.h
-include/gthumb-2.12/gthumb/gth-folder-tree.h
-include/gthumb-2.12/gthumb/gth-histogram-view.h
-include/gthumb-2.12/gthumb/gth-histogram.h
-include/gthumb-2.12/gthumb/gth-hook.h
-include/gthumb-2.12/gthumb/gth-icon-cache.h
-include/gthumb-2.12/gthumb/gth-icon-view.h
-include/gthumb-2.12/gthumb/gth-image-dragger.h
-include/gthumb-2.12/gthumb/gth-image-history.h
-include/gthumb-2.12/gthumb/gth-image-loader.h
-include/gthumb-2.12/gthumb/gth-image-navigator.h
-include/gthumb-2.12/gthumb/gth-image-preloader.h
-include/gthumb-2.12/gthumb/gth-image-selector.h
-include/gthumb-2.12/gthumb/gth-image-viewer-tool.h
-include/gthumb-2.12/gthumb/gth-image-viewer.h
-include/gthumb-2.12/gthumb/gth-info-bar.h
-include/gthumb-2.12/gthumb/gth-location-chooser.h
-include/gthumb-2.12/gthumb/gth-main.h
-include/gthumb-2.12/gthumb/gth-marshal.h
-include/gthumb-2.12/gthumb/gth-metadata-chooser.h
-include/gthumb-2.12/gthumb/gth-metadata-provider.h
-include/gthumb-2.12/gthumb/gth-metadata.h
-include/gthumb-2.12/gthumb/gth-monitor.h
-include/gthumb-2.12/gthumb/gth-multipage.h
-include/gthumb-2.12/gthumb/gth-overwrite-dialog.h
-include/gthumb-2.12/gthumb/gth-pixbuf-list-task.h
-include/gthumb-2.12/gthumb/gth-pixbuf-saver.h
-include/gthumb-2.12/gthumb/gth-pixbuf-task.h
-include/gthumb-2.12/gthumb/gth-preferences.h
-include/gthumb-2.12/gthumb/gth-progress-dialog.h
-include/gthumb-2.12/gthumb/gth-sidebar.h
-include/gthumb-2.12/gthumb/gth-source-tree.h
-include/gthumb-2.12/gthumb/gth-statusbar.h
-include/gthumb-2.12/gthumb/gth-stock.h
-include/gthumb-2.12/gthumb/gth-string-list.h
-include/gthumb-2.12/gthumb/gth-tags-entry.h
-include/gthumb-2.12/gthumb/gth-tags-file.h
-include/gthumb-2.12/gthumb/gth-task.h
-include/gthumb-2.12/gthumb/gth-test-category.h
-include/gthumb-2.12/gthumb/gth-test-chain.h
-include/gthumb-2.12/gthumb/gth-test-selector.h
-include/gthumb-2.12/gthumb/gth-test-simple.h
-include/gthumb-2.12/gthumb/gth-test.h
-include/gthumb-2.12/gthumb/gth-thumb-loader.h
-include/gthumb-2.12/gthumb/gth-time-selector.h
-include/gthumb-2.12/gthumb/gth-time.h
-include/gthumb-2.12/gthumb/gth-toggle-menu-tool-button.h
-include/gthumb-2.12/gthumb/gth-toolbox.h
-include/gthumb-2.12/gthumb/gth-uri-list.h
-include/gthumb-2.12/gthumb/gth-user-dir.h
-include/gthumb-2.12/gthumb/gth-viewer-page.h
-include/gthumb-2.12/gthumb/gth-window.h
-include/gthumb-2.12/gthumb/gtk-utils.h
-include/gthumb-2.12/gthumb/gvaluehash.h
-include/gthumb-2.12/gthumb/main.h
-include/gthumb-2.12/gthumb/pixbuf-cache.h
-include/gthumb-2.12/gthumb/pixbuf-io.h
-include/gthumb-2.12/gthumb/pixbuf-utils.h
-include/gthumb-2.12/gthumb/typedefs.h
-include/gthumb-2.12/gthumb/zlib-utils.h
+include/gthumb-2.14/gthumb.h
+include/gthumb-2.14/gthumb/cairo-utils.h
+include/gthumb-2.14/gthumb/dom.h
+include/gthumb-2.14/gthumb/egg-macros.h
+include/gthumb-2.14/gthumb/eggfileformatchooser.h
+include/gthumb-2.14/gthumb/gconf-utils.h
+include/gthumb-2.14/gthumb/gedit-message-area.h
+include/gthumb-2.14/gthumb/gio-utils.h
+include/gthumb-2.14/gthumb/glib-utils.h
+include/gthumb-2.14/gthumb/gnome-desktop-thumbnail.h
+include/gthumb-2.14/gthumb/gsignature.h
+include/gthumb-2.14/gthumb/gth-async-task.h
+include/gthumb-2.14/gthumb/gth-browser.h
+include/gthumb-2.14/gthumb/gth-buffer-data.h
+include/gthumb-2.14/gthumb/gth-cell-renderer-thumbnail.h
+include/gthumb-2.14/gthumb/gth-dumb-notebook.h
+include/gthumb-2.14/gthumb/gth-duplicable.h
+include/gthumb-2.14/gthumb/gth-embedded-dialog.h
+include/gthumb-2.14/gthumb/gth-empty-list.h
+include/gthumb-2.14/gthumb/gth-enum-types.h
+include/gthumb-2.14/gthumb/gth-error.h
+include/gthumb-2.14/gthumb/gth-extensions.h
+include/gthumb-2.14/gthumb/gth-file-chooser-dialog.h
+include/gthumb-2.14/gthumb/gth-file-data.h
+include/gthumb-2.14/gthumb/gth-file-list.h
+include/gthumb-2.14/gthumb/gth-file-properties.h
+include/gthumb-2.14/gthumb/gth-file-selection.h
+include/gthumb-2.14/gthumb/gth-file-source-vfs.h
+include/gthumb-2.14/gthumb/gth-file-source.h
+include/gthumb-2.14/gthumb/gth-file-store.h
+include/gthumb-2.14/gthumb/gth-file-tool.h
+include/gthumb-2.14/gthumb/gth-file-view.h
+include/gthumb-2.14/gthumb/gth-filter-editor-dialog.h
+include/gthumb-2.14/gthumb/gth-filter-file.h
+include/gthumb-2.14/gthumb/gth-filter.h
+include/gthumb-2.14/gthumb/gth-filterbar.h
+include/gthumb-2.14/gthumb/gth-folder-tree.h
+include/gthumb-2.14/gthumb/gth-histogram-view.h
+include/gthumb-2.14/gthumb/gth-histogram.h
+include/gthumb-2.14/gthumb/gth-hook.h
+include/gthumb-2.14/gthumb/gth-icon-cache.h
+include/gthumb-2.14/gthumb/gth-icon-view.h
+include/gthumb-2.14/gthumb/gth-image-dragger.h
+include/gthumb-2.14/gthumb/gth-image-history.h
+include/gthumb-2.14/gthumb/gth-image-loader.h
+include/gthumb-2.14/gthumb/gth-image-navigator.h
+include/gthumb-2.14/gthumb/gth-image-preloader.h
+include/gthumb-2.14/gthumb/gth-image-selector.h
+include/gthumb-2.14/gthumb/gth-image-viewer-tool.h
+include/gthumb-2.14/gthumb/gth-image-viewer.h
+include/gthumb-2.14/gthumb/gth-image.h
+include/gthumb-2.14/gthumb/gth-info-bar.h
+include/gthumb-2.14/gthumb/gth-list-view.h
+include/gthumb-2.14/gthumb/gth-load-file-data-task.h
+include/gthumb-2.14/gthumb/gth-location-chooser.h
+include/gthumb-2.14/gthumb/gth-main.h
+include/gthumb-2.14/gthumb/gth-marshal.h
+include/gthumb-2.14/gthumb/gth-menu-button.h
+include/gthumb-2.14/gthumb/gth-metadata-chooser.h
+include/gthumb-2.14/gthumb/gth-metadata-provider.h
+include/gthumb-2.14/gthumb/gth-metadata.h
+include/gthumb-2.14/gthumb/gth-monitor.h
+include/gthumb-2.14/gthumb/gth-multipage.h
+include/gthumb-2.14/gthumb/gth-overwrite-dialog.h
+include/gthumb-2.14/gthumb/gth-pixbuf-list-task.h
+include/gthumb-2.14/gthumb/gth-pixbuf-saver.h
+include/gthumb-2.14/gthumb/gth-pixbuf-task.h
+include/gthumb-2.14/gthumb/gth-preferences.h
+include/gthumb-2.14/gthumb/gth-progress-dialog.h
+include/gthumb-2.14/gthumb/gth-request-dialog.h
+include/gthumb-2.14/gthumb/gth-save-file-data-task.h
+include/gthumb-2.14/gthumb/gth-screensaver.h
+include/gthumb-2.14/gthumb/gth-sidebar.h
+include/gthumb-2.14/gthumb/gth-source-tree.h
+include/gthumb-2.14/gthumb/gth-statusbar.h
+include/gthumb-2.14/gthumb/gth-stock.h
+include/gthumb-2.14/gthumb/gth-string-list.h
+include/gthumb-2.14/gthumb/gth-tags-entry.h
+include/gthumb-2.14/gthumb/gth-tags-file.h
+include/gthumb-2.14/gthumb/gth-task.h
+include/gthumb-2.14/gthumb/gth-test-category.h
+include/gthumb-2.14/gthumb/gth-test-chain.h
+include/gthumb-2.14/gthumb/gth-test-selector.h
+include/gthumb-2.14/gthumb/gth-test-simple.h
+include/gthumb-2.14/gthumb/gth-test.h
+include/gthumb-2.14/gthumb/gth-thumb-loader.h
+include/gthumb-2.14/gthumb/gth-time-selector.h
+include/gthumb-2.14/gthumb/gth-time.h
+include/gthumb-2.14/gthumb/gth-toggle-menu-tool-button.h
+include/gthumb-2.14/gthumb/gth-toolbox.h
+include/gthumb-2.14/gthumb/gth-uri-list.h
+include/gthumb-2.14/gthumb/gth-user-dir.h
+include/gthumb-2.14/gthumb/gth-viewer-page.h
+include/gthumb-2.14/gthumb/gth-window.h
+include/gthumb-2.14/gthumb/gtk-utils.h
+include/gthumb-2.14/gthumb/gvaluehash.h
+include/gthumb-2.14/gthumb/main.h
+include/gthumb-2.14/gthumb/pixbuf-cache.h
+include/gthumb-2.14/gthumb/pixbuf-io.h
+include/gthumb-2.14/gthumb/pixbuf-utils.h
+include/gthumb-2.14/gthumb/typedefs.h
+include/gthumb-2.14/gthumb/zlib-utils.h
 lib/gthumb/extensions/bookmarks.extension
+lib/gthumb/extensions/cairo_io.extension
 lib/gthumb/extensions/catalogs.extension
 lib/gthumb/extensions/change_date.extension
 lib/gthumb/extensions/comments.extension
+lib/gthumb/extensions/contact_sheet.extension
 lib/gthumb/extensions/convert_format.extension
 lib/gthumb/extensions/desktop_background.extension
 lib/gthumb/extensions/edit_metadata.extension
@@ -107,15 +116,18 @@ lib/gthumb/extensions/export_tools.extension
 lib/gthumb/extensions/file_manager.extension
 lib/gthumb/extensions/file_tools.extension
 lib/gthumb/extensions/file_viewer.extension
+lib/gthumb/extensions/find_duplicates.extension
 lib/gthumb/extensions/image_print.extension
 lib/gthumb/extensions/image_rotation.extension
 lib/gthumb/extensions/image_viewer.extension
 lib/gthumb/extensions/importer.extension
 lib/gthumb/extensions/jpeg_utils.extension
 lib/gthumb/extensions/libbookmarks.la
+lib/gthumb/extensions/libcairo_io.la
 lib/gthumb/extensions/libcatalogs.la
 lib/gthumb/extensions/libchange_date.la
 lib/gthumb/extensions/libcomments.la
+lib/gthumb/extensions/libcontact_sheet.la
 lib/gthumb/extensions/libconvert_format.la
 lib/gthumb/extensions/libdesktop_background.la
 lib/gthumb/extensions/libedit_metadata.la
@@ -124,6 +136,7 @@ lib/gthumb/extensions/libexport_tools.la
 lib/gthumb/extensions/libfile_manager.la
 lib/gthumb/extensions/libfile_tools.la
 lib/gthumb/extensions/libfile_viewer.la
+lib/gthumb/extensions/libfind_duplicates.la
 lib/gthumb/extensions/libimage_print.la
 lib/gthumb/extensions/libimage_rotation.la
 lib/gthumb/extensions/libimage_viewer.la
@@ -149,16 +162,19 @@ lib/gthumb/extensions/resize_images.extension
 lib/gthumb/extensions/search.extension
 lib/gthumb/extensions/slideshow.extension
 lib/gthumb/extensions/webalbums.extension
-lib/pkgconfig/gthumb-2.12.pc
+lib/pkgconfig/gthumb-2.14.pc
 share/aclocal/gthumb.m4
 share/applications/gthumb-import.desktop
 share/applications/gthumb.desktop
 share/gconf/schemas/gthumb-comments.schemas
+share/gconf/schemas/gthumb-file-manager.schemas
 share/gconf/schemas/gthumb-image-viewer.schemas
 share/gconf/schemas/gthumb-importer.schemas
 share/gconf/schemas/gthumb-pixbuf-savers.schemas
 share/gconf/schemas/gthumb-slideshow.schemas
 share/gconf/schemas/gthumb.schemas
+share/gconf/schemas/gthumb_change_date.schemas
+share/gconf/schemas/gthumb_contact_sheet.schemas
 share/gconf/schemas/gthumb_convert_format.schemas
 share/gconf/schemas/gthumb_crop_options.schemas
 share/gconf/schemas/gthumb_image_print.schemas
@@ -166,6 +182,7 @@ share/gconf/schemas/gthumb_photo_importer.schemas
 share/gconf/schemas/gthumb_rename_series.schemas
 share/gconf/schemas/gthumb_resize_images.schemas
 share/gconf/schemas/gthumb_resize_options.schemas
+share/gconf/schemas/gthumb_rotate_options.schemas
 share/gconf/schemas/gthumb_webalbums.schemas
 share/gnome/help/gthumb/C/attributes.page
 share/gnome/help/gthumb/C/batch-change-date.page
@@ -192,6 +209,7 @@ share/gnome/help/gthumb/C/figures/palette.png
 share/gnome/help/gthumb/C/figures/preferences.png
 share/gnome/help/gthumb/C/figures/specific-filter.png
 share/gnome/help/gthumb/C/figures/thumbnail-pane.png
+share/gnome/help/gthumb/C/file-copy-move.page
 share/gnome/help/gthumb/C/filtering.page
 share/gnome/help/gthumb/C/fullscreen.page
 share/gnome/help/gthumb/C/gimp.page
@@ -202,6 +220,7 @@ share/gnome/help/gthumb/C/legal.xml
 share/gnome/help/gthumb/C/printing.page
 share/gnome/help/gthumb/C/rename-series.page
 share/gnome/help/gthumb/C/sharing-disc.page
+share/gnome/help/gthumb/C/sharing-social.page
 share/gnome/help/gthumb/C/shortcuts.page
 share/gnome/help/gthumb/C/slideshow.page
 share/gnome/help/gthumb/C/sorting.page
@@ -235,6 +254,7 @@ share/gnome/help/gthumb/de/figures/palette.png
 share/gnome/help/gthumb/de/figures/preferences.png
 share/gnome/help/gthumb/de/figures/specific-filter.png
 share/gnome/help/gthumb/de/figures/thumbnail-pane.png
+share/gnome/help/gthumb/de/file-copy-move.page
 share/gnome/help/gthumb/de/filtering.page
 share/gnome/help/gthumb/de/fullscreen.page
 share/gnome/help/gthumb/de/gimp.page
@@ -245,6 +265,7 @@ share/gnome/help/gthumb/de/legal.xml
 share/gnome/help/gthumb/de/printing.page
 share/gnome/help/gthumb/de/rename-series.page
 share/gnome/help/gthumb/de/sharing-disc.page
+share/gnome/help/gthumb/de/sharing-social.page
 share/gnome/help/gthumb/de/shortcuts.page
 share/gnome/help/gthumb/de/slideshow.page
 share/gnome/help/gthumb/de/sorting.page
@@ -278,6 +299,7 @@ share/gnome/help/gthumb/el/figures/palette.png
 share/gnome/help/gthumb/el/figures/preferences.png
 share/gnome/help/gthumb/el/figures/specific-filter.png
 share/gnome/help/gthumb/el/figures/thumbnail-pane.png
+share/gnome/help/gthumb/el/file-copy-move.page
 share/gnome/help/gthumb/el/filtering.page
 share/gnome/help/gthumb/el/fullscreen.page
 share/gnome/help/gthumb/el/gimp.page
@@ -288,6 +310,7 @@ share/gnome/help/gthumb/el/legal.xml
 share/gnome/help/gthumb/el/printing.page
 share/gnome/help/gthumb/el/rename-series.page
 share/gnome/help/gthumb/el/sharing-disc.page
+share/gnome/help/gthumb/el/sharing-social.page
 share/gnome/help/gthumb/el/shortcuts.page
 share/gnome/help/gthumb/el/slideshow.page
 share/gnome/help/gthumb/el/sorting.page
@@ -321,6 +344,7 @@ share/gnome/help/gthumb/es/figures/palette.png
 share/gnome/help/gthumb/es/figures/preferences.png
 share/gnome/help/gthumb/es/figures/specific-filter.png
 share/gnome/help/gthumb/es/figures/thumbnail-pane.png
+share/gnome/help/gthumb/es/file-copy-move.page
 share/gnome/help/gthumb/es/filtering.page
 share/gnome/help/gthumb/es/fullscreen.page
 share/gnome/help/gthumb/es/gimp.page
@@ -331,6 +355,7 @@ share/gnome/help/gthumb/es/legal.xml
 share/gnome/help/gthumb/es/printing.page
 share/gnome/help/gthumb/es/rename-series.page
 share/gnome/help/gthumb/es/sharing-disc.page
+share/gnome/help/gthumb/es/sharing-social.page
 share/gnome/help/gthumb/es/shortcuts.page
 share/gnome/help/gthumb/es/slideshow.page
 share/gnome/help/gthumb/es/sorting.page
@@ -364,6 +389,7 @@ share/gnome/help/gthumb/eu/figures/palette.png
 share/gnome/help/gthumb/eu/figures/preferences.png
 share/gnome/help/gthumb/eu/figures/specific-filter.png
 share/gnome/help/gthumb/eu/figures/thumbnail-pane.png
+share/gnome/help/gthumb/eu/file-copy-move.page
 share/gnome/help/gthumb/eu/filtering.page
 share/gnome/help/gthumb/eu/fullscreen.page
 share/gnome/help/gthumb/eu/gimp.page
@@ -374,6 +400,7 @@ share/gnome/help/gthumb/eu/legal.xml
 share/gnome/help/gthumb/eu/printing.page
 share/gnome/help/gthumb/eu/rename-series.page
 share/gnome/help/gthumb/eu/sharing-disc.page
+share/gnome/help/gthumb/eu/sharing-social.page
 share/gnome/help/gthumb/eu/shortcuts.page
 share/gnome/help/gthumb/eu/slideshow.page
 share/gnome/help/gthumb/eu/sorting.page
@@ -407,6 +434,7 @@ share/gnome/help/gthumb/fr/figures/palette.png
 share/gnome/help/gthumb/fr/figures/preferences.png
 share/gnome/help/gthumb/fr/figures/specific-filter.png
 share/gnome/help/gthumb/fr/figures/thumbnail-pane.png
+share/gnome/help/gthumb/fr/file-copy-move.page
 share/gnome/help/gthumb/fr/filtering.page
 share/gnome/help/gthumb/fr/fullscreen.page
 share/gnome/help/gthumb/fr/gimp.page
@@ -417,6 +445,7 @@ share/gnome/help/gthumb/fr/legal.xml
 share/gnome/help/gthumb/fr/printing.page
 share/gnome/help/gthumb/fr/rename-series.page
 share/gnome/help/gthumb/fr/sharing-disc.page
+share/gnome/help/gthumb/fr/sharing-social.page
 share/gnome/help/gthumb/fr/shortcuts.page
 share/gnome/help/gthumb/fr/slideshow.page
 share/gnome/help/gthumb/fr/sorting.page
@@ -450,6 +479,7 @@ share/gnome/help/gthumb/oc/figures/palette.png
 share/gnome/help/gthumb/oc/figures/preferences.png
 share/gnome/help/gthumb/oc/figures/specific-filter.png
 share/gnome/help/gthumb/oc/figures/thumbnail-pane.png
+share/gnome/help/gthumb/oc/file-copy-move.page
 share/gnome/help/gthumb/oc/filtering.page
 share/gnome/help/gthumb/oc/fullscreen.page
 share/gnome/help/gthumb/oc/gimp.page
@@ -460,6 +490,7 @@ share/gnome/help/gthumb/oc/legal.xml
 share/gnome/help/gthumb/oc/printing.page
 share/gnome/help/gthumb/oc/rename-series.page
 share/gnome/help/gthumb/oc/sharing-disc.page
+share/gnome/help/gthumb/oc/sharing-social.page
 share/gnome/help/gthumb/oc/shortcuts.page
 share/gnome/help/gthumb/oc/slideshow.page
 share/gnome/help/gthumb/oc/sorting.page
@@ -493,6 +524,7 @@ share/gnome/help/gthumb/sl/figures/palette.png
 share/gnome/help/gthumb/sl/figures/preferences.png
 share/gnome/help/gthumb/sl/figures/specific-filter.png
 share/gnome/help/gthumb/sl/figures/thumbnail-pane.png
+share/gnome/help/gthumb/sl/file-copy-move.page
 share/gnome/help/gthumb/sl/filtering.page
 share/gnome/help/gthumb/sl/fullscreen.page
 share/gnome/help/gthumb/sl/gimp.page
@@ -503,6 +535,7 @@ share/gnome/help/gthumb/sl/legal.xml
 share/gnome/help/gthumb/sl/printing.page
 share/gnome/help/gthumb/sl/rename-series.page
 share/gnome/help/gthumb/sl/sharing-disc.page
+share/gnome/help/gthumb/sl/sharing-social.page
 share/gnome/help/gthumb/sl/shortcuts.page
 share/gnome/help/gthumb/sl/slideshow.page
 share/gnome/help/gthumb/sl/sorting.page
@@ -536,6 +569,7 @@ share/gnome/help/gthumb/sv/figures/palette.png
 share/gnome/help/gthumb/sv/figures/preferences.png
 share/gnome/help/gthumb/sv/figures/specific-filter.png
 share/gnome/help/gthumb/sv/figures/thumbnail-pane.png
+share/gnome/help/gthumb/sv/file-copy-move.page
 share/gnome/help/gthumb/sv/filtering.page
 share/gnome/help/gthumb/sv/fullscreen.page
 share/gnome/help/gthumb/sv/gimp.page
@@ -546,6 +580,7 @@ share/gnome/help/gthumb/sv/legal.xml
 share/gnome/help/gthumb/sv/printing.page
 share/gnome/help/gthumb/sv/rename-series.page
 share/gnome/help/gthumb/sv/sharing-disc.page
+share/gnome/help/gthumb/sv/sharing-social.page
 share/gnome/help/gthumb/sv/shortcuts.page
 share/gnome/help/gthumb/sv/slideshow.page
 share/gnome/help/gthumb/sv/sorting.page
@@ -579,6 +614,7 @@ share/gnome/help/gthumb/zh_CN/figures/palette.png
 share/gnome/help/gthumb/zh_CN/figures/preferences.png
 share/gnome/help/gthumb/zh_CN/figures/specific-filter.png
 share/gnome/help/gthumb/zh_CN/figures/thumbnail-pane.png
+share/gnome/help/gthumb/zh_CN/file-copy-move.page
 share/gnome/help/gthumb/zh_CN/filtering.page
 share/gnome/help/gthumb/zh_CN/fullscreen.page
 share/gnome/help/gthumb/zh_CN/gimp.page
@@ -589,6 +625,7 @@ share/gnome/help/gthumb/zh_CN/legal.xml
 share/gnome/help/gthumb/zh_CN/printing.page
 share/gnome/help/gthumb/zh_CN/rename-series.page
 share/gnome/help/gthumb/zh_CN/sharing-disc.page
+share/gnome/help/gthumb/zh_CN/sharing-social.page
 share/gnome/help/gthumb/zh_CN/shortcuts.page
 share/gnome/help/gthumb/zh_CN/slideshow.page
 share/gnome/help/gthumb/zh_CN/sorting.page
@@ -641,16 +678,23 @@ share/gthumb/albumthemes/Wiki/index.gthtml
 share/gthumb/albumthemes/Wiki/preview.png
 share/gthumb/albumthemes/Wiki/style.css
 share/gthumb/albumthemes/Wiki/thumbnail.gthtml
+share/gthumb/contactsheetthemes/default.cst
+share/gthumb/contactsheetthemes/minimalist.cst
+share/gthumb/contactsheetthemes/rainbow.cst
 share/gthumb/icons/hicolor/16x16/actions/browser-mode.png
-share/gthumb/icons/hicolor/16x16/actions/facebook.png
 share/gthumb/icons/hicolor/16x16/actions/file-catalog.png
 share/gthumb/icons/hicolor/16x16/actions/file-library.png
 share/gthumb/icons/hicolor/16x16/actions/file-search.png
-share/gthumb/icons/hicolor/16x16/actions/flickr.png
+share/gthumb/icons/hicolor/16x16/actions/histogram-linear.png
+share/gthumb/icons/hicolor/16x16/actions/histogram-logarithmic.png
 share/gthumb/icons/hicolor/16x16/actions/histogram.png
 share/gthumb/icons/hicolor/16x16/actions/image-navigator.png
-share/gthumb/icons/hicolor/16x16/actions/photobucket.png
-share/gthumb/icons/hicolor/16x16/actions/picasaweb.png
+share/gthumb/icons/hicolor/16x16/actions/map.png
+share/gthumb/icons/hicolor/16x16/actions/site-facebook.png
+share/gthumb/icons/hicolor/16x16/actions/site-flickr.png
+share/gthumb/icons/hicolor/16x16/actions/site-photobucket.png
+share/gthumb/icons/hicolor/16x16/actions/site-picasaweb.png
+share/gthumb/icons/hicolor/16x16/actions/site-twentythree.png
 share/gthumb/icons/hicolor/16x16/actions/tool-adjust-colors.png
 share/gthumb/icons/hicolor/16x16/actions/tool-crop.png
 share/gthumb/icons/hicolor/16x16/actions/tool-desaturate.png
@@ -662,6 +706,8 @@ share/gthumb/icons/hicolor/16x16/actions/tool-red-eye.png
 share/gthumb/icons/hicolor/16x16/actions/tool-resize.png
 share/gthumb/icons/hicolor/16x16/actions/tool-rotate-270.png
 share/gthumb/icons/hicolor/16x16/actions/tool-rotate-90.png
+share/gthumb/icons/hicolor/16x16/actions/tool-rotate.png
+share/gthumb/icons/hicolor/16x16/actions/tool-sharpen.png
 share/gthumb/icons/hicolor/22x22/actions/browser-mode.png
 share/gthumb/icons/hicolor/22x22/actions/file-catalog.png
 share/gthumb/icons/hicolor/22x22/actions/file-library.png
@@ -669,12 +715,15 @@ share/gthumb/icons/hicolor/22x22/actions/file-search.png
 share/gthumb/icons/hicolor/22x22/actions/histogram.png
 share/gthumb/icons/hicolor/22x22/actions/palette.png
 share/gthumb/icons/hicolor/22x22/actions/share.png
+share/gthumb/icons/hicolor/22x22/actions/tag.png
 share/gthumb/icons/hicolor/22x22/actions/tool-adjust-colors.png
 share/gthumb/icons/hicolor/22x22/actions/tool-crop.png
 share/gthumb/icons/hicolor/22x22/actions/tool-desaturate.png
 share/gthumb/icons/hicolor/22x22/actions/tool-enhance.png
 share/gthumb/icons/hicolor/22x22/actions/tool-red-eye.png
 share/gthumb/icons/hicolor/22x22/actions/tool-resize.png
+share/gthumb/icons/hicolor/22x22/actions/tool-rotate.png
+share/gthumb/icons/hicolor/22x22/actions/tool-sharpen.png
 share/gthumb/icons/hicolor/22x22/actions/zoom-fit-width.png
 share/gthumb/icons/hicolor/48x48/actions/browser-mode.png
 share/gthumb/icons/hicolor/48x48/actions/file-catalog.png
@@ -689,20 +738,29 @@ share/gthumb/icons/hicolor/scalable/actions/palette.svg
 share/gthumb/icons/hicolor/scalable/actions/share.svg
 share/gthumb/icons/hicolor/scalable/actions/slideshow-pause.svg
 share/gthumb/icons/hicolor/scalable/actions/tag.svg
+share/gthumb/icons/hicolor/scalable/actions/tool-sharpen.svg
 share/gthumb/ui/add-to-catalog.ui
 share/gthumb/ui/adjust-colors-options.ui
 share/gthumb/ui/ask-value.ui
 share/gthumb/ui/bookmarks.ui
 share/gthumb/ui/catalog-properties.ui
 share/gthumb/ui/change-date.ui
+share/gthumb/ui/code-selector.ui
 share/gthumb/ui/comments-preferences.ui
+share/gthumb/ui/contact-sheet-theme-properties.ui
+share/gthumb/ui/contact-sheet.ui
 share/gthumb/ui/convert-format.ui
 share/gthumb/ui/crop-options.ui
 share/gthumb/ui/edit-comment-page.ui
 share/gthumb/ui/edit-exiv2-page.ui
-share/gthumb/ui/extensions.ui
+share/gthumb/ui/extensions-preferences.ui
 share/gthumb/ui/filter-editor.ui
+share/gthumb/ui/find-duplicates-choose-folders.ui
+share/gthumb/ui/find-duplicates-dialog.ui
+share/gthumb/ui/find-duplicates.ui
+share/gthumb/ui/histogram-info.ui
 share/gthumb/ui/image-viewer-preferences.ui
+share/gthumb/ui/image-wall.ui
 share/gthumb/ui/import-preferences.ui
 share/gthumb/ui/jpeg-options.ui
 share/gthumb/ui/organize-files-task.ui
@@ -715,13 +773,16 @@ share/gthumb/ui/photo-importer.ui
 share/gthumb/ui/png-options.ui
 share/gthumb/ui/preferences.ui
 share/gthumb/ui/print-layout.ui
+share/gthumb/ui/print-preferences.ui
 share/gthumb/ui/red-eye-removal-options.ui
 share/gthumb/ui/rename-series.ui
 share/gthumb/ui/resize-images.ui
 share/gthumb/ui/resize-options.ui
+share/gthumb/ui/rotate-options.ui
 share/gthumb/ui/save-options-preferences.ui
 share/gthumb/ui/script-editor.ui
 share/gthumb/ui/search-editor.ui
+share/gthumb/ui/sharpen-options.ui
 share/gthumb/ui/slideshow-preferences.ui
 share/gthumb/ui/sort-order.ui
 share/gthumb/ui/tag-chooser.ui
@@ -747,6 +808,7 @@ 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/eo/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
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index b46c74343dc..2f5d184eea0 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2011/11/17 12:59:15 drochner Exp $
+$NetBSD: distinfo,v 1.27 2011/12/17 13:50:38 drochner Exp $
 
-SHA1 (gthumb-2.12.4.tar.bz2) = 2fac9fde2e89f90aea7174158990ca61bd95e2a5
-RMD160 (gthumb-2.12.4.tar.bz2) = dee727570c53f6bf700287853dee74efd233d497
-Size (gthumb-2.12.4.tar.bz2) = 6466576 bytes
-SHA1 (patch-ab) = eae34695f9b3ca9725228711490102a9a8a5d8ba
+SHA1 (gthumb-2.14.1.tar.xz) = 15a0672e5a94a8e828516b3c065a3a07ebffa461
+RMD160 (gthumb-2.14.1.tar.xz) = b1fbd3844a42c1232954053d2ec87fd166febe1a
+Size (gthumb-2.14.1.tar.xz) = 5800780 bytes
+SHA1 (patch-ab) = b57d1b92bd6d447a0a4ec5af9d5385b3549a143f
 SHA1 (patch-ac) = 8e28e914f6d72c83069ba5577f5d51d55e321d58
 SHA1 (patch-ad) = 12a530d10726d5ec07bba4cd8a7a42da6cff4303
 SHA1 (patch-ae) = 2ce0608493b3a261a0c0b5a67932173081837522
diff --git a/graphics/gthumb/patches/patch-ab b/graphics/gthumb/patches/patch-ab
index f63d4800dca..d7feb367f22 100644
--- a/graphics/gthumb/patches/patch-ab
+++ b/graphics/gthumb/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.5 2010/12/04 21:15:00 adam Exp $
+$NetBSD: patch-ab,v 1.6 2011/12/17 13:50:39 drochner Exp $
 
 Build eggsmclient-osx.c (required on Mac OS X).
 
---- copy-n-paste/Makefile.in.orig	2010-12-04 09:03:37.000000000 +0000
+--- copy-n-paste/Makefile.in.orig	2011-12-04 18:42:50.000000000 +0000
 +++ copy-n-paste/Makefile.in
-@@ -53,6 +53,7 @@ am__DEPENDENCIES_1 =
- libeggsmclient_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@@ -54,6 +54,7 @@ libeggsmclient_la_DEPENDENCIES = $(am__D
+ 	$(am__DEPENDENCIES_1)
  am_libeggsmclient_la_OBJECTS = libeggsmclient_la-eggdesktopfile.lo \
  	libeggsmclient_la-eggsmclient.lo \
 +	libeggsmclient_la-eggsmclient-osx.lo \
  	libeggsmclient_la-eggsmclient-xsmp.lo
  libeggsmclient_la_OBJECTS = $(am_libeggsmclient_la_OBJECTS)
  AM_V_lt = $(am__v_lt_$(V))
-@@ -288,6 +289,7 @@ libeggsmclient_la_SOURCES = eggdesktopfi
+@@ -305,6 +306,7 @@ libeggsmclient_la_SOURCES = eggdesktopfi
  			    eggdesktopfile.c \
  			    eggsmclient.h \
  			    eggsmclient.c \
@@ -20,7 +20,7 @@ Build eggsmclient-osx.c (required on Mac OS X).
  			    eggsmclient-private.h \
  			    eggsmclient-xsmp.c
  
-@@ -344,6 +346,7 @@ distclean-compile:
+@@ -361,6 +363,7 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggdesktopfile.Plo@am__quote@
@@ -28,7 +28,7 @@ Build eggsmclient-osx.c (required on Mac OS X).
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient.Plo@am__quote@
  
-@@ -387,6 +390,14 @@ libeggsmclient_la-eggsmclient.lo: eggsmc
+@@ -404,6 +407,14 @@ libeggsmclient_la-eggsmclient.lo: eggsmc
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggsmclient_la_CFLAGS) $(CFLAGS) -c -o libeggsmclient_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c