4 files changed, 24 insertions, 42 deletions

diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index 9fdc8152485f..3a86e9b08c18 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	kactivities
-# Date created:		2012-02-22
-# Whom:			Max Brazhnikov <makc@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	kactivities
 PORTVERSION=	${KDE4_VERSION}
diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo
index 9bfe5e8ca3fe..030378e81ff5 100644
--- a/x11/kactivities/distinfo
+++ b/x11/kactivities/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kactivities-4.8.4.tar.xz) = ae64526a07ebadb75b5e793c0fd920c4f789ddc3bbb066ff1af0a6cc1778b74f
-SIZE (KDE/kactivities-4.8.4.tar.xz) = 42396
+SHA256 (KDE/kactivities-4.9.5.tar.xz) = dfe4eb835d47de3457656c907c42d117d12c3efc29986d4980abff313439178c
+SIZE (KDE/kactivities-4.9.5.tar.xz) = 88600
diff --git a/x11/kactivities/files/patch-git_2d114b6 b/x11/kactivities/files/patch-git_2d114b6
deleted file mode 100644
index 2d9364848ee3..000000000000
--- a/x11/kactivities/files/patch-git_2d114b6
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Alberto Villa <avilla@FreeBSD.org>
-Date: Sat, 07 Jul 2012 11:31:28 +0000
-Subject: Make Nepomuk code rely on NEPOMUK_INCLUDE_DIRS
-X-Git-Url: http://quickgit.kde.org/?p=kactivities.git&amp;a=commitdiff&amp;h=2d114b655547ba26254983c1b7f48f8eea058b43
----
-Make Nepomuk code rely on NEPOMUK_INCLUDE_DIRS
-
-Including only SOPRANO_INCLUDE_DIR made the build pick up KDE 3
-headers on FreeBSD, where KDE SC 4 is installed in non-default prefix
-(while Soprano and KDE 3 aren't). NEPOMUK_INCLUDE_DIRS ensures that
-KDE include directories come first in the inclusion order.
-Additionally, it's better to rely on FindNepomuk.cmake to set the
-correct include directories, instead of adding the Soprano one by hand.
-
-This is a backport of commit edbbe3e115b0a4806873969c808383b2926ec581.
----
-
-
---- ./service/CMakeLists.txt
-+++ ./service/CMakeLists.txt
-@@ -31,7 +31,7 @@
- 
- if(Nepomuk_FOUND)
-     set(HAVE_NEPOMUK 1)
--    include_directories(${SOPRANO_INCLUDE_DIR})
-+    include_directories(${NEPOMUK_INCLUDE_DIRS})
-     set(ADDITIONAL_LINK_LIBS
-         ${ADDITIONAL_LINK_LIBS}
-         ${NEPOMUK_LIBRARIES}
-
diff --git a/x11/kactivities/pkg-plist b/x11/kactivities/pkg-plist
index d41fe30204c9..0492626b4239 100644
--- a/x11/kactivities/pkg-plist
+++ b/x11/kactivities/pkg-plist
@@ -12,21 +12,38 @@ 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_dummy.so
 lib/kde4/activitymanager_plugin_globalshortcuts.so
-lib/kde4/activitymanager_plugin_nepomuk.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/libkactivities.so
 lib/libkactivities.so.6
 lib/libkactivities.so.6.0.0
 libdata/pkgconfig/libkactivities.pc
-share/kde4/services/activitymanager-plugin-dummy.desktop
+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-nepomuk.desktop
 share/kde4/services/activitymanager-plugin-slc.desktop
+share/kde4/services/activitymanager-plugin-sqlite.desktop
 share/kde4/services/kactivitymanagerd.desktop
-share/kde4/services/kded/activitymanager.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/cmake/KActivities
 @dirrmtry lib/cmake
 @dirrm include/kactivities