Update to KDE SC 4.14.3

3 files changed, 32 insertions, 36 deletions

diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile
index 5c49718de30..702f0261417 100644
--- a/x11/kde-workspace4/Makefile
+++ b/x11/kde-workspace4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2014/11/07 19:39:26 adam Exp $
+# $NetBSD: Makefile,v 1.42 2014/11/13 10:53:49 markd Exp $
 
-DISTNAME=	kde-workspace-${_KDE_VERSION}
+DISTNAME=	kde-workspace-4.11.14
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	6
 CATEGORIES=	x11
 COMMENT=	Base workspace for the KDE 4 integrated X11 desktop
 
@@ -57,6 +56,8 @@ REPLACE_SH+=		libs/plasmagenericshell/widgetsexplorer/package/Messages.sh
 
 PY_PATCHPLIST=	yes
 
+PLIST_SUBST+=		KDE_VERSION=${_KDE_VERSION}
+
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
@@ -143,8 +144,9 @@ BUILDLINK_DEPMETHOD.qt4-tools=	full
 .include "../../sysutils/pciutils/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../math/qalculate/buildlink3.mk"
 .include "../../misc/kdepimlibs4/buildlink3.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
+#.include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../multimedia/phonon/buildlink3.mk"
 .include "../../x11/py-kde4/buildlink3.mk"
 .include "../../x11/kactivities/buildlink3.mk"
diff --git a/x11/kde-workspace4/PLIST b/x11/kde-workspace4/PLIST
index bc04cad034b..caf8f3f1d55 100644
--- a/x11/kde-workspace4/PLIST
+++ b/x11/kde-workspace4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:05:19 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/11/13 10:53:49 markd Exp $
 bin/genkdmconf
 bin/kaccess
 bin/kapplymousetheme
@@ -202,7 +202,6 @@ lib/kde4/krunner_bookmarksrunner.so
 lib/kde4/krunner_calculatorrunner.so
 lib/kde4/krunner_kill.so
 lib/kde4/krunner_locations.so
-lib/kde4/krunner_nepomuksearchrunner.so
 lib/kde4/krunner_placesrunner.so
 lib/kde4/krunner_plasma-desktop.so
 lib/kde4/krunner_powerdevil.so
@@ -292,7 +291,6 @@ lib/kde4/plasma_engine_filebrowser.so
 lib/kde4/plasma_engine_geolocation.so
 lib/kde4/plasma_engine_hotplug.so
 lib/kde4/plasma_engine_keystate.so
-lib/kde4/plasma_engine_metadata.so
 lib/kde4/plasma_engine_mouse.so
 lib/kde4/plasma_engine_mpris2.so
 lib/kde4/plasma_engine_notifications.so
@@ -331,7 +329,7 @@ lib/kde4/powerdevilrunscriptaction_config.so
 lib/kde4/powerdevilsuspendsessionaction_config.so
 lib/libkdecorations.so
 lib/libkdecorations.so.4
-lib/libkdecorations.so.${PKGVERSION}
+lib/libkdecorations.so.${KDE_VERSION}
 lib/libkdeinit4_kaccess.so
 lib/libkdeinit4_kcminit.so
 lib/libkdeinit4_kcminit_startup.so
@@ -347,25 +345,25 @@ lib/libkdeinit4_plasma-netbook.so
 lib/libkdeinit4_plasma-windowed.so
 lib/libkephal.so
 lib/libkephal.so.4
-lib/libkephal.so.${PKGVERSION}
+lib/libkephal.so.${KDE_VERSION}
 lib/libkfontinst.so
 lib/libkfontinst.so.4
-lib/libkfontinst.so.${PKGVERSION}
+lib/libkfontinst.so.${KDE_VERSION}
 lib/libkfontinstui.so
 lib/libkfontinstui.so.4
-lib/libkfontinstui.so.${PKGVERSION}
+lib/libkfontinstui.so.${KDE_VERSION}
 lib/libkhotkeysprivate.so.4
-lib/libkhotkeysprivate.so.${PKGVERSION}
+lib/libkhotkeysprivate.so.${KDE_VERSION}
 lib/libkickoff.so
 lib/libkscreensaver.so
 lib/libkscreensaver.so.5
 lib/libkscreensaver.so.5.0.0
 lib/libksgrd.so
 lib/libksgrd.so.4
-lib/libksgrd.so.${PKGVERSION}
+lib/libksgrd.so.${KDE_VERSION}
 lib/libksignalplotter.so
 lib/libksignalplotter.so.4
-lib/libksignalplotter.so.${PKGVERSION}
+lib/libksignalplotter.so.${KDE_VERSION}
 lib/libkwineffects.so
 lib/libkwineffects.so.1
 lib/libkwineffects.so.1.0.0
@@ -374,48 +372,48 @@ lib/libkwinglutils.so.1
 lib/libkwinglutils.so.1.0.0
 lib/libkworkspace.so
 lib/libkworkspace.so.4
-lib/libkworkspace.so.${PKGVERSION}
+lib/libkworkspace.so.${KDE_VERSION}
 lib/liblsofui.so
 lib/liblsofui.so.4
-lib/liblsofui.so.${PKGVERSION}
+lib/liblsofui.so.${KDE_VERSION}
 lib/liboxygenstyle.so
 lib/liboxygenstyle.so.4
-lib/liboxygenstyle.so.${PKGVERSION}
+lib/liboxygenstyle.so.${KDE_VERSION}
 lib/liboxygenstyleconfig.so
 lib/liboxygenstyleconfig.so.4
-lib/liboxygenstyleconfig.so.${PKGVERSION}
+lib/liboxygenstyleconfig.so.${KDE_VERSION}
 lib/libplasma-geolocation-interface.so
 lib/libplasma-geolocation-interface.so.4
-lib/libplasma-geolocation-interface.so.${PKGVERSION}
+lib/libplasma-geolocation-interface.so.${KDE_VERSION}
 lib/libplasma_applet-system-monitor.so
 lib/libplasma_applet-system-monitor.so.4
-lib/libplasma_applet-system-monitor.so.${PKGVERSION}
+lib/libplasma_applet-system-monitor.so.${KDE_VERSION}
 lib/libplasmaclock.so
 lib/libplasmaclock.so.4
-lib/libplasmaclock.so.${PKGVERSION}
+lib/libplasmaclock.so.${KDE_VERSION}
 lib/libplasmagenericshell.so
 lib/libplasmagenericshell.so.4
-lib/libplasmagenericshell.so.${PKGVERSION}
+lib/libplasmagenericshell.so.${KDE_VERSION}
 lib/libpowerdevilconfigcommonprivate.so
 lib/libpowerdevilconfigcommonprivate.so.4
-lib/libpowerdevilconfigcommonprivate.so.${PKGVERSION}
+lib/libpowerdevilconfigcommonprivate.so.${KDE_VERSION}
 lib/libpowerdevilcore.so
 lib/libpowerdevilcore.so.0
 lib/libpowerdevilcore.so.0.1.0
 lib/libpowerdevilui.so
 lib/libpowerdevilui.so.4
-lib/libpowerdevilui.so.${PKGVERSION}
+lib/libpowerdevilui.so.${KDE_VERSION}
 lib/libprocesscore.so
 lib/libprocesscore.so.4
-lib/libprocesscore.so.${PKGVERSION}
+lib/libprocesscore.so.${KDE_VERSION}
 lib/libprocessui.so
 lib/libprocessui.so.4
-lib/libprocessui.so.${PKGVERSION}
+lib/libprocessui.so.${KDE_VERSION}
 lib/libsystemsettingsview.so
 lib/libsystemsettingsview.so.2
 lib/libtaskmanager.so
 lib/libtaskmanager.so.4
-lib/libtaskmanager.so.${PKGVERSION}
+lib/libtaskmanager.so.${KDE_VERSION}
 lib/libweather_ion.so
 lib/libweather_ion.so.6
 lib/libweather_ion.so.6.0.0
@@ -546,9 +544,6 @@ share/doc/kde/HTML/en/kcontrol/solid-actions/edit-action.png
 share/doc/kde/HTML/en/kcontrol/solid-actions/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/solid-actions/index.docbook
 share/doc/kde/HTML/en/kcontrol/solid-actions/main.png
-share/doc/kde/HTML/en/kcontrol/solid-hardware/common
-share/doc/kde/HTML/en/kcontrol/solid-hardware/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/solid-hardware/index.docbook
 share/doc/kde/HTML/en/kcontrol/splashscreen/common
 share/doc/kde/HTML/en/kcontrol/splashscreen/get-new-theme.png
 share/doc/kde/HTML/en/kcontrol/splashscreen/index.cache.bz2
@@ -1304,6 +1299,7 @@ share/kde/apps/kdm/sessions/qvwm.desktop
 share/kde/apps/kdm/sessions/ratpoison.desktop
 share/kde/apps/kdm/sessions/sapphire.desktop
 share/kde/apps/kdm/sessions/sawfish.desktop
+share/kde/apps/kdm/sessions/subtle.desktop
 share/kde/apps/kdm/sessions/twm.desktop
 share/kde/apps/kdm/sessions/ude.desktop
 share/kde/apps/kdm/sessions/vtwm.desktop
@@ -2030,7 +2026,6 @@ share/kde4/services/plasma-dataengine-time.desktop
 share/kde4/services/plasma-dataengine-weather.desktop
 share/kde4/services/plasma-engine-activities.desktop
 share/kde4/services/plasma-engine-akonadi.desktop
-share/kde4/services/plasma-engine-metadata.desktop
 share/kde4/services/plasma-engine-searchlaunch.desktop
 share/kde4/services/plasma-geolocation-ip.desktop
 share/kde4/services/plasma-layout-org.kde.plasma-desktop.SaL.desktop
@@ -2051,7 +2046,6 @@ share/kde4/services/plasma-runner-calculator.desktop
 share/kde4/services/plasma-runner-kill.desktop
 share/kde4/services/plasma-runner-kill_config.desktop
 share/kde4/services/plasma-runner-locations.desktop
-share/kde4/services/plasma-runner-nepomuksearch.desktop
 share/kde4/services/plasma-runner-places.desktop
 share/kde4/services/plasma-runner-plasma-desktop.desktop
 share/kde4/services/plasma-runner-powerdevil.desktop
diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo
index f6e0630cc5d..a2f867e0d12 100644
--- a/x11/kde-workspace4/distinfo
+++ b/x11/kde-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2014/02/01 02:20:53 markd Exp $
+$NetBSD: distinfo,v 1.12 2014/11/13 10:53:49 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -9,9 +9,9 @@ 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.11.5.tar.xz) = 4292288f7636a082f95072c4188015c041b424d3
-RMD160 (kde-workspace-4.11.5.tar.xz) = 4f0fd2387863dd4847cb6c79cf4f1c1d40dbeb4e
-Size (kde-workspace-4.11.5.tar.xz) = 13714748 bytes
+SHA1 (kde-workspace-4.11.14.tar.xz) = ec79a5d638a93b1abbb99b22a7bea52d9a2c26eb
+RMD160 (kde-workspace-4.11.14.tar.xz) = e17eebd9aefce2fa409ccc5d78b04009e69fcba3
+Size (kde-workspace-4.11.14.tar.xz) = 13529808 bytes
 SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
 SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
 SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7