Update to KDE SC 4.10.2

bugfixes, other quality improvements, new and improved KDE Applications

2 files changed, 127 insertions, 76 deletions

diff --git a/meta-pkgs/kde4/Makefile b/meta-pkgs/kde4/Makefile
index c250e5ff683..00a1324ea18 100644
--- a/meta-pkgs/kde4/Makefile
+++ b/meta-pkgs/kde4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2012/10/03 21:56:41 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/03 10:51:43 markd Exp $
 
-DISTNAME=	kde4-4.8.4
-PKGREVISION=	1
+DISTNAME=	kde4-4.10.2
 CATEGORIES=	meta-pkgs x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,77 +9,124 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE4 integrated X11 desktop
 
-DEPENDS+=	oxygen-icons-4.8.4{,nb[0-9]*}:../../graphics/oxygen-icons
-DEPENDS+=	kdelibs4-4.8.4{,nb[0-9]*}:../../x11/kdelibs4
-DEPENDS+=	kdepimlibs4-4.8.4{,nb[0-9]*}:../../misc/kdepimlibs4
-DEPENDS+=	kde-runtime4-4.8.4{,nb[0-9]*}:../../x11/kde-runtime4
-DEPENDS+=	kde-workspace4-4.8.4{,nb[0-9]*}:../../x11/kde-workspace4
-DEPENDS+=	kde-wallpapers4-4.8.4{,nb[0-9]*}:../../misc/kde-wallpapers4
-DEPENDS+=	kde-baseapps4-4.8.4{,nb[0-9]*}:../../x11/kde-baseapps4
-DEPENDS+=	konsole-4.8.4{,nb[0-9]*}:../../x11/konsole
-DEPENDS+=	kaccessible-4.8.4{,nb[0-9]*}:../../misc/kaccessible
-DEPENDS+=	kmag-4.8.4{,nb[0-9]*}:../../misc/kmag
-DEPENDS+=	kmouth-4.8.4{,nb[0-9]*}:../../misc/kmouth
-DEPENDS+=	kmousetool-4.8.4{,nb[0-9]*}:../../misc/kmousetool
-DEPENDS+=	kdeadmin4-4.8.4{,nb[0-9]*}:../../misc/kdeadmin4
-DEPENDS+=	kdeartwork4-4.8.4{,nb[0-9]*}:../../misc/kdeartwork4
-DEPENDS+=	marble-4.8.4{,nb[0-9]*}:../../misc/marble
-DEPENDS+=	blinken-4.8.4{,nb[0-9]*}:../../games/blinken
-DEPENDS+=	analitza-4.8.4{,nb[0-9]*}:../../math/analitza
-DEPENDS+=	cantor-4.8.4{,nb[0-9]*}:../../math/cantor
-DEPENDS+=	kalgebra-4.8.4{,nb[0-9]*}:../../math/kalgebra
-DEPENDS+=	kalzium-4.8.4{,nb[0-9]*}:../../misc/kalzium
-DEPENDS+=	kanagram-4.8.4{,nb[0-9]*}:../../games/kanagram
-DEPENDS+=	kbruch-4.8.4{,nb[0-9]*}:../../misc/kbruch
-DEPENDS+=	kgeography-4.8.4{,nb[0-9]*}:../../misc/kgeography
-DEPENDS+=	khangman-4.8.4{,nb[0-9]*}:../../games/khangman
-DEPENDS+=	kig-4.8.4{,nb[0-9]*}:../../misc/kig
-DEPENDS+=	kiten-4.8.4{,nb[0-9]*}:../../misc/kiten
-DEPENDS+=	klettres-4.8.4{,nb[0-9]*}:../../misc/klettres
-DEPENDS+=	kstars-4.8.4{,nb[0-9]*}:../../misc/kstars
-DEPENDS+=	ktouch-4.8.4{,nb[0-9]*}:../../misc/ktouch
-DEPENDS+=	kturtle-4.8.4{,nb[0-9]*}:../../misc/kturtle
-DEPENDS+=	kwordquiz-4.8.4{,nb[0-9]*}:../../misc/kwordquiz
-DEPENDS+=	parley-4.8.4{,nb[0-9]*}:../../misc/parley
-DEPENDS+=	rocs-4.8.4{,nb[0-9]*}:../../misc/rocs
-DEPENDS+=	step-4.8.4{,nb[0-9]*}:../../misc/step
-DEPENDS+=	kdegames4-4.8.4{,nb[0-9]*}:../../games/kdegames4
-DEPENDS+=	kamera-4.8.4{,nb[0-9]*}:../../graphics/kamera
-DEPENDS+=	gwenview-4.8.4{,nb[0-9]*}:../../graphics/gwenview
-DEPENDS+=	ksaneplugin-4.8.4{,nb[0-9]*}:../../graphics/ksaneplugin
-DEPENDS+=	ksnapshot-4.8.4{,nb[0-9]*}:../../graphics/ksnapshot
-DEPENDS+=	kcolorchooser-4.8.4{,nb[0-9]*}:../../graphics/kcolorchooser
-DEPENDS+=	kgamma-4.8.4{,nb[0-9]*}:../../graphics/kgamma
-DEPENDS+=	kruler-4.8.4{,nb[0-9]*}:../../graphics/kruler
-DEPENDS+=	kolourpaint-4.8.4{,nb[0-9]*}:../../graphics/kolourpaint
-DEPENDS+=	okular-4.8.4{,nb[0-9]*}:../../print/okular
-DEPENDS+=	kdegraphics-mobipocket-4.8.4{,nb[0-9]*}:../../graphics/kdegraphics-mobipocket
-DEPENDS+=	kdegraphics-strigi-analyzer-4.8.4{,nb[0-9]*}:../../graphics/kdegraphics-strigi-analyzer
-DEPENDS+=	kdegraphics-thumbnailers-4.8.4{,nb[0-9]*}:../../graphics/kdegraphics-thumbnailers
-DEPENDS+=	svgpart-4.8.4{,nb[0-9]*}:../../graphics/svgpart
-DEPENDS+=	kdemultimedia4-4.8.4{,nb[0-9]*}:../../multimedia/kdemultimedia4
-DEPENDS+=	kdenetwork4-4.8.4{,nb[0-9]*}:../../net/kdenetwork4
+DEPENDS+=	oxygen-icons-4.10.2{,nb[0-9]*}:../../graphics/oxygen-icons
+DEPENDS+=	kdelibs4-4.10.2{,nb[0-9]*}:../../x11/kdelibs4
+DEPENDS+=	kdepimlibs4-4.10.2{,nb[0-9]*}:../../misc/kdepimlibs4
+DEPENDS+=	kde-runtime4-4.10.2{,nb[0-9]*}:../../x11/kde-runtime4
+DEPENDS+=	kde-workspace4-4.10.2{,nb[0-9]*}:../../x11/kde-workspace4
+DEPENDS+=	kde-wallpapers4-4.10.2{,nb[0-9]*}:../../misc/kde-wallpapers4
+DEPENDS+=	kde-baseapps4-4.10.2{,nb[0-9]*}:../../x11/kde-baseapps4
+DEPENDS+=	konsole-4.10.2{,nb[0-9]*}:../../x11/konsole
+DEPENDS+=	kaccessible-4.10.2{,nb[0-9]*}:../../misc/kaccessible
+DEPENDS+=	kmag-4.10.2{,nb[0-9]*}:../../misc/kmag
+DEPENDS+=	kmouth-4.10.2{,nb[0-9]*}:../../misc/kmouth
+DEPENDS+=	kmousetool-4.10.2{,nb[0-9]*}:../../misc/kmousetool
+DEPENDS+=	kdeadmin4-4.10.2{,nb[0-9]*}:../../misc/kdeadmin4
+DEPENDS+=	kdeartwork4-4.10.2{,nb[0-9]*}:../../misc/kdeartwork4
+DEPENDS+=	marble-4.10.2{,nb[0-9]*}:../../misc/marble
+DEPENDS+=	blinken-4.10.2{,nb[0-9]*}:../../games/blinken
+DEPENDS+=	analitza-4.10.2{,nb[0-9]*}:../../math/analitza
+DEPENDS+=	cantor-4.10.2{,nb[0-9]*}:../../math/cantor
+DEPENDS+=	kalgebra-4.10.2{,nb[0-9]*}:../../math/kalgebra
+DEPENDS+=	kalzium-4.10.2{,nb[0-9]*}:../../misc/kalzium
+DEPENDS+=	kanagram-4.10.2{,nb[0-9]*}:../../games/kanagram
+DEPENDS+=	kbruch-4.10.2{,nb[0-9]*}:../../misc/kbruch
+DEPENDS+=	kgeography-4.10.2{,nb[0-9]*}:../../misc/kgeography
+DEPENDS+=	khangman-4.10.2{,nb[0-9]*}:../../games/khangman
+DEPENDS+=	kig-4.10.2{,nb[0-9]*}:../../misc/kig
+DEPENDS+=	kiten-4.10.2{,nb[0-9]*}:../../misc/kiten
+DEPENDS+=	klettres-4.10.2{,nb[0-9]*}:../../misc/klettres
+DEPENDS+=	kstars-4.10.2{,nb[0-9]*}:../../misc/kstars
+DEPENDS+=	ktouch-4.10.2{,nb[0-9]*}:../../misc/ktouch
+DEPENDS+=	kturtle-4.10.2{,nb[0-9]*}:../../misc/kturtle
+DEPENDS+=	kwordquiz-4.10.2{,nb[0-9]*}:../../misc/kwordquiz
+DEPENDS+=	parley-4.10.2{,nb[0-9]*}:../../misc/parley
+DEPENDS+=	rocs-4.10.2{,nb[0-9]*}:../../misc/rocs
+DEPENDS+=	step-4.10.2{,nb[0-9]*}:../../misc/step
+#DEPENDS+=	kdegames4-4.10.2{,nb[0-9]*}:../../games/kdegames4
+DEPENDS+=	bomber-4.10.2{,nb[0-9]*}:../../games/bomber
+DEPENDS+=	bovo-4.10.2{,nb[0-9]*}:../../games/bovo
+DEPENDS+=	granatier-4.10.2{,nb[0-9]*}:../../games/granatier
+DEPENDS+=	kajongg-4.10.2{,nb[0-9]*}:../../games/kajongg
+DEPENDS+=	kapman-4.10.2{,nb[0-9]*}:../../games/kapman
+DEPENDS+=	katomic-4.10.2{,nb[0-9]*}:../../games/katomic
+DEPENDS+=	kblackbox-4.10.2{,nb[0-9]*}:../../games/kblackbox
+DEPENDS+=	kblocks-4.10.2{,nb[0-9]*}:../../games/kblocks
+DEPENDS+=	kbounce-4.10.2{,nb[0-9]*}:../../games/kbounce
+DEPENDS+=	kbreakout-4.10.2{,nb[0-9]*}:../../games/kbreakout
+DEPENDS+=	kdiamond-4.10.2{,nb[0-9]*}:../../games/kdiamond
+DEPENDS+=	kfourinline-4.10.2{,nb[0-9]*}:../../games/kfourinline
+DEPENDS+=	kgoldrunner-4.10.2{,nb[0-9]*}:../../games/kgoldrunner
+DEPENDS+=	kigo-4.10.2{,nb[0-9]*}:../../games/kigo
+DEPENDS+=	killbots-4.10.2{,nb[0-9]*}:../../games/killbots
+DEPENDS+=	kiriki-4.10.2{,nb[0-9]*}:../../games/kiriki
+DEPENDS+=	kjumpingcube-4.10.2{,nb[0-9]*}:../../games/kjumpingcube
+DEPENDS+=	klickety-4.10.2{,nb[0-9]*}:../../games/klickety
+DEPENDS+=	klines-4.10.2{,nb[0-9]*}:../../games/klines
+DEPENDS+=	kmahjongg-4.10.2{,nb[0-9]*}:../../games/kmahjongg
+DEPENDS+=	kmines-4.10.2{,nb[0-9]*}:../../games/kmines
+DEPENDS+=	knavalbattle-4.10.2{,nb[0-9]*}:../../games/knavalbattle
+DEPENDS+=	knetwalk-4.10.2{,nb[0-9]*}:../../games/knetwalk
+DEPENDS+=	kolf-4.10.2{,nb[0-9]*}:../../games/kolf
+DEPENDS+=	kollision-4.10.2{,nb[0-9]*}:../../games/kollision
+DEPENDS+=	konquest-4.10.2{,nb[0-9]*}:../../games/konquest
+DEPENDS+=	kpat-4.10.2{,nb[0-9]*}:../../games/kpat
+DEPENDS+=	kreversi-4.10.2{,nb[0-9]*}:../../games/kreversi
+DEPENDS+=	kshisen-4.10.2{,nb[0-9]*}:../../games/kshisen
+DEPENDS+=	ksirk-4.10.2{,nb[0-9]*}:../../games/ksirk
+DEPENDS+=	ksnakeduel-4.10.2{,nb[0-9]*}:../../games/ksnakeduel
+DEPENDS+=	kspaceduel-4.10.2{,nb[0-9]*}:../../games/kspaceduel
+DEPENDS+=	ksquares-4.10.2{,nb[0-9]*}:../../games/ksquares
+DEPENDS+=	ksudoku-4.10.2{,nb[0-9]*}:../../games/ksudoku
+DEPENDS+=	ktuberling-4.10.2{,nb[0-9]*}:../../games/ktuberling
+DEPENDS+=	kubrick-4.10.2{,nb[0-9]*}:../../games/kubrick
+DEPENDS+=	lskat-4.10.2{,nb[0-9]*}:../../games/lskat
+DEPENDS+=	palapeli-4.10.2{,nb[0-9]*}:../../games/palapeli
+DEPENDS+=	picmi-4.10.2{,nb[0-9]*}:../../games/picmi
+DEPENDS+=	kamera-4.10.2{,nb[0-9]*}:../../graphics/kamera
+DEPENDS+=	kde-base-artwork-4.10.2{,nb[0-9]*}:../../graphics/kde-base-artwork
+DEPENDS+=	gwenview-4.10.2{,nb[0-9]*}:../../graphics/gwenview
+DEPENDS+=	ksaneplugin-4.10.2{,nb[0-9]*}:../../graphics/ksaneplugin
+DEPENDS+=	ksnapshot-4.10.2{,nb[0-9]*}:../../graphics/ksnapshot
+DEPENDS+=	kcolorchooser-4.10.2{,nb[0-9]*}:../../graphics/kcolorchooser
+DEPENDS+=	kgamma-4.10.2{,nb[0-9]*}:../../graphics/kgamma
+DEPENDS+=	kruler-4.10.2{,nb[0-9]*}:../../graphics/kruler
+DEPENDS+=	kolourpaint-4.10.2{,nb[0-9]*}:../../graphics/kolourpaint
+DEPENDS+=	okular-4.10.2{,nb[0-9]*}:../../print/okular
+DEPENDS+=	kdegraphics-mobipocket-4.10.2{,nb[0-9]*}:../../graphics/kdegraphics-mobipocket
+DEPENDS+=	kdegraphics-strigi-analyzer-4.10.2{,nb[0-9]*}:../../graphics/kdegraphics-strigi-analyzer
+DEPENDS+=	kdegraphics-thumbnailers-4.10.2{,nb[0-9]*}:../../graphics/kdegraphics-thumbnailers
+DEPENDS+=	svgpart-4.10.2{,nb[0-9]*}:../../graphics/svgpart
+#DEPENDS+=	kdemultimedia4-4.10.2{,nb[0-9]*}:../../multimedia/kdemultimedia4
+DEPENDS+=	audiocd-kio-4.10.2{,nb[0-9]*}:../../multimedia/audiocd-kio
+DEPENDS+=	dragon-4.10.2{,nb[0-9]*}:../../multimedia/dragon
+DEPENDS+=	ffmpegthumbs-4.10.2{,nb[0-9]*}:../../multimedia/ffmpegthumbs
+DEPENDS+=	juk-4.10.2{,nb[0-9]*}:../../multimedia/juk
+DEPENDS+=	kmix-4.10.2{,nb[0-9]*}:../../multimedia/kmix
+DEPENDS+=	kscd-4.10.2{,nb[0-9]*}:../../multimedia/kscd
+DEPENDS+=	mplayerthumbs-4.10.2{,nb[0-9]*}:../../multimedia/mplayerthumbs
+DEPENDS+=	kdenetwork4-4.10.2{,nb[0-9]*}:../../net/kdenetwork4
 DEPENDS+=	kdepim4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim4
 DEPENDS+=	kdepim-runtime4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim-runtime4
-DEPENDS+=	kdeplasma-addons4-4.8.4{,nb[0-9]*}:../../misc/kdeplasma-addons4
-DEPENDS+=	kdesdk4-4.8.4{,nb[0-9]*}:../../devel/kdesdk4
-DEPENDS+=	kate-4.8.4{,nb[0-9]*}:../../editors/kate
-DEPENDS+=	kdetoys4-4.8.4{,nb[0-9]*}:../../games/kdetoys4
-DEPENDS+=	ark-4.8.4{,nb[0-9]*}:../../archivers/ark
-DEPENDS+=	filelight-4.8.4{,nb[0-9]*}:../../sysutils/filelight
-DEPENDS+=	kcalc-4.8.4{,nb[0-9]*}:../../math/kcalc
-DEPENDS+=	kcharselect-4.8.4{,nb[0-9]*}:../../misc/kcharselect
-DEPENDS+=	kdf-4.8.4{,nb[0-9]*}:../../sysutils/kdf
-DEPENDS+=	kfloppy-4.8.4{,nb[0-9]*}:../../sysutils/kfloppy
-DEPENDS+=	kremotecontrol-4.8.4{,nb[0-9]*}:../../misc/kremotecontrol
-DEPENDS+=	ksecrets-4.8.4{,nb[0-9]*}:../../security/ksecrets
-DEPENDS+=	ktimer-4.8.4{,nb[0-9]*}:../../time/ktimer
-DEPENDS+=	kwallet-4.8.4{,nb[0-9]*}:../../security/kwallet
-DEPENDS+=	kgpg-4.8.4{,nb[0-9]*}:../../security/kgpg
-DEPENDS+=	printer-applet-4.8.4{,nb[0-9]*}:../../print/printer-applet
-DEPENDS+=	superkaramba-4.8.4{,nb[0-9]*}:../../misc/superkaramba
-DEPENDS+=	sweeper-4.8.4{,nb[0-9]*}:../../misc/sweeper
-DEPENDS+=	kdewebdev4-4.8.4{,nb[0-9]*}:../../www/kdewebdev4
+DEPENDS+=	kdeplasma-addons4-4.10.2{,nb[0-9]*}:../../misc/kdeplasma-addons4
+DEPENDS+=	kdesdk4-4.10.2{,nb[0-9]*}:../../devel/kdesdk4
+DEPENDS+=	kate-4.10.2{,nb[0-9]*}:../../editors/kate
+DEPENDS+=	kdetoys4-4.10.2{,nb[0-9]*}:../../games/kdetoys4
+DEPENDS+=	ark-4.10.2{,nb[0-9]*}:../../archivers/ark
+DEPENDS+=	filelight-4.10.2{,nb[0-9]*}:../../sysutils/filelight
+DEPENDS+=	kcalc-4.10.2{,nb[0-9]*}:../../math/kcalc
+DEPENDS+=	kcharselect-4.10.2{,nb[0-9]*}:../../misc/kcharselect
+DEPENDS+=	kdf-4.10.2{,nb[0-9]*}:../../sysutils/kdf
+DEPENDS+=	kfloppy-4.10.2{,nb[0-9]*}:../../sysutils/kfloppy
+DEPENDS+=	kremotecontrol-4.10.2{,nb[0-9]*}:../../misc/kremotecontrol
+#DEPENDS+=	ksecrets-4.10.2{,nb[0-9]*}:../../security/ksecrets
+DEPENDS+=	ktimer-4.10.2{,nb[0-9]*}:../../time/ktimer
+DEPENDS+=	kwallet-4.10.2{,nb[0-9]*}:../../security/kwallet
+DEPENDS+=	kgpg-4.10.2{,nb[0-9]*}:../../security/kgpg
+#DEPENDS+=	printer-applet-4.10.2{,nb[0-9]*}:../../print/printer-applet
+DEPENDS+=	superkaramba-4.10.2{,nb[0-9]*}:../../misc/superkaramba
+DEPENDS+=	sweeper-4.10.2{,nb[0-9]*}:../../misc/sweeper
+DEPENDS+=	kdewebdev4-4.10.2{,nb[0-9]*}:../../www/kdewebdev4
 
 META_PACKAGE=	yes
 
diff --git a/meta-pkgs/kde4/Makefile.kde4 b/meta-pkgs/kde4/Makefile.kde4
index 9a7ae99320a..0956fe7ce6c 100644
--- a/meta-pkgs/kde4/Makefile.kde4
+++ b/meta-pkgs/kde4/Makefile.kde4
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.kde4,v 1.17 2012/09/11 23:26:14 asau Exp $
+# $NetBSD: Makefile.kde4,v 1.18 2013/04/03 10:51:43 markd Exp $
 #
 # This Makefile fragment is included at the top of package Makefiles for
 # KDE4-distributed packages (they all share common configure and build
 # settings).
 
 CATEGORIES+=	kde
-_KDE_VERSION=	4.8.4
-MASTER_SITE_KDE_I18N=	${MASTER_SITE_KDE:=4.8.4/src/kde-l10n/}
-MASTER_SITES?=	${MASTER_SITE_KDE:=4.8.4/src/}
+_KDE_VERSION=	4.10.2
+MASTER_SITE_KDE_I18N=	${MASTER_SITE_KDE:=4.10.2/src/kde-l10n/}
+MASTER_SITES?=	${MASTER_SITE_KDE:=4.10.2/src/}
 EXTRACT_SUFX?=	.tar.xz
 EXTRACT_USING=	gtar
 
@@ -24,5 +24,10 @@ USE_CMAKE=	yes
 CMAKE_ARG_PATH=	..
 CONFIGURE_DIRS= _KDE_build
 
+# eventually allow CMAKE_BUILD_TYPE to be overridden
+# set for current default
+TARGET_NAME=	relwithdebinfo
+PLIST_SUBST+=	TARGETS=${TARGET_NAME}
+
 pre-configure:
 	${MKDIR} ${WRKSRC}/_KDE_build