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

4 files changed, 23 insertions, 35 deletions

diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index a401a886630..50407fb1ed1 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 10:38:40 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/04/10 02:45:04 markd Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
 CATEGORIES=	multimedia
@@ -24,7 +24,6 @@ DEPENDS+=	xine-xcb>=1.1.9:../../x11/xine-xcb
 .include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kdelibs-experimental4/buildlink3.mk"
 .include "../../x11/kdebase-runtime4/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
diff --git a/multimedia/kdemultimedia4/PLIST b/multimedia/kdemultimedia4/PLIST
index a9a1781d576..a0ba8c5ef1a 100644
--- a/multimedia/kdemultimedia4/PLIST
+++ b/multimedia/kdemultimedia4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/04/10 02:45:04 markd Exp $
 bin/dragon
 bin/juk
 bin/kmix
@@ -26,13 +26,13 @@ lib/kde4/libaudiocd_encoder_wav.so
 lib/kde4/videopreview.so
 lib/libaudiocdplugins.so
 lib/libaudiocdplugins.so.4
-lib/libaudiocdplugins.so.4.3.0
+lib/libaudiocdplugins.so.4.4.0
 lib/libkcddb.so
 lib/libkcddb.so.4
-lib/libkcddb.so.4.3.0
+lib/libkcddb.so.4.4.0
 lib/libkcompactdisc.so
 lib/libkcompactdisc.so.4
-lib/libkcompactdisc.so.4.3.0
+lib/libkcompactdisc.so.4.4.0
 lib/libkdeinit4_kmix.so
 lib/libkdeinit4_kmixctrl.so
 share/applications/kde4/dragonplayer.desktop
@@ -59,6 +59,12 @@ share/doc/kde/HTML/en/juk/juk-tag-guesser.png
 share/doc/kde/HTML/en/juk/normal-playlist.png
 share/doc/kde/HTML/en/juk/search-playlist.png
 share/doc/kde/HTML/en/juk/toolbar.png
+share/doc/kde/HTML/en/kcontrol/cddbretrieval/common
+share/doc/kde/HTML/en/kcontrol/cddbretrieval/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/cddbretrieval/index.docbook
+share/doc/kde/HTML/en/kcontrol/cddbretrieval/kscd13.png
+share/doc/kde/HTML/en/kcontrol/cddbretrieval/kscd14.png
+share/doc/kde/HTML/en/kcontrol/cddbretrieval/kscd16.png
 share/doc/kde/HTML/en/kioslave/audiocd/common
 share/doc/kde/HTML/en/kioslave/audiocd/index.cache.bz2
 share/doc/kde/HTML/en/kioslave/audiocd/index.docbook
@@ -69,23 +75,6 @@ share/doc/kde/HTML/en/kmix/kmix-channel-playback.png
 share/doc/kde/HTML/en/kmix/kmix-channel-record.png
 share/doc/kde/HTML/en/kmix/kmix-channel-switches.png
 share/doc/kde/HTML/en/kmix/kmix-window.png
-share/doc/kde/HTML/en/kscd/common
-share/doc/kde/HTML/en/kscd/index.cache.bz2
-share/doc/kde/HTML/en/kscd/index.docbook
-share/doc/kde/HTML/en/kscd/kscd.png
-share/doc/kde/HTML/en/kscd/kscd11.png
-share/doc/kde/HTML/en/kscd/kscd12.png
-share/doc/kde/HTML/en/kscd/kscd13.png
-share/doc/kde/HTML/en/kscd/kscd14.png
-share/doc/kde/HTML/en/kscd/kscd16.png
-share/doc/kde/HTML/en/kscd/kscd18.png
-share/doc/kde/HTML/en/kscd/kscd19.png
-share/doc/kde/HTML/en/kscd/kscd2.png
-share/doc/kde/HTML/en/kscd/kscd3.png
-share/doc/kde/HTML/en/kscd/kscd5.png
-share/doc/kde/HTML/en/kscd/kscd6.png
-share/doc/kde/HTML/en/kscd/kscd9.png
-share/doc/kde/HTML/en/kscd/kscdannounc.png
 share/icons/hicolor/128x128/apps/dragonplayer.png
 share/icons/hicolor/128x128/apps/juk.png
 share/icons/hicolor/128x128/apps/kmix.png
@@ -129,7 +118,6 @@ share/kde/apps/kmix/kmixui.rc
 share/kde/apps/kmix/pics/kmixdocked.png
 share/kde/apps/kmix/pics/kmixdocked_error.png
 share/kde/apps/kmix/pics/kmixdocked_mute.png
-share/kde/apps/kmix/pics/mix_record.png
 share/kde/apps/kmix/pics/mixer-ac97.png
 share/kde/apps/kmix/pics/mixer-capture.png
 share/kde/apps/kmix/pics/mixer-cd.png
@@ -155,6 +143,7 @@ share/kde/apps/kscd/skin/default.svg
 share/kde/apps/profiles/kscd.profile.xml
 share/kde/apps/solid/actions/dragonplayer-opendvd.desktop
 share/kde/apps/solid/actions/kscd-play-audiocd.desktop
+share/kde/apps/solid/actions/solid_audiocd.desktop
 share/kde/apps/videothumbnail/sprocket-large.png
 share/kde/apps/videothumbnail/sprocket-medium.png
 share/kde/apps/videothumbnail/sprocket-small.png
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 3f6800a02b0..4c085fc6a45 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2010/01/27 10:38:40 markd Exp $
+$NetBSD: distinfo,v 1.6 2010/04/10 02:45:04 markd Exp $
 
-SHA1 (kdemultimedia-4.3.5.tar.bz2) = fd215c529d76cf7f998539a9a6a4476f2bd885fc
-RMD160 (kdemultimedia-4.3.5.tar.bz2) = 51d77ff3aec536f7ad74970cb5fbffee65ee7449
-Size (kdemultimedia-4.3.5.tar.bz2) = 1591456 bytes
-SHA1 (patch-ac) = 729f99548af7a21b98e5aa746cca7699f7880800
+SHA1 (kdemultimedia-4.4.2.tar.bz2) = a2793c577f88ac6a2d9c3c70d09bd761229437e9
+RMD160 (kdemultimedia-4.4.2.tar.bz2) = 8755bb5277d8f685c7cce36e6c0f6da5d8837e9a
+Size (kdemultimedia-4.4.2.tar.bz2) = 1454165 bytes
+SHA1 (patch-ac) = 27d242ae4dd8e9ac8e3a12c35e5f588a6acbb8d5
 SHA1 (patch-ad) = 8901537664189b95f54f06b429362ac15df5afa9
 SHA1 (patch-af) = c6ce9d8c45ca25ce5fb9ea8f0e26344cc7c70e15
 SHA1 (patch-ag) = 8242c31fff139a128688c72c6ae36840138d1492
diff --git a/multimedia/kdemultimedia4/patches/patch-ac b/multimedia/kdemultimedia4/patches/patch-ac
index 6a65b452324..fbb0ee8c202 100644
--- a/multimedia/kdemultimedia4/patches/patch-ac
+++ b/multimedia/kdemultimedia4/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+$NetBSD: patch-ac,v 1.2 2010/04/10 02:45:04 markd Exp $
 
---- kmix/CMakeLists.txt.orig	2009-05-20 00:06:59.000000000 +1200
+--- kmix/CMakeLists.txt.orig	2009-12-10 23:15:09.000000000 +0000
 +++ kmix/CMakeLists.txt
-@@ -39,7 +39,7 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRC
+@@ -40,7 +40,7 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRC
  
  kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
  
--target_link_libraries(kdeinit_kmix ${LIBKNOTIFICATIONITEM-1_LIBRARIES} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY})
-+target_link_libraries(kdeinit_kmix ${LIBKNOTIFICATIONITEM-1_LIBRARIES} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
+-target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
++target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
  
  if (HAVE_LIBASOUND2)
      target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY})
-@@ -72,7 +72,7 @@ set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor
+@@ -73,7 +73,7 @@ set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor
  
  kde4_add_kdeinit_executable( kmixctrl ${kmixctrl_KDEINIT_SRCS})