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

3 files changed, 33 insertions, 30 deletions

diff --git a/meta-pkgs/kde4/Makefile b/meta-pkgs/kde4/Makefile
index 49eb71574b3..93209cc161e 100644
--- a/meta-pkgs/kde4/Makefile
+++ b/meta-pkgs/kde4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 10:38:39 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/04/10 02:45:03 markd Exp $
 
-DISTNAME=	kde4-4.3.5
+DISTNAME=	kde4-4.4.2
 CATEGORIES=	meta-pkgs x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,28 +9,27 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE4 integrated X11 desktop
 
-DEPENDS+=	oxygen-icons-4.3.5{,nb[0-9]*}:../../graphics/oxygen-icons
-DEPENDS+=	kdelibs4-4.3.5{,nb[0-9]*}:../../x11/kdelibs4
-DEPENDS+=	kdelibs-experimental4-4.3.5{,nb[0-9]*}:../../x11/kdelibs-experimental4
-DEPENDS+=	kdepimlibs4-4.3.5{,nb[0-9]*}:../../misc/kdepimlibs4
-DEPENDS+=	kdebase-runtime4-4.3.5{,nb[0-9]*}:../../x11/kdebase-runtime4
-DEPENDS+=	kdebase4-4.3.5{,nb[0-9]*}:../../x11/kdebase4
-DEPENDS+=	kdebase-workspace4-4.3.5{,nb[0-9]*}:../../x11/kdebase-workspace4
-DEPENDS+=	kdeaccessibility4-4.3.5{,nb[0-9]*}:../../misc/kdeaccessibility4
-DEPENDS+=	kdeadmin4-4.3.5{,nb[0-9]*}:../../misc/kdeadmin4
-DEPENDS+=	kdeartwork4-4.3.5{,nb[0-9]*}:../../misc/kdeartwork4
-DEPENDS+=	kdeedu4-4.3.5{,nb[0-9]*}:../../misc/kdeedu4
-DEPENDS+=	kdegames4-4.3.5{,nb[0-9]*}:../../games/kdegames4
-DEPENDS+=	kdegraphics4-4.3.5{,nb[0-9]*}:../../graphics/kdegraphics4
-DEPENDS+=	kdemultimedia4-4.3.5{,nb[0-9]*}:../../multimedia/kdemultimedia4
-DEPENDS+=	kdenetwork4-4.3.5{,nb[0-9]*}:../../net/kdenetwork4
-DEPENDS+=	kdepim4-4.3.5{,nb[0-9]*}:../../misc/kdepim4
-DEPENDS+=	kdepim-runtime4-4.3.5{,nb[0-9]*}:../../misc/kdepim-runtime4
-DEPENDS+=	kdeplasma-addons4-4.3.5{,nb[0-9]*}:../../misc/kdeplasma-addons4
-DEPENDS+=	kdesdk4-4.3.5{,nb[0-9]*}:../../devel/kdesdk4
-DEPENDS+=	kdetoys4-4.3.5{,nb[0-9]*}:../../games/kdetoys4
-DEPENDS+=	kdeutils4-4.3.5{,nb[0-9]*}:../../misc/kdeutils4
-DEPENDS+=	kdewebdev4-4.3.5{,nb[0-9]*}:../../www/kdewebdev4
+DEPENDS+=	oxygen-icons-4.4.2{,nb[0-9]*}:../../graphics/oxygen-icons
+DEPENDS+=	kdelibs4-4.4.2{,nb[0-9]*}:../../x11/kdelibs4
+DEPENDS+=	kdepimlibs4-4.4.2{,nb[0-9]*}:../../misc/kdepimlibs4
+DEPENDS+=	kdebase-runtime4-4.4.2{,nb[0-9]*}:../../x11/kdebase-runtime4
+DEPENDS+=	kdebase4-4.4.2{,nb[0-9]*}:../../x11/kdebase4
+DEPENDS+=	kdebase-workspace4-4.4.2{,nb[0-9]*}:../../x11/kdebase-workspace4
+DEPENDS+=	kdeaccessibility4-4.4.2{,nb[0-9]*}:../../misc/kdeaccessibility4
+DEPENDS+=	kdeadmin4-4.4.2{,nb[0-9]*}:../../misc/kdeadmin4
+DEPENDS+=	kdeartwork4-4.4.2{,nb[0-9]*}:../../misc/kdeartwork4
+DEPENDS+=	kdeedu4-4.4.2{,nb[0-9]*}:../../misc/kdeedu4
+DEPENDS+=	kdegames4-4.4.2{,nb[0-9]*}:../../games/kdegames4
+DEPENDS+=	kdegraphics4-4.4.2{,nb[0-9]*}:../../graphics/kdegraphics4
+DEPENDS+=	kdemultimedia4-4.4.2{,nb[0-9]*}:../../multimedia/kdemultimedia4
+DEPENDS+=	kdenetwork4-4.4.2{,nb[0-9]*}:../../net/kdenetwork4
+DEPENDS+=	kdepim4-4.4.2{,nb[0-9]*}:../../misc/kdepim4
+DEPENDS+=	kdepim-runtime4-4.4.2{,nb[0-9]*}:../../misc/kdepim-runtime4
+DEPENDS+=	kdeplasma-addons4-4.4.2{,nb[0-9]*}:../../misc/kdeplasma-addons4
+DEPENDS+=	kdesdk4-4.4.2{,nb[0-9]*}:../../devel/kdesdk4
+DEPENDS+=	kdetoys4-4.4.2{,nb[0-9]*}:../../games/kdetoys4
+DEPENDS+=	kdeutils4-4.4.2{,nb[0-9]*}:../../misc/kdeutils4
+DEPENDS+=	kdewebdev4-4.4.2{,nb[0-9]*}:../../www/kdewebdev4
 
 META_PACKAGE=	yes
 
diff --git a/meta-pkgs/kde4/Makefile.kde4 b/meta-pkgs/kde4/Makefile.kde4
index 8a001cd5231..53118d204b0 100644
--- a/meta-pkgs/kde4/Makefile.kde4
+++ b/meta-pkgs/kde4/Makefile.kde4
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.kde4,v 1.5 2010/01/27 10:38:39 markd Exp $
+# $NetBSD: Makefile.kde4,v 1.6 2010/04/10 02:45:03 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.3.5
-MASTER_SITE_KDE_I18N=	${MASTER_SITE_KDE:=4.3.5/src/kde-l10n/}
-MASTER_SITES?=	${MASTER_SITE_KDE:=4.3.5/src/}
+_KDE_VERSION=	4.4.2
+MASTER_SITE_KDE_I18N=	${MASTER_SITE_KDE:=4.4.2/src/kde-l10n/}
+MASTER_SITES?=	${MASTER_SITE_KDE:=4.4.2/src/}
 EXTRACT_SUFX?=	.tar.bz2
 PKGNAME?=	${DISTNAME:S/-4/4-4/}
 
@@ -27,5 +27,4 @@ CONFIGURE_DIRS= _KDE_build
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 pre-configure:
-	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 	${MKDIR} ${WRKSRC}/_KDE_build
diff --git a/meta-pkgs/kde4/kde4.mk b/meta-pkgs/kde4/kde4.mk
index fb6321aadce..320fd0db4bd 100644
--- a/meta-pkgs/kde4/kde4.mk
+++ b/meta-pkgs/kde4/kde4.mk
@@ -1,4 +1,4 @@
-# $NetBSD: kde4.mk,v 1.1.1.1 2009/10/02 21:43:12 markd Exp $
+# $NetBSD: kde4.mk,v 1.2 2010/04/10 02:45:03 markd Exp $
 #
 # This Makefile fragment is included by packages that use the KDE4
 # configure-and-build process.
@@ -22,6 +22,11 @@ CMAKE_ARGS+=	-DSYSCONF_INSTALL_DIR=${PKG_SYSCONFDIR:Q}
 CMAKE_ARGS+=	-DINFO_INSTALL_DIR=${PREFIX}/${PKGINFODIR}
 CMAKE_ARGS+=	-DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}
 
+pre-configure: qmake-bin-add
+
+qmake-bin-add:
+	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
+
 BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.4.0
 .include "../../x11/qt4-libs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.4.0