- chase exiv2 library bump

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

35 files changed, 162 insertions, 43 deletions

diff --git a/astro/merkaartor/pkg-plist b/astro/merkaartor/pkg-plist
index aaefb1c82e0a..962a8dc10811 100644
--- a/astro/merkaartor/pkg-plist
+++ b/astro/merkaartor/pkg-plist
@@ -32,7 +32,7 @@ share/icons/hicolor/48x48/apps/merkaartor.png
 %%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm
 %%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm
 %%DATADIR%%/world_background.osb
-@dirrm %%DATADIR%%/translations
+%%NLS%%@dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index 58140525c946..27ef394cbc46 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	strigi
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.vandenoever.info/software/strigi/ \
 		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -16,7 +16,7 @@ COMMENT=	Desktop searching program
 
 LIB_DEPENDS=	clucene.0:${PORTSDIR}/textproc/clucene \
 		dbus-1:${PORTSDIR}/devel/dbus \
-		exiv2:${PORTSDIR}/graphics/exiv2
+		exiv2.10:${PORTSDIR}/graphics/exiv2
 
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui dbus moc_build uic_build qmake_build rcc_build
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index e075c1d769be..7b3325ae02a2 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	${KOFFICE2_VERSION}
+PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/
@@ -23,7 +24,7 @@ LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		qca.2:${PORTSDIR}/devel/qca \
 		GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
-		exiv2.9:${PORTSDIR}/graphics/exiv2 \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		kdcraw.9:${PORTSDIR}/graphics/kdegraphics4 \
 		lcms2.2:${PORTSDIR}/graphics/lcms2 \
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index e075c1d769be..7b3325ae02a2 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	${KOFFICE2_VERSION}
+PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/
@@ -23,7 +24,7 @@ LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		qca.2:${PORTSDIR}/devel/qca \
 		GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
-		exiv2.9:${PORTSDIR}/graphics/exiv2 \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		kdcraw.9:${PORTSDIR}/graphics/kdegraphics4 \
 		lcms2.2:${PORTSDIR}/graphics/lcms2 \
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index e3c1942e231c..fe6d622a4c55 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gthumb
 PORTVERSION=	2.12.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -45,7 +46,7 @@ OPTIONS=	EXIV2 "Exif support (image metadata)" 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
 PLIST_SUB+=	EXIV2=""
 .else
diff --git a/graphics/gthumb/files/patch-extensions__exiv2_tools__exiv2-utils.cpp b/graphics/gthumb/files/patch-extensions__exiv2_tools__exiv2-utils.cpp
new file mode 100644
index 000000000000..aaabc64ad811
--- /dev/null
+++ b/graphics/gthumb/files/patch-extensions__exiv2_tools__exiv2-utils.cpp
@@ -0,0 +1,42 @@
+--- ./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/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index 7f9c232cd487..aea3a7e0a0e1 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gwenview
 PORTVERSION=	1.4.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics kde
 MASTER_SITES=	SF
 
@@ -15,7 +15,7 @@ MAINTAINER=	markus@FreeBSD.org
 COMMENT=	An image viewer and browser for the KDE environment
 
 LIB_DEPENDS=	kipi.2:${PORTSDIR}/graphics/libkipi \
-		exiv2.9:${PORTSDIR}/graphics/exiv2
+		exiv2.10:${PORTSDIR}/graphics/exiv2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/graphics/gwenview-kde4/distinfo b/graphics/gwenview-kde4/distinfo
index e7765a8416f9..644085b21532 100644
--- a/graphics/gwenview-kde4/distinfo
+++ b/graphics/gwenview-kde4/distinfo
@@ -1,3 +1,2 @@
-MD5 (gwenview-1.4.2.tar.bz2) = 33c3fc68224d57f5f5cc4d34b48293c6
 SHA256 (gwenview-1.4.2.tar.bz2) = 26ec1a3f3ac7cce9584b44e6090402776fb84df3fc5f9e5aadbe66e9887851fd
 SIZE (gwenview-1.4.2.tar.bz2) = 984977
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 7f9c232cd487..aea3a7e0a0e1 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gwenview
 PORTVERSION=	1.4.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics kde
 MASTER_SITES=	SF
 
@@ -15,7 +15,7 @@ MAINTAINER=	markus@FreeBSD.org
 COMMENT=	An image viewer and browser for the KDE environment
 
 LIB_DEPENDS=	kipi.2:${PORTSDIR}/graphics/libkipi \
-		exiv2.9:${PORTSDIR}/graphics/exiv2
+		exiv2.10:${PORTSDIR}/graphics/exiv2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/graphics/gwenview/distinfo b/graphics/gwenview/distinfo
index e7765a8416f9..644085b21532 100644
--- a/graphics/gwenview/distinfo
+++ b/graphics/gwenview/distinfo
@@ -1,3 +1,2 @@
-MD5 (gwenview-1.4.2.tar.bz2) = 33c3fc68224d57f5f5cc4d34b48293c6
 SHA256 (gwenview-1.4.2.tar.bz2) = 26ec1a3f3ac7cce9584b44e6090402776fb84df3fc5f9e5aadbe66e9887851fd
 SIZE (gwenview-1.4.2.tar.bz2) = 984977
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 046f658b2f83..58b1a64fda69 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hugin
 PORTVERSION=	2010.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
@@ -18,7 +18,7 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		png:${PORTSDIR}/graphics/png \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR \
-		exiv2:${PORTSDIR}/graphics/exiv2 \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		pano13:${PORTSDIR}/graphics/libpano13 \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR \
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index da3c846ba773..22e20ac447f4 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -22,7 +23,7 @@ LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
 		lcms.1:${PORTSDIR}/graphics/lcms \
 		paper.2:${PORTSDIR}/print/libpaper \
 		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \
-		exiv2.9:${PORTSDIR}/graphics/exiv2 \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		chm.0:${PORTSDIR}/misc/chmlib \
 		sane.1:${PORTSDIR}/graphics/sane-backends \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index 8cbf54543f73..434f74a5cced 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kphotoalbum
 PORTVERSION=		3.1.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=		graphics kde
 MASTER_SITES=		http://www.kphotoalbum.org/data/download/
 
@@ -14,7 +14,7 @@ MAINTAINER=		markus@FreeBSD.org
 COMMENT=		Image database for KDE
 
 LIB_DEPENDS=		kipi.2:${PORTSDIR}/graphics/libkipi \
-			exiv2.9:${PORTSDIR}/graphics/exiv2 \
+			exiv2.10:${PORTSDIR}/graphics/exiv2 \
 			kdcraw.4:${PORTSDIR}/graphics/libkdcraw
 
 USE_KDELIBS_VER=	3
diff --git a/graphics/kphotoalbum/distinfo b/graphics/kphotoalbum/distinfo
index 9220812780c3..c110c90aa46b 100644
--- a/graphics/kphotoalbum/distinfo
+++ b/graphics/kphotoalbum/distinfo
@@ -1,3 +1,2 @@
-MD5 (kphotoalbum-3.1.1.tar.bz2) = 0ced1a53efa25b70dbb1ca19b1d0afc3
 SHA256 (kphotoalbum-3.1.1.tar.bz2) = 9b21b32afc94f9ac82950abe87028896d30208373e5c35ebb248bba31ac107f0
 SIZE (kphotoalbum-3.1.1.tar.bz2) = 15503061
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index 2f82643034cd..ef9dbfd18bb6 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -6,14 +6,14 @@
 
 PORTNAME=	libkexiv2
 PORTVERSION=	0.1.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/kipi/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A wrapper library to manipulate pictures metadata
 
-LIB_DEPENDS=	exiv2.9:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
diff --git a/graphics/libkexiv2-kde4/distinfo b/graphics/libkexiv2-kde4/distinfo
index 8e430cad8b98..cdb94ad6ec1b 100644
--- a/graphics/libkexiv2-kde4/distinfo
+++ b/graphics/libkexiv2-kde4/distinfo
@@ -1,3 +1,2 @@
-MD5 (libkexiv2-0.1.9.tar.bz2) = 6e6fc9edbfad4506f6f59508d9aa45d6
 SHA256 (libkexiv2-0.1.9.tar.bz2) = 004bacd4ae4574c0862342d6c4f7fdccb6fac01e50c77a4673487b96af9a0fad
 SIZE (libkexiv2-0.1.9.tar.bz2) = 432834
diff --git a/graphics/libkexiv2-kde4/files/patch-libkexiv2__libkexiv2__kexiv2.cpp b/graphics/libkexiv2-kde4/files/patch-libkexiv2__libkexiv2__kexiv2.cpp
new file mode 100644
index 000000000000..beb1972ce786
--- /dev/null
+++ b/graphics/libkexiv2-kde4/files/patch-libkexiv2__libkexiv2__kexiv2.cpp
@@ -0,0 +1,26 @@
+--- ./libkexiv2/libkexiv2/kexiv2.cpp.orig	2009-02-27 09:39:37.000000000 +0100
++++ ./libkexiv2/libkexiv2/kexiv2.cpp	2011-04-12 00:45:19.851801624 +0200
+@@ -1603,7 +1603,11 @@
+     {
+         std::string exifkey(exifTagName);
+         Exiv2::ExifKey ek(exifkey);
++#if (EXIV2_TEST_VERSION(0,21,0))
++	return QString::fromLocal8Bit( ek.tagLabel().c_str() );
++#else
+         return QString::fromLocal8Bit( Exiv2::ExifTags::tagTitle(ek.tag(), ek.ifdId()) );
++#endif
+     }
+     catch (Exiv2::Error& e)
+     {
+@@ -1619,7 +1623,11 @@
+     {
+         std::string exifkey(exifTagName);
+         Exiv2::ExifKey ek(exifkey);
++#if (EXIV2_TEST_VERSION(0,21,0))
++	return QString::fromLocal8Bit( ek.tagDesc().c_str() );
++#else
+         return QString::fromLocal8Bit( Exiv2::ExifTags::tagDesc(ek.tag(), ek.ifdId()) );
++#endif
+     }
+     catch (Exiv2::Error& e)
+     {
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 2f82643034cd..ef9dbfd18bb6 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -6,14 +6,14 @@
 
 PORTNAME=	libkexiv2
 PORTVERSION=	0.1.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/kipi/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A wrapper library to manipulate pictures metadata
 
-LIB_DEPENDS=	exiv2.9:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
diff --git a/graphics/libkexiv2/distinfo b/graphics/libkexiv2/distinfo
index 8e430cad8b98..cdb94ad6ec1b 100644
--- a/graphics/libkexiv2/distinfo
+++ b/graphics/libkexiv2/distinfo
@@ -1,3 +1,2 @@
-MD5 (libkexiv2-0.1.9.tar.bz2) = 6e6fc9edbfad4506f6f59508d9aa45d6
 SHA256 (libkexiv2-0.1.9.tar.bz2) = 004bacd4ae4574c0862342d6c4f7fdccb6fac01e50c77a4673487b96af9a0fad
 SIZE (libkexiv2-0.1.9.tar.bz2) = 432834
diff --git a/graphics/libkexiv2/files/patch-libkexiv2__libkexiv2__kexiv2.cpp b/graphics/libkexiv2/files/patch-libkexiv2__libkexiv2__kexiv2.cpp
new file mode 100644
index 000000000000..beb1972ce786
--- /dev/null
+++ b/graphics/libkexiv2/files/patch-libkexiv2__libkexiv2__kexiv2.cpp
@@ -0,0 +1,26 @@
+--- ./libkexiv2/libkexiv2/kexiv2.cpp.orig	2009-02-27 09:39:37.000000000 +0100
++++ ./libkexiv2/libkexiv2/kexiv2.cpp	2011-04-12 00:45:19.851801624 +0200
+@@ -1603,7 +1603,11 @@
+     {
+         std::string exifkey(exifTagName);
+         Exiv2::ExifKey ek(exifkey);
++#if (EXIV2_TEST_VERSION(0,21,0))
++	return QString::fromLocal8Bit( ek.tagLabel().c_str() );
++#else
+         return QString::fromLocal8Bit( Exiv2::ExifTags::tagTitle(ek.tag(), ek.ifdId()) );
++#endif
+     }
+     catch (Exiv2::Error& e)
+     {
+@@ -1619,7 +1623,11 @@
+     {
+         std::string exifkey(exifTagName);
+         Exiv2::ExifKey ek(exifkey);
++#if (EXIV2_TEST_VERSION(0,21,0))
++	return QString::fromLocal8Bit( ek.tagDesc().c_str() );
++#else
+         return QString::fromLocal8Bit( Exiv2::ExifTags::tagDesc(ek.tag(), ek.ifdId()) );
++#endif
+     }
+     catch (Exiv2::Error& e)
+     {
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index 46a2704bf822..efeb23274342 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	luminance
 DISTVERSION=	2.0.1-1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/qtpfsgui/luminance/${DISTVERSION:S/-1//}/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER=	goffredo@gmail.com
 COMMENT=	A graphical user interface that provides a workflow for HDR imaging
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-LIB_DEPENDS=	exiv2.9:${PORTSDIR}/graphics/exiv2 \
+LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/luminance/pkg-plist b/graphics/luminance/pkg-plist
index 63ee59f60676..df9a593cc9f9 100644
--- a/graphics/luminance/pkg-plist
+++ b/graphics/luminance/pkg-plist
@@ -70,7 +70,6 @@ share/icons/hicolor/32x32/apps/luminance.png
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/help/js
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/help/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/help/en/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/help/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/help
diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile
index e3b57373fe6f..a2b63f4238cf 100644
--- a/graphics/py-exiv2/Makefile
+++ b/graphics/py-exiv2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	exiv2
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://launchpadlibrarian.net/49194059/ \
 		http://www.dindin.ru/download/
@@ -16,7 +17,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Python bindings for exiv2
 
-LIB_DEPENDS=	exiv2.9:${PORTSDIR}/graphics/exiv2\
+LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2\
 		boost_python.4:${PORTSDIR}/devel/boost-python-libs
 
 USE_PYTHON=	yes
diff --git a/graphics/py-exiv2/distinfo b/graphics/py-exiv2/distinfo
index f547bf987d6f..d3b0a48047c1 100644
--- a/graphics/py-exiv2/distinfo
+++ b/graphics/py-exiv2/distinfo
@@ -1,3 +1,2 @@
-MD5 (pyexiv2-0.2.2.tar.bz2) = 3c1aab78bbd44cc3581a0645b0ee56ee
 SHA256 (pyexiv2-0.2.2.tar.bz2) = 44642d4f632b283551cb05ff4945dfd5bf1724019606fa575214a45d0cbceef7
 SIZE (pyexiv2-0.2.2.tar.bz2) = 180998
diff --git a/graphics/py-exiv2/files/patch-src__exiv2wrapper.cpp b/graphics/py-exiv2/files/patch-src__exiv2wrapper.cpp
new file mode 100644
index 000000000000..48b178a9ecfa
--- /dev/null
+++ b/graphics/py-exiv2/files/patch-src__exiv2wrapper.cpp
@@ -0,0 +1,27 @@
+--- ./src/exiv2wrapper.cpp.orig	2010-05-27 10:41:11.000000000 +0200
++++ ./src/exiv2wrapper.cpp	2011-04-12 07:51:12.423977241 +0200
+@@ -457,6 +457,16 @@
+         _data = 0;
+     }
+ 
++#if EXIV2_TEST_VERSION(0,21,0)
++    Exiv2::ExifKey exifKey(key);
++    _type = Exiv2::TypeInfo::typeName(exifKey.defaultTypeId());
++    _name =exifKey.tagName();
++    _label = exifKey.tagLabel();
++    _description = exifKey.tagDesc();
++    _sectionName = Exiv2::ExifTags::sectionName(exifKey);
++    // section is no longer provided set it to sectionName currently
++    _sectionDescription = _sectionName;
++#else
+     const uint16_t tag = _datum->tag();
+     const Exiv2::IfdId ifd = _datum->ifdId();
+     _type = Exiv2::TypeInfo::typeName(Exiv2::ExifTags::tagType(tag, ifd));
+@@ -465,6 +475,7 @@
+     _description = Exiv2::ExifTags::tagDesc(tag, ifd);
+     _sectionName = Exiv2::ExifTags::sectionName(tag, ifd);
+     _sectionDescription = Exiv2::ExifTags::sectionDesc(tag, ifd);
++#endif
+ }
+ 
+ ExifTag::~ExifTag()
diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index 06990d243457..e8114f6ee527 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rawstudio
 PORTVERSION=	1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawstudio.org/files/release/
 
@@ -16,7 +16,7 @@ COMMENT=	Rawstudio is an open-source program to read and manipulate RAW images
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		exiv2.9:${PORTSDIR}/graphics/exiv2 \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		dbus-1.3:${PORTSDIR}/devel/dbus
 
 GNU_CONFIGURE=	yes
@@ -24,6 +24,6 @@ USE_GMAKE=	yes
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GETTEXT=	yes
-USE_GNOME=	gtk20 libxml2 gconf2
+USE_GNOME=	gtk20 libxml2 gconf2 desktopfileutils
 
 .include <bsd.port.mk>
diff --git a/graphics/rawstudio/distinfo b/graphics/rawstudio/distinfo
index 69d6e7f42b38..304431be9c5c 100644
--- a/graphics/rawstudio/distinfo
+++ b/graphics/rawstudio/distinfo
@@ -1,3 +1,2 @@
-MD5 (rawstudio-1.2.tar.gz) = 25399cd80294fa44220a8940fc77689f
 SHA256 (rawstudio-1.2.tar.gz) = bce8525bbd0d59a9097a4404e0d70856faa5c671f77cd32ca0d28c7bc28e6d85
 SIZE (rawstudio-1.2.tar.gz) = 516171
diff --git a/graphics/solang/Makefile b/graphics/solang/Makefile
index 19ca9c30d3c4..38f493b2eb94 100644
--- a/graphics/solang/Makefile
+++ b/graphics/solang/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	A photo manager for GNOME
 
 LIB_DEPENDS=	gegl-0.1.105:${PORTSDIR}/graphics/gegl \
-		exiv2.9:${PORTSDIR}/graphics/exiv2 \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		flickcurl.0:${PORTSDIR}/www/flickcurl \
 		gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview \
 		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
@@ -29,7 +29,7 @@ LIB_DEPENDS=	gegl-0.1.105:${PORTSDIR}/graphics/gegl \
 		gdamm-4.0.12:${PORTSDIR}/databases/libgdamm \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 
-BROKEN=		bad plist
+BROKEN=		bad plist + do not build with latest exiv2
 
 USE_AUTOTOOLS=	autoconf
 USE_GMAKE=	yes
diff --git a/graphics/solang/distinfo b/graphics/solang/distinfo
index a434ae3c7e35..5497d015b0c0 100644
--- a/graphics/solang/distinfo
+++ b/graphics/solang/distinfo
@@ -1,6 +1,4 @@
-MD5 (solang-0.3.tar.gz) = 6f82d34174815deacb4392b88a4134ed
 SHA256 (solang-0.3.tar.gz) = 0d3c85c4f96f829eefc8851713510e068f3cf6b90a0cb084035d98f4d69cb00a
 SIZE (solang-0.3.tar.gz) = 658189
-MD5 (0001-Ported-to-libgdamm-4.x.patch) = 4afe92dff02a4359b2bea3d9c358b274
 SHA256 (0001-Ported-to-libgdamm-4.x.patch) = 55bdf02d4c22b947a0e718baced9437949e55480e8ad4fd2ad6ee34b38f29c4f
 SIZE (0001-Ported-to-libgdamm-4.x.patch) = 23747
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index e28c3af12653..7e0f5f96757b 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ufraw
 PORTVERSION=	0.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -40,7 +40,7 @@ OPTIONS=	CONTRAST "Enable contrast setting"		on	\
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_EXIV2)
-LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS+=	exiv2.10:${PORTSDIR}/graphics/exiv2
 .else
 PC_FALSE+=	exiv2
 .endif
diff --git a/graphics/ufraw/distinfo b/graphics/ufraw/distinfo
index 839b7f4871aa..505feea78aed 100644
--- a/graphics/ufraw/distinfo
+++ b/graphics/ufraw/distinfo
@@ -1,3 +1,2 @@
-MD5 (ufraw-0.17.tar.gz) = 5e2c2b4adaea1f6d03eac66e11747fc6
 SHA256 (ufraw-0.17.tar.gz) = f65a32d9bc1edbf5399e6d3e18617df4380f13d8d02d32fa2aaee4a404beb6a2
 SIZE (ufraw-0.17.tar.gz) = 1158114
diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile
index 8e59e278d800..f3bc697b782e 100644
--- a/sysutils/krename-kde4/Makefile
+++ b/sysutils/krename-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	krename
 PORTVERSION=	4.0.7
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	SF/${PORTNAME}/KDE4%20${PORTNAME}-stable/${PORTVERSION}
 
@@ -14,7 +15,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Very powerful batch file renamer for KDE
 
 LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
-		exiv2.9:${PORTSDIR}/graphics/exiv2 \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		podofo.0:${PORTSDIR}/graphics/podofo
 
 LATEST_LINK=	${PORTNAME}-kde4
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index e7790ac400de..d57f8f722e6b 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -58,7 +58,7 @@ check: build install
 # for it, if not present then it will not add support for it, but it cannot
 # be disabled if present
 .if !defined(WITHOUT_EXIV2) || exists(${LOCALBASE}/include/exiv2/exif.hpp)
-LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS+=	exiv2.10:${PORTSDIR}/graphics/exiv2
 PLIST_SUB+=	EXIV2=""
 .else
 PLIST_SUB+=	EXIV2="@comment "
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 0aad91c0c0c1..4ab2d81fded6 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase-runtime
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
-		exiv2.9:${PORTSDIR}/graphics/exiv2 \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		xine.1:${PORTSDIR}/multimedia/libxine \
 		slp.1:${PORTSDIR}/net/openslp \
 		smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 0aad91c0c0c1..4ab2d81fded6 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase-runtime
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
-		exiv2.9:${PORTSDIR}/graphics/exiv2 \
+		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		xine.1:${PORTSDIR}/multimedia/libxine \
 		slp.1:${PORTSDIR}/net/openslp \
 		smbclient.0:${PORTSDIR}/net/samba-libsmbclient \