Update to kde3.2.2

3 files changed, 112 insertions, 18 deletions

diff --git a/meta-pkgs/kde3/Makefile b/meta-pkgs/kde3/Makefile
index de598b1a191..12a69ad7180 100644
--- a/meta-pkgs/kde3/Makefile
+++ b/meta-pkgs/kde3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2004/04/05 18:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2004/04/20 12:08:19 markd Exp $
 
-DISTNAME=	kde-3.2.1
-PKGREVISION=	5
+DISTNAME=	kde-3.2.2
 CATEGORIES=	meta-pkgs x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,19 +9,19 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
-DEPENDS+=	kdeaccessibility-3.2.1nb1:../../misc/kdeaccessibility3
-DEPENDS+=	kdeartwork-3.2.1nb1:../../misc/kdeartwork3
-DEPENDS+=	kdeaddons-3.2.1nb2:../../misc/kdeaddons3
-DEPENDS+=	kdeadmin-3.2.1nb1:../../misc/kdeadmin3
-DEPENDS+=	kdeedu-3.2.1nb1:../../misc/kdeedu3
-DEPENDS+=	kdegames-3.2.1nb1:../../games/kdegames3
-DEPENDS+=	kdegraphics-3.2.1nb2:../../graphics/kdegraphics3
-DEPENDS+=	kdemultimedia-3.2.1nb3:../../multimedia/kdemultimedia3
-DEPENDS+=	kdenetwork-3.2.1nb1:../../net/kdenetwork3
-DEPENDS+=	kdepim-3.2.1nb1:../../misc/kdepim3
-DEPENDS+=	kdetoys-3.2.1nb1:../../games/kdetoys3
-DEPENDS+=	kdeutils-3.2.1nb1:../../misc/kdeutils3
-DEPENDS+=	quanta-3.2.1nb2:../../www/quanta3
+DEPENDS+=	kdeaccessibility-3.2.2:../../misc/kdeaccessibility3
+DEPENDS+=	kdeartwork-3.2.2:../../misc/kdeartwork3
+DEPENDS+=	kdeaddons-3.2.2:../../misc/kdeaddons3
+DEPENDS+=	kdeadmin-3.2.2:../../misc/kdeadmin3
+DEPENDS+=	kdeedu-3.2.2:../../misc/kdeedu3
+DEPENDS+=	kdegames-3.2.2:../../games/kdegames3
+DEPENDS+=	kdegraphics-3.2.2:../../graphics/kdegraphics3
+DEPENDS+=	kdemultimedia-3.2.2:../../multimedia/kdemultimedia3
+DEPENDS+=	kdenetwork-3.2.2:../../net/kdenetwork3
+DEPENDS+=	kdepim-3.2.2:../../misc/kdepim3
+DEPENDS+=	kdetoys-3.2.2:../../games/kdetoys3
+DEPENDS+=	kdeutils-3.2.2:../../misc/kdeutils3
+DEPENDS+=	quanta-3.2.2:../../www/quanta3
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/meta-pkgs/kde3/Makefile.kde3 b/meta-pkgs/kde3/Makefile.kde3
index 1cd234e4951..3dbd50f6960 100644
--- a/meta-pkgs/kde3/Makefile.kde3
+++ b/meta-pkgs/kde3/Makefile.kde3
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.kde3,v 1.13 2004/03/10 00:10:04 markd Exp $
+# $NetBSD: Makefile.kde3,v 1.14 2004/04/20 12:08:19 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.2.1
+_KDE_VERSION=	3.2.2
 MASTER_SITES_KDE=	ftp://ftp.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \
 		ftp://download.uk.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \
 		ftp://download.au.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \
diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk
new file mode 100644
index 00000000000..d80aa547b4f
--- /dev/null
+++ b/meta-pkgs/kde3/kde3.mk
@@ -0,0 +1,95 @@
+# $NetBSD: kde3.mk,v 1.1 2004/04/20 12:08:19 markd Exp $
+#
+# This Makefile fragment is included by packages that use the KDE3
+# configure-and-build process.
+#
+# To use this Makefile fragment, simply include this Makefile fragment in
+# the package Makefile.
+#
+# The buildlink strategy with KDE3 packages is:
+#
+#     * pass UIC to the configure script, as the KDE3 configure scripts now
+#	check for its existance and fail if its not found.
+#
+#     * pass USER_LDFLAGS to the configure script, containing the value of
+#	LDFLAGS as set by bsd.pkg.mk; this should pass all of the necessary
+#	library directory and rpath settings to the compiler/linker to find
+#	the X11, Qt-3.x, and KDE-3.x libraries.
+#
+# We pass the following values via options to the configure script:
+#
+#     * datadir is where all of the KDE3 data files go
+#     * qt-dir is the location of QT3 for build purposes
+#     * extra-includes is where headers for dependencies may be found
+#
+# We _don't_ pass the following values via options to the configure script:
+#
+#     * extra-libs contains library directories that are added to both the
+#	rpath via -R and to the linker flags via -L; we don't need this
+#	since we pass them in directly via ${USER_LDFLAGS}
+#
+# We also disable the rpath setting by the configure script since it often
+# guesses wrong on odd setups, and since we already pass all of the required
+# flags through USER_LDFLAGS.
+#
+# The qt3-tools and qt3-libs buildlink2.mk files are also pulled in as all
+# KDE3 pkgs need them.
+
+.if !defined(KDE3_MK)
+KDE3_MK=	# defined
+
+# All KDE3 packages satisfy the requirements for USE_X11BASE.  This also
+# forces all KDE3 packages to have a common installation prefix.
+#
+USE_X11=		YES
+
+.include "../../mk/bsd.prefs.mk"
+
+KDEDIR?=		${PREFIX}
+QTDIR?=			${PREFIX}/qt3
+
+CONFIGURE_ARGS+=	--datadir="${KDEDIR}/share/kde"
+CONFIGURE_ARGS+=	--with-qt-dir="${QTDIR}"
+CONFIGURE_ARGS+=	--with-extra-includes="${_KDE3_EXTRA_INCLUDES}"
+CONFIGURE_ARGS+=	--disable-rpath
+CONFIGURE_ARGS+=	--disable-debug
+.if exists(${X11BASE}/lib/libXinerama.so)
+CONFIGURE_ARGS+=	--with-xinerama
+.endif
+
+CONFIGURE_ENV+=		USER_LDFLAGS="${LDFLAGS}"
+LDFLAGS+=		-L${QTDIR}/lib
+
+_KDE3_EXTRA_INCLUDES?=	${LOCALBASE}/include:${X11BASE}/include
+
+KDE_CONFIG_SITE?=	${KDEDIR}/share/kde/config.site			\
+			${KDEDIR}/etc/config.site
+
+CONFIGURE_ENV+=		KDEDIR="${KDEDIR}"
+CONFIGURE_ENV+=		CONFIG_SITE="${KDE_CONFIG_SITE}"
+CONFIGURE_ENV+=		kde_appsdir="${KDEDIR}/share/kde/applnk"
+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"
+.if defined(USE_PKGLOCALEDIR) && !empty(USE_PKGLOCALEDIR:M[Yy][Ee][Ss])
+CONFIGURE_ENV+=		kde_locale="${KDEDIR}/${PKGLOCALEDIR}/locale"
+.else
+CONFIGURE_ENV+=		kde_locale="${KDEDIR}/share/kde/locale"
+.endif
+CONFIGURE_ENV+=		kde_mimedir="${KDEDIR}/share/kde/mimelnk"
+CONFIGURE_ENV+=		kde_servicesdir="${KDEDIR}/share/kde/services"
+CONFIGURE_ENV+=		kde_servicetypesdir="${KDEDIR}/share/kde/servicetypes"
+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
+
+.include "../../x11/qt3-tools/buildlink3.mk"
+
+.endif	# KDE3_MK