[pkgsrc/trunk]: pkgsrc/meta-pkgs/kde3 Update to kde 3.3.2.

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/75ea903e9f70
branches:  trunk
changeset: 485398:75ea903e9f70
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri Dec 10 05:59:50 2004 +0000

description:
Update to kde 3.3.2.

changes are generally bug fixes including some security fixes.

pkgsrc changes are a big PLIST cleanup and moving locale files
to ${PKGLOCALEDIR}/locale/... rather than replicating the tree.

diffstat:

 meta-pkgs/kde3/Makefile      |  31 +++++++++++++++----------------
 meta-pkgs/kde3/Makefile.kde3 |   6 +++---
 meta-pkgs/kde3/kde3.mk       |  10 ++--------
 3 files changed, 20 insertions(+), 27 deletions(-)

diffs (98 lines):

diff -r fefe62933c47 -r 75ea903e9f70 meta-pkgs/kde3/Makefile
--- a/meta-pkgs/kde3/Makefile   Fri Dec 10 04:27:39 2004 +0000
+++ b/meta-pkgs/kde3/Makefile   Fri Dec 10 05:59:50 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2004/11/28 18:35:48 kleink Exp $
+# $NetBSD: Makefile,v 1.36 2004/12/10 05:59:50 markd Exp $
 
-DISTNAME=      kde-3.3.1
-PKGREVISION=   1
+DISTNAME=      kde-3.3.2
 CATEGORIES=    meta-pkgs x11 kde
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -10,19 +9,19 @@
 HOMEPAGE=      http://www.kde.org/
 COMMENT=       "meta-package" for the KDE integrated X11 desktop
 
-DEPENDS+=      kdeaccessibility-3.3.1:../../misc/kdeaccessibility3
-DEPENDS+=      kdeartwork-3.3.1:../../misc/kdeartwork3
-DEPENDS+=      kdeaddons-3.3.1:../../misc/kdeaddons3
-DEPENDS+=      kdeadmin-3.3.1:../../misc/kdeadmin3
-DEPENDS+=      kdeedu-3.3.1:../../misc/kdeedu3
-DEPENDS+=      kdegames-3.3.1:../../games/kdegames3
-DEPENDS+=      kdegraphics-3.3.1nb1:../../graphics/kdegraphics3
-DEPENDS+=      kdemultimedia-3.3.1:../../multimedia/kdemultimedia3
-DEPENDS+=      kdenetwork-3.3.1:../../net/kdenetwork3
-DEPENDS+=      kdepim-3.3.1nb2:../../misc/kdepim3
-DEPENDS+=      kdetoys-3.3.1:../../games/kdetoys3
-DEPENDS+=      kdeutils-3.3.1:../../misc/kdeutils3
-DEPENDS+=      kdewebdev-3.3.1:../../www/kdewebdev3
+DEPENDS+=      kdeaccessibility-3.3.2:../../misc/kdeaccessibility3
+DEPENDS+=      kdeartwork-3.3.2:../../misc/kdeartwork3
+DEPENDS+=      kdeaddons-3.3.2:../../misc/kdeaddons3
+DEPENDS+=      kdeadmin-3.3.2:../../misc/kdeadmin3
+DEPENDS+=      kdeedu-3.3.2:../../misc/kdeedu3
+DEPENDS+=      kdegames-3.3.2:../../games/kdegames3
+DEPENDS+=      kdegraphics-3.3.2:../../graphics/kdegraphics3
+DEPENDS+=      kdemultimedia-3.3.2:../../multimedia/kdemultimedia3
+DEPENDS+=      kdenetwork-3.3.2:../../net/kdenetwork3
+DEPENDS+=      kdepim-3.3.2:../../misc/kdepim3
+DEPENDS+=      kdetoys-3.3.2:../../games/kdetoys3
+DEPENDS+=      kdeutils-3.3.2:../../misc/kdeutils3
+DEPENDS+=      kdewebdev-3.3.2:../../www/kdewebdev3
 
 EXTRACT_ONLY=  # empty
 NO_CHECKSUM=   yes
diff -r fefe62933c47 -r 75ea903e9f70 meta-pkgs/kde3/Makefile.kde3
--- a/meta-pkgs/kde3/Makefile.kde3      Fri Dec 10 04:27:39 2004 +0000
+++ b/meta-pkgs/kde3/Makefile.kde3      Fri Dec 10 05:59:50 2004 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.kde3,v 1.21 2004/10/20 14:45:20 taca Exp $
+# $NetBSD: Makefile.kde3,v 1.22 2004/12/10 05:59:50 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.3.1
-_KDE_DISTVER=  3.3.1
+_KDE_VERSION=  3.3.2
+_KDE_DISTVER=  3.3.2
 MASTER_SITES_KDE=      ftp://ftp.kde.org/pub/kde/stable/${_KDE_DISTVER}/src/ \
                ftp://ftp.uk.kde.org/pub/kde/stable/${_KDE_DISTVER}/src/ \
                ftp://download.au.kde.org/pub/kde/stable/${_KDE_DISTVER}/src/ \
diff -r fefe62933c47 -r 75ea903e9f70 meta-pkgs/kde3/kde3.mk
--- a/meta-pkgs/kde3/kde3.mk    Fri Dec 10 04:27:39 2004 +0000
+++ b/meta-pkgs/kde3/kde3.mk    Fri Dec 10 05:59:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: kde3.mk,v 1.3 2004/09/19 04:17:22 markd Exp $
+# $NetBSD: kde3.mk,v 1.4 2004/12/10 05:59:50 markd Exp $
 #
 # This Makefile fragment is included by packages that use the KDE3
 # configure-and-build process.
@@ -37,10 +37,8 @@
 .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
+USE_PKGLOCALEDIR=      YES
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -72,11 +70,7 @@
 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"