3 files changed, 36 insertions, 33 deletions

diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index d52e761c8624..91d0c1e92e14 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -5,22 +5,27 @@ PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Kactivities library
 
 CONFLICTS_INSTALL=	kdelibs-4.7.* kde-runtime-4.7.*
 
-USE_XZ=	yes
-USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
+USE_XZ=		yes
+USE_KDE4=	automoc4 kdehier kdelibs kdeprefix soprano nepomuk-core
 USES=		cmake:outsource
-USE_QT4=	moc_build qmake_build rcc_build uic_build
+USE_QT4=	declarative moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e '/pkgconfig/s,$${LIB_INSTALL_DIR},libdata,' \
-		${WRKSRC}/lib/CMakeLists.txt
+		${WRKSRC}/src/lib/core/CMakeLists.txt \
+		${WRKSRC}/src/lib/models/CMakeLists.txt
+# Disable kactivitymanagerd
+	${REINPLACE_CMD} -e "/add_subdirectory (service)/d" \
+		-e "/add_subdirectory (workspace)/d" \
+		${WRKSRC}/src/CMakeLists.txt \
 
 .include <bsd.port.mk>
diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo
index 030378e81ff5..02dc3321a25b 100644
--- a/x11/kactivities/distinfo
+++ b/x11/kactivities/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kactivities-4.9.5.tar.xz) = dfe4eb835d47de3457656c907c42d117d12c3efc29986d4980abff313439178c
-SIZE (KDE/kactivities-4.9.5.tar.xz) = 88600
+SHA256 (KDE/4.10.1/kactivities-4.10.1.tar.xz) = 2f288f67f492893f3f7be01eda5cc3c0938510381dedfac3f1affe2f09f1c967
+SIZE (KDE/4.10.1/kactivities-4.10.1.tar.xz) = 108336
diff --git a/x11/kactivities/pkg-plist b/x11/kactivities/pkg-plist
index 0492626b4239..a20be312f955 100644
--- a/x11/kactivities/pkg-plist
+++ b/x11/kactivities/pkg-plist
@@ -1,50 +1,48 @@
-bin/kactivitymanagerd
 include/KDE/KActivities/Consumer
 include/KDE/KActivities/Controller
 include/KDE/KActivities/Info
+include/KDE/KActivities/Models/ActivityModel
+include/KDE/KActivities/Models/ResourceModel
 include/KDE/KActivities/ResourceInstance
+include/kactivities-models/activitymodel.h
+include/kactivities-models/kactivities_models_export.h
+include/kactivities-models/resourcemodel.h
 include/kactivities/consumer.h
 include/kactivities/controller.h
 include/kactivities/info.h
 include/kactivities/kactivities_export.h
 include/kactivities/resourceinstance.h
+lib/cmake/KActivities-Models/KActivities-ModelsConfig.cmake
+lib/cmake/KActivities-Models/KActivities-ModelsConfigVersion.cmake
+lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets.cmake
 lib/cmake/KActivities/KActivitiesConfig.cmake
 lib/cmake/KActivities/KActivitiesConfigVersion.cmake
 lib/cmake/KActivities/KActivitiesLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
-lib/kde4/activitymanager_plugin_globalshortcuts.so
-lib/kde4/activitymanager_plugin_slc.so
-lib/kde4/activitymanager_plugin_sqlite.so
-lib/kde4/activitymanager_uihandler_declarative.so
-lib/kde4/activitymanager_uihandler_kdialog.so
-lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so
-lib/kde4/kio_activities.so
+lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so
+lib/kde4/imports/org/kde/activities/models/qmldir
+lib/libkactivities-models.so
+lib/libkactivities-models.so.1
+lib/libkactivities-models.so.1.0.0
 lib/libkactivities.so
 lib/libkactivities.so.6
-lib/libkactivities.so.6.0.0
+lib/libkactivities.so.6.1.0
+libdata/pkgconfig/libkactivities-models.pc
 libdata/pkgconfig/libkactivities.pc
-share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/ChoiceDialog.qml
-share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/MessageDialog.qml
-share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/NewPasswordDialog.qml
-share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/PasswordDialog.qml
-share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/uihandler.qml
-share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/metadata.desktop
-share/kde4/services/activities.protocol
-share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
-share/kde4/services/activitymanager-plugin-slc.desktop
-share/kde4/services/activitymanager-plugin-sqlite.desktop
-share/kde4/services/kactivitymanagerd.desktop
-share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
-share/kde4/servicetypes/activitymanager-plugin.desktop
 share/ontology/kde/kao.ontology
 share/ontology/kde/kao.trig
 @dirrmtry share/ontology/kde
 @dirrmtry share/ontology
-@dirrm share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui
-@dirrm share/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents
-@dirrm share/apps/plasma/packages/org.kde.ActivityManager.UiHandler
-@dirrmtry share/apps/plasma/packages
+@dirrm lib/kde4/imports/org/kde/activities/models
+@dirrm lib/kde4/imports/org/kde/activities
+@dirrmtry lib/kde4/imports/org/kde
+@dirrmtry lib/kde4/imports/org
+@dirrmtry lib/kde4/imports
+@dirrm lib/cmake/KActivities-Models
 @dirrm lib/cmake/KActivities
 @dirrmtry lib/cmake
+@dirrm include/kactivities-models
 @dirrm include/kactivities
+@dirrm include/KDE/KActivities/Models
 @dirrm include/KDE/KActivities