The KDE/FreeBSD team is pleased to announce KDE Software Compilation

4.7.2. The official release notes can be found at:
http://kde.org/announcements/announce-4.7.2.php
This release ships with many improvements. Read more about them here:
http://FreeBSD.kde.org/news.php#itemKDESC472availableinports

We'd like to say thanks to all testers and contributors, especially to
lwhsu@ for his effort on hosting our test packages.

PR:		156293 [1]
		159219 [2]
		160164 [3]
Submitted by:	Oleg Sidorkin <osidorkin@gmail.com> [1]
		Alvaro Castillo <gobledb@gmail.com> [2]
		dkeav04@gmail.com [3]
Tested by:	exp-run via pav

5 files changed, 44 insertions, 54 deletions

diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index ef9dbfd18bb6..dbfbbecded1a 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -1,29 +1,37 @@
 # New ports collection makefile for:	libkexiv2
-# Date created:			14 March 2007
-# Whom:				Alex Dupre <ale@FreeBSD.org>
+# Date created:				9 August 2011
+# Whom:					Alberto Villa <avilla@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	libkexiv2
-PORTVERSION=	0.1.9
-PORTREVISION=	6
-CATEGORIES=	graphics devel
-MASTER_SITES=	SF/kipi/${PORTNAME}/${PORTVERSION}
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	graphics kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
 
-MAINTAINER=	ale@FreeBSD.org
-COMMENT=	A wrapper library to manipulate pictures metadata
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Exiv2 library interface for KDE
 
 LIB_DEPENDS=	exiv2.10:${PORTSDIR}/graphics/exiv2
 
+LATEST_LINK=	${PORTNAME}-kde4
+
+CONFLICTS=	kdegraphics-4.[0-6].*
+
 USE_BZIP2=	yes
-USE_KDELIBS_VER=3
-USE_GNOME=	gnomehack pkgconfig
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool
-USE_LDCONFIG=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus gui xml \
+		moc_build qmake_build rcc_build uic_build
+MAKE_JOBS_SAFE=	yes
+
+pre-configure:
+	${REINPLACE_CMD} -e '/pkgconfig/ s/$${LIB_INSTALL_DIR}/libdata/' \
+		-e 's/${PORTNAME}.pc\([^.]\)/${PORTNAME}-kde4.pc\1/g' \
+		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/graphics/libkexiv2-kde4/distinfo b/graphics/libkexiv2-kde4/distinfo
index cdb94ad6ec1b..f09bdf2f9da9 100644
--- a/graphics/libkexiv2-kde4/distinfo
+++ b/graphics/libkexiv2-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libkexiv2-0.1.9.tar.bz2) = 004bacd4ae4574c0862342d6c4f7fdccb6fac01e50c77a4673487b96af9a0fad
-SIZE (libkexiv2-0.1.9.tar.bz2) = 432834
+SHA256 (KDE/libkexiv2-4.7.2.tar.bz2) = e1657dc9e488d17ef1b0240f5b272fe18a1e7cbf3a0967e671cc2466ead4df71
+SIZE (KDE/libkexiv2-4.7.2.tar.bz2) = 132538
diff --git a/graphics/libkexiv2-kde4/files/patch-libkexiv2__libkexiv2__kexiv2.cpp b/graphics/libkexiv2-kde4/files/patch-libkexiv2__libkexiv2__kexiv2.cpp
deleted file mode 100644
index beb1972ce786..000000000000
--- a/graphics/libkexiv2-kde4/files/patch-libkexiv2__libkexiv2__kexiv2.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./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-kde4/pkg-descr b/graphics/libkexiv2-kde4/pkg-descr
index 1bc503f548fd..d0e73d2a13b6 100644
--- a/graphics/libkexiv2-kde4/pkg-descr
+++ b/graphics/libkexiv2-kde4/pkg-descr
@@ -1,6 +1,5 @@
-libkexiv2 is a wrapper around Exiv2 library to manipulate pictures metadata.
+Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures
+metadata as EXIF/IPTC and XMP. This library is used by kipi-plugins,
+digiKam and others kipi host programs.
 
-WWW: http://www.kipi-plugins.org/
-
-- Alex Dupre
-ale@FreeBSD.org
+WWW: http://www.digikam.org
diff --git a/graphics/libkexiv2-kde4/pkg-plist b/graphics/libkexiv2-kde4/pkg-plist
index d7b7cd08c836..963f38778988 100644
--- a/graphics/libkexiv2-kde4/pkg-plist
+++ b/graphics/libkexiv2-kde4/pkg-plist
@@ -1,9 +1,18 @@
+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.a
-lib/libkexiv2.la
 lib/libkexiv2.so
-lib/libkexiv2.so.5
-libdata/pkgconfig/libkexiv2.pc
+lib/libkexiv2.so.10
+lib/libkexiv2.so.10.0.0
+libdata/pkgconfig/libkexiv2-kde4.pc
+share/apps/libkexiv2/data/topicset.iptc-subjectcode.xml
+@dirrm share/apps/libkexiv2/data
+@dirrm share/apps/libkexiv2
 @dirrm include/libkexiv2