Update KDE to 4.4.2

For 4.4.0 major new technologies have been introduced, including social
networking and online collaboration features, a new netbook-oriented
interface and infrastructural innovations such as the KAuth authentication
framework. According to KDE's bug-tracking system, 7293 bugs have been
fixed and 1433 new feature requests were implemented.

KDE SC 4.4.1 has a number of improvements:
 A performance problem in KMail when sending emails has been fixed
 Various fixes in Plasma widgets and other addons, such as the analog clock
  and the picture frame
 A number of fixes in Konsole, KDE's powerful terminal application

KDE SC 4.4.2 has a number of improvements:
 Possible crashes in Plasma, Dolphin and Okular have been fixed
 The Microblog applet now shows the correct time in the timeline
 The audioplayer KRunner plugin has been fixed to not freeze the KRunner UI
  anymore

5 files changed, 325 insertions, 108 deletions

diff --git a/x11/kdebase-runtime4/Makefile b/x11/kdebase-runtime4/Makefile
index 8aab2ecc78c..44f49714c24 100644
--- a/x11/kdebase-runtime4/Makefile
+++ b/x11/kdebase-runtime4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/27 10:38:41 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/04/10 02:45:04 markd Exp $
 
 DISTNAME=	kdebase-runtime-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -40,9 +40,12 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../misc/attica/buildlink3.mk"
+.include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../net/openslp/buildlink3.mk"
-.include "../../x11/kdelibs-experimental4/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase-runtime4/PLIST b/x11/kdebase-runtime4/PLIST
index 81a2a28b871..3a1f71e7393 100644
--- a/x11/kdebase-runtime4/PLIST
+++ b/x11/kdebase-runtime4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/06 14:06:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/04/10 02:45:04 markd Exp $
 bin/kcmshell4
 bin/kde-cp
 bin/kde-mv
@@ -10,6 +10,7 @@ bin/keditfiletype
 bin/kfile4
 bin/kglobalaccel
 bin/khelpcenter
+bin/khotnewstuff-upload
 bin/khotnewstuff4
 bin/kiconfinder
 bin/kioclient
@@ -28,8 +29,10 @@ bin/nepomukserver
 bin/nepomukservicestub
 bin/plasmapkg
 bin/solid-hardware
+lib/attica_kde.so
 lib/kconf_update_bin/phonon_devicepreference_update
 lib/kconf_update_bin/phonon_deviceuids_update
+lib/kde4/comicbookthumbnail.so
 lib/kde4/cursorthumbnail.so
 lib/kde4/djvuthumbnail.so
 lib/kde4/exrthumbnail.so
@@ -37,8 +40,10 @@ lib/kde4/fixhosturifilter.so
 lib/kde4/htmlthumbnail.so
 lib/kde4/imagethumbnail.so
 lib/kde4/jpegthumbnail.so
+lib/kde4/kcm_attica.so
 lib/kde4/kcm_cgi.so
 lib/kde4/kcm_componentchooser.so
+lib/kde4/kcm_device_automounter.so
 lib/kde4/kcm_emoticons.so
 lib/kde4/kcm_filetypes.so
 lib/kde4/kcm_icons.so
@@ -48,11 +53,14 @@ lib/kde4/kcm_knotify.so
 lib/kde4/kcm_locale.so
 lib/kde4/kcm_nepomuk.so
 lib/kde4/kcm_phonon.so
+lib/kde4/kcm_phononxine.so
 lib/kde4/kcm_trash.so
 lib/kde4/kcmspellchecking.so
 lib/kde4/kded_desktopnotifier.so
+lib/kde4/kded_device_automounter.so
 lib/kde4/kded_kpasswdserver.so
 lib/kde4/kded_ktimezoned.so
+lib/kde4/kded_nepomuksearchmodule.so
 lib/kde4/kded_networkwatcher.so
 lib/kde4/kded_phononserver.so
 lib/kde4/kded_remotedirnotify.so
@@ -70,14 +78,15 @@ lib/kde4/kio_fish.so
 lib/kde4/kio_floppy.so
 lib/kde4/kio_info.so
 lib/kde4/kio_man.so
+lib/kde4/kio_nepomuk.so
 lib/kde4/kio_nepomuksearch.so
 lib/kde4/kio_network.so
 lib/kde4/kio_nfs.so
 lib/kde4/kio_remote.so
 lib/kde4/kio_settings.so
-lib/kde4/kio_sftp.so
 ${PLIST.smb}lib/kde4/kio_smb.so
 lib/kde4/kio_thumbnail.so
+lib/kde4/kio_timeline.so
 lib/kde4/kio_trash.so
 lib/kde4/kshorturifilter.so
 lib/kde4/kstyle_oxygen_config.so
@@ -103,14 +112,18 @@ lib/kde4/nepomukfilewatch.so
 lib/kde4/nepomukmigration1.so
 lib/kde4/nepomukontologyloader.so
 lib/kde4/nepomukqueryservice.so
+lib/kde4/nepomukremovablestorageservice.so
 lib/kde4/nepomukstorage.so
 lib/kde4/nepomukstrigiservice.so
 lib/kde4/plasma_appletscript_simple_javascript.so
+lib/kde4/plasma_dataenginescript_javascript.so
 lib/kde4/plasma_runnerscript_javascript.so
 lib/kde4/plugins/phonon_platform/kde.so
 lib/kde4/plugins/styles/oxygen.so
 lib/kde4/svgthumbnail.so
 lib/kde4/textthumbnail.so
+lib/kde4/windowsexethumbnail.so
+lib/kde4/windowsimagethumbnail.so
 lib/libkdeinit4_kcmshell4.so
 lib/libkdeinit4_kglobalaccel.so
 lib/libkdeinit4_khelpcenter.so
@@ -119,11 +132,11 @@ lib/libkdeinit4_kwalletd.so
 lib/libkdeinit4_nepomukserver.so
 lib/libkwalletbackend.so
 lib/libkwalletbackend.so.4
-lib/libkwalletbackend.so.4.3.0
+lib/libkwalletbackend.so.4.4.0
 lib/libmolletnetwork.so
 lib/libmolletnetwork.so.4
-lib/libmolletnetwork.so.4.3.0
-lib/strigi/strigiindex_sopranobackend.so
+lib/libmolletnetwork.so.4.4.0
+lib/strigi/strigiindex_nepomukbackend.so
 man/man1/kdesu.1
 man/man8/nepomukserver.8
 man/man8/nepomukservicestub.8
@@ -135,6 +148,7 @@ share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
 share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
 share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
+share/dbus-1/interfaces/org.kde.nepomuk.RemovableStorage.xml
 share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml
 share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
@@ -180,34 +194,24 @@ share/desktop-directories/kde-utilities-peripherals.directory
 share/desktop-directories/kde-utilities-pim.directory
 share/desktop-directories/kde-utilities-xutils.directory
 share/desktop-directories/kde-utilities.directory
-share/doc/kde/HTML/en/kcontrol/background/common
-share/doc/kde/HTML/en/kcontrol/background/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/background/index.docbook
+share/doc/kde/HTML/en/kcontrol/attica/common
+share/doc/kde/HTML/en/kcontrol/attica/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/attica/index.docbook
 share/doc/kde/HTML/en/kcontrol/bookmarks/common
 share/doc/kde/HTML/en/kcontrol/bookmarks/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/bookmarks/index.docbook
 share/doc/kde/HTML/en/kcontrol/cache/common
 share/doc/kde/HTML/en/kcontrol/cache/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/cache/index.docbook
-share/doc/kde/HTML/en/kcontrol/common
+share/doc/kde/HTML/en/kcontrol/componentchooser/common
+share/doc/kde/HTML/en/kcontrol/componentchooser/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/componentchooser/index.docbook
 share/doc/kde/HTML/en/kcontrol/cookies/common
 share/doc/kde/HTML/en/kcontrol/cookies/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/cookies/index.docbook
-share/doc/kde/HTML/en/kcontrol/crypto/common
-share/doc/kde/HTML/en/kcontrol/crypto/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/crypto/index.docbook
-share/doc/kde/HTML/en/kcontrol/desktop/common
-share/doc/kde/HTML/en/kcontrol/desktop/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/desktop/index.docbook
-share/doc/kde/HTML/en/kcontrol/desktopbehavior/common
-share/doc/kde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/desktopbehavior/index.docbook
 share/doc/kde/HTML/en/kcontrol/ebrowsing/common
 share/doc/kde/HTML/en/kcontrol/ebrowsing/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/ebrowsing/index.docbook
-share/doc/kde/HTML/en/kcontrol/email/common
-share/doc/kde/HTML/en/kcontrol/email/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/email/index.docbook
 share/doc/kde/HTML/en/kcontrol/emoticons/common
 share/doc/kde/HTML/en/kcontrol/emoticons/emoticons.png
 share/doc/kde/HTML/en/kcontrol/emoticons/index.cache.bz2
@@ -215,14 +219,15 @@ share/doc/kde/HTML/en/kcontrol/emoticons/index.docbook
 share/doc/kde/HTML/en/kcontrol/filemanager/common
 share/doc/kde/HTML/en/kcontrol/filemanager/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/filemanager/index.docbook
-share/doc/kde/HTML/en/kcontrol/filemanager/kfileman1.png
-share/doc/kde/HTML/en/kcontrol/filemanager/kfileman2.png
 share/doc/kde/HTML/en/kcontrol/filetypes/common
 share/doc/kde/HTML/en/kcontrol/filetypes/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/filetypes/index.docbook
 share/doc/kde/HTML/en/kcontrol/helpindex/common
 share/doc/kde/HTML/en/kcontrol/helpindex/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/helpindex/index.docbook
+share/doc/kde/HTML/en/kcontrol/history/common
+share/doc/kde/HTML/en/kcontrol/history/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/history/index.docbook
 share/doc/kde/HTML/en/kcontrol/icons/common
 share/doc/kde/HTML/en/kcontrol/icons/delete-theme.png
 share/doc/kde/HTML/en/kcontrol/icons/effects.png
@@ -233,30 +238,36 @@ share/doc/kde/HTML/en/kcontrol/icons/install-theme.png
 share/doc/kde/HTML/en/kcontrol/icons/main.png
 share/doc/kde/HTML/en/kcontrol/icons/size.png
 share/doc/kde/HTML/en/kcontrol/icons/use-of-icons.png
-share/doc/kde/HTML/en/kcontrol/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/index.docbook
+share/doc/kde/HTML/en/kcontrol/kcmcgi/common
+share/doc/kde/HTML/en/kcontrol/kcmcgi/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/kcmcgi/index.docbook
 share/doc/kde/HTML/en/kcontrol/kcmcss/common
 share/doc/kde/HTML/en/kcontrol/kcmcss/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/kcmcss/index.docbook
-share/doc/kde/HTML/en/kcontrol/kcmkonsole/common
-share/doc/kde/HTML/en/kcontrol/kcmkonsole/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/kcmkonsole/index.docbook
 share/doc/kde/HTML/en/kcontrol/kcmlaunch/common
 share/doc/kde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/kcmlaunch/index.docbook
 share/doc/kde/HTML/en/kcontrol/kcmnotify/common
 share/doc/kde/HTML/en/kcontrol/kcmnotify/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/kcmnotify/index.docbook
-share/doc/kde/HTML/en/kcontrol/kcmtaskbar/common
-share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.docbook
-share/doc/kde/HTML/en/kcontrol/kdm/common
-share/doc/kde/HTML/en/kcontrol/kdm/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/kdm/index.docbook
-share/doc/kde/HTML/en/kcontrol/khtml/common
-share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/khtml/index.docbook
-share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook
+share/doc/kde/HTML/en/kcontrol/kded/common
+share/doc/kde/HTML/en/kcontrol/kded/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/kded/index.docbook
+share/doc/kde/HTML/en/kcontrol/khtml-adblock/common
+share/doc/kde/HTML/en/kcontrol/khtml-adblock/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/khtml-adblock/index.docbook
+share/doc/kde/HTML/en/kcontrol/khtml-behavior/common
+share/doc/kde/HTML/en/kcontrol/khtml-behavior/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/khtml-behavior/index.docbook
+share/doc/kde/HTML/en/kcontrol/khtml-general/common
+share/doc/kde/HTML/en/kcontrol/khtml-general/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/khtml-general/index.docbook
+share/doc/kde/HTML/en/kcontrol/khtml-java-js/common
+share/doc/kde/HTML/en/kcontrol/khtml-java-js/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/khtml-java-js/index.docbook
+share/doc/kde/HTML/en/kcontrol/khtml-plugins/common
+share/doc/kde/HTML/en/kcontrol/khtml-plugins/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/khtml-plugins/index.docbook
 share/doc/kde/HTML/en/kcontrol/language/common
 share/doc/kde/HTML/en/kcontrol/language/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/language/index.docbook
@@ -266,15 +277,6 @@ share/doc/kde/HTML/en/kcontrol/nepomuk/index.docbook
 share/doc/kde/HTML/en/kcontrol/netpref/common
 share/doc/kde/HTML/en/kcontrol/netpref/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/netpref/index.docbook
-share/doc/kde/HTML/en/kcontrol/panel/common
-share/doc/kde/HTML/en/kcontrol/panel/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/panel/index.docbook
-share/doc/kde/HTML/en/kcontrol/panelappearance/common
-share/doc/kde/HTML/en/kcontrol/panelappearance/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/panelappearance/index.docbook
-share/doc/kde/HTML/en/kcontrol/passwords/common
-share/doc/kde/HTML/en/kcontrol/passwords/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/passwords/index.docbook
 share/doc/kde/HTML/en/kcontrol/paths/common
 share/doc/kde/HTML/en/kcontrol/paths/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/paths/index.docbook
@@ -282,17 +284,24 @@ share/doc/kde/HTML/en/kcontrol/paths/paths.png
 share/doc/kde/HTML/en/kcontrol/performance/common
 share/doc/kde/HTML/en/kcontrol/performance/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/performance/index.docbook
+share/doc/kde/HTML/en/kcontrol/phonon/common
+share/doc/kde/HTML/en/kcontrol/phonon/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/phonon/index.docbook
 share/doc/kde/HTML/en/kcontrol/proxy/common
 share/doc/kde/HTML/en/kcontrol/proxy/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/proxy/index.docbook
-share/doc/kde/HTML/en/kcontrol/proxy/socks.docbook
-share/doc/kde/HTML/en/kcontrol/screenshot.png
 share/doc/kde/HTML/en/kcontrol/smb/common
 share/doc/kde/HTML/en/kcontrol/smb/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/smb/index.docbook
+share/doc/kde/HTML/en/kcontrol/solid-device-automounter/common
+share/doc/kde/HTML/en/kcontrol/solid-device-automounter/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/solid-device-automounter/index.docbook
 share/doc/kde/HTML/en/kcontrol/spellchecking/common
 share/doc/kde/HTML/en/kcontrol/spellchecking/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/spellchecking/index.docbook
+share/doc/kde/HTML/en/kcontrol/trash/common
+share/doc/kde/HTML/en/kcontrol/trash/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/trash/index.docbook
 share/doc/kde/HTML/en/kcontrol/useragent/common
 share/doc/kde/HTML/en/kcontrol/useragent/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/useragent/index.docbook
@@ -577,6 +586,7 @@ share/kde/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svgz
 share/kde/apps/desktoptheme/default/opaque/widgets/extender-background.svgz
 share/kde/apps/desktoptheme/default/opaque/widgets/panel-background.svgz
 share/kde/apps/desktoptheme/default/opaque/widgets/tooltip.svgz
+share/kde/apps/desktoptheme/default/widgets/action-overlays.svgz
 share/kde/apps/desktoptheme/default/widgets/analog_meter.svgz
 share/kde/apps/desktoptheme/default/widgets/arrows.svgz
 share/kde/apps/desktoptheme/default/widgets/background.svgz
@@ -595,11 +605,13 @@ share/kde/apps/desktoptheme/default/widgets/extender-dragger.svgz
 share/kde/apps/desktoptheme/default/widgets/frame.svgz
 share/kde/apps/desktoptheme/default/widgets/glowbar.svgz
 share/kde/apps/desktoptheme/default/widgets/line.svgz
+share/kde/apps/desktoptheme/default/widgets/lineedit.svgz
 share/kde/apps/desktoptheme/default/widgets/monitor.svgz
 share/kde/apps/desktoptheme/default/widgets/pager.svgz
 share/kde/apps/desktoptheme/default/widgets/panel-background.svgz
 share/kde/apps/desktoptheme/default/widgets/plot-background.svgz
 share/kde/apps/desktoptheme/default/widgets/scrollbar.svgz
+share/kde/apps/desktoptheme/default/widgets/scrollwidget.svgz
 share/kde/apps/desktoptheme/default/widgets/slider.svgz
 share/kde/apps/desktoptheme/default/widgets/systemtray.svgz
 share/kde/apps/desktoptheme/default/widgets/tasks.svgz
@@ -607,7 +619,6 @@ share/kde/apps/desktoptheme/default/widgets/toolbox.svgz
 share/kde/apps/desktoptheme/default/widgets/tooltip.svgz
 share/kde/apps/desktoptheme/default/widgets/translucentbackground.svgz
 share/kde/apps/desktoptheme/default/widgets/viewitem.svgz
-share/kde/apps/desktoptheme/default/widgets/viewitem.svgz
 share/kde/apps/desktoptheme/oxygen/colors
 share/kde/apps/desktoptheme/oxygen/dialogs/background.svgz
 share/kde/apps/desktoptheme/oxygen/dialogs/kickoff.svgz
@@ -621,6 +632,7 @@ share/kde/apps/desktoptheme/oxygen/opaque/dialogs/shutdowndialog.svgz
 share/kde/apps/desktoptheme/oxygen/opaque/widgets/extender-background.svgz
 share/kde/apps/desktoptheme/oxygen/opaque/widgets/panel-background.svgz
 share/kde/apps/desktoptheme/oxygen/opaque/widgets/tooltip.svgz
+share/kde/apps/desktoptheme/oxygen/widgets/action-overlays.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/analog_meter.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/arrows.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/background.svgz
@@ -639,11 +651,13 @@ share/kde/apps/desktoptheme/oxygen/widgets/extender-dragger.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/frame.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/glowbar.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/line.svgz
+share/kde/apps/desktoptheme/oxygen/widgets/lineedit.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/monitor.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/pager.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/panel-background.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/plot-background.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/scrollbar.svgz
+share/kde/apps/desktoptheme/oxygen/widgets/scrollwidget.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/slider.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/systemtray.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/tasks.svgz
@@ -652,7 +666,9 @@ share/kde/apps/desktoptheme/oxygen/widgets/toolbox.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/tooltip.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/translucentbackground.svgz
 share/kde/apps/desktoptheme/oxygen/widgets/viewitem.svgz
-share/kde/apps/drkonqi/debuggers/gdbrc
+share/kde/apps/drkonqi/debuggers/external/gdbrc
+share/kde/apps/drkonqi/debuggers/external/kdbgrc
+share/kde/apps/drkonqi/debuggers/internal/gdbrc
 share/kde/apps/drkonqi/mappings
 share/kde/apps/drkonqi/pics/crash.png
 share/kde/apps/kcm_componentchooser/kcm_browser.desktop
@@ -665,6 +681,7 @@ share/kde/apps/kcmlocale/pics/background.png
 share/kde/apps/kconf_update/devicepreference.upd
 share/kde/apps/kconf_update/kuriikwsfilter.upd
 share/kde/apps/kde/kde.notifyrc
+share/kde/apps/kglobalaccel/kglobalaccel.notifyrc
 share/kde/apps/khelpcenter/glossary.html.in
 share/kde/apps/khelpcenter/glossary.xslt
 share/kde/apps/khelpcenter/index.html.in
@@ -711,7 +728,6 @@ share/kde/apps/kio_finger/kio_finger.css
 share/kde/apps/kio_finger/kio_finger.pl
 share/kde/apps/kio_info/kde-info2html
 share/kde/apps/kio_info/kde-info2html.conf
-share/kde/apps/kio_thumbnail/pics/thumbnailfont_7x4.png
 share/kde/apps/konqsidebartng/virtual_folders/remote/virtualfolder_network.desktop
 ${PLIST.smb}share/kde/apps/konqueror/dirtree/remote/smb-network.desktop
 share/kde/apps/ksmserver/windowmanagers/compiz-custom.desktop
@@ -719,40 +735,14 @@ share/kde/apps/ksmserver/windowmanagers/compiz.desktop
 share/kde/apps/ksmserver/windowmanagers/metacity.desktop
 share/kde/apps/ksmserver/windowmanagers/openbox.desktop
 share/kde/apps/kstyle/themes/oxygen.themerc
+share/kde/apps/kstyle/themes/qtcde.themerc
+share/kde/apps/kstyle/themes/qtcleanlooks.themerc
+share/kde/apps/kstyle/themes/qtgtk.themerc
+share/kde/apps/kstyle/themes/qtmotif.themerc
+share/kde/apps/kstyle/themes/qtplastique.themerc
+share/kde/apps/kstyle/themes/qtwindows.themerc
 share/kde/apps/kwalletd/kwalletd.notifyrc
 share/kde/apps/libphonon/hardwaredatabase
-share/kde/apps/nepomuk/ontologies/dces.desktop
-share/kde/apps/nepomuk/ontologies/dces.rdf
-share/kde/apps/nepomuk/ontologies/dcq.desktop
-share/kde/apps/nepomuk/ontologies/dcq.rdf
-share/kde/apps/nepomuk/ontologies/dctype.desktop
-share/kde/apps/nepomuk/ontologies/dctype.rdf
-share/kde/apps/nepomuk/ontologies/nao.desktop
-share/kde/apps/nepomuk/ontologies/nao.trig
-share/kde/apps/nepomuk/ontologies/ncal.desktop
-share/kde/apps/nepomuk/ontologies/ncal.trig
-share/kde/apps/nepomuk/ontologies/nco.desktop
-share/kde/apps/nepomuk/ontologies/nco.trig
-share/kde/apps/nepomuk/ontologies/nexif.desktop
-share/kde/apps/nepomuk/ontologies/nexif.trig
-share/kde/apps/nepomuk/ontologies/nfo.desktop
-share/kde/apps/nepomuk/ontologies/nfo.trig
-share/kde/apps/nepomuk/ontologies/nid3.desktop
-share/kde/apps/nepomuk/ontologies/nid3.trig
-share/kde/apps/nepomuk/ontologies/nie.desktop
-share/kde/apps/nepomuk/ontologies/nie.trig
-share/kde/apps/nepomuk/ontologies/nmo.desktop
-share/kde/apps/nepomuk/ontologies/nmo.trig
-share/kde/apps/nepomuk/ontologies/nrl.desktop
-share/kde/apps/nepomuk/ontologies/nrl.trig
-share/kde/apps/nepomuk/ontologies/pimo.desktop
-share/kde/apps/nepomuk/ontologies/pimo.trig
-share/kde/apps/nepomuk/ontologies/rdf.desktop
-share/kde/apps/nepomuk/ontologies/rdf.rdfs
-share/kde/apps/nepomuk/ontologies/rdfs.desktop
-share/kde/apps/nepomuk/ontologies/rdfs.rdfs
-share/kde/apps/nepomuk/ontologies/xesam.desktop
-share/kde/apps/nepomuk/ontologies/xesam.rdfs
 share/kde/apps/nepomukstorage/nepomukstorage.notifyrc
 share/kde/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
 share/kde/apps/phonon/phonon.notifyrc
@@ -763,6 +753,7 @@ share/kde/config.kcfg/khelpcenter.kcfg
 share/kde/config/emoticons.knsrc
 share/kde/config/icons.knsrc
 share/kde/config/khotnewstuff.knsrc
+share/kde/config/khotnewstuff_upload.knsrc
 share/kde/config/kshorturifilterrc
 share/kde4/services/about.protocol
 share/kde4/services/applications.protocol
@@ -771,10 +762,12 @@ share/kde4/services/bookmarks.protocol
 share/kde4/services/bzip.protocol
 share/kde4/services/bzip2.protocol
 share/kde4/services/cgi.protocol
+share/kde4/services/comicbookthumbnail.desktop
 share/kde4/services/componentchooser.desktop
 share/kde4/services/cursorthumbnail.desktop
 share/kde4/services/desktop.protocol
 share/kde4/services/desktopthumbnail.desktop
+share/kde4/services/device_automounter_kcm.desktop
 share/kde4/services/directorythumbnail.desktop
 share/kde4/services/djvuthumbnail.desktop
 share/kde4/services/emoticons.desktop
@@ -789,16 +782,21 @@ share/kde4/services/htmlthumbnail.desktop
 share/kde4/services/icons.desktop
 share/kde4/services/imagethumbnail.desktop
 share/kde4/services/info.protocol
+share/kde4/services/jpegthumbnail.desktop
+share/kde4/services/kcm_attica.desktop
 share/kde4/services/kcm_kdnssd.desktop
 share/kde4/services/kcm_nepomuk.desktop
 share/kde4/services/kcm_phonon.desktop
+share/kde4/services/kcm_phononxine.desktop
 share/kde4/services/kcmcgi.desktop
 share/kde4/services/kcmkded.desktop
 share/kde4/services/kcmnotify.desktop
 share/kde4/services/kcmtrash.desktop
 share/kde4/services/kded/desktopnotifier.desktop
+share/kde4/services/kded/device_automounter.desktop
 share/kde4/services/kded/kpasswdserver.desktop
 share/kde4/services/kded/ktimezoned.desktop
+share/kde4/services/kded/nepomuksearchmodule.desktop
 share/kde4/services/kded/networkwatcher.desktop
 share/kde4/services/kded/phononserver.desktop
 share/kde4/services/kded/remotedirnotify.desktop
@@ -815,17 +813,21 @@ share/kde4/services/kurisearchfilter.desktop
 share/kde4/services/kwalletd.desktop
 share/kde4/services/language.desktop
 share/kde4/services/localdomainurifilter.desktop
+share/kde4/services/lzma.protocol
 share/kde4/services/man.protocol
+share/kde4/services/nepomuk.protocol
 share/kde4/services/nepomukfilewatch.desktop
 share/kde4/services/nepomukmigration1.desktop
 share/kde4/services/nepomukontologyloader.desktop
 share/kde4/services/nepomukqueryservice.desktop
+share/kde4/services/nepomukremovablestorageservice.desktop
 share/kde4/services/nepomuksearch.protocol
 share/kde4/services/nepomukstorage.desktop
 share/kde4/services/nepomukstrigiservice.desktop
 share/kde4/services/network.protocol
 share/kde4/services/nfs.protocol
 share/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop
+share/kde4/services/plasma-scriptengine-dataengine-javascript.desktop
 share/kde4/services/plasma-scriptengine-runner-javascript.desktop
 share/kde4/services/programs.protocol
 share/kde4/services/remote.protocol
@@ -852,6 +854,7 @@ share/kde4/services/searchproviders/dbug.desktop
 share/kde4/services/searchproviders/de2en.desktop
 share/kde4/services/searchproviders/de2fr.desktop
 share/kde4/services/searchproviders/deb.desktop
+share/kde4/services/searchproviders/dictfr.desktop
 share/kde4/services/searchproviders/dmoz.desktop
 share/kde4/services/searchproviders/docbook.desktop
 share/kde4/services/searchproviders/doi.desktop
@@ -925,22 +928,230 @@ share/kde4/services/searchproviders/webster.desktop
 share/kde4/services/searchproviders/whatis.desktop
 share/kde4/services/searchproviders/wikipedia.desktop
 share/kde4/services/searchproviders/wiktionary.desktop
+share/kde4/services/searchproviders/wolfram_alpha.desktop
 share/kde4/services/searchproviders/wordref.desktop
 share/kde4/services/settings.protocol
-share/kde4/services/sftp.protocol
-share/kde4/services/spellchecking.desktop
 ${PLIST.smb}share/kde4/services/smb.protocol
-share/kde4/services/jpegthumbnail.desktop
+share/kde4/services/spellchecking.desktop
 share/kde4/services/svgthumbnail.desktop
 share/kde4/services/tar.protocol
 share/kde4/services/textthumbnail.desktop
 share/kde4/services/thumbnail.protocol
+share/kde4/services/timeline.protocol
 share/kde4/services/trash.protocol
+share/kde4/services/windowsexethumbnail.desktop
+share/kde4/services/windowsimagethumbnail.desktop
+share/kde4/services/xz.protocol
 share/kde4/services/zip.protocol
 share/kde4/servicetypes/nepomukservice.desktop
 share/kde4/servicetypes/phononbackend.desktop
 share/kde4/servicetypes/searchprovider.desktop
 share/kde4/servicetypes/thumbcreator.desktop
+share/locale/currency/adf.desktop
+share/locale/currency/adp.desktop
+share/locale/currency/aed.desktop
+share/locale/currency/afa.desktop
+share/locale/currency/afn.desktop
+share/locale/currency/all.desktop
+share/locale/currency/amd.desktop
+share/locale/currency/ang.desktop
+share/locale/currency/aoa.desktop
+share/locale/currency/aon.desktop
+share/locale/currency/ars.desktop
+share/locale/currency/ats.desktop
+share/locale/currency/aud.desktop
+share/locale/currency/awg.desktop
+share/locale/currency/azm.desktop
+share/locale/currency/azn.desktop
+share/locale/currency/bam.desktop
+share/locale/currency/bbd.desktop
+share/locale/currency/bdt.desktop
+share/locale/currency/bef.desktop
+share/locale/currency/bgl.desktop
+share/locale/currency/bgn.desktop
+share/locale/currency/bhd.desktop
+share/locale/currency/bif.desktop
+share/locale/currency/bmd.desktop
+share/locale/currency/bnd.desktop
+share/locale/currency/bob.desktop
+share/locale/currency/bov.desktop
+share/locale/currency/brl.desktop
+share/locale/currency/bsd.desktop
+share/locale/currency/btn.desktop
+share/locale/currency/bwp.desktop
+share/locale/currency/byr.desktop
+share/locale/currency/bzd.desktop
+share/locale/currency/cad.desktop
+share/locale/currency/cdf.desktop
+share/locale/currency/chf.desktop
+share/locale/currency/clf.desktop
+share/locale/currency/clp.desktop
+share/locale/currency/cny.desktop
+share/locale/currency/cop.desktop
+share/locale/currency/cou.desktop
+share/locale/currency/crc.desktop
+share/locale/currency/cuc.desktop
+share/locale/currency/cup.desktop
+share/locale/currency/cve.desktop
+share/locale/currency/cyp.desktop
+share/locale/currency/czk.desktop
+share/locale/currency/dem.desktop
+share/locale/currency/djf.desktop
+share/locale/currency/dkk.desktop
+share/locale/currency/dop.desktop
+share/locale/currency/dzd.desktop
+share/locale/currency/eek.desktop
+share/locale/currency/egp.desktop
+share/locale/currency/ern.desktop
+share/locale/currency/esp.desktop
+share/locale/currency/etb.desktop
+share/locale/currency/eur.desktop
+share/locale/currency/fim.desktop
+share/locale/currency/fjd.desktop
+share/locale/currency/fkp.desktop
+share/locale/currency/frf.desktop
+share/locale/currency/gbp.desktop
+share/locale/currency/gel.desktop
+share/locale/currency/ghc.desktop
+share/locale/currency/ghs.desktop
+share/locale/currency/gip.desktop
+share/locale/currency/gmd.desktop
+share/locale/currency/gnf.desktop
+share/locale/currency/grd.desktop
+share/locale/currency/gtq.desktop
+share/locale/currency/gwp.desktop
+share/locale/currency/gyd.desktop
+share/locale/currency/hkd.desktop
+share/locale/currency/hnl.desktop
+share/locale/currency/hrk.desktop
+share/locale/currency/htg.desktop
+share/locale/currency/huf.desktop
+share/locale/currency/idr.desktop
+share/locale/currency/iep.desktop
+share/locale/currency/ils.desktop
+share/locale/currency/inr.desktop
+share/locale/currency/iqd.desktop
+share/locale/currency/irr.desktop
+share/locale/currency/isk.desktop
+share/locale/currency/itl.desktop
+share/locale/currency/jmd.desktop
+share/locale/currency/jod.desktop
+share/locale/currency/jpy.desktop
+share/locale/currency/kes.desktop
+share/locale/currency/kgs.desktop
+share/locale/currency/khr.desktop
+share/locale/currency/kmf.desktop
+share/locale/currency/kpw.desktop
+share/locale/currency/krw.desktop
+share/locale/currency/kwd.desktop
+share/locale/currency/kyd.desktop
+share/locale/currency/kzt.desktop
+share/locale/currency/lak.desktop
+share/locale/currency/lbp.desktop
+share/locale/currency/lkr.desktop
+share/locale/currency/lrd.desktop
+share/locale/currency/lsl.desktop
+share/locale/currency/ltl.desktop
+share/locale/currency/luf.desktop
+share/locale/currency/lvl.desktop
+share/locale/currency/lyd.desktop
+share/locale/currency/mad.desktop
+share/locale/currency/mdl.desktop
+share/locale/currency/mga.desktop
+share/locale/currency/mgf.desktop
+share/locale/currency/mkd.desktop
+share/locale/currency/mlf.desktop
+share/locale/currency/mmk.desktop
+share/locale/currency/mnt.desktop
+share/locale/currency/mop.desktop
+share/locale/currency/mro.desktop
+share/locale/currency/mtl.desktop
+share/locale/currency/mur.desktop
+share/locale/currency/mvr.desktop
+share/locale/currency/mwk.desktop
+share/locale/currency/mxn.desktop
+share/locale/currency/mxv.desktop
+share/locale/currency/myr.desktop
+share/locale/currency/mzm.desktop
+share/locale/currency/mzn.desktop
+share/locale/currency/nad.desktop
+share/locale/currency/ngn.desktop
+share/locale/currency/nio.desktop
+share/locale/currency/nlg.desktop
+share/locale/currency/nok.desktop
+share/locale/currency/npr.desktop
+share/locale/currency/nzd.desktop
+share/locale/currency/omr.desktop
+share/locale/currency/pab.desktop
+share/locale/currency/pen.desktop
+share/locale/currency/pgk.desktop
+share/locale/currency/php.desktop
+share/locale/currency/pkr.desktop
+share/locale/currency/pln.desktop
+share/locale/currency/pte.desktop
+share/locale/currency/pyg.desktop
+share/locale/currency/qar.desktop
+share/locale/currency/rol.desktop
+share/locale/currency/ron.desktop
+share/locale/currency/rsd.desktop
+share/locale/currency/rub.desktop
+share/locale/currency/rur.desktop
+share/locale/currency/rwf.desktop
+share/locale/currency/sar.desktop
+share/locale/currency/sbd.desktop
+share/locale/currency/scr.desktop
+share/locale/currency/sdd.desktop
+share/locale/currency/sdg.desktop
+share/locale/currency/sek.desktop
+share/locale/currency/sgd.desktop
+share/locale/currency/shp.desktop
+share/locale/currency/sit.desktop
+share/locale/currency/skk.desktop
+share/locale/currency/sll.desktop
+share/locale/currency/sos.desktop
+share/locale/currency/srd.desktop
+share/locale/currency/srg.desktop
+share/locale/currency/std.desktop
+share/locale/currency/svc.desktop
+share/locale/currency/syp.desktop
+share/locale/currency/szl.desktop
+share/locale/currency/thb.desktop
+share/locale/currency/tjs.desktop
+share/locale/currency/tmm.desktop
+share/locale/currency/tmt.desktop
+share/locale/currency/tnd.desktop
+share/locale/currency/top.desktop
+share/locale/currency/tpe.desktop
+share/locale/currency/trl.desktop
+share/locale/currency/try.desktop
+share/locale/currency/ttd.desktop
+share/locale/currency/twd.desktop
+share/locale/currency/tzs.desktop
+share/locale/currency/uah.desktop
+share/locale/currency/ugx.desktop
+share/locale/currency/usd.desktop
+share/locale/currency/usn.desktop
+share/locale/currency/uss.desktop
+share/locale/currency/uyu.desktop
+share/locale/currency/uzs.desktop
+share/locale/currency/veb.desktop
+share/locale/currency/vnd.desktop
+share/locale/currency/vuv.desktop
+share/locale/currency/wst.desktop
+share/locale/currency/xaf.desktop
+share/locale/currency/xag.desktop
+share/locale/currency/xau.desktop
+share/locale/currency/xcd.desktop
+share/locale/currency/xof.desktop
+share/locale/currency/xpd.desktop
+share/locale/currency/xpf.desktop
+share/locale/currency/xpt.desktop
+share/locale/currency/yer.desktop
+share/locale/currency/yum.desktop
+share/locale/currency/zar.desktop
+share/locale/currency/zmk.desktop
+share/locale/currency/zwd.desktop
+share/locale/currency/zwl.desktop
 share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
diff --git a/x11/kdebase-runtime4/distinfo b/x11/kdebase-runtime4/distinfo
index c83d4f2a6db..420590de619 100644
--- a/x11/kdebase-runtime4/distinfo
+++ b/x11/kdebase-runtime4/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.6 2010/02/04 16:06:51 joerg Exp $
+$NetBSD: distinfo,v 1.7 2010/04/10 02:45:04 markd Exp $
 
-SHA1 (kdebase-runtime-4.3.5.tar.bz2) = 4f6c1c3641837bf08b9ba9afc361a363b2da557c
-RMD160 (kdebase-runtime-4.3.5.tar.bz2) = b3230f4b7099b3dbfa637b33db79f938c2a68ab6
-Size (kdebase-runtime-4.3.5.tar.bz2) = 7333093 bytes
+SHA1 (kdebase-runtime-4.4.2.tar.bz2) = 3ad83397a5102ea101c913346721c7f6ca0ad3b8
+RMD160 (kdebase-runtime-4.4.2.tar.bz2) = d45160a1d42e4a38b88532ae5fbd26beddd18d0d
+Size (kdebase-runtime-4.4.2.tar.bz2) = 7323555 bytes
 SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
 SHA1 (patch-ac) = 6bb21775f48d7a7155712524162a2de736391f40
 SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
 SHA1 (patch-ae) = b2728696f413b146831db62e422adcf73b132126
-SHA1 (patch-af) = 729a24c0391477c7774e0d594f0e69f79ac74322
+SHA1 (patch-af) = 1a8f15ac1c8dadd59fe00ca7ca304ba41521f896
 SHA1 (patch-ag) = 5ca9064552379792c32577875d07562d3f736ab7
 SHA1 (patch-ah) = edda8d4ff8d1dc4a1aef8aafb2dc9cc7c9b11502
 SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a
-SHA1 (patch-aj) = 343c29c116a7436c6299c74e78d9137d3abbef67
+SHA1 (patch-aj) = 33db436fd3e4e3a0412c67aad7d2af09691f5ba4
 SHA1 (patch-kdesud) = d26cc003542eb1a2922eeff313037746bd907dea
diff --git a/x11/kdebase-runtime4/patches/patch-af b/x11/kdebase-runtime4/patches/patch-af
index 0fd97ad3c02..d898ee06256 100644
--- a/x11/kdebase-runtime4/patches/patch-af
+++ b/x11/kdebase-runtime4/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
+$NetBSD: patch-af,v 1.2 2010/04/10 02:45:04 markd Exp $
 
---- khelpcenter/searchhandlers/khc_docbookdig.pl.cmake.orig	2009-02-27 03:16:03.000000000 +1300
+--- khelpcenter/searchhandlers/khc_docbookdig.pl.cmake.orig	2009-09-23 19:21:09.000000000 +0000
 +++ khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
 @@ -26,8 +26,8 @@ use strict;
  
@@ -13,16 +13,19 @@ $NetBSD: patch-af,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $
  my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
  chomp $kdeprefix;
  
-@@ -126,20 +126,23 @@ if ( !open( PARSER, ">$parserfile" ) ) {
+@@ -124,7 +124,10 @@ if ( !open( PARSER, ">$parserfile" ) ) {
+   exit 1;
+ }
  print PARSER << "EOT";
- #! /bin/sh
- 
+-#! /bin/bash
++#! /bin/sh
++
 +PATH=/bin:/usr/bin:\$PATH
 +export PATH
-+
+ 
  file=\$1
  shift
- mime=\$1
+@@ -132,14 +135,14 @@ mime=\$1
  shift
  
  if test "\$#" -gt 0; then
diff --git a/x11/kdebase-runtime4/patches/patch-aj b/x11/kdebase-runtime4/patches/patch-aj
index 21895d05864..5e57eefec65 100644
--- a/x11/kdebase-runtime4/patches/patch-aj
+++ b/x11/kdebase-runtime4/patches/patch-aj
@@ -1,14 +1,14 @@
-$NetBSD: patch-aj,v 1.1 2010/02/04 16:06:51 joerg Exp $
+$NetBSD: patch-aj,v 1.2 2010/04/10 02:45:04 markd Exp $
 
---- drkonqi/krashconf.cpp.orig	2010-02-04 15:07:21.000000000 +0000
-+++ drkonqi/krashconf.cpp
-@@ -44,6 +44,9 @@
- #ifdef HAVE_STRSIGNAL
+--- drkonqi/crashedapplication.cpp.orig	2010-03-26 17:26:38.000000000 +0000
++++ drkonqi/crashedapplication.cpp
+@@ -23,6 +23,9 @@
  # include <clocale>
  # include <cstring>
+ # include <cstdlib>
 +extern "C" {
 +# include <unistd.h>
 +}
  #endif
  
- KrashConfig :: KrashConfig(QObject *parent)
+ CrashedApplication::CrashedApplication(QObject *parent)