Update to KDE-3.2

3 files changed, 25 insertions, 23 deletions

diff --git a/meta-pkgs/kde3/Makefile b/meta-pkgs/kde3/Makefile
index f6c19993ca9..4cd03c744bf 100644
--- a/meta-pkgs/kde3/Makefile
+++ b/meta-pkgs/kde3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/01/26 15:46:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/04 14:01:16 markd Exp $
 
-DISTNAME=	kde-3.1.5
-PKGREVISION=	1
+DISTNAME=	kde-3.2.0
 CATEGORIES=	meta-pkgs x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,18 +9,19 @@ MAINTAINER=	skrll@NetBSD.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
-DEPENDS+=	kdeartwork-3.1.5nb1:../../misc/kdeartwork3
-DEPENDS+=	kdeaddons-3.1.5nb1:../../misc/kdeaddons3
-DEPENDS+=	kdeadmin-3.1.5nb1:../../misc/kdeadmin3
-DEPENDS+=	kdeedu-3.1.5nb1:../../misc/kdeedu3
-DEPENDS+=	kdegames-3.1.5nb1:../../games/kdegames3
-DEPENDS+=	kdegraphics-3.1.5nb1:../../graphics/kdegraphics3
-DEPENDS+=	kdemultimedia-3.1.5nb2:../../multimedia/kdemultimedia3
-DEPENDS+=	kdenetwork-3.1.5nb1:../../net/kdenetwork3
-DEPENDS+=	kdepim-3.1.5nb1:../../misc/kdepim3
-DEPENDS+=	kdetoys-3.1.5nb1:../../games/kdetoys3
-DEPENDS+=	kdeutils-3.1.5nb1:../../misc/kdeutils3
-DEPENDS+=	quanta-3.1.5nb1:../../www/quanta3
+DEPENDS+=	kdeaccessibility-3.2.0:../../misc/kdeaccessibility3
+DEPENDS+=	kdeartwork-3.2.0:../../misc/kdeartwork3
+DEPENDS+=	kdeaddons-3.2.0:../../misc/kdeaddons3
+DEPENDS+=	kdeadmin-3.2.0:../../misc/kdeadmin3
+DEPENDS+=	kdeedu-3.2.0:../../misc/kdeedu3
+DEPENDS+=	kdegames-3.2.0:../../games/kdegames3
+DEPENDS+=	kdegraphics-3.2.0:../../graphics/kdegraphics3
+DEPENDS+=	kdemultimedia-3.2.0:../../multimedia/kdemultimedia3
+DEPENDS+=	kdenetwork-3.2.0:../../net/kdenetwork3
+DEPENDS+=	kdepim-3.2.0:../../misc/kdepim3
+DEPENDS+=	kdetoys-3.2.0:../../games/kdetoys3
+DEPENDS+=	kdeutils-3.2.0:../../misc/kdeutils3
+DEPENDS+=	quanta-3.2.0:../../www/quanta3
 
 EXTRACT_ONLY=	# empty
 USE_BUILDLINK2=	yes
diff --git a/meta-pkgs/kde3/Makefile.kde3 b/meta-pkgs/kde3/Makefile.kde3
index a21e6d27889..56cd7a1f952 100644
--- a/meta-pkgs/kde3/Makefile.kde3
+++ b/meta-pkgs/kde3/Makefile.kde3
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.kde3,v 1.5 2004/01/24 14:01:53 grant Exp $
+# $NetBSD: Makefile.kde3,v 1.6 2004/02/04 14:01:16 markd Exp $
 #
 # This Makefile fragment is included at the top of package Makefiles for
 # KDE3-distributed packages (they all share common configure and build
 # settings).
 
 CATEGORIES+=	kde
-_KDE_VERSION=	3.1.5
-MASTER_SITES_KDE=	ftp://ftp.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \
-		ftp://ftp.us.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \
-		ftp://ftp.de.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \
-		ftp://public.planetmirror.com.au/pub/kde/stable/${_KDE_VERSION}/src/ \
-		http://public.planetmirror.com.au/pub/kde/stable/${_KDE_VERSION}/src/
+_KDE_VERSION=	3.2.0
+MASTER_SITES_KDE=	ftp://ftp.kde.org/pub/kde/stable/3.2/src/ \
+		ftp://ftp.us.kde.org/pub/kde/stable/3.2/src/ \
+		ftp://ftp.de.kde.org/pub/kde/stable/3.2/src/ \
+		ftp://public.planetmirror.com.au/pub/kde/stable/3.2/src/ \
+		http://public.planetmirror.com.au/pub/kde/stable/3.2/src/
 MASTER_SITES?=	${MASTER_SITES_KDE}
 EXTRACT_SUFX?=	.tar.bz2
 
diff --git a/meta-pkgs/kde3/buildlink2.mk b/meta-pkgs/kde3/buildlink2.mk
index f0ecf8e0b7a..af167ed45f7 100644
--- a/meta-pkgs/kde3/buildlink2.mk
+++ b/meta-pkgs/kde3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/08/04 20:37:04 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/02/04 14:01:16 markd Exp $
 #
 # This Makefile fragment is included by packages that use the KDE3
 # configure-and-build process.
@@ -85,6 +85,8 @@ CONFIGURE_ENV+=		kde_sounddir="${KDEDIR}/share/kde/sounds"
 CONFIGURE_ENV+=		kde_templatesdir="${KDEDIR}/share/kde/templates"
 CONFIGURE_ENV+=		kde_toolbardir="${KDEDIR}/share/kde/toolbar"
 CONFIGURE_ENV+=		kde_wallpaperdir="${KDEDIR}/share/kde/wallpapers"
+CONFIGURE_ENV+=		xdg_appsdir="${KDEDIR}/share/applications/kde"
+CONFIGURE_ENV+=		xdg_directorydir="${KDEDIR}/share/desktop-directories"
 
 BUILDLINK_DEPMETHOD.qt3-tools=	build