KDE/FreeBSD team presents KDE SC 4.9.5 ports!

- kdebindings ports have been renamed to match upstream.
- kdemultimedia and kdenetwork have been split.
- New port games/pairs added.
- Trim Makefile header
- Convert to new option framework
- New USE_KDE4 components: libkcddb, libkcompactdisc
- Update:
	databases/akonadi to 1.9.0
	devel/grantlee to 0.3.0
	textproc/rasqal to 0.9.30
	textproc/redland-bindings to 1.0.16.1
	textproc/soprano to 2.9.0
	x11-toolkits/attica to 0.4.1

The area51 repository features commits by Schaich Alonso, avilla, dbn,
jhale, makc and rakuco.

Contributors:
- Oleg Sidorkin
- Tobias Berner
- Kurt Jaeger

29 files changed, 173 insertions, 138 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 979172bbfc2..982c4590260 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -1,7 +1,4 @@
-# New ports collection Makefile for:	kdeutils
-# Date created:				2008-01-31
-# Whom:					Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kcharselect
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 03f67ec4142..e55a9a9bd27 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kcharselect-4.8.4.tar.xz) = cf51f06c0ce14e17b0ebe00ac05c821939ecc31a7a6635b447595a5a7f90b704
-SIZE (KDE/kcharselect-4.8.4.tar.xz) = 86828
+SHA256 (KDE/kcharselect-4.9.5.tar.xz) = 7f5962bfed76ce89cf34cb9ecf5cd0f03043bd9e7a504b3d78e60dceeaa08c40
+SIZE (KDE/kcharselect-4.9.5.tar.xz) = 86480
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 08667ec1bfb..3eadb83b831 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdepim-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -12,9 +11,12 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
+		kgapi.0:${PORTSDIR}/devel/libkgapi \
+		kolab:${PORTSDIR}/devel/libkolab
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
+CONFLICTS=		akonadi-google-0.*
 CONFLICTS_INSTALL=	kdepim-runtime-4.4.*
 
 USE_XZ=	yes
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
index faf099114a7..ffcd503ee4c 100644
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-runtime-4.8.4.tar.xz) = 57fbfe2dc6c7a1055486ef2ab307e47d51781abc1658dcd7891c02e5d8a333ec
-SIZE (KDE/kdepim-runtime-4.8.4.tar.xz) = 1184016
+SHA256 (KDE/kdepim-runtime-4.9.5.tar.xz) = 6a2d6aabf1bcb07c8929e45b5010d4eb2f145d6517197d93e7d098570cb39f6a
+SIZE (KDE/kdepim-runtime-4.9.5.tar.xz) = 1153120
diff --git a/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt
deleted file mode 100644
index aded1f763a2..00000000000
--- a/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./resources/kolabproxy/CMakeLists.txt.orig	2009-08-04 09:09:41.000000000 +1100
-+++ ./resources/kolabproxy/CMakeLists.txt	2009-08-10 19:40:23.000000000 +1100
-@@ -1,8 +1,10 @@
- project(kolabproxy)
- 
- include_directories(
--    ${kdepim-runtime_SOURCE_DIR}
-+    ${QT_QTCORE_INCLUDE_DIR}
-+    ${QT_QTGUI_INCLUDE_DIR}
-     ${QT_QTDBUS_INCLUDE_DIR}
-+    ${kdepim-runtime_SOURCE_DIR}
-     ${Boost_INCLUDE_DIR}
- )
- 
diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
index 3c3cb4894a6..13feef7b116 100644
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -1,8 +1,9 @@
 bin/accountwizard
 bin/akonadi2xml
 bin/akonadi_birthdays_resource
-bin/akonadi_calendarsearch_agent
 bin/akonadi_davgroupware_resource
+bin/akonadi_googlecalendar_resource
+bin/akonadi_googlecontacts_resource
 bin/akonadi_imap_resource
 bin/akonadi_invitations_agent
 bin/akonadi_kabc_resource
@@ -74,9 +75,10 @@ lib/libnepomukfeederpluginlib.a
 share/akonadi/agents/akonadinepomukfeederagent.desktop
 share/akonadi/agents/akonotesresource.desktop
 share/akonadi/agents/birthdaysresource.desktop
-share/akonadi/agents/calendarsearchagent.desktop
 share/akonadi/agents/contactsresource.desktop
 share/akonadi/agents/davgroupwareresource.desktop
+share/akonadi/agents/googlecalendarresource.desktop
+share/akonadi/agents/googlecontactsresource.desktop
 share/akonadi/agents/icalresource.desktop
 share/akonadi/agents/imapresource.desktop
 share/akonadi/agents/invitationsagent.desktop
@@ -124,6 +126,9 @@ share/apps/akonadi/accountwizard/maildir/maildirwizard.ui
 share/apps/akonadi/accountwizard/pop3/pop3wizard.desktop
 share/apps/akonadi/accountwizard/pop3/pop3wizard.js
 share/apps/akonadi/accountwizard/pop3/pop3wizard.ui
+share/apps/akonadi/accountwizard/tine20/tine20wizard.desktop
+share/apps/akonadi/accountwizard/tine20/tine20wizard.es
+share/apps/akonadi/accountwizard/tine20/tine20wizard.ui
 share/apps/akonadi/akonadi-xml.xsd
 share/apps/akonadi/firstrun/defaultaddressbook
 share/apps/akonadi/firstrun/defaultcalendar
@@ -185,6 +190,7 @@ share/ontology/kde/aneo.trig
 @dirrm share/apps/akonadi/plugins/serializer
 @dirrm share/apps/akonadi/plugins
 @dirrm share/apps/akonadi/firstrun
+@dirrm share/apps/akonadi/accountwizard/tine20
 @dirrm share/apps/akonadi/accountwizard/pop3
 @dirrm share/apps/akonadi/accountwizard/maildir
 @dirrm share/apps/akonadi/accountwizard/mailbox
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index b1b391a1e9a..63ea5838775 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -12,11 +11,11 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
-		assuan.0:${PORTSDIR}/security/libassuan \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
+		assuan:${PORTSDIR}/security/libassuan \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
-		grantlee_gui.0:${PORTSDIR}/devel/grantlee \
+		grantlee_gui:${PORTSDIR}/devel/grantlee \
 		clucene-core:${PORTSDIR}/textproc/clucene
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 439745425ab..b8464b053fa 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-4.8.4.tar.xz) = ce21f36563fd2c71f65a3e8c495252084de782d23f2ef7fbae0e8ef78cc08e60
-SIZE (KDE/kdepim-4.8.4.tar.xz) = 14614276
+SHA256 (KDE/kdepim-4.9.5.tar.xz) = e873b9cef574db851cd0341073215412a08a6832c1a32a2ef1b3f94fa45bcd6e
+SIZE (KDE/kdepim-4.9.5.tar.xz) = 13942832
diff --git a/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt b/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt
new file mode 100644
index 00000000000..3710688f8e9
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- kleopatra/CMakeLists.txt.orig	2012-11-30 08:38:45.000000000 +0100
++++ kleopatra/CMakeLists.txt	2013-01-15 21:05:47.000000000 +0100
+@@ -365,6 +365,7 @@
+ endif(KDEPIM_MOBILE_UI)
+ 
+ add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
++add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
+ 
+ 
+ kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
diff --git a/deskutils/kdepim4/files/patch-kmail__avscripts__kmail_clamav.sh b/deskutils/kdepim4/files/patch-kmail__avscripts__kmail_clamav.sh
deleted file mode 100644
index 76185fcc74e..00000000000
--- a/deskutils/kdepim4/files/patch-kmail__avscripts__kmail_clamav.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kmail/avscripts/kmail_clamav.sh.orig	2008-01-15 04:57:51.000000000 +0300
-+++ ./kmail/avscripts/kmail_clamav.sh	2010-03-27 01:28:30.548465474 +0300
-@@ -35,7 +35,7 @@
- cat > $TEMPFILE
- 
- # check for a running daemon
--if [ "`ps -eo comm|grep clamd`" = "clamd" ]; then
-+if [ "`ps -axo comm|grep clamd`" = "clamd" ]; then
-     chmod a+r $TEMPFILE
-     CLAMCOMANDO="clamdscan --stdout --no-summary "
- else
diff --git a/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt b/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt
index a06653e8ebd..ab88fcdd6b5 100644
--- a/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt
+++ b/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ./messageviewer/CMakeLists.txt.orig	2012-08-25 03:19:01.387668126 +0200
-+++ ./messageviewer/CMakeLists.txt	2012-08-25 03:19:18.597652001 +0200
+--- ./messageviewer/CMakeLists.txt.orig	2012-08-25 03:26:14.357593951 +0200
++++ ./messageviewer/CMakeLists.txt	2012-08-25 03:26:19.147594463 +0200
 @@ -17,7 +17,6 @@
  
  configure_file(messageviewer.kcfg.cmake ${CMAKE_CURRENT_BINARY_DIR}/messageviewer.kcfg)
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index ada6282fc63..aeb504396ea 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -1,9 +1,12 @@
+bin/akonadi_archivemail_agent
 bin/akonadi_mailfilter_agent
 bin/akonadiconsole
 bin/akregator
 bin/akregatorstorageexporter
+bin/backupmail
 bin/blogilo
 bin/ical2vcal
+bin/importwizard
 bin/kabc2mutt
 bin/kabcclient
 bin/kaddressbook
@@ -28,6 +31,7 @@ bin/korgac
 bin/korganizer
 bin/ksendemail
 bin/ktimetracker
+bin/ktnef
 bin/kwatchgnupg
 etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
 lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
@@ -168,6 +172,9 @@ lib/libksieveui.so.5.0.1
 lib/libmailcommon.so
 lib/libmailcommon.so.5
 lib/libmailcommon.so.5.0.1
+lib/libmailimporter.so
+lib/libmailimporter.so.5
+lib/libmailimporter.so.5.0.1
 lib/libmessagecomposer.so
 lib/libmessagecomposer.so.5
 lib/libmessagecomposer.so.5.0.1
@@ -187,6 +194,7 @@ lib/strigi/strigiea_ctg.so
 lib/strigi/strigiea_ics.so
 lib/strigi/strigiea_mail.so
 lib/strigi/strigiea_vcf.so
+share/akonadi/agents/archivemailagent.desktop
 share/akonadi/agents/mailfilteragent.desktop
 share/applications/kde4/KMail2.desktop
 share/applications/kde4/KNode.desktop
@@ -195,6 +203,7 @@ share/applications/kde4/Kontact.desktop
 share/applications/kde4/akonadiconsole.desktop
 share/applications/kde4/akregator.desktop
 share/applications/kde4/blogilo.desktop
+share/applications/kde4/importwizard.desktop
 share/applications/kde4/kaddressbook.desktop
 share/applications/kde4/kalarm.desktop
 share/applications/kde4/kleopatra.desktop
@@ -206,6 +215,9 @@ share/applications/kde4/kontact-admin.desktop
 share/applications/kde4/korganizer-import.desktop
 share/applications/kde4/korganizer.desktop
 share/applications/kde4/ktimetracker.desktop
+share/applications/kde4/ktnef.desktop
+share/apps/akonadi_archivemail_agent/akonadi_archivemail_agent.notifyrc
+share/apps/akonadi_mailfilter_agent/akonadi_mailfilter_agent.notifyrc
 share/apps/akonadiconsole/akonadiconsoleui.rc
 share/apps/akregator/about/akregator.css
 share/apps/akregator/about/main.html
@@ -218,10 +230,12 @@ share/apps/akregator/pageviewer.rc
 share/apps/akregator/pics/kmmsgnew.png
 share/apps/akregator/pics/kmmsgunseen.png
 share/apps/akregator_sharemicroblog_plugin/akregator_sharemicroblog_plugin.rc
+share/apps/backupmail/backupmail.rc
 share/apps/blogilo/TextEditorInitialHtml
 share/apps/blogilo/blogiloui.rc
 share/apps/desktoptheme/default/widgets/stickynote.svgz
 share/apps/kaddressbook/kaddressbookui.rc
+share/apps/kaddressbook/printing/compact-style.png
 share/apps/kaddressbook/printing/detailed-style.png
 share/apps/kaddressbook/printing/mike-style.png
 share/apps/kaddressbook/printing/ringbinder-style.png
@@ -410,6 +424,7 @@ share/apps/ktimetracker/pics/watch-4.xpm
 share/apps/ktimetracker/pics/watch-5.xpm
 share/apps/ktimetracker/pics/watch-6.xpm
 share/apps/ktimetracker/pics/watch-7.xpm
+share/apps/ktnef/ktnefui.rc
 share/apps/kwatchgnupg/kwatchgnupgui.rc
 share/apps/kwatchgnupg/pics/kwatchgnupg.png
 share/apps/kwatchgnupg/pics/kwatchgnupg2.png
@@ -684,6 +699,9 @@ share/doc/HTML/en/ktimetracker/index.cache.bz2
 share/doc/HTML/en/ktimetracker/index.docbook
 share/doc/HTML/en/ktimetracker/ktimetracker.png
 share/doc/HTML/en/ktimetracker/systray.png
+share/doc/HTML/en/ktnef/common
+share/doc/HTML/en/ktnef/index.cache.bz2
+share/doc/HTML/en/ktnef/index.docbook
 share/doc/HTML/en/kwatchgnupg/common
 share/doc/HTML/en/kwatchgnupg/index.cache.bz2
 share/doc/HTML/en/kwatchgnupg/index.docbook
@@ -728,6 +746,8 @@ share/icons/hicolor/16x16/apps/ktimetracker.png
 share/icons/hicolor/22x22/actions/format-text-blockquote.png
 share/icons/hicolor/22x22/actions/format-text-code.png
 share/icons/hicolor/22x22/actions/insert-more-mark.png
+share/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
+share/icons/hicolor/22x22/actions/ktnef_extract_to.png
 share/icons/hicolor/22x22/actions/remove-link.png
 share/icons/hicolor/22x22/actions/upload-media.png
 share/icons/hicolor/22x22/apps/akonadiconsole.png
@@ -782,6 +802,7 @@ share/icons/hicolor/48x48/apps/korg-journal.png
 share/icons/hicolor/48x48/apps/korg-todo.png
 share/icons/hicolor/48x48/apps/korganizer.png
 share/icons/hicolor/48x48/apps/ktimetracker.png
+share/icons/hicolor/48x48/apps/ktnef.png
 share/icons/hicolor/64x64/actions/upload-media.png
 share/icons/hicolor/64x64/apps/akonadiconsole.png
 share/icons/hicolor/64x64/apps/akregator.png
@@ -808,6 +829,10 @@ share/icons/hicolor/scalable/apps/kontact.svgz
 share/icons/hicolor/scalable/apps/korg-journal.svgz
 share/icons/hicolor/scalable/apps/korg-todo.svgz
 share/icons/hicolor/scalable/apps/korganizer.svgz
+share/icons/locolor/16x16/actions/ktnef_extract_all_to.png
+share/icons/locolor/16x16/actions/ktnef_extract_to.png
+share/icons/locolor/16x16/apps/ktnef.png
+share/icons/locolor/32x32/apps/ktnef.png
 share/icons/oxygen/128x128/apps/kalarm.png
 share/icons/oxygen/128x128/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
@@ -876,7 +901,6 @@ share/kde4/services/kmail_config_composer.desktop
 share/kde4/services/kmail_config_identity.desktop
 share/kde4/services/kmail_config_misc.desktop
 share/kde4/services/kmail_config_security.desktop
-share/kde4/services/knewsservice.protocol
 share/kde4/services/knode_config_accounts.desktop
 share/kde4/services/knode_config_appearance.desktop
 share/kde4/services/knode_config_cleanup.desktop
@@ -943,9 +967,14 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
 @dirrm share/kde4/services/kontact
 @dirrmtry share/icons/oxygen/512x512/mimetypes
 @dirrmtry share/icons/oxygen/512x512
-@dirrmtry share/icons/hicolor/256x256/apps
-@dirrmtry share/icons/hicolor/256x256
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16/actions
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
 @dirrm share/doc/HTML/en/kwatchgnupg
+@dirrm share/doc/HTML/en/ktnef
 @dirrm share/doc/HTML/en/ktimetracker
 @dirrm share/doc/HTML/en/korganizer
 @dirrm share/doc/HTML/en/kontact-admin
@@ -973,6 +1002,7 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
 @dirrm share/apps/libkleopatra
 @dirrm share/apps/kwatchgnupg/pics
 @dirrm share/apps/kwatchgnupg
+@dirrm share/apps/ktnef
 @dirrm share/apps/ktimetracker/pics
 @dirrm share/apps/ktimetracker/icons/oxygen/scalable/actions
 @dirrm share/apps/ktimetracker/icons/oxygen/scalable
@@ -1047,7 +1077,10 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
 @dirrm share/apps/kaddressbook/printing
 @dirrm share/apps/kaddressbook
 @dirrm share/apps/blogilo
+@dirrm share/apps/backupmail
 @dirrm share/apps/akregator_sharemicroblog_plugin
+@dirrm share/apps/akonadi_mailfilter_agent
+@dirrm share/apps/akonadi_archivemail_agent
 @dirrmtry share/apps/akregator/pics
 @dirrm share/apps/akregator/about
 @dirrmtry share/apps/akregator
diff --git a/deskutils/kdepim44-runtime/Makefile b/deskutils/kdepim44-runtime/Makefile
index ea05e6abe55..c36bbce4423 100644
--- a/deskutils/kdepim44-runtime/Makefile
+++ b/deskutils/kdepim44-runtime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdepim-runtime
 PORTVERSION=	4.4.11.1
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/kdepim-${PORTVERSION}/src
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 6c761fbdb6c..5916204a20a 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	4.4.11.1
-PORTREVISION=	5
+PORTREVISION=	4
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/kdepim-${PORTVERSION}/src
@@ -15,7 +15,7 @@ COMMENT=	Libraries for KDE-PIM applications
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
-		qca.2:${PORTSDIR}/devel/qca
+		qca:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/akonadi_mbox_resource:${PORTSDIR}/deskutils/kdepim44-runtime
 
 LATEST_LINK=	${PORTNAME}44
diff --git a/deskutils/kdepim44/files/patch-kleopatra__CMakeLists.txt b/deskutils/kdepim44/files/patch-kleopatra__CMakeLists.txt
new file mode 100644
index 00000000000..f3df21cd1bc
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kleopatra__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- kleopatra/CMakeLists.txt.orig	2013-01-09 20:23:28.900492685 +0000
++++ kleopatra/CMakeLists.txt	2013-01-09 20:23:50.410492001 +0000
+@@ -301,6 +301,7 @@
+ )
+ 
+ add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
++add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
+ 
+ 
+ kde4_add_app_icon(_kleopatra_mainwindow_SRCS "ox*-app-kleopatra.png")
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 8173f959386..1dda583b2f8 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -12,12 +11,12 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
 		ical:${PORTSDIR}/devel/libical \
-		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		prison.0:${PORTSDIR}/graphics/prison
+		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
+		prison:${PORTSDIR}/graphics/prison
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index cd50227531c..19feaac1e28 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepimlibs-4.8.4.tar.xz) = 6b81b00255ca15d86b5c5a91487fdcde1d8753ff803d8ddab4910d1e603b11f3
-SIZE (KDE/kdepimlibs-4.8.4.tar.xz) = 2858756
+SHA256 (KDE/kdepimlibs-4.9.5.tar.xz) = f6ea96baf452895699160b24e7bb67f6a263d1d687abf479415c3b71ac488136
+SIZE (KDE/kdepimlibs-4.9.5.tar.xz) = 2720068
diff --git a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
deleted file mode 100644
index a5bcbed0a1e..00000000000
--- a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./CMakeLists.txt.orig	2011-07-20 08:36:16.000000000 +1100
-+++ ./CMakeLists.txt	2011-08-09 00:34:17.959934057 +1100
-@@ -81,7 +81,7 @@
- if (NOT KDEPIM_ONLY_KLEO)
-   #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that.
-   set(Akonadi_MIN_VERSION "1.5.52")
--  find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET NO_MODULE)
-+  find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET)
-   macro_log_feature(Akonadi_FOUND "Akonadi server libraries" "Access to PIM storage and services" "http://pim.kde.org/akonadi" TRUE "${Akonadi_MIN_VERSION}" "")
- 
-   find_package(Sasl2)
diff --git a/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake
index 699a9025352..546628a30d0 100644
--- a/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake
+++ b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake
@@ -6,7 +6,7 @@
        find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread
 -                   HINTS ${GPGME_LIBRARY_DIR})
 +                   HINTS ${GPGME_LIBRARY_DIR} %%KDE4_PREFIX%%/lib)
-    endif ( WIN32 )
+    endif()
  
     find_library(QGPGME_LIBRARY qgpgme
 -                HINTS ${GPGME_LIBRARY_DIR})
diff --git a/deskutils/kdepimlibs4/files/patch-kcal__vcalformat.cpp b/deskutils/kdepimlibs4/files/patch-kcal__vcalformat.cpp
deleted file mode 100644
index 8dc3bc4e9d8..00000000000
--- a/deskutils/kdepimlibs4/files/patch-kcal__vcalformat.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- kcal/vcalformat.cpp.orig	2012-11-23 17:05:03.000000000 +0800
-+++ kcal/vcalformat.cpp	2012-11-23 17:05:32.000000000 +0800
-@@ -1029,8 +1029,7 @@
-   if ( ( vo = isAPropertyOf( vevent, VCRRuleProp ) ) != 0 ) {
-     QString tmpStr = ( s = fakeCString( vObjectUStringZValue( vo ) ) );
-     deleteStr( s );
--    tmpStr.simplified();
--    tmpStr = tmpStr.toUpper();
-+    tmpStr = tmpStr.simplified().toUpper();
- 
-     // first, read the type of the recurrence
-     int typelen = 1;
diff --git a/deskutils/kdepimlibs4/files/patch-kcalcore__vcalformat.cpp b/deskutils/kdepimlibs4/files/patch-kcalcore__vcalformat.cpp
deleted file mode 100644
index 227415512b2..00000000000
--- a/deskutils/kdepimlibs4/files/patch-kcalcore__vcalformat.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- kcalcore/vcalformat.cpp.orig	2012-11-23 17:03:35.000000000 +0800
-+++ kcalcore/vcalformat.cpp	2012-11-23 17:04:14.000000000 +0800
-@@ -1190,8 +1190,7 @@
-   if ( ( vo = isAPropertyOf( vtodo, VCRRuleProp ) ) != 0 ) {
-     QString tmpStr = ( s = fakeCString( vObjectUStringZValue( vo ) ) );
-     deleteStr( s );
--    tmpStr.simplified();
--    tmpStr = tmpStr.toUpper();
-+    tmpStr = tmpStr.simplified().toUpper();
-     // first, read the type of the recurrence
-     int typelen = 1;
-     uint type = Recurrence::rNone;
-@@ -1674,8 +1673,7 @@
-   if ( ( vo = isAPropertyOf( vevent, VCRRuleProp ) ) != 0 ) {
-     QString tmpStr = ( s = fakeCString( vObjectUStringZValue( vo ) ) );
-     deleteStr( s );
--    tmpStr.simplified();
--    tmpStr = tmpStr.toUpper();
-+    tmpStr = tmpStr.simplified().toUpper();
-     // first, read the type of the recurrence
-     int typelen = 1;
-     uint type = Recurrence::rNone;
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index eb8c25cd9aa..ea78857808d 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -1,4 +1,5 @@
 include/KDE/Akonadi/AgentBase
+include/KDE/Akonadi/AgentFactory
 include/KDE/Akonadi/AgentFilterProxyModel
 include/KDE/Akonadi/AgentInstance
 include/KDE/Akonadi/AgentInstanceCreateJob
@@ -12,6 +13,8 @@ include/KDE/Akonadi/AgentTypeWidget
 include/KDE/Akonadi/Attribute
 include/KDE/Akonadi/AttributeFactory
 include/KDE/Akonadi/CachePolicy
+include/KDE/Akonadi/Calendar/FreeBusyProviderBase
+include/KDE/Akonadi/Calendar/StandardCalendarActionManager
 include/KDE/Akonadi/ChangeRecorder
 include/KDE/Akonadi/Collection
 include/KDE/Akonadi/CollectionAttributesSynchronizationJob
@@ -25,6 +28,7 @@ include/KDE/Akonadi/CollectionFetchScope
 include/KDE/Akonadi/CollectionFilterProxyModel
 include/KDE/Akonadi/CollectionModel
 include/KDE/Akonadi/CollectionModifyJob
+include/KDE/Akonadi/CollectionMoveJob
 include/KDE/Akonadi/CollectionPropertiesDialog
 include/KDE/Akonadi/CollectionPropertiesPage
 include/KDE/Akonadi/CollectionRequester
@@ -60,8 +64,11 @@ include/KDE/Akonadi/Control
 include/KDE/Akonadi/ETMViewStateSaver
 include/KDE/Akonadi/Entity
 include/KDE/Akonadi/EntityDisplayAttribute
+include/KDE/Akonadi/EntityHiddenAttribute
 include/KDE/Akonadi/EntityListView
 include/KDE/Akonadi/EntityMimeTypeFilterModel
+include/KDE/Akonadi/EntityOrderProxyModel
+include/KDE/Akonadi/EntityRightsFilterModel
 include/KDE/Akonadi/EntityTreeModel
 include/KDE/Akonadi/EntityTreeView
 include/KDE/Akonadi/Exception
@@ -83,8 +90,11 @@ include/KDE/Akonadi/Job
 include/KDE/Akonadi/KCal/FreeBusyProviderBase
 include/KDE/Akonadi/KCal/IncidenceMimeTypeVisitor
 include/KDE/Akonadi/KMime/AddressAttribute
+include/KDE/Akonadi/KMime/MessageFlags
 include/KDE/Akonadi/KMime/MessageFolderAttribute
 include/KDE/Akonadi/KMime/MessageModel
+include/KDE/Akonadi/KMime/MessageParts
+include/KDE/Akonadi/KMime/MessageStatus
 include/KDE/Akonadi/KMime/MessageThreaderProxyModel
 include/KDE/Akonadi/KMime/MessageThreadingAttribute
 include/KDE/Akonadi/KMime/SpecialMailCollections
@@ -93,6 +103,8 @@ include/KDE/Akonadi/LinkJob
 include/KDE/Akonadi/MimeTypeChecker
 include/KDE/Akonadi/Monitor
 include/KDE/Akonadi/PreprocessorBase
+include/KDE/Akonadi/RecursiveCollectionFilterProxyModel
+include/KDE/Akonadi/RecursiveItemFetchJob
 include/KDE/Akonadi/ResourceBase
 include/KDE/Akonadi/SearchCreateJob
 include/KDE/Akonadi/ServerManager
@@ -343,6 +355,7 @@ include/KDE/KResources/Resource
 include/KDE/KResources/SelectDialog
 include/KDE/KTNEF/Formatter
 include/KDE/KTNEF/KTNEFAttach
+include/KDE/KTNEF/KTNEFDefs
 include/KDE/KTNEF/KTNEFMessage
 include/KDE/KTNEF/KTNEFParser
 include/KDE/KTNEF/KTNEFProperty
@@ -1131,6 +1144,8 @@ share/apps/libkholidays/plan2/holiday_cz_cs
 share/apps/libkholidays/plan2/holiday_de-by_de
 share/apps/libkholidays/plan2/holiday_de_de
 share/apps/libkholidays/plan2/holiday_dk_da
+share/apps/libkholidays/plan2/holiday_dz_ar
+share/apps/libkholidays/plan2/holiday_dz_fr
 share/apps/libkholidays/plan2/holiday_ee_et
 share/apps/libkholidays/plan2/holiday_eg_ar
 share/apps/libkholidays/plan2/holiday_es-ct_ca
@@ -1164,6 +1179,8 @@ share/apps/libkholidays/plan2/holiday_jm_en-gb
 share/apps/libkholidays/plan2/holiday_jp_en-us
 share/apps/libkholidays/plan2/holiday_jp_ja
 share/apps/libkholidays/plan2/holiday_kr_ko
+share/apps/libkholidays/plan2/holiday_kz_kk
+share/apps/libkholidays/plan2/holiday_kz_ru
 share/apps/libkholidays/plan2/holiday_lt_lt
 share/apps/libkholidays/plan2/holiday_lu_fr
 share/apps/libkholidays/plan2/holiday_lu_lb
@@ -1175,12 +1192,15 @@ share/apps/libkholidays/plan2/holiday_nc_fr
 share/apps/libkholidays/plan2/holiday_nl_nl
 share/apps/libkholidays/plan2/holiday_no_nb
 share/apps/libkholidays/plan2/holiday_nz_en-gb
+share/apps/libkholidays/plan2/holiday_pa_en
+share/apps/libkholidays/plan2/holiday_pa_es
 share/apps/libkholidays/plan2/holiday_pf_fr
 share/apps/libkholidays/plan2/holiday_pl_pl
 share/apps/libkholidays/plan2/holiday_pt_pt
 share/apps/libkholidays/plan2/holiday_py_es
 share/apps/libkholidays/plan2/holiday_re_fr
 share/apps/libkholidays/plan2/holiday_ro_ro
+share/apps/libkholidays/plan2/holiday_rs_sr
 share/apps/libkholidays/plan2/holiday_ru_ru
 share/apps/libkholidays/plan2/holiday_se_sv
 share/apps/libkholidays/plan2/holiday_sg_en-gb
@@ -1236,7 +1256,7 @@ share/kde4/services/akonadi/contact/skypeprotocol.desktop
 share/kde4/services/akonadi/contact/smsprotocol.desktop
 share/kde4/services/akonadi/contact/yahooprotocol.desktop
 share/kde4/services/akonadicontact_actions.desktop
-share/kde4/services/imap4.protocol
+share/kde4/services/imap.protocol
 share/kde4/services/imaps.protocol
 share/kde4/services/kcm_mailtransport.desktop
 share/kde4/services/kresources.desktop
@@ -1343,6 +1363,7 @@ share/mime/packages/kdepimlibs-mime.xml
 @dirrm include/KDE/Akonadi/KMime
 @dirrm include/KDE/Akonadi/KCal
 @dirrm include/KDE/Akonadi/Contact
+@dirrm include/KDE/Akonadi/Calendar
 @dirrm include/KDE/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
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 864a1f90849..be684b1a59e 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	kdeplasmoids
-# Date created:		2008-06-29
-# Whom:			Max Brazhnikov <makc@issp.ac.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	kdeplasma-addons
 PORTVERSION=	${KDE4_VERSION}
@@ -17,7 +12,9 @@ COMMENT=	Extra plasmoids for KDE4
 
 LIB_DEPENDS=	qalculate.5:${PORTSDIR}/math/libqalculate \
 		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
-		qca.2:${PORTSDIR}/devel/qca
+		qca.2:${PORTSDIR}/devel/qca \
+		qoauth.1:${PORTSDIR}/net/qoauth \
+		qjson.0:${PORTSDIR}/devel/qjson
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
 
@@ -32,13 +29,16 @@ USE_QT4=	dbus gui network opengl script sql svg webkit xml \
 USE_XORG=	x11 xrender xtst
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	MARBLE "Support for desktop globe wallpaper" on \
-		IBUS "Enable IBUS backend for input dialog" off \
-		SCIM "Enable SCIM backend for input dialog" off
+OPTIONS_DEFINE=	MARBLE IBUS SCIM
+OPTIONS_DEFAULT=	MARBLE
+
+MARBLE_DESC=	Support for desktop globe wallpaper
+IBUS_DESC=	Enable IBUS backend for input dialog
+SCIM_DESC=	Enable SCIM backend for input dialog
 
 .include <bsd.port.options.mk>
 
-.ifndef(WITHOUT_MARBLE)
+.if ${PORT_OPTIONS:MMARBLE}
 USE_KDE4+=	marble
 PLIST_SUB+=	MARBLE=""
 .else
@@ -46,7 +46,7 @@ CMAKE_ARGS+=	-DWITH_Marble:BOOL=FALSE
 PLIST_SUB+=	MARBLE="@comment "
 .endif
 
-.ifdef(WITH_IBUS)
+.if ${PORT_OPTIONS:MIBUS}
 LIB_DEPENDS+=	ibus-1.0:${PORTSDIR}/textproc/ibus
 PLIST_SUB+=	IBUS=""
 .else
@@ -54,7 +54,7 @@ CMAKE_ARGS+=	-DWITH_IBUS:BOOL=FALSE
 PLIST_SUB+=	IBUS="@comment "
 .endif
 
-.ifdef(WITH_SCIM)
+.if ${PORT_OPTIONS:MSCIM}
 LIB_DEPENDS+=	scim-1.0.10:${PORTSDIR}/textproc/scim
 PLIST_SUB+=	SCIM=""
 .else
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 867e37e9764..78a944c5507 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeplasma-addons-4.8.4.tar.xz) = 16a3f7d54f8b0049b43f8771cd621a1c020fd4b03cb167670c2c292cf3bb8bb8
-SIZE (KDE/kdeplasma-addons-4.8.4.tar.xz) = 1774416
+SHA256 (KDE/kdeplasma-addons-4.9.5.tar.xz) = f6f22d592c448c227d16ba1995d8336c1a41fc1376a9683859ce1764add9475c
+SIZE (KDE/kdeplasma-addons-4.9.5.tar.xz) = 1775360
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index 22be4099702..11fc0be5b36 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -109,6 +109,7 @@ lib/kde4/krunner_konsolesessions.so
 lib/kde4/krunner_kopete.so
 lib/kde4/krunner_mediawiki.so
 lib/kde4/krunner_spellcheckrunner.so
+lib/kde4/krunner_youtube.so
 %%IBUS%%lib/kde4/libexec/kimpanel-ibus-panel
 %%SCIM%%lib/kde4/libexec/kimpanel-scim-panel
 lib/kde4/plasma-applet_systemloadviewer.so
@@ -132,8 +133,6 @@ lib/kde4/plasma_applet_kdeobservatory.so
 lib/kde4/plasma_applet_kimpanel.so
 lib/kde4/plasma_applet_knowledgebase.so
 lib/kde4/plasma_applet_kolourpicker.so
-lib/kde4/plasma_applet_konqprofiles.so
-lib/kde4/plasma_applet_konsoleprofiles.so
 lib/kde4/plasma_applet_lancelot_launcher.so
 lib/kde4/plasma_applet_lancelot_part.so
 lib/kde4/plasma_applet_leavenote.so
@@ -144,7 +143,6 @@ lib/kde4/plasma_applet_mediaplayer.so
 lib/kde4/plasma_applet_microblog.so
 lib/kde4/plasma_applet_news.so
 lib/kde4/plasma_applet_notes.so
-lib/kde4/plasma_applet_nowplaying.so
 lib/kde4/plasma_applet_opendesktop.so
 lib/kde4/plasma_applet_opendesktop_activities.so
 lib/kde4/plasma_applet_paste.so
@@ -169,6 +167,8 @@ lib/kde4/plasma_containment_groupingpanel.so
 lib/kde4/plasma_engine_comic.so
 lib/kde4/plasma_engine_kdeobservatory.so
 lib/kde4/plasma_engine_kimpanel.so
+lib/kde4/plasma_engine_konqprofiles.so
+lib/kde4/plasma_engine_konsoleprofiles.so
 lib/kde4/plasma_engine_microblog.so
 lib/kde4/plasma_engine_ocs.so
 lib/kde4/plasma_engine_potd.so
@@ -294,7 +294,6 @@ share/apps/desktoptheme/default/widgets/eyes.svg
 share/apps/desktoptheme/default/widgets/luna.svgz
 share/apps/desktoptheme/default/widgets/microblog.svgz
 share/apps/desktoptheme/default/widgets/notes.svgz
-share/apps/desktoptheme/default/widgets/nowplaying/nocover.svgz
 share/apps/desktoptheme/default/widgets/previewer-16.svgz
 share/apps/desktoptheme/default/widgets/previewer-22.svgz
 share/apps/desktoptheme/default/widgets/timer.svgz
@@ -329,9 +328,30 @@ share/apps/lancelot/lancelot.notifyrc
 share/apps/plasma-applet-frame/picture-frame-default.jpg
 share/apps/plasma-applet-opendesktop-activities/plasma-applet-opendesktop-activities.notifyrc
 share/apps/plasma-applet-opendesktop/user.css
+share/apps/plasma/plasmoids/konqprofiles/contents/ui/konqprofiles.qml
+share/apps/plasma/plasmoids/konqprofiles/metadata.desktop
+share/apps/plasma/plasmoids/konsoleprofiles/contents/ui/konsoleprofiles.qml
+share/apps/plasma/plasmoids/konsoleprofiles/metadata.desktop
+share/apps/plasma/plasmoids/nowplaying/contents/code/service.js
+share/apps/plasma/plasmoids/nowplaying/contents/images/nocover.svgz
+share/apps/plasma/plasmoids/nowplaying/contents/ui/AlbumArt.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/CompactLayout.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/Controls.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/FullLayout.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/Label.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/MetadataLine.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/MetadataPanel.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/Mpris2.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/PlayPauseButton.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/PositionSlider.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/VLayout.qml
+share/apps/plasma/plasmoids/nowplaying/contents/ui/nowplaying.qml
+share/apps/plasma/plasmoids/nowplaying/metadata.desktop
 share/apps/plasma/services/kdeobservatory.operations
 share/apps/plasma/services/kimpanel.operations
 share/apps/plasma/services/ocsPerson.operations
+share/apps/plasma/services/org.kde.plasma.dataengine.konqprofiles.operations
+share/apps/plasma/services/org.kde.plasma.dataengine.konsoleprofiles.operations
 share/apps/plasma/services/rtmauth.operations
 share/apps/plasma/services/rtmtask.operations
 share/apps/plasma/services/rtmtasks.operations
@@ -390,6 +410,7 @@ share/icons/hicolor/128x128/apps/luna.png
 share/icons/hicolor/128x128/apps/plasmaapplet-shelf.png
 share/icons/hicolor/128x128/apps/previewer.png
 share/icons/hicolor/128x128/apps/qalculate-applet.png
+share/icons/hicolor/16x16/actions/youtube.png
 share/icons/hicolor/16x16/apps/bball.png
 share/icons/hicolor/16x16/apps/eyes.png
 share/icons/hicolor/16x16/apps/kdeobservatory.png
@@ -399,6 +420,7 @@ share/icons/hicolor/16x16/apps/lifegame.png
 share/icons/hicolor/16x16/apps/luna.png
 share/icons/hicolor/16x16/apps/plasmaapplet-shelf.png
 share/icons/hicolor/16x16/apps/previewer.png
+share/icons/hicolor/22x22/actions/youtube.png
 share/icons/hicolor/22x22/apps/eyes.png
 share/icons/hicolor/22x22/apps/kdeobservatory.png
 share/icons/hicolor/22x22/apps/lancelot-start.png
@@ -409,6 +431,7 @@ share/icons/hicolor/22x22/apps/plasmaapplet-shelf.png
 share/icons/hicolor/22x22/apps/previewer.png
 share/icons/hicolor/256x256/apps/eyes.png
 share/icons/hicolor/256x256/apps/lifegame.png
+share/icons/hicolor/32x32/actions/youtube.png
 share/icons/hicolor/32x32/apps/bball.png
 share/icons/hicolor/32x32/apps/eyes.png
 share/icons/hicolor/32x32/apps/kdeobservatory.png
@@ -418,6 +441,7 @@ share/icons/hicolor/32x32/apps/lifegame.png
 share/icons/hicolor/32x32/apps/luna.png
 share/icons/hicolor/32x32/apps/plasmaapplet-shelf.png
 share/icons/hicolor/32x32/apps/previewer.png
+share/icons/hicolor/48x48/actions/youtube.png
 share/icons/hicolor/48x48/apps/bball.png
 share/icons/hicolor/48x48/apps/kdeobservatory.png
 share/icons/hicolor/48x48/apps/lancelot-start.png
@@ -427,6 +451,7 @@ share/icons/hicolor/48x48/apps/luna.png
 share/icons/hicolor/48x48/apps/plasmaapplet-shelf.png
 share/icons/hicolor/48x48/apps/previewer.png
 share/icons/hicolor/48x48/apps/qalculate-applet.png
+share/icons/hicolor/64x64/actions/youtube.png
 share/icons/hicolor/64x64/apps/bball.png
 share/icons/hicolor/64x64/apps/kdeobservatory.png
 share/icons/hicolor/64x64/apps/lancelot-start.png
@@ -435,6 +460,7 @@ share/icons/hicolor/64x64/apps/lifegame.png
 share/icons/hicolor/64x64/apps/luna.png
 share/icons/hicolor/64x64/apps/plasmaapplet-shelf.png
 share/icons/hicolor/64x64/apps/previewer.png
+share/icons/hicolor/scalable/actions/youtube.svgz
 share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
 share/icons/hicolor/scalable/apps/bball.svgz
 share/icons/hicolor/scalable/apps/eyes.svgz
@@ -503,6 +529,8 @@ share/kde4/services/plasma-containment-groupingdesktop.desktop
 share/kde4/services/plasma-containment-groupingpanel.desktop
 share/kde4/services/plasma-dataengine-comic.desktop
 share/kde4/services/plasma-dataengine-kimpanel.desktop
+share/kde4/services/plasma-dataengine-konqprofiles.desktop
+share/kde4/services/plasma-dataengine-konsoleprofiles.desktop
 share/kde4/services/plasma-dataengine-microblog.desktop
 share/kde4/services/plasma-dataengine-ocs.desktop
 share/kde4/services/plasma-dataengine-potd.desktop
@@ -527,6 +555,7 @@ share/kde4/services/plasma-runner-spellchecker_config.desktop
 share/kde4/services/plasma-runner-techbase.desktop
 share/kde4/services/plasma-runner-wikipedia.desktop
 share/kde4/services/plasma-runner-wikitravel.desktop
+share/kde4/services/plasma-runner-youtube.desktop
 share/kde4/services/plasma-wallpaper-mandelbrot.desktop
 %%MARBLE%%share/kde4/services/plasma-wallpaper-marble.desktop
 share/kde4/services/plasma-wallpaper-pattern.desktop
@@ -538,13 +567,22 @@ share/kde4/services/wcpotdprovider.desktop
 share/kde4/servicetypes/plasma_comicprovider.desktop
 share/kde4/servicetypes/plasma_potdprovider.desktop
 share/mime/packages/lancelotpart-mime.xml
-@dirrmtry share/icons/hicolor/256x256/apps
-@dirrmtry share/icons/hicolor/256x256
 @dirrm share/apps/rssnow
 @dirrm share/apps/plasmaboard
 @dirrm share/apps/plasma_wallpaper_pattern/patterns
 @dirrm share/apps/plasma_wallpaper_pattern
 @dirrm share/apps/plasma_pastebin
+@dirrm share/apps/plasma/plasmoids/nowplaying/contents/ui
+@dirrm share/apps/plasma/plasmoids/nowplaying/contents/images
+@dirrm share/apps/plasma/plasmoids/nowplaying/contents/code
+@dirrm share/apps/plasma/plasmoids/nowplaying/contents
+@dirrm share/apps/plasma/plasmoids/nowplaying
+@dirrm share/apps/plasma/plasmoids/konsoleprofiles/contents/ui
+@dirrm share/apps/plasma/plasmoids/konsoleprofiles/contents
+@dirrm share/apps/plasma/plasmoids/konsoleprofiles
+@dirrm share/apps/plasma/plasmoids/konqprofiles/contents/ui
+@dirrm share/apps/plasma/plasmoids/konqprofiles/contents
+@dirrm share/apps/plasma/plasmoids/konqprofiles
 @dirrm share/apps/plasma-applet-opendesktop-activities
 @dirrm share/apps/plasma-applet-opendesktop
 @dirrm share/apps/plasma-applet-frame
@@ -554,7 +592,6 @@ share/mime/packages/lancelotpart-mime.xml
 @dirrmtry share/apps/desktoptheme/slim-glow
 @dirrm share/apps/desktoptheme/oxygen/lancelot
 @dirrmtry share/apps/desktoptheme/oxygen
-@dirrm share/apps/desktoptheme/default/widgets/nowplaying
 @dirrm share/apps/desktoptheme/default/weatherstation
 @dirrm share/apps/desktoptheme/default/weather
 @dirrm share/apps/desktoptheme/default/stylesheets
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
index cd3148e3831..ce313f61af7 100644
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	kruler
-# Date created:				5 September 2011
-# Whom:					Alberto Villa <avilla@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	kruler
 PORTVERSION=	${KDE4_VERSION}
diff --git a/deskutils/kruler/distinfo b/deskutils/kruler/distinfo
index 5bfa4cacadb..375c9d42d2f 100644
--- a/deskutils/kruler/distinfo
+++ b/deskutils/kruler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kruler-4.8.4.tar.xz) = 48989a35c4d2a69046d3bb9d183e318480f0d2ff3e78f2fbfbd870bffbbab7a7
-SIZE (KDE/kruler-4.8.4.tar.xz) = 134768
+SHA256 (KDE/kruler-4.9.5.tar.xz) = 10d3e3c69f3025ca4edb7ee100a88e0d6ddc8f50208352cbb2f4f50517fc11c9
+SIZE (KDE/kruler-4.9.5.tar.xz) = 134052
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index 55c5cd427a9..26fbdb177e0 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -1,7 +1,3 @@
-# New ports collection Makefile for:	superkaramba
-# Date created:				2012-02-23
-# Whom:					Max Brazhikov <makc@FreeBSD.org>
-#
 # $FreeBSD$
 
 PORTNAME=	superkaramba
diff --git a/deskutils/superkaramba/distinfo b/deskutils/superkaramba/distinfo
index b06f92c1a07..b1b2e36f4c5 100644
--- a/deskutils/superkaramba/distinfo
+++ b/deskutils/superkaramba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/superkaramba-4.8.4.tar.xz) = 3ed728b7d11ed1822a3733b8c6b1e9aab1196e7f0a6f6516ceb0aa9c1675af17
-SIZE (KDE/superkaramba-4.8.4.tar.xz) = 394084
+SHA256 (KDE/superkaramba-4.9.5.tar.xz) = e608d4f3671ea97fb84fd3ec94c29baa525908a87af6f3bd493a7bb9d075da16
+SIZE (KDE/superkaramba-4.9.5.tar.xz) = 390104