- chase exiv2 library bump

- while here remove some MD5
- fix some forgottern desktop-file-utils dependencies

9 files changed, 61 insertions, 10 deletions

diff --git a/astro/gpscorrelate/Makefile b/astro/gpscorrelate/Makefile
index 402f8ba4a5a8..7e51e0d22a4d 100644
--- a/astro/gpscorrelate/Makefile
+++ b/astro/gpscorrelate/Makefile
@@ -6,14 +6,14 @@
 
 PORTNAME=	gpscorrelate
 PORTVERSION=	1.5.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro geography
 MASTER_SITES=	http://freefoote.dview.net/linux/
 
 MAINTAINER=	Iam@LukasMaly.NET
 COMMENT=	A gps file gpx correlate exif tag in photos
 
-LIB_DEPENDS=	exiv2:${PORTSDIR}/graphics/exiv2 \
+LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
 
 MAN1=		gpscorrelate.1 gpscorrelate-gui.1
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 4176ea849b44..a964c74ae21a 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	merkaartor
 PORTVERSION=	0.17.2
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://www.merkaartor.be/attachments/download/253/
 
@@ -38,7 +39,7 @@ OPTIONS=	GEOIMAGE "Enable geotagged images (needs exiv2)" on\
 
 .if !defined(WITHOUT_GEOIMAGE)
 QMAKEFLAGS+=	GEOIMAGE=1
-LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS+=	exiv2.10:${PORTSDIR}/graphics/exiv2
 .endif
 
 .if defined(WITH_GDAL)
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index f1aac7c32303..ac89757206ce 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	darktable
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.7
 
@@ -15,7 +16,7 @@ COMMENT=	A virtual lighttable and darkroom for photographers
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	exiv2.9:${PORTSDIR}/graphics/exiv2 \
+LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
 		lensfun.2:${PORTSDIR}/graphics/lensfun \
diff --git a/graphics/darktable/files/patch-src__common__exif.cc b/graphics/darktable/files/patch-src__common__exif.cc
new file mode 100644
index 000000000000..c897391d9b6d
--- /dev/null
+++ b/graphics/darktable/files/patch-src__common__exif.cc
@@ -0,0 +1,15 @@
+--- ./src/common/exif.cc.orig	2010-12-07 12:49:56.000000000 +0100
++++ ./src/common/exif.cc	2011-04-11 14:54:09.176904295 +0200
+@@ -29,11 +29,8 @@
+ #include "common/imageio.h"
+ }
+ // #include <libexif/exif-data.h>
+-#include <exiv2/xmp.hpp>
+-#include <exiv2/error.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
+ #include <exiv2/canonmn.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <sqlite3.h>
+ #include <iostream>
+ #include <fstream>
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 1f1e93b74bfe..7c0f710f768f 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geeqie
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -16,7 +16,7 @@ COMMENT=	Lightweight image viewer forked from GQview
 
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 desktopfileutils
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}" \
@@ -40,7 +40,7 @@ OPTIONS=	EXIV2 "Metadata editing" on \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_EXIV2)
-LIB_DEPENDS+=	exiv2.9:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS+=	exiv2.10:${PORTSDIR}/graphics/exiv2
 CONFIGURE_ARGS+=--enable-exiv2
 .else
 CONFIGURE_ARGS+=--disable-exiv2
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo
index dac406d9366c..c0dea10a597d 100644
--- a/graphics/geeqie/distinfo
+++ b/graphics/geeqie/distinfo
@@ -1,3 +1,2 @@
-MD5 (geeqie-1.0.tar.gz) = 1d67ef990390224c5052697d93bb49c0
 SHA256 (geeqie-1.0.tar.gz) = d1ad64666446c1d490437a9441267e8d7c1b9dc6ab640716b213e386d9211fdd
 SIZE (geeqie-1.0.tar.gz) = 1934236
diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile
index 317106f72867..cd1cf78b0782 100644
--- a/graphics/gexiv2/Makefile
+++ b/graphics/gexiv2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gexiv2
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://yorba.org/download/gexiv2/${PORTVERSION:R}/
 DISTNAME=	libgexiv2-${PORTVERSION}
@@ -17,7 +18,7 @@ COMMENT=	GObject-based wrapper around the Exiv2 library
 BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool \
 		gm4:${PORTSDIR}/devel/m4 \
 		pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS=	exiv2:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2
 
 USE_BZIP2=	yes
 USE_GNOME=	glib20
diff --git a/graphics/gexiv2/distinfo b/graphics/gexiv2/distinfo
index 7085db5e661f..6afd2303aeaa 100644
--- a/graphics/gexiv2/distinfo
+++ b/graphics/gexiv2/distinfo
@@ -1,3 +1,2 @@
-MD5 (libgexiv2-0.2.1.tar.bz2) = eda379b9a7b482988f55d5d79962d16b
 SHA256 (libgexiv2-0.2.1.tar.bz2) = 6279becd711de669606a95d6a2198000ef3909611b19fdfd9478a0cf265243da
 SIZE (libgexiv2-0.2.1.tar.bz2) = 24419
diff --git a/graphics/gexiv2/files/patch-exiv2-0.21 b/graphics/gexiv2/files/patch-exiv2-0.21
new file mode 100644
index 000000000000..f4ad1128a038
--- /dev/null
+++ b/graphics/gexiv2/files/patch-exiv2-0.21
@@ -0,0 +1,35 @@
+diff -ur gexiv2/gexiv2-metadata-exif.cpp.orig gexiv2/gexiv2-metadata-exif.cpp
+--- gexiv2/gexiv2-metadata-exif.cpp.orig	2010-09-10 17:52:54.000000000 -0400
++++ gexiv2/gexiv2-metadata-exif.cpp	2010-12-19 19:44:49.883274002 -0500
+@@ -235,10 +235,13 @@
+ const gchar* gexiv2_metadata_get_exif_tag_label (const gchar* tag) {
+     g_return_val_if_fail(tag != NULL, NULL);
+     
+-    Exiv2::ExifKey key(tag);
+-    
+     try {
++        Exiv2::ExifKey key(tag);
++#if EXIV2_TEST_VERSION(0, 21, 0)
++        return g_intern_string(key.tagLabel().c_str());
++#else
+         return Exiv2::ExifTags::tagLabel (key.tag (), key.ifdId ());
++#endif
+     } catch (Exiv2::Error& e) {
+         LOG_ERROR(e);
+     }
+@@ -249,10 +252,13 @@
+ const gchar* gexiv2_metadata_get_exif_tag_description (const gchar* tag) {
+     g_return_val_if_fail(tag != NULL, NULL);
+     
+-    Exiv2::ExifKey key(tag);
+-    
+     try {
++        Exiv2::ExifKey key(tag);
++#if EXIV2_TEST_VERSION(0, 21, 0)
++        return g_intern_string(key.tagDesc().c_str());
++#else
+         return Exiv2::ExifTags::tagDesc (key.tag (), key.ifdId ());
++#endif
+     } catch (Exiv2::Error& e) {
+         LOG_ERROR(e);
+     }