5 files changed, 35 insertions, 43 deletions

diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 84128f633d2c..dd752f74f0bd 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
@@ -19,12 +19,13 @@ BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 CONFLICTS=		akonadi-google-0.*
 CONFLICTS_INSTALL=	kdepim-runtime-4.4.*
 
-USE_XZ=	yes
+USE_XZ=		yes
 USE_GNOME=	libxml2
-USE_KDE4=	kdehier kdelibs kdeprefix pimlibs \
+USE_KDE4=	kdehier kdelibs kdeprefix pimlibs nepomuk-core \
 		akonadi automoc4 ontologies sharedmime soprano strigi
 USES=		cmake:outsource
-USE_QT4=	dbus designer gui network xml xmlpatterns \
+USE_QT4=	corelib dbus declarative designer_build gui network qtestlib \
+		script xml xmlpatterns \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
@@ -38,7 +39,4 @@ post-patch:
 		${PATCH_WRKSRC}/CMakeLists.txt \
 		${PATCH_WRKSRC}/accountwizard/CMakeLists.txt
 
-post-install:
-	@-update-mime-database ${KDE4_PREFIX}/share/mime
-
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
index ffcd503ee4c4..1f35f4aec166 100644
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-runtime-4.9.5.tar.xz) = 6a2d6aabf1bcb07c8929e45b5010d4eb2f145d6517197d93e7d098570cb39f6a
-SIZE (KDE/kdepim-runtime-4.9.5.tar.xz) = 1153120
+SHA256 (KDE/4.10.1/kdepim-runtime-4.10.1.tar.xz) = 949a0bf547eaadde64f5fc2c894ced7c77c6d7a86cbb373d4db6c85acfb827bb
+SIZE (KDE/4.10.1/kdepim-runtime-4.10.1.tar.xz) = 1155668
diff --git a/deskutils/kdepim4-runtime/files/patch-git34817487 b/deskutils/kdepim4-runtime/files/patch-git34817487
new file mode 100644
index 000000000000..06c736523bc6
--- /dev/null
+++ b/deskutils/kdepim4-runtime/files/patch-git34817487
@@ -0,0 +1,11 @@
+--- ./agents/nepomukfeeder/nepomukfeederagent.cpp.orig	2013-03-01 06:59:42.493968000 +0000
++++ ./agents/nepomukfeeder/nepomukfeederagent.cpp	2013-03-17 11:41:45.562852063 +0000
+@@ -63,7 +63,7 @@
+ #include "nepomukfeeder-config.h"
+ #include "nepomukfeederadaptor.h"
+ 
+-typedef QSharedPointer< QMultiHash< typename Akonadi::Collection::Id,  typename Akonadi::Item::Id> > MultiHashPointer;
++typedef QSharedPointer< QMultiHash< Akonadi::Collection::Id, Akonadi::Item::Id> > MultiHashPointer;
+ Q_DECLARE_METATYPE(MultiHashPointer)
+ 
+ namespace Akonadi {
diff --git a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
index a2f61f9b2add..d40edbbf5975 100644
--- a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
+++ b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
@@ -1,33 +1,12 @@
---- ./xml/CMakeLists.txt.orig	2009-06-03 22:54:34.000000000 +1100
-+++ ./xml/CMakeLists.txt	2009-07-05 22:39:32.000000000 +1100
-@@ -1,21 +1,24 @@
- project (akonadixml)
- 
--if ( LIBXML2_FOUND )
--  add_definitions( -DHAVE_LIBXML2 )
--endif ( LIBXML2_FOUND )
--
--add_subdirectory( tests )
--
- add_definitions( -DQT_NO_CAST_FROM_ASCII )
- add_definitions( -DQT_NO_CAST_TO_ASCII )
- 
- include_directories(
-+    ${QT_QTGUI_INCLUDE_DIR}
-+    ${QT_QTCORE_INCLUDE_DIR}
-+    ${QT_QTXML_INCLUDE_DIR}
-     ${AKONADI_INCLUDE_DIR}
-     ${KDE4_INCLUDES}
-     ${KDEPIMLIBS_INCLUDE_DIR}
-     ${LIBXML2_INCLUDE_DIR}
- )
- 
-+if ( LIBXML2_FOUND )
-+  add_definitions( -DHAVE_LIBXML2 )
-+endif ( LIBXML2_FOUND )
-+
-+add_subdirectory( tests )
+--- xml/CMakeLists.txt.orig	2013-01-23 22:59:04.000000000 +0100
++++ xml/CMakeLists.txt	2013-03-01 18:21:43.000000000 +0100
+@@ -4,6 +4,9 @@
+   add_definitions( -DHAVE_LIBXML2 )
+ endif ( LIBXML2_FOUND )
+ 
++include_directories(${QT_QTCORE_INCLUDE_DIR})
++include_directories(${QT_QTXML_INCLUDE_DIR})
 +
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+ add_subdirectory( tests )
  
- set( akonadixml_SRCS
+ add_definitions( -DQT_NO_CAST_FROM_ASCII )
diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
index 13feef7b1165..bf0d61e6b5d5 100644
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -4,6 +4,7 @@ bin/akonadi_birthdays_resource
 bin/akonadi_davgroupware_resource
 bin/akonadi_googlecalendar_resource
 bin/akonadi_googlecontacts_resource
+bin/akonadi_icaldir_resource
 bin/akonadi_imap_resource
 bin/akonadi_invitations_agent
 bin/akonadi_kabc_resource
@@ -26,6 +27,7 @@ bin/kaddressbookmigrator
 bin/kjotsmigrator
 bin/kmail-migrator
 bin/kres-migrator
+bin/nepomukpimindexerutility
 lib/kde4/accountwizard_plugin.so
 lib/kde4/akonadi_akonotes_resource.so
 lib/kde4/akonadi_contacts_resource.so
@@ -64,7 +66,6 @@ lib/libakonadi-xml.so.5.0.1
 lib/libkdepim-copy.so
 lib/libkdepim-copy.so.5
 lib/libkdepim-copy.so.5.0.1
-lib/libkdepim-runtime-dms-copy.so
 lib/libkmindexreader.so
 lib/libkmindexreader.so.5
 lib/libkmindexreader.so.5.0.1
@@ -79,6 +80,7 @@ share/akonadi/agents/contactsresource.desktop
 share/akonadi/agents/davgroupwareresource.desktop
 share/akonadi/agents/googlecalendarresource.desktop
 share/akonadi/agents/googlecontactsresource.desktop
+share/akonadi/agents/icaldirresource.desktop
 share/akonadi/agents/icalresource.desktop
 share/akonadi/agents/imapresource.desktop
 share/akonadi/agents/invitationsagent.desktop
@@ -143,6 +145,8 @@ share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
 share/apps/akonadi_knut_resource/knut-template.xml
 share/apps/akonadi_maildispatcher_agent/akonadi_maildispatcher_agent.notifyrc
+share/apps/akonadi_nepomuk_feeder/akonadi_nepomuk_feeder.notifyrc
+share/apps/nepomukpimindexerutility/nepomukpimindexerutility.rc
 share/autostart/kaddressbookmigrator.desktop
 share/config/accountwizard.knsrc
 share/config/kmail-migratorrc
@@ -185,6 +189,8 @@ share/ontology/kde/aneo.trig
 @dirrmtry share/ontology
 @dirrm share/kde4/services/akonadi/davgroupware-providers
 @dirrmtry share/kde4/services/akonadi
+@dirrm share/apps/nepomukpimindexerutility
+@dirrm share/apps/akonadi_nepomuk_feeder
 @dirrm share/apps/akonadi_maildispatcher_agent
 @dirrm share/apps/akonadi_knut_resource
 @dirrm share/apps/akonadi/plugins/serializer
@@ -202,5 +208,3 @@ share/ontology/kde/aneo.trig
 @dirrmtry share/apps/akonadi
 @dirrm share/akonadi/agents
 @dirrm share/akonadi
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true