Update KDE to 3.5.6

pkgsrc changes: move icon tree to ${PREFIX}/share/icons to conform to XDG.

3 files changed, 23 insertions, 22 deletions

diff --git a/meta-pkgs/kde3/Makefile b/meta-pkgs/kde3/Makefile
index beaa28b558b..d6a7136f36c 100644
--- a/meta-pkgs/kde3/Makefile
+++ b/meta-pkgs/kde3/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2006/10/12 10:23:49 markd Exp $
+# $NetBSD: Makefile,v 1.55 2007/01/26 02:36:14 markd Exp $
 
-DISTNAME=	kde-3.5.5
+DISTNAME=	kde-3.5.6
 CATEGORIES=	meta-pkgs x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,20 +9,20 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
-DEPENDS+=	kdelibs-3.5.5{,nb[0-9]*}:../../x11/kdelibs3
-DEPENDS+=	kdeaccessibility-3.5.5{,nb[0-9]*}:../../misc/kdeaccessibility3
-DEPENDS+=	kdeartwork-3.5.5{,nb[0-9]*}:../../misc/kdeartwork3
-DEPENDS+=	kdeaddons-3.5.5{,nb[0-9]*}:../../misc/kdeaddons3
-DEPENDS+=	kdeadmin-3.5.5{,nb[0-9]*}:../../misc/kdeadmin3
-DEPENDS+=	kdeedu-3.5.5{,nb[0-9]*}:../../misc/kdeedu3
-DEPENDS+=	kdegames-3.5.5{,nb[0-9]*}:../../games/kdegames3
-DEPENDS+=	kdegraphics-3.5.5{,nb[0-9]*}:../../graphics/kdegraphics3
-DEPENDS+=	kdemultimedia-3.5.5{,nb[0-9]*}:../../multimedia/kdemultimedia3
-DEPENDS+=	kdenetwork-3.5.5{,nb[0-9]*}:../../net/kdenetwork3
-DEPENDS+=	kdepim-3.5.5{,nb[0-9]*}:../../misc/kdepim3
-DEPENDS+=	kdetoys-3.5.5{,nb[0-9]*}:../../games/kdetoys3
-DEPENDS+=	kdeutils-3.5.5{,nb[0-9]*}:../../misc/kdeutils3
-DEPENDS+=	kdewebdev-3.5.5{,nb[0-9]*}:../../www/kdewebdev3
+DEPENDS+=	kdelibs-3.5.6{,nb[0-9]*}:../../x11/kdelibs3
+DEPENDS+=	kdeaccessibility-3.5.6{,nb[0-9]*}:../../misc/kdeaccessibility3
+DEPENDS+=	kdeartwork-3.5.6{,nb[0-9]*}:../../misc/kdeartwork3
+DEPENDS+=	kdeaddons-3.5.6{,nb[0-9]*}:../../misc/kdeaddons3
+DEPENDS+=	kdeadmin-3.5.6{,nb[0-9]*}:../../misc/kdeadmin3
+DEPENDS+=	kdeedu-3.5.6{,nb[0-9]*}:../../misc/kdeedu3
+DEPENDS+=	kdegames-3.5.6{,nb[0-9]*}:../../games/kdegames3
+DEPENDS+=	kdegraphics-3.5.6{,nb[0-9]*}:../../graphics/kdegraphics3
+DEPENDS+=	kdemultimedia-3.5.6{,nb[0-9]*}:../../multimedia/kdemultimedia3
+DEPENDS+=	kdenetwork-3.5.6{,nb[0-9]*}:../../net/kdenetwork3
+DEPENDS+=	kdepim-3.5.6{,nb[0-9]*}:../../misc/kdepim3
+DEPENDS+=	kdetoys-3.5.6{,nb[0-9]*}:../../games/kdetoys3
+DEPENDS+=	kdeutils-3.5.6{,nb[0-9]*}:../../misc/kdeutils3
+DEPENDS+=	kdewebdev-3.5.6{,nb[0-9]*}:../../www/kdewebdev3
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/meta-pkgs/kde3/Makefile.kde3 b/meta-pkgs/kde3/Makefile.kde3
index fdfd5b025c3..45edd31dda6 100644
--- a/meta-pkgs/kde3/Makefile.kde3
+++ b/meta-pkgs/kde3/Makefile.kde3
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.kde3,v 1.38 2006/10/12 10:23:49 markd Exp $
+# $NetBSD: Makefile.kde3,v 1.39 2007/01/26 02:36:14 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.5.5
-MASTER_SITE_KDE_I18N=	${MASTER_SITE_KDE:=3.5.5/src/kde-i18n/}
-MASTER_SITES?=	${MASTER_SITE_KDE:=3.5.5/src/}
+_KDE_VERSION=	3.5.6
+MASTER_SITE_KDE_I18N=	${MASTER_SITE_KDE:=3.5.6/src/kde-i18n/}
+MASTER_SITES?=	${MASTER_SITE_KDE:=3.5.6/src/}
 EXTRACT_SUFX?=	.tar.bz2
 
 MAINTAINER?=	markd@NetBSD.org
diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk
index 8079f16b77f..362f8842a3e 100644
--- a/meta-pkgs/kde3/kde3.mk
+++ b/meta-pkgs/kde3/kde3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: kde3.mk,v 1.13 2006/04/06 06:22:23 reed Exp $
+# $NetBSD: kde3.mk,v 1.14 2007/01/26 02:36:14 markd Exp $
 #
 # This Makefile fragment is included by packages that use the KDE3
 # configure-and-build process.
@@ -78,7 +78,7 @@ CONFIGURE_ENV+=		kde_cgidir="${KDEDIR}/kde-cgi-bin"
 CONFIGURE_ENV+=		kde_confdir="${KDEDIR}/share/kde/config"
 CONFIGURE_ENV+=		kde_datadir="${KDEDIR}/share/kde/apps"
 CONFIGURE_ENV+=		kde_htmldir="${KDEDIR}/share/doc/kde/HTML"
-CONFIGURE_ENV+=		kde_icondir="${KDEDIR}/share/kde/icons"
+CONFIGURE_ENV+=		kde_icondir="${KDEDIR}/share/icons"
 CONFIGURE_ENV+=		kde_locale="${KDEDIR}/${PKGLOCALEDIR}/locale"
 CONFIGURE_ENV+=		kde_mimedir="${KDEDIR}/share/kde/mimelnk"
 CONFIGURE_ENV+=		kde_servicesdir="${KDEDIR}/share/kde/services"
@@ -94,6 +94,7 @@ _IN_ARTS_BUILD?=	no
 .if !empty(_IN_ARTS_BUILD:M[nN][oO])
 BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.3.3nb1
 .include "../../x11/qt3-libs/buildlink3.mk"
+USE_DIRS+=		kde3-1.0
 .endif
 
 .include "../../x11/qt3-tools/buildlink3.mk"