Update KDE SC to 4.8.2

bugfixes.

22 files changed, 99 insertions, 85 deletions

diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo
index 595ce191d69..9a269e31125 100644
--- a/x11/kactivities/distinfo
+++ b/x11/kactivities/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2012/03/19 19:44:01 markd Exp $
+$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
 
-SHA1 (kactivities-4.8.0.tar.bz2) = ac64d13f767c06bfcf2040fcdf94a78410ad035d
-RMD160 (kactivities-4.8.0.tar.bz2) = 973a06b82980a19a36da3a17a4d5269322b8fd19
-Size (kactivities-4.8.0.tar.bz2) = 37583 bytes
+SHA1 (kactivities-4.8.2.tar.xz) = e97d0b82661fd3d886b87d673d7a1191073af7ff
+RMD160 (kactivities-4.8.2.tar.xz) = 265973e76c23cb8fb038ab16e8c01647232baced
+Size (kactivities-4.8.2.tar.xz) = 37472 bytes
diff --git a/x11/kde-baseapps4/Makefile b/x11/kde-baseapps4/Makefile
index b50204190e6..08c644c0953 100644
--- a/x11/kde-baseapps4/Makefile
+++ b/x11/kde-baseapps4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/03/22 15:33:43 obache Exp $
+# $NetBSD: Makefile,v 1.3 2012/04/15 05:54:51 markd Exp $
 
 DISTNAME=	kde-baseapps-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 4 integrated X11 desktop
 
diff --git a/x11/kde-baseapps4/PLIST b/x11/kde-baseapps4/PLIST
index 43fb9d8901d..6c848ea06fd 100644
--- a/x11/kde-baseapps4/PLIST
+++ b/x11/kde-baseapps4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:03 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:51 markd Exp $
 bin/dolphin
 bin/fsview
 bin/kbookmarkmerger
@@ -118,7 +118,9 @@ share/doc/kde/HTML/en/dolphin/default-ui.png
 share/doc/kde/HTML/en/dolphin/index.cache.bz2
 share/doc/kde/HTML/en/dolphin/index.docbook
 share/doc/kde/HTML/en/dolphin/locationbar-breadcrumb.png
+share/doc/kde/HTML/en/dolphin/locationbar-context-menu.png
 share/doc/kde/HTML/en/dolphin/locationbar-editable.png
+share/doc/kde/HTML/en/dolphin/locationbar-places-icon.png
 share/doc/kde/HTML/en/dolphin/nepomuk-search.png
 share/doc/kde/HTML/en/dolphin/preferences-general-behavior.png
 share/doc/kde/HTML/en/dolphin/preferences-navigation.png
@@ -318,6 +320,8 @@ share/kde/apps/kwebkitpart/kpartplugins/autorefresh.desktop
 share/kde/apps/kwebkitpart/kpartplugins/autorefresh.rc
 share/kde/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop
 share/kde/apps/kwebkitpart/kpartplugins/khtmlkttsd.rc
+share/kde/apps/kwebkitpart/kpartplugins/khtmlsettingsplugin.desktop
+share/kde/apps/kwebkitpart/kpartplugins/khtmlsettingsplugin.rc
 share/kde/apps/kwebkitpart/kpartplugins/plugin_babelfish.desktop
 share/kde/apps/kwebkitpart/kpartplugins/plugin_babelfish.rc
 share/kde/apps/kwebkitpart/kpartplugins/plugin_validators.desktop
diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo
index 79604c16c73..f66f7bc4e75 100644
--- a/x11/kde-baseapps4/distinfo
+++ b/x11/kde-baseapps4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2012/03/19 19:44:03 markd Exp $
+$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
 
-SHA1 (kde-baseapps-4.8.0.tar.bz2) = 25151b551793164c5eb1cb303d3031e63a6122e3
-RMD160 (kde-baseapps-4.8.0.tar.bz2) = cac3dd1200a6a56ecc1641bf79793a3944074222
-Size (kde-baseapps-4.8.0.tar.bz2) = 2820730 bytes
+SHA1 (kde-baseapps-4.8.2.tar.xz) = 13dc2e6c8639feadc9a5a334d0720a60b1e3ccb6
+RMD160 (kde-baseapps-4.8.2.tar.xz) = 31def2b20abfc1df8cf03c830b7d7c01ba42678b
+Size (kde-baseapps-4.8.2.tar.xz) = 2663404 bytes
diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile
index bb358fa7f83..f45733c1072 100644
--- a/x11/kde-runtime4/Makefile
+++ b/x11/kde-runtime4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2012/03/25 20:11:28 markd Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/15 05:54:54 markd Exp $
 
 DISTNAME=	kde-runtime-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Runtime requirements for the KDE integrated X11 desktop
 
diff --git a/x11/kde-runtime4/PLIST b/x11/kde-runtime4/PLIST
index a48b5d2dcb3..aa02fee06ea 100644
--- a/x11/kde-runtime4/PLIST
+++ b/x11/kde-runtime4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:03 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:54 markd Exp $
 bin/kcmshell4
 bin/kde-cp
 bin/kde-mv
@@ -256,6 +256,8 @@ lib/libmolletnetwork.so.4
 lib/libmolletnetwork.so.4.8.0
 lib/libnepomukcommon.so
 lib/libnepomukdatamanagement.so
+lib/libnepomukdatamanagement.so.4
+lib/libnepomukdatamanagement.so.4.8.0
 lib/libnepomuksync.so
 lib/libnepomuksync.so.4
 lib/libnepomuksync.so.4.8.0
@@ -717,6 +719,7 @@ share/kde/apps/kcm_phonon/listview-background.png
 share/kde/apps/kcmlocale/pics/background.png
 share/kde/apps/kconf_update/devicepreference.upd
 share/kde/apps/kconf_update/kuriikwsfilter.upd
+share/kde/apps/kconf_update/nepomukstrigiservice-migrate.upd
 share/kde/apps/kde/kde.notifyrc
 share/kde/apps/kglobalaccel/kglobalaccel.notifyrc
 share/kde/apps/khelpcenter/glossary.html.in
diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo
index 7512fe7f781..05b82bf3d40 100644
--- a/x11/kde-runtime4/distinfo
+++ b/x11/kde-runtime4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2012/03/19 19:44:03 markd Exp $
+$NetBSD: distinfo,v 1.2 2012/04/15 05:54:54 markd Exp $
 
-SHA1 (kde-runtime-4.8.0.tar.bz2) = 5e1e98535529a67f8d20e8c76d051c81604d7064
-RMD160 (kde-runtime-4.8.0.tar.bz2) = accba23895645f5c4c02696f9cb1916d5eea4b83
-Size (kde-runtime-4.8.0.tar.bz2) = 6159026 bytes
+SHA1 (kde-runtime-4.8.2.tar.xz) = d2931b8a7c744d6c2fc95d46b2195ed2cd253c00
+RMD160 (kde-runtime-4.8.2.tar.xz) = 30debc525c2e043babb30ef9e5f56fec68e13599
+Size (kde-runtime-4.8.2.tar.xz) = 5849868 bytes
 SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
 SHA1 (patch-ac) = fadc0c0d3b7c8f893a9249724f26e2fc2c7f0f1e
 SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
diff --git a/x11/kde-workspace4/PLIST b/x11/kde-workspace4/PLIST
index c8cec33ba5c..f77abfd89a1 100644
--- a/x11/kde-workspace4/PLIST
+++ b/x11/kde-workspace4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:03 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:59 markd Exp $
 bin/genkdmconf
 bin/kaccess
 bin/kapplymousetheme
@@ -1062,10 +1062,12 @@ share/icons/oxygen/16x16/apps/waiting.png
 share/icons/oxygen/16x16/mimetypes/fonts-package.png
 share/icons/oxygen/22x22/apps/kcmkwm.png
 share/icons/oxygen/22x22/apps/kfontview.png
+share/icons/oxygen/22x22/apps/networkmanager.png
 share/icons/oxygen/22x22/mimetypes/fonts-package.png
 share/icons/oxygen/32x32/apps/kcmkwm.png
 share/icons/oxygen/32x32/apps/kfontview.png
 share/icons/oxygen/32x32/apps/kwin.png
+share/icons/oxygen/32x32/apps/networkmanager.png
 share/icons/oxygen/32x32/mimetypes/fonts-package.png
 share/icons/oxygen/48x48/apps/kcmkwm.png
 share/icons/oxygen/48x48/apps/kfontview.png
@@ -1073,6 +1075,7 @@ share/icons/oxygen/48x48/apps/kwin.png
 share/icons/oxygen/48x48/mimetypes/fonts-package.png
 share/icons/oxygen/64x64/apps/kcmkwm.png
 share/icons/oxygen/64x64/apps/kfontview.png
+share/icons/oxygen/64x64/apps/networkmanager.png
 share/icons/oxygen/64x64/mimetypes/fonts-package.png
 share/icons/oxygen/scalable/apps/kcmkwm.svgz
 share/icons/oxygen/scalable/apps/kfontview.svgz
diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo
index df836c6340a..b1dc9d36f4a 100644
--- a/x11/kde-workspace4/distinfo
+++ b/x11/kde-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2012/03/31 06:39:20 marino Exp $
+$NetBSD: distinfo,v 1.3 2012/04/15 05:55:00 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -9,13 +9,14 @@ Size (Daemon.png) = 15725 bytes
 SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
 RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
 Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (kde-workspace-4.8.0.tar.bz2) = 4c471b159315b084c65196b0c93c34981a9105c5
-RMD160 (kde-workspace-4.8.0.tar.bz2) = 05481e904d1ab00f6fbca54f37cf444ad7c513f3
-Size (kde-workspace-4.8.0.tar.bz2) = 35364809 bytes
+SHA1 (kde-workspace-4.8.2.tar.xz) = 3cd36ed633def0db74ad872a0d6385bf06662121
+RMD160 (kde-workspace-4.8.2.tar.xz) = 3afa0b2bb7b037cadee947382b009a76c8fad843
+Size (kde-workspace-4.8.2.tar.xz) = 34081864 bytes
 SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
 SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
 SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
 SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
+SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 12986752a1062199833df5aeba8163277ddb7361
 SHA1 (patch-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21
 SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 42970c40f8e0e18f36570b504f708c7c100e96b8
 SHA1 (patch-ksysguard_ksysguard_FreeBSD_cpuinfo.c) = e827d09a853b479294a7771b47534d4ba71ef7cb
diff --git a/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c b/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c
new file mode 100644
index 00000000000..fe23be1036e
--- /dev/null
+++ b/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-kdm_kfrontend_genkdmconf.c,v 1.1 2012/04/15 05:55:00 markd Exp $
+
+--- kdm/kfrontend/genkdmconf.c.orig	2012-03-29 22:02:31.000000000 +0000
++++ kdm/kfrontend/genkdmconf.c
+@@ -46,9 +46,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+ #include <sys/wait.h>
+ #include <sys/param.h>
+ #ifdef BSD
+-# ifdef BSD_UTMP
+ #  include <utmp.h>
+-# endif
+ # ifndef _PATH_UTMP
+ #  if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
+ #   define _PATH_UTMP "/var/run/utmp"
diff --git a/x11/kde4-l10n-de/PLIST b/x11/kde4-l10n-de/PLIST
index 0c680f6c5de..01a2fcd74d7 100644
--- a/x11/kde4-l10n-de/PLIST
+++ b/x11/kde4-l10n-de/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/04/05 22:30:02 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/04/15 05:55:00 markd Exp $
 man/de/man1/adddebug.1
 man/de/man1/ark.1
 man/de/man1/cheatmake.1
@@ -881,6 +881,7 @@ share/doc/kde/HTML/de/kmail/index.cache.bz2
 share/doc/kde/HTML/de/kmail/index.docbook
 share/doc/kde/HTML/de/kmail/intro.docbook
 share/doc/kde/HTML/de/kmail/menus.docbook
+share/doc/kde/HTML/de/kmail/troubleshooting.docbook
 share/doc/kde/HTML/de/kmail/using-kmail.docbook
 share/doc/kde/HTML/de/kmenuedit/common
 share/doc/kde/HTML/de/kmenuedit/done.png
@@ -2282,7 +2283,6 @@ share/locale/de/LC_MESSAGES/okular_tiff.mo
 share/locale/de/LC_MESSAGES/okular_xps.mo
 share/locale/de/LC_MESSAGES/palapeli.mo
 share/locale/de/LC_MESSAGES/parley.mo
-share/locale/de/LC_MESSAGES/phonon-xine.mo
 share/locale/de/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/de/LC_MESSAGES/phonon_kde.mo
 share/locale/de/LC_MESSAGES/phonon_vlc.mo
diff --git a/x11/kde4-l10n-de/distinfo b/x11/kde4-l10n-de/distinfo
index 1e57e31e3c3..87b3882aaf8 100644
--- a/x11/kde4-l10n-de/distinfo
+++ b/x11/kde4-l10n-de/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2012/04/05 22:30:02 markd Exp $
+$NetBSD: distinfo,v 1.15 2012/04/15 05:55:00 markd Exp $
 
-SHA1 (kde-l10n-de-4.8.0.tar.bz2) = cc8e85d42d4f11ea89f33b14676967a682447462
-RMD160 (kde-l10n-de-4.8.0.tar.bz2) = a17339f935ef03d29d989d3126d15e02374beddd
-Size (kde-l10n-de-4.8.0.tar.bz2) = 38303153 bytes
+SHA1 (kde-l10n-de-4.8.2.tar.xz) = 8878e7331033e513cc5038f2b007cb4a0bab9c8b
+RMD160 (kde-l10n-de-4.8.2.tar.xz) = c750803d190cdd3488539a10ee60cf88dfa75211
+Size (kde-l10n-de-4.8.2.tar.xz) = 36358272 bytes
diff --git a/x11/kde4-l10n-en_GB/PLIST b/x11/kde4-l10n-en_GB/PLIST
index 41fdc7715ca..ba74cc99df9 100644
--- a/x11/kde4-l10n-en_GB/PLIST
+++ b/x11/kde4-l10n-en_GB/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/04/05 22:30:02 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/04/15 05:55:00 markd Exp $
 share/doc/kde/HTML/en_GB/common/fdl-translated.html
 share/doc/kde/HTML/en_GB/common/gpl-translated.html
 share/doc/kde/HTML/en_GB/common/kde-localised.css
@@ -685,7 +685,6 @@ share/locale/en_GB/LC_MESSAGES/okular_tiff.mo
 share/locale/en_GB/LC_MESSAGES/okular_xps.mo
 share/locale/en_GB/LC_MESSAGES/palapeli.mo
 share/locale/en_GB/LC_MESSAGES/parley.mo
-share/locale/en_GB/LC_MESSAGES/phonon-xine.mo
 share/locale/en_GB/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/en_GB/LC_MESSAGES/phonon_kde.mo
 share/locale/en_GB/LC_MESSAGES/phononserver.mo
diff --git a/x11/kde4-l10n-en_GB/distinfo b/x11/kde4-l10n-en_GB/distinfo
index 8fb40860453..4a87366187f 100644
--- a/x11/kde4-l10n-en_GB/distinfo
+++ b/x11/kde4-l10n-en_GB/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2012/04/05 22:30:02 markd Exp $
+$NetBSD: distinfo,v 1.15 2012/04/15 05:55:00 markd Exp $
 
-SHA1 (kde-l10n-en_GB-4.8.0.tar.bz2) = 7664caee4afcb30aa6b5f9a96b887da9ef0a03b8
-RMD160 (kde-l10n-en_GB-4.8.0.tar.bz2) = 8425460e092108f9ec24ade316d972b6079703de
-Size (kde-l10n-en_GB-4.8.0.tar.bz2) = 3631308 bytes
+SHA1 (kde-l10n-en_GB-4.8.2.tar.xz) = 22784b4eac2b9f535fbefc246a36d077e206ec74
+RMD160 (kde-l10n-en_GB-4.8.2.tar.xz) = 0046955e55319c38fff3ef7657f0c847a41d25b3
+Size (kde-l10n-en_GB-4.8.2.tar.xz) = 3154732 bytes
diff --git a/x11/kde4-l10n-nl/PLIST b/x11/kde4-l10n-nl/PLIST
index 21e04f99c14..43437a568fc 100644
--- a/x11/kde4-l10n-nl/PLIST
+++ b/x11/kde4-l10n-nl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/04/05 22:30:02 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/04/15 05:55:00 markd Exp $
 man/nl/man1/adddebug.1
 man/nl/man1/ark.1
 man/nl/man1/cheatmake.1
@@ -226,10 +226,22 @@ share/doc/kde/HTML/nl/kbounce/index.docbook
 share/doc/kde/HTML/nl/kbreakout/common
 share/doc/kde/HTML/nl/kbreakout/index.cache.bz2
 share/doc/kde/HTML/nl/kbreakout/index.docbook
+share/doc/kde/HTML/nl/kbruch/checked.png
 share/doc/kde/HTML/nl/kbruch/common
+share/doc/kde/HTML/nl/kbruch/compare.png
+share/doc/kde/HTML/nl/kbruch/convert.png
+share/doc/kde/HTML/nl/kbruch/factorize.png
+share/doc/kde/HTML/nl/kbruch/gui_main.png
+share/doc/kde/HTML/nl/kbruch/gui_mode.png
 share/doc/kde/HTML/nl/kbruch/index.cache.bz2
 share/doc/kde/HTML/nl/kbruch/index.docbook
+share/doc/kde/HTML/nl/kbruch/learning.png
 share/doc/kde/HTML/nl/kbruch/man-kbruch.1.docbook
+share/doc/kde/HTML/nl/kbruch/mixed.png
+share/doc/kde/HTML/nl/kbruch/percentage.png
+share/doc/kde/HTML/nl/kbruch/reduced.png
+share/doc/kde/HTML/nl/kbruch/settings.png
+share/doc/kde/HTML/nl/kbruch/statistics.png
 share/doc/kde/HTML/nl/kcachegrind/common
 share/doc/kde/HTML/nl/kcachegrind/index.cache.bz2
 share/doc/kde/HTML/nl/kcachegrind/index.docbook
@@ -567,6 +579,12 @@ share/doc/kde/HTML/nl/kig/simple_locus_construction.png
 share/doc/kde/HTML/nl/kig/test_run_macro.png
 share/doc/kde/HTML/nl/kig/text_label_attaching.png
 share/doc/kde/HTML/nl/kig/text_label_wizard.png
+share/doc/kde/HTML/nl/kigo/common
+share/doc/kde/HTML/nl/kigo/index.cache.bz2
+share/doc/kde/HTML/nl/kigo/index.docbook
+share/doc/kde/HTML/nl/killbots/common
+share/doc/kde/HTML/nl/killbots/index.cache.bz2
+share/doc/kde/HTML/nl/killbots/index.docbook
 share/doc/kde/HTML/nl/kimagemapeditor/common
 share/doc/kde/HTML/nl/kimagemapeditor/index.cache.bz2
 share/doc/kde/HTML/nl/kimagemapeditor/index.docbook
@@ -726,6 +744,7 @@ share/doc/kde/HTML/nl/kmail/index.cache.bz2
 share/doc/kde/HTML/nl/kmail/index.docbook
 share/doc/kde/HTML/nl/kmail/intro.docbook
 share/doc/kde/HTML/nl/kmail/menus.docbook
+share/doc/kde/HTML/nl/kmail/troubleshooting.docbook
 share/doc/kde/HTML/nl/kmail/using-kmail.docbook
 share/doc/kde/HTML/nl/kmenuedit/common
 share/doc/kde/HTML/nl/kmenuedit/index.cache.bz2
@@ -1091,9 +1110,6 @@ share/doc/kde/HTML/nl/lokalize/index.docbook
 share/doc/kde/HTML/nl/lskat/common
 share/doc/kde/HTML/nl/lskat/index.cache.bz2
 share/doc/kde/HTML/nl/lskat/index.docbook
-share/doc/kde/HTML/nl/mancala/common
-share/doc/kde/HTML/nl/mancala/index.cache.bz2
-share/doc/kde/HTML/nl/mancala/index.docbook
 share/doc/kde/HTML/nl/marble/common
 share/doc/kde/HTML/nl/marble/configure-cacheproxy.png
 share/doc/kde/HTML/nl/marble/configure-navigation.png
@@ -1282,6 +1298,7 @@ share/locale/nl/LC_MESSAGES/akonadi_strigi_feeder.mo
 share/locale/nl/LC_MESSAGES/akonadi_vcard_resource.mo
 share/locale/nl/LC_MESSAGES/akonadi_vcarddir_resource.mo
 share/locale/nl/LC_MESSAGES/akonadicontact.mo
+share/locale/nl/LC_MESSAGES/akonadinotes.mo
 share/locale/nl/LC_MESSAGES/akonaditray.mo
 share/locale/nl/LC_MESSAGES/akregator.mo
 share/locale/nl/LC_MESSAGES/akregator_konqplugin.mo
@@ -1792,7 +1809,6 @@ share/locale/nl/LC_MESSAGES/okular_tiff.mo
 share/locale/nl/LC_MESSAGES/okular_xps.mo
 share/locale/nl/LC_MESSAGES/palapeli.mo
 share/locale/nl/LC_MESSAGES/parley.mo
-share/locale/nl/LC_MESSAGES/phonon-xine.mo
 share/locale/nl/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/nl/LC_MESSAGES/phonon_kde.mo
 share/locale/nl/LC_MESSAGES/phonon_vlc.mo
diff --git a/x11/kde4-l10n-nl/distinfo b/x11/kde4-l10n-nl/distinfo
index ddec4295571..dc3625ab1e2 100644
--- a/x11/kde4-l10n-nl/distinfo
+++ b/x11/kde4-l10n-nl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2012/04/05 22:30:02 markd Exp $
+$NetBSD: distinfo,v 1.15 2012/04/15 05:55:00 markd Exp $
 
-SHA1 (kde-l10n-nl-4.8.0.tar.bz2) = e5e354f2ce9f5b97e1024db11f97db4f442036e6
-RMD160 (kde-l10n-nl-4.8.0.tar.bz2) = 2a0040feafab1469fc34336cbb2baaecd7292eb3
-Size (kde-l10n-nl-4.8.0.tar.bz2) = 16117916 bytes
+SHA1 (kde-l10n-nl-4.8.2.tar.xz) = d6f5682a8f091338a1fb66784309b8c9c67fa795
+RMD160 (kde-l10n-nl-4.8.2.tar.xz) = 0ad3e5e0240526545f09bf9f03796ade9291d3d5
+Size (kde-l10n-nl-4.8.2.tar.xz) = 15821708 bytes
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 2171cc09f28..ebea45f0087 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2012/04/02 10:09:06 dholland Exp $
+# $NetBSD: Makefile,v 1.41 2012/04/15 05:54:53 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index 9cbc8bcbd33..b5b62928401 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/03/31 21:46:55 hans Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/04/15 05:54:53 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -221,6 +221,7 @@ include/KDE/KArchiveDirectory
 include/KDE/KArchiveEntry
 include/KDE/KArchiveFile
 include/KDE/KArrowButton
+include/KDE/KAscii
 include/KDE/KAssistantDialog
 include/KDE/KAuth/Action
 include/KDE/KAuth/ActionReply
@@ -2091,12 +2092,14 @@ lib/libthreadweaver.so
 lib/libthreadweaver.so.4
 lib/libthreadweaver.so.4.8.0
 man/man1/checkXML.1
+man/man1/kconfig_compiler.1
 man/man1/kde4-config.1
 man/man1/kdecmake.1
 man/man1/kjs.1
 man/man1/kjscmd.1
 man/man1/kross.1
 man/man1/makekdewidgets.1
+man/man1/preparetips.1
 man/man7/kdeoptions.7
 man/man7/qtoptions.7
 man/man8/kbuildsycoca4.8
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index f715555e25b..29f8b91266b 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2012/03/31 21:46:55 hans Exp $
+$NetBSD: distinfo,v 1.27 2012/04/15 05:54:53 markd Exp $
 
-SHA1 (kdelibs-4.8.0.tar.bz2) = 5e4744405734e6c3ce572ef7d16054390692b38a
-RMD160 (kdelibs-4.8.0.tar.bz2) = b5fd03eec81a390ea74d4713d6459b685352d362
-Size (kdelibs-4.8.0.tar.bz2) = 13044553 bytes
+SHA1 (kdelibs-4.8.2.tar.xz) = f844ae0877880563361144d9577706064c3483e7
+RMD160 (kdelibs-4.8.2.tar.xz) = 9c52ef42274f4ed5fd82a749ed7cf78f482c9c67
+Size (kdelibs-4.8.2.tar.xz) = 11966308 bytes
 SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
 SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
 SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
@@ -14,7 +14,6 @@ SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
 SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
 SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
 SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
-SHA1 (patch-cmake_modules_FindXine.cmake) = 292d8e4b44367b66e3a737d2be045c2ff075e8cb
 SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
diff --git a/x11/kdelibs4/patches/patch-cmake_modules_FindXine.cmake b/x11/kdelibs4/patches/patch-cmake_modules_FindXine.cmake
deleted file mode 100644
index 026e0b3c058..00000000000
--- a/x11/kdelibs4/patches/patch-cmake_modules_FindXine.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-cmake_modules_FindXine.cmake,v 1.1 2012/03/22 22:08:30 markd Exp $
-
-Starting with the recently released version 1.2.0, xine has its version
-number macros in xine/version.h instead of xine.h itself.
-
-Account for this case by checking if xine/version.h exists and falling
-back to xine.h if it doesn't when reading the version numbers.
-
---- cmake/modules/FindXine.cmake.orig	2012-01-18 18:06:22.000000000 +0000
-+++ cmake/modules/FindXine.cmake
-@@ -47,7 +47,13 @@ FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES
- 
- # Get the version number from xine.h and store it in the cache:
- IF(XINE_INCLUDE_DIR  AND NOT  XINE_VERSION)
--  FILE(READ ${XINE_INCLUDE_DIR}/xine.h XINE_VERSION_CONTENT)
-+  IF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) # xine 1.2.0+
-+    SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine/version.h)
-+  ELSE(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h)
-+    SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine.h)
-+  ENDIF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h)
-+
-+  FILE(READ ${XINE_VERSION_FILE} XINE_VERSION_CONTENT)
-   STRING(REGEX MATCH "#define *XINE_MAJOR_VERSION *([0-9]+)"  _dummy "${XINE_VERSION_CONTENT}")
-   SET(XINE_VERSION_MAJOR "${CMAKE_MATCH_1}")
- 
diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo
index 1a7c7a0d2a0..71c6df33c4f 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/03/20 05:07:48 markd Exp $
+$NetBSD: distinfo,v 1.2 2012/04/15 05:54:54 markd Exp $
 
-SHA1 (konsole-4.8.0.tar.bz2) = f99abc20fd0042be62e48308f334b66a6a3135d7
-RMD160 (konsole-4.8.0.tar.bz2) = 4375686e3bb30a51feced29db4538e1f5dfd4de4
-Size (konsole-4.8.0.tar.bz2) = 476032 bytes
+SHA1 (konsole-4.8.2.tar.xz) = 4e9e9d373ce77160b098dbf4fe24b319e7942ff1
+RMD160 (konsole-4.8.2.tar.xz) = 1295bb2da2ded97da333691e032e62f642c19445
+Size (konsole-4.8.2.tar.xz) = 434900 bytes
 SHA1 (patch-src_ProcessInfo.cpp) = aa0c1d6bfa7462681b82bdee4609e0cf26211300
diff --git a/x11/py-kde4/distinfo b/x11/py-kde4/distinfo
index 3a1bad62136..8b43ad2d264 100644
--- a/x11/py-kde4/distinfo
+++ b/x11/py-kde4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2012/03/19 19:44:04 markd Exp $
+$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
 
-SHA1 (pykde4-4.8.0.tar.bz2) = cf204efebc1eda6de7f4405dbf5037bdaffd30e9
-RMD160 (pykde4-4.8.0.tar.bz2) = 1933aca61f0f29a7d3622d891137425278820c51
-Size (pykde4-4.8.0.tar.bz2) = 2109081 bytes
+SHA1 (pykde4-4.8.2.tar.xz) = 7d1a41e00794dba160ce8e2a3f750c9a4298ef15
+RMD160 (pykde4-4.8.2.tar.xz) = 24f9b9c114eedc3c5219d0f390ca3bd9cae30067
+Size (pykde4-4.8.2.tar.xz) = 2057044 bytes
 SHA1 (patch-CMakeLists.txt) = 6981a91671511739e63568d7bc2ee8899d28f8a9
 SHA1 (patch-__init__.py) = 721287a0ec82b79ea4a502526ed98ba44c6d979f