Update to KDE SC 4.8.0

6 files changed, 33 insertions, 88 deletions

diff --git a/graphics/libkexiv2/DESCR b/graphics/libkexiv2/DESCR
index 518c839adfa..a732659380b 100644
--- a/graphics/libkexiv2/DESCR
+++ b/graphics/libkexiv2/DESCR
@@ -1,2 +1,6 @@
-Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures metadata.
-This library is used by kipi-plugins, digiKam and others kipi host programs.
+libKExiv2 is a wrapper around exiv2, providing read/write access to EXIF,
+IPTC and XMP metadata. The main differences to exiv2 are:
+
+* Functions take standard Qt containers as parameters
+* Helper functions for GPS data
+* Transparent XMP sidecar support
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 288ced57238..d4140354121 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -1,31 +1,17 @@
-# $NetBSD: Makefile,v 1.29 2012/03/03 00:12:34 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2012/03/19 23:12:19 markd Exp $
 #
 
-DISTNAME=	libkexiv2-0.1.9
-PKGREVISION=	12
+DISTNAME=	libkexiv2-${_KDE_VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kipi/}
-EXTRACT_SUFX=	.tar.bz2
+COMMENT=	a KDE wrapper around exiv2
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.kipi-plugins.org/
-COMMENT=	KDE wrapper for exiv2
-LICENSE=	gnu-gpl-v2
+.include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+PKGCONFIG_OVERRIDE+=    libkexiv2.pc.cmake
 
-GNU_CONFIGURE=	yes
-SET_LIBDIR=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
+.include "../../meta-pkgs/kde4/kde4.mk"
 
-PKGCONFIG_OVERRIDE+=	libkexiv2/libkexiv2.pc.in
-
-.include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libkexiv2/PLIST b/graphics/libkexiv2/PLIST
index dc4c64370f1..eb78e6ab7e7 100644
--- a/graphics/libkexiv2/PLIST
+++ b/graphics/libkexiv2/PLIST
@@ -1,6 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/03/19 23:12:19 markd Exp $
+include/libkexiv2/altlangstredit.h
+include/libkexiv2/countryselector.h
 include/libkexiv2/kexiv2.h
+include/libkexiv2/kexiv2data.h
+include/libkexiv2/kexiv2previews.h
 include/libkexiv2/libkexiv2_export.h
+include/libkexiv2/msgtextedit.h
+include/libkexiv2/rotationmatrix.h
+include/libkexiv2/subjectwidget.h
 include/libkexiv2/version.h
-lib/libkexiv2.la
+lib/libkexiv2.so
+lib/libkexiv2.so.10
+lib/libkexiv2.so.10.0.1
 lib/pkgconfig/libkexiv2.pc
+share/kde/apps/libkexiv2/data/topicset.iptc-subjectcode.xml
diff --git a/graphics/libkexiv2/buildlink3.mk b/graphics/libkexiv2/buildlink3.mk
index 115240f5ee3..83ac9db28c3 100644
--- a/graphics/libkexiv2/buildlink3.mk
+++ b/graphics/libkexiv2/buildlink3.mk
@@ -1,18 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.18 2012/03/03 00:12:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2012/03/19 23:12:19 markd Exp $
 
 BUILDLINK_TREE+=	libkexiv2
 
 .if !defined(LIBKEXIV2_BUILDLINK3_MK)
 LIBKEXIV2_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libkexiv2+=	libkexiv2>=0.1.1
-BUILDLINK_ABI_DEPENDS.libkexiv2+=	libkexiv2>=0.1.9nb12
+BUILDLINK_API_DEPENDS.libkexiv2+=	libkexiv2>=4.8.0
 BUILDLINK_PKGSRCDIR.libkexiv2?=	../../graphics/libkexiv2
 
-.include "../../graphics/exiv2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.endif # LIBKEXIV2_BUILDLINK3_MK
+.endif	# LIBKEXIV2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libkexiv2
diff --git a/graphics/libkexiv2/distinfo b/graphics/libkexiv2/distinfo
index 55f534afe20..5357a7daaf9 100644
--- a/graphics/libkexiv2/distinfo
+++ b/graphics/libkexiv2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2011/01/03 20:45:27 markd Exp $
+$NetBSD: distinfo,v 1.10 2012/03/19 23:12:19 markd Exp $
 
-SHA1 (libkexiv2-0.1.9.tar.bz2) = 252243b105f0f0e0565219b61aed6f223cbb4000
-RMD160 (libkexiv2-0.1.9.tar.bz2) = c4d68e36a69de29b31eb2ceecac6d7e370d68213
-Size (libkexiv2-0.1.9.tar.bz2) = 432834 bytes
-SHA1 (patch-aa) = da9d931b52bebb21148e3445051fa5b19baa164c
+SHA1 (libkexiv2-4.8.0.tar.bz2) = 4536ffd3df63a8dcf68bf8ab221ba0c09be417c6
+RMD160 (libkexiv2-4.8.0.tar.bz2) = 6825d90e666697de4f1e404a9024043a62f6e6f8
+Size (libkexiv2-4.8.0.tar.bz2) = 141680 bytes
diff --git a/graphics/libkexiv2/patches/patch-aa b/graphics/libkexiv2/patches/patch-aa
deleted file mode 100644
index 1d3d0407c57..00000000000
--- a/graphics/libkexiv2/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2011/01/03 20:45:28 markd Exp $
-
---- libkexiv2/libkexiv2/kexiv2.cpp.orig	2009-02-27 08:39:37.000000000 +0000
-+++ libkexiv2/libkexiv2/kexiv2.cpp
-@@ -49,6 +49,20 @@ extern "C"
- #include "kexiv2private.h"
- #include "kexiv2.h"
- 
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(__DragonFly__) && __DragonFly_version < 190000) || (defined(__NetBSD__) && __NetBSD_Version__ <= 399001700)
-+static double trunc(double val)
-+{
-+	if (val > 0)
-+		return floor(val);
-+	else
-+		return ceil(val);
-+}
-+#endif
-+
- namespace KExiv2Iface
- {
- 
-@@ -1603,7 +1617,11 @@ QString KExiv2::getExifTagTitle(const ch
-     {
-         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 +1637,11 @@ QString KExiv2::getExifTagDescription(co
-     {
-         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)
-     {