Update to KDE 3.2

Changes:
Unknown

5 files changed, 21 insertions, 84 deletions

diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index ac464bcbe61..b3beb47a451 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/04 20:44:42 markd Exp $
 
-DISTNAME=	kdeadmin-3.1.5
-PKGREVISION=	1
+DISTNAME=	kdeadmin-${_KDE_VERSION}
 CATEGORIES=	misc
 COMMENT=	System administration tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdeadmin3/PLIST b/misc/kdeadmin3/PLIST
index 72060dc6762..d852200d0b2 100644
--- a/misc/kdeadmin3/PLIST
+++ b/misc/kdeadmin3/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2003/04/01 12:27:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/04 20:44:42 markd Exp $
 bin/kcron
 bin/kpackage
 bin/kuser
-bin/kxconfig
 bin/secpolicy
 lib/kde3/kfile_deb.la
 lib/kde3/kfile_deb.so
 lib/kde3/kfile_rpm.la
 lib/kde3/kfile_rpm.so
+share/applications/kde/kcron.desktop
+share/applications/kde/kpackage.desktop
+share/applications/kde/kuser.desktop
 share/doc/kde/HTML/en/kcron/common
 share/doc/kde/HTML/en/kcron/index.cache.bz2
 share/doc/kde/HTML/en/kcron/index.docbook
@@ -19,9 +21,21 @@ share/doc/kde/HTML/en/kcron/print.png
 share/doc/kde/HTML/en/kdat/common
 share/doc/kde/HTML/en/kdat/index.cache.bz2
 share/doc/kde/HTML/en/kdat/index.docbook
+share/doc/kde/HTML/en/kpackage/bsdloc.png
 share/doc/kde/HTML/en/kpackage/common
+share/doc/kde/HTML/en/kpackage/debaptloc.png
+share/doc/kde/HTML/en/kpackage/debloc.png
+share/doc/kde/HTML/en/kpackage/handle.png
 share/doc/kde/HTML/en/kpackage/index.cache.bz2
 share/doc/kde/HTML/en/kpackage/index.docbook
+share/doc/kde/HTML/en/kpackage/install.png
+share/doc/kde/HTML/en/kpackage/left.png
+share/doc/kde/HTML/en/kpackage/right-change.png
+share/doc/kde/HTML/en/kpackage/right-files.png
+share/doc/kde/HTML/en/kpackage/right-prop.png
+share/doc/kde/HTML/en/kpackage/rpmloc.png
+share/doc/kde/HTML/en/kpackage/slackloc.png
+share/doc/kde/HTML/en/kpackage/uninstall.png
 share/doc/kde/HTML/en/ksysv/common
 share/doc/kde/HTML/en/ksysv/index.cache.bz2
 share/doc/kde/HTML/en/ksysv/index.docbook
@@ -29,24 +43,6 @@ share/doc/kde/HTML/en/kuser/common
 share/doc/kde/HTML/en/kuser/index.cache.bz2
 share/doc/kde/HTML/en/kuser/index.docbook
 share/doc/kde/HTML/en/kuser/kuser.png
-share/doc/kde/HTML/en/kwuftpd/common
-share/doc/kde/HTML/en/kwuftpd/directories.png
-share/doc/kde/HTML/en/kwuftpd/index.cache.bz2
-share/doc/kde/HTML/en/kwuftpd/index.docbook
-share/doc/kde/HTML/en/kwuftpd/logging.png
-share/doc/kde/HTML/en/kwuftpd/messages.png
-share/doc/kde/HTML/en/kwuftpd/ratios.png
-share/doc/kde/HTML/en/kwuftpd/security.png
-share/doc/kde/HTML/en/kwuftpd/uploads.png
-share/doc/kde/HTML/en/kwuftpd/user_classes.png
-share/doc/kde/HTML/en/kwuftpd/virtual.png
-share/doc/kde/HTML/en/kxconfig/common
-share/doc/kde/HTML/en/kxconfig/index.cache.bz2
-share/doc/kde/HTML/en/kxconfig/index.docbook
-share/kde/applnk/Settings/Peripherals/kxconfig.desktop
-share/kde/applnk/System/kcron.desktop
-share/kde/applnk/System/kpackage.desktop
-share/kde/applnk/System/kuser.desktop
 share/kde/apps/kpackage/kpackageui.rc
 share/kde/apps/kpackage/pics/bnew.png
 share/kde/apps/kpackage/pics/bsd.png
@@ -80,30 +76,6 @@ share/kde/apps/kuser/icons/crystalsvg/22x22/actions/edit_user.png
 share/kde/apps/kuser/kuserui.rc
 share/kde/apps/kuser/pics/group.png
 share/kde/apps/kuser/pics/user.png
-share/kde/apps/kxconfig/XF86Config-4.default
-share/kde/apps/kxconfig/XF86Config-4.template
-share/kde/apps/kxconfig/hwdata/Monitors
-share/kde/apps/kxconfig/hwdata/VideoCards
-share/kde/apps/kxconfig/pics/ati.png
-share/kde/apps/kxconfig/pics/decreaseX.png
-share/kde/apps/kxconfig/pics/decreaseY.png
-share/kde/apps/kxconfig/pics/down.png
-share/kde/apps/kxconfig/pics/fonts.png
-share/kde/apps/kxconfig/pics/general.png
-share/kde/apps/kxconfig/pics/increaseX.png
-share/kde/apps/kxconfig/pics/increaseY.png
-share/kde/apps/kxconfig/pics/keyboard.png
-share/kde/apps/kxconfig/pics/layout.png
-share/kde/apps/kxconfig/pics/left.png
-share/kde/apps/kxconfig/pics/matrox.png
-share/kde/apps/kxconfig/pics/monitor.png
-share/kde/apps/kxconfig/pics/pointer.png
-share/kde/apps/kxconfig/pics/resolution.png
-share/kde/apps/kxconfig/pics/right.png
-share/kde/apps/kxconfig/pics/threed.png
-share/kde/apps/kxconfig/pics/up.png
-share/kde/apps/kxconfig/pics/videocard.png
-share/kde/apps/kxconfig/pics/xlogo_small.png
 share/kde/icons/crystalsvg/128x128/apps/kpackage.png
 share/kde/icons/crystalsvg/128x128/apps/kuser.png
 share/kde/icons/crystalsvg/16x16/apps/kcron.png
@@ -112,12 +84,10 @@ share/kde/icons/crystalsvg/16x16/apps/kuser.png
 share/kde/icons/crystalsvg/32x32/apps/kcron.png
 share/kde/icons/crystalsvg/32x32/apps/kpackage.png
 share/kde/icons/crystalsvg/32x32/apps/kuser.png
-share/kde/icons/crystalsvg/32x32/apps/kxconfig.png
 share/kde/icons/crystalsvg/48x48/apps/kpackage.png
 share/kde/icons/crystalsvg/48x48/apps/kuser.png
 share/kde/icons/crystalsvg/64x64/apps/kpackage.png
 share/kde/icons/crystalsvg/64x64/apps/kuser.png
-share/kde/icons/locolor/16x16/apps/kxconfig.png
 share/kde/mimelnk/application/x-debian-package.desktop
 share/kde/services/kfile_deb.desktop
 share/kde/services/kfile_rpm.desktop
@@ -128,9 +98,6 @@ share/kde/services/kfile_rpm.desktop
 @comment dirrm share/kde/icons/crystalsvg/32x32/apps
 @comment dirrm share/kde/icons/crystalsvg/16x16/apps
 @comment dirrm share/kde/icons/crystalsvg/128x128/apps
-@dirrm share/kde/apps/kxconfig/pics
-@dirrm share/kde/apps/kxconfig/hwdata
-@dirrm share/kde/apps/kxconfig
 @comment dirrm share/kde/apps/kuser/pics
 @dirrm share/kde/apps/kuser/icons/crystalsvg/22x22/actions
 @dirrm share/kde/apps/kuser/icons/crystalsvg/22x22
@@ -142,7 +109,6 @@ share/kde/services/kfile_rpm.desktop
 @dirrm share/kde/apps/kpackage
 @comment dirrm share/kde/apps
 @comment dirrm share/kde/applnk/System
-@dirrm share/doc/kde/HTML/en/kwuftpd
 @dirrm share/doc/kde/HTML/en/kuser
 @dirrm share/doc/kde/HTML/en/ksysv
 @dirrm share/doc/kde/HTML/en/kpackage
diff --git a/misc/kdeadmin3/distinfo b/misc/kdeadmin3/distinfo
index 367173292ac..a06fe694155 100644
--- a/misc/kdeadmin3/distinfo
+++ b/misc/kdeadmin3/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.13 2004/01/15 10:58:31 markd Exp $
+$NetBSD: distinfo,v 1.14 2004/02/04 20:44:42 markd Exp $
 
-SHA1 (kdeadmin-3.1.5.tar.bz2) = 3569be09b56f6c81ba5db377926102f5e36d8076
-Size (kdeadmin-3.1.5.tar.bz2) = 1554554 bytes
-SHA1 (patch-aa) = 84c7fd5c9e9eb868f0c34d9d96dcde6d8c9a7ed1
-SHA1 (patch-ab) = 81f1ca7dfcdbbbc02e8b421fb0f23ba7d30ac6ca
+SHA1 (kdeadmin-3.2.0.tar.bz2) = 09702f20906c0deaa09ac3fba64f1d827cad2c08
+Size (kdeadmin-3.2.0.tar.bz2) = 1561532 bytes
diff --git a/misc/kdeadmin3/patches/patch-aa b/misc/kdeadmin3/patches/patch-aa
deleted file mode 100644
index ac56167b2fb..00000000000
--- a/misc/kdeadmin3/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/09/10 12:31:55 markd Exp $
-
---- kuser/mnt.cpp.orig	2003-07-14 07:22:05.000000000 +1200
-+++ kuser/mnt.cpp
-@@ -98,7 +98,7 @@ Mounts::Mounts() {
-     if (!CORRECT_FSTYPE((const char *)mt->mnt_fstype))
-       continue;
- 
--    quotafilename = QString("%1%2%3")
-+    quotafilename = QString::fromLatin1("%1%2%3")
-                           .arg(QString::fromLatin1(mt->mnt_mountp))
-                           .arg(QString::fromLatin1((mt->mnt_mountp[strlen(mt->mnt_mountp) - 1] == '/') ? "" : "/"))
-                           .arg(QString::fromLatin1(_KU_QUOTAFILENAME));
diff --git a/misc/kdeadmin3/patches/patch-ab b/misc/kdeadmin3/patches/patch-ab
deleted file mode 100644
index fee48dd8337..00000000000
--- a/misc/kdeadmin3/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/01/15 10:58:31 markd Exp $
-
---- kxconfig/kxdata.cpp.orig	2004-01-12 02:35:51.797062400 +1300
-+++ kxconfig/kxdata.cpp
-@@ -334,7 +334,7 @@ void KXData::loadPointerData()
- {
-     // ### hardcoded
- 
--#ifndef HAVE_X11_EXTENSIONS_XF86MISC_H
-+#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
-     m_pointerModels.append( KXPointerModel( i18n( "Generic PS/2" ), "PS/2",
-                                             MTYPE_PS_2 ) );
-     m_pointerModels.append( KXPointerModel( i18n( "Generic PS/2 Wheelmouse" ), "PS/2",