- Update to 2.12.4

Submitted by:	kwm

4 files changed, 49 insertions, 47 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 9da8cc457a11..1baef1f16e56 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gthumb
-PORTVERSION=	2.12.1
-PORTREVISION=	1
+PORTVERSION=	2.12.4
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +16,7 @@ COMMENT=	An image viewer and browser for the GNOME 2 environment
 
 LIB_DEPENDS=	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_GETTEXT=	yes
 USE_BISON=	build
 USE_GMAKE=	yes
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 00e791780e04..02386f1489c3 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gthumb-2.12.1.tar.bz2) = 94d186db48e4527f1ba1dad41b860fc34b8f13da4228319dc742c91f45ddea64
-SIZE (gnome2/gthumb-2.12.1.tar.bz2) = 5186434
+SHA256 (gnome2/gthumb-2.12.4.tar.xz) = b6e316ed8a7187ee58b388a44b1cef1ec3405b19a734cb07aaec311083761423
+SIZE (gnome2/gthumb-2.12.4.tar.xz) = 5715320
diff --git a/graphics/gthumb/files/patch-extensions__exiv2_tools__exiv2-utils.cpp b/graphics/gthumb/files/patch-extensions__exiv2_tools__exiv2-utils.cpp
deleted file mode 100644
index aaabc64ad811..000000000000
--- a/graphics/gthumb/files/patch-extensions__exiv2_tools__exiv2-utils.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./extensions/exiv2_tools/exiv2-utils.cpp.orig	2010-09-15 21:07:15.000000000 +0200
-+++ ./extensions/exiv2_tools/exiv2-utils.cpp	2011-04-11 15:39:59.491373470 +0200
-@@ -497,19 +497,19 @@
- static const char *
- get_exif_default_category (const Exiv2::Exifdatum &md)
- {
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+	if (Exiv2::ExifTags::isMakerGroup(md.groupName()))
-+#else
- 	if (Exiv2::ExifTags::isMakerIfd(md.ifdId()))
-+#endif
- 		return "Exif::MakerNotes";
- 
--	switch (md.ifdId()) {
--	case Exiv2::ifd1Id:
-+	if (md.groupName().compare("Thumbnail") == 0)
- 		return "Exif::Thumbnail";
--	case Exiv2::gpsIfdId:
-+	else if (md.groupName().compare("GPSInfo") == 0)
- 		return "Exif::GPS";
--	case Exiv2::iopIfdId:
-+	else if (md.groupName().compare("Iop") == 0)
- 		return "Exif::Versions";
--	default:
--		break;
--	}
- 
- 	return "Exif::Other";
- }
-@@ -531,7 +531,11 @@
- 			stringstream description;
- 			if (! md->tagLabel().empty())
- 				description << md->tagLabel();
--			else if (md->ifdId () > Exiv2::ifd1Id)
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+			else if (Exiv2::ExifTags::isMakerGroup(md->groupName()))
-+#else
-+			else if (Exiv2::ExifTags::isMakerIfd(md->ifdId()))
-+#endif
- 				// Must be a MakerNote - include group name
- 				description << md->groupName() << "." << md->tagName();
- 			else
diff --git a/graphics/gthumb/pkg-plist b/graphics/gthumb/pkg-plist
index dd4bb2c5f87c..ef7bbc48766c 100644
--- a/graphics/gthumb/pkg-plist
+++ b/graphics/gthumb/pkg-plist
@@ -410,6 +410,49 @@ share/gnome/help/gthumb/es/thumbnails.page
 share/gnome/help/gthumb/es/thumbnail-pane.page
 share/gnome/help/gthumb/es/viewer.page
 share/gnome/help/gthumb/es/wallpaper.page
+share/gnome/help/gthumb/eu/attributes.page
+share/gnome/help/gthumb/eu/batch-change-date.page
+share/gnome/help/gthumb/eu/batch-convert-format.page
+share/gnome/help/gthumb/eu/batch-resize.page
+share/gnome/help/gthumb/eu/batch-rotate.page
+share/gnome/help/gthumb/eu/batch-scripts.page
+share/gnome/help/gthumb/eu/bookmarks.page
+share/gnome/help/gthumb/eu/browser.page
+share/gnome/help/gthumb/eu/edit-colors.page
+share/gnome/help/gthumb/eu/edit-redeye.page
+share/gnome/help/gthumb/eu/edit-resize-crop.page
+share/gnome/help/gthumb/eu/edit-rotate.page
+share/gnome/help/gthumb/eu/edit-save-undo-redo.page
+share/gnome/help/gthumb/eu/extensions.page
+share/gnome/help/gthumb/eu/figures/comment.png
+share/gnome/help/gthumb/eu/figures/general-filter.png
+share/gnome/help/gthumb/eu/figures/import-pref-auto-folder.png
+share/gnome/help/gthumb/eu/figures/import-pref-custom-format.png
+share/gnome/help/gthumb/eu/figures/import.png
+share/gnome/help/gthumb/eu/figures/main-win.png
+share/gnome/help/gthumb/eu/figures/nav-button.png
+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/filtering.page
+share/gnome/help/gthumb/eu/fullscreen.page
+share/gnome/help/gthumb/eu/gimp.page
+share/gnome/help/gthumb/eu/import.page
+share/gnome/help/gthumb/eu/index.page
+share/gnome/help/gthumb/eu/introduction.page
+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/shortcuts.page
+share/gnome/help/gthumb/eu/slideshow.page
+share/gnome/help/gthumb/eu/sorting.page
+share/gnome/help/gthumb/eu/strftime.page
+share/gnome/help/gthumb/eu/thumbnail-pane.page
+share/gnome/help/gthumb/eu/thumbnails.page
+share/gnome/help/gthumb/eu/viewer.page
+share/gnome/help/gthumb/eu/wallpaper.page
 share/gnome/help/gthumb/fr/attributes.page
 share/gnome/help/gthumb/fr/batch-convert-format.page
 share/gnome/help/gthumb/fr/batch-change-date.page
@@ -882,6 +925,8 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm share/gnome/help/gthumb/oc
 @dirrm share/gnome/help/gthumb/fr/figures
 @dirrm share/gnome/help/gthumb/fr
+@dirrm share/gnome/help/gthumb/eu/figures
+@dirrm share/gnome/help/gthumb/eu
 @dirrm share/gnome/help/gthumb/es/figures
 @dirrm share/gnome/help/gthumb/es
 @dirrm share/gnome/help/gthumb/el/figures