Rejoice, for the long awaited upgrade to kde 3.1.1 is here!

16 files changed, 122 insertions, 168 deletions

diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo
index 5d06f2f20ec2..fc8daaa140db 100644
--- a/sysutils/kdeadmin3/distinfo
+++ b/sysutils/kdeadmin3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeadmin-3.1.tar.bz2) = 4ceed5f59fc5960105278be58ab80f80
+MD5 (KDE/kdeadmin-3.1.1.tar.bz2) = 755deaf26d0841ed16eddd7596701004
diff --git a/sysutils/kdeadmin3/pkg-plist b/sysutils/kdeadmin3/pkg-plist
index 39c2eefb2c22..ebd5252ce2db 100644
--- a/sysutils/kdeadmin3/pkg-plist
+++ b/sysutils/kdeadmin3/pkg-plist
@@ -1,7 +1,6 @@
 bin/kcron
 bin/kpackage
 bin/kuser
-bin/kwuftpd
 bin/kxconfig
 bin/secpolicy
 lib/kde3/kfile_deb.la
@@ -9,11 +8,9 @@ lib/kde3/kfile_deb.so
 lib/kde3/kfile_rpm.la
 lib/kde3/kfile_rpm.so
 share/applnk/Settings/Peripherals/kxconfig.desktop
-share/applnk/System/More/kwuftpd.desktop
 share/applnk/System/kcron.desktop
 share/applnk/System/kpackage.desktop
 share/applnk/System/kuser.desktop
-share/applnk/System/kwuftpd.desktop
 share/apps/kpackage/kpackageui.rc
 share/apps/kpackage/pics/bnew.png
 share/apps/kpackage/pics/bsd.png
@@ -150,7 +147,6 @@ share/services/kfile_rpm.desktop
 @dirrm share/doc/HTML/en/kcron
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @dirrm share/apps/kxconfig/pics
 @dirrm share/apps/kxconfig/hwdata
 @dirrm share/apps/kxconfig
@@ -164,7 +160,6 @@ share/services/kfile_rpm.desktop
 @dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
 @dirrm share/apps
-@dirrm share/applnk/System/More
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Peripherals
 @dirrm share/applnk/Settings
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 5d06f2f20ec2..fc8daaa140db 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeadmin-3.1.tar.bz2) = 4ceed5f59fc5960105278be58ab80f80
+MD5 (KDE/kdeadmin-3.1.1.tar.bz2) = 755deaf26d0841ed16eddd7596701004
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index 39c2eefb2c22..ebd5252ce2db 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -1,7 +1,6 @@
 bin/kcron
 bin/kpackage
 bin/kuser
-bin/kwuftpd
 bin/kxconfig
 bin/secpolicy
 lib/kde3/kfile_deb.la
@@ -9,11 +8,9 @@ lib/kde3/kfile_deb.so
 lib/kde3/kfile_rpm.la
 lib/kde3/kfile_rpm.so
 share/applnk/Settings/Peripherals/kxconfig.desktop
-share/applnk/System/More/kwuftpd.desktop
 share/applnk/System/kcron.desktop
 share/applnk/System/kpackage.desktop
 share/applnk/System/kuser.desktop
-share/applnk/System/kwuftpd.desktop
 share/apps/kpackage/kpackageui.rc
 share/apps/kpackage/pics/bnew.png
 share/apps/kpackage/pics/bsd.png
@@ -150,7 +147,6 @@ share/services/kfile_rpm.desktop
 @dirrm share/doc/HTML/en/kcron
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @dirrm share/apps/kxconfig/pics
 @dirrm share/apps/kxconfig/hwdata
 @dirrm share/apps/kxconfig
@@ -164,7 +160,6 @@ share/services/kfile_rpm.desktop
 @dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
 @dirrm share/apps
-@dirrm share/applnk/System/More
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Peripherals
 @dirrm share/applnk/Settings
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index a8af40a21512..d93b5e24f10b 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.tar.bz2) = 81e2916ba0fa865053aff858982c040e
+MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
diff --git a/sysutils/kdf/files/patch-ksimcpu.cpp b/sysutils/kdf/files/patch-ksimcpu.cpp
deleted file mode 100644
index 38fa88cabeec..000000000000
--- a/sysutils/kdf/files/patch-ksimcpu.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- ksim/monitors/cpu/ksimcpu.cpp.orig	Mon May 13 10:47:51 2002
-+++ ksim/monitors/cpu/ksimcpu.cpp	Mon Mar 17 13:26:46 2003
-@@ -42,8 +42,16 @@
- #include <themetypes.h>
- 
- #ifdef Q_OS_BSD4
--#include <sys/dkstat.h>
- #include <sys/param.h>
-+#ifdef Q_OS_FREEBSD
-+#if __FreeBSD_version < 500101
-+#include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
-+#else
-+#include <sys/dkstat.h>
-+#endif
- #include <sys/sysctl.h>
- #include <string.h>
- #include <kvm.h>
-@@ -246,8 +254,8 @@
-   static int oidCpuTime[CTL_MAXNAME + 2];
-   static size_t oidCpuTimeLen = sizeof(oidCpuTime);
-   long cpuTime[CPUSTATES];
--  unsigned int cpuTimeLen = sizeof(cpuTime);
--  static char *name = "kern.cp_time";
-+  size_t cpuTimeLen = sizeof(cpuTime);
-+  static const char *name = "kern.cp_time";
-   static int initialized = 0;
- 
-   if (!initialized) {
diff --git a/sysutils/kdf/files/patch-ksimdisk.cpp b/sysutils/kdf/files/patch-ksimdisk.cpp
index be1790d8ec21..ecb5bd17da08 100644
--- a/sysutils/kdf/files/patch-ksimdisk.cpp
+++ b/sysutils/kdf/files/patch-ksimdisk.cpp
@@ -1,24 +1,44 @@
-Index: ksimdisk.cpp
-===================================================================
-RCS file: /home/kde/kdeutils/ksim/monitors/disk/ksimdisk.cpp,v
-retrieving revision 1.13
-diff -u -5 -p -d -r1.13 ksimdisk.cpp
---- ksimdisk.cpp	2 Nov 2002 14:34:08 -0000	1.13
-+++ ksim/monitors/disk/ksimdisk.cpp	3 Mar 2003 08:48:34 -0000
-@@ -39,11 +39,16 @@
- #include <chart.h>
- #include <progress.h>
- #include <themetypes.h>
+--- ksim/monitors/disk/ksimdisk.cpp.orig	Mon Nov  4 11:03:53 2002
++++ ksim/monitors/disk/ksimdisk.cpp	Wed Mar 19 13:37:39 2003
+@@ -248,6 +253,16 @@
+ #endif
  
  #ifdef Q_OS_FREEBSD
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
++#if __FreeBSD_version < 500107
++#define	devstat_getdevs(fd, stats)	getdevs(stats)
++#define	devstat_selectdevs		selectdevs
++#define	bytes_read(dev)			(dev).bytes_read
++#define	bytes_written(dev)		(dev).bytes_written
 +#else
-+#include <sys/resource.h>
++#define	bytes_read(dev)			(dev).bytes[DEVSTAT_READ]
++#define	bytes_written(dev)		(dev).bytes[DEVSTAT_WRITE]
 +#endif
- #include <devstat.h>
- #include <stdlib.h>
- #endif
++
+   statinfo diskStats;
+   bzero(&diskStats, sizeof(diskStats));
+   diskStats.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
+@@ -258,11 +273,11 @@
+   long generation;
+   device_selection *deviceSelect = 0;
+ 
+-  if (getdevs(&diskStats) < 0)
++  if (devstat_getdevs(NULL, &diskStats) < 0)
+     return;
+ 
+   deviceAmount = diskStats.dinfo->numdevs;
+-  if (selectdevs(&deviceSelect, &selected, &selections,
++  if (devstat_selectdevs(&deviceSelect, &selected, &selections,
+      &generation, diskStats.dinfo->generation,
+      diskStats.dinfo->devices, deviceAmount,
+      0, 0, 0, 0, DS_SELECT_ONLY, 10, 1) < 0)
+@@ -275,8 +290,8 @@
+     disk = deviceSelect[i].position;
+     device = diskStats.dinfo->devices[disk];
+     blockSize = (device.block_size <= 0 ? 512 : device.block_size);
+-    readBlocks = device.bytes_read / blockSize;
+-    writeBlocks = device.bytes_written / blockSize;
++    readBlocks = bytes_read(device) / blockSize;
++    writeBlocks = bytes_written(device) / blockSize;
  
- #ifdef Q_OS_LINUX
+     DiskData diskData;
+     diskData.name = device.device_name
diff --git a/sysutils/kdf/files/plist.base.rm b/sysutils/kdf/files/plist.base.rm
index 197cb22fe65b..c0eb57b0ed06 100644
--- a/sysutils/kdf/files/plist.base.rm
+++ b/sysutils/kdf/files/plist.base.rm
@@ -33,7 +33,6 @@
 @dirrm share/doc/HTML/en/KRegExpEditor
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @dirrm share/config
 @dirrm share/apps/ksim/themes/ksim/net
 @dirrm share/apps/ksim/themes/ksim/mail
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index a8af40a21512..d93b5e24f10b 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.tar.bz2) = 81e2916ba0fa865053aff858982c040e
+MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
diff --git a/sysutils/kfloppy/files/patch-ksimcpu.cpp b/sysutils/kfloppy/files/patch-ksimcpu.cpp
deleted file mode 100644
index 38fa88cabeec..000000000000
--- a/sysutils/kfloppy/files/patch-ksimcpu.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- ksim/monitors/cpu/ksimcpu.cpp.orig	Mon May 13 10:47:51 2002
-+++ ksim/monitors/cpu/ksimcpu.cpp	Mon Mar 17 13:26:46 2003
-@@ -42,8 +42,16 @@
- #include <themetypes.h>
- 
- #ifdef Q_OS_BSD4
--#include <sys/dkstat.h>
- #include <sys/param.h>
-+#ifdef Q_OS_FREEBSD
-+#if __FreeBSD_version < 500101
-+#include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
-+#else
-+#include <sys/dkstat.h>
-+#endif
- #include <sys/sysctl.h>
- #include <string.h>
- #include <kvm.h>
-@@ -246,8 +254,8 @@
-   static int oidCpuTime[CTL_MAXNAME + 2];
-   static size_t oidCpuTimeLen = sizeof(oidCpuTime);
-   long cpuTime[CPUSTATES];
--  unsigned int cpuTimeLen = sizeof(cpuTime);
--  static char *name = "kern.cp_time";
-+  size_t cpuTimeLen = sizeof(cpuTime);
-+  static const char *name = "kern.cp_time";
-   static int initialized = 0;
- 
-   if (!initialized) {
diff --git a/sysutils/kfloppy/files/patch-ksimdisk.cpp b/sysutils/kfloppy/files/patch-ksimdisk.cpp
index be1790d8ec21..ecb5bd17da08 100644
--- a/sysutils/kfloppy/files/patch-ksimdisk.cpp
+++ b/sysutils/kfloppy/files/patch-ksimdisk.cpp
@@ -1,24 +1,44 @@
-Index: ksimdisk.cpp
-===================================================================
-RCS file: /home/kde/kdeutils/ksim/monitors/disk/ksimdisk.cpp,v
-retrieving revision 1.13
-diff -u -5 -p -d -r1.13 ksimdisk.cpp
---- ksimdisk.cpp	2 Nov 2002 14:34:08 -0000	1.13
-+++ ksim/monitors/disk/ksimdisk.cpp	3 Mar 2003 08:48:34 -0000
-@@ -39,11 +39,16 @@
- #include <chart.h>
- #include <progress.h>
- #include <themetypes.h>
+--- ksim/monitors/disk/ksimdisk.cpp.orig	Mon Nov  4 11:03:53 2002
++++ ksim/monitors/disk/ksimdisk.cpp	Wed Mar 19 13:37:39 2003
+@@ -248,6 +253,16 @@
+ #endif
  
  #ifdef Q_OS_FREEBSD
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
++#if __FreeBSD_version < 500107
++#define	devstat_getdevs(fd, stats)	getdevs(stats)
++#define	devstat_selectdevs		selectdevs
++#define	bytes_read(dev)			(dev).bytes_read
++#define	bytes_written(dev)		(dev).bytes_written
 +#else
-+#include <sys/resource.h>
++#define	bytes_read(dev)			(dev).bytes[DEVSTAT_READ]
++#define	bytes_written(dev)		(dev).bytes[DEVSTAT_WRITE]
 +#endif
- #include <devstat.h>
- #include <stdlib.h>
- #endif
++
+   statinfo diskStats;
+   bzero(&diskStats, sizeof(diskStats));
+   diskStats.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
+@@ -258,11 +273,11 @@
+   long generation;
+   device_selection *deviceSelect = 0;
+ 
+-  if (getdevs(&diskStats) < 0)
++  if (devstat_getdevs(NULL, &diskStats) < 0)
+     return;
+ 
+   deviceAmount = diskStats.dinfo->numdevs;
+-  if (selectdevs(&deviceSelect, &selected, &selections,
++  if (devstat_selectdevs(&deviceSelect, &selected, &selections,
+      &generation, diskStats.dinfo->generation,
+      diskStats.dinfo->devices, deviceAmount,
+      0, 0, 0, 0, DS_SELECT_ONLY, 10, 1) < 0)
+@@ -275,8 +290,8 @@
+     disk = deviceSelect[i].position;
+     device = diskStats.dinfo->devices[disk];
+     blockSize = (device.block_size <= 0 ? 512 : device.block_size);
+-    readBlocks = device.bytes_read / blockSize;
+-    writeBlocks = device.bytes_written / blockSize;
++    readBlocks = bytes_read(device) / blockSize;
++    writeBlocks = bytes_written(device) / blockSize;
  
- #ifdef Q_OS_LINUX
+     DiskData diskData;
+     diskData.name = device.device_name
diff --git a/sysutils/kfloppy/files/plist.base.rm b/sysutils/kfloppy/files/plist.base.rm
index 197cb22fe65b..c0eb57b0ed06 100644
--- a/sysutils/kfloppy/files/plist.base.rm
+++ b/sysutils/kfloppy/files/plist.base.rm
@@ -33,7 +33,6 @@
 @dirrm share/doc/HTML/en/KRegExpEditor
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @dirrm share/config
 @dirrm share/apps/ksim/themes/ksim/net
 @dirrm share/apps/ksim/themes/ksim/mail
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index a8af40a21512..d93b5e24f10b 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.tar.bz2) = 81e2916ba0fa865053aff858982c040e
+MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73
diff --git a/sysutils/sweeper/files/patch-ksimcpu.cpp b/sysutils/sweeper/files/patch-ksimcpu.cpp
deleted file mode 100644
index 38fa88cabeec..000000000000
--- a/sysutils/sweeper/files/patch-ksimcpu.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- ksim/monitors/cpu/ksimcpu.cpp.orig	Mon May 13 10:47:51 2002
-+++ ksim/monitors/cpu/ksimcpu.cpp	Mon Mar 17 13:26:46 2003
-@@ -42,8 +42,16 @@
- #include <themetypes.h>
- 
- #ifdef Q_OS_BSD4
--#include <sys/dkstat.h>
- #include <sys/param.h>
-+#ifdef Q_OS_FREEBSD
-+#if __FreeBSD_version < 500101
-+#include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
-+#else
-+#include <sys/dkstat.h>
-+#endif
- #include <sys/sysctl.h>
- #include <string.h>
- #include <kvm.h>
-@@ -246,8 +254,8 @@
-   static int oidCpuTime[CTL_MAXNAME + 2];
-   static size_t oidCpuTimeLen = sizeof(oidCpuTime);
-   long cpuTime[CPUSTATES];
--  unsigned int cpuTimeLen = sizeof(cpuTime);
--  static char *name = "kern.cp_time";
-+  size_t cpuTimeLen = sizeof(cpuTime);
-+  static const char *name = "kern.cp_time";
-   static int initialized = 0;
- 
-   if (!initialized) {
diff --git a/sysutils/sweeper/files/patch-ksimdisk.cpp b/sysutils/sweeper/files/patch-ksimdisk.cpp
index be1790d8ec21..ecb5bd17da08 100644
--- a/sysutils/sweeper/files/patch-ksimdisk.cpp
+++ b/sysutils/sweeper/files/patch-ksimdisk.cpp
@@ -1,24 +1,44 @@
-Index: ksimdisk.cpp
-===================================================================
-RCS file: /home/kde/kdeutils/ksim/monitors/disk/ksimdisk.cpp,v
-retrieving revision 1.13
-diff -u -5 -p -d -r1.13 ksimdisk.cpp
---- ksimdisk.cpp	2 Nov 2002 14:34:08 -0000	1.13
-+++ ksim/monitors/disk/ksimdisk.cpp	3 Mar 2003 08:48:34 -0000
-@@ -39,11 +39,16 @@
- #include <chart.h>
- #include <progress.h>
- #include <themetypes.h>
+--- ksim/monitors/disk/ksimdisk.cpp.orig	Mon Nov  4 11:03:53 2002
++++ ksim/monitors/disk/ksimdisk.cpp	Wed Mar 19 13:37:39 2003
+@@ -248,6 +253,16 @@
+ #endif
  
  #ifdef Q_OS_FREEBSD
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
++#if __FreeBSD_version < 500107
++#define	devstat_getdevs(fd, stats)	getdevs(stats)
++#define	devstat_selectdevs		selectdevs
++#define	bytes_read(dev)			(dev).bytes_read
++#define	bytes_written(dev)		(dev).bytes_written
 +#else
-+#include <sys/resource.h>
++#define	bytes_read(dev)			(dev).bytes[DEVSTAT_READ]
++#define	bytes_written(dev)		(dev).bytes[DEVSTAT_WRITE]
 +#endif
- #include <devstat.h>
- #include <stdlib.h>
- #endif
++
+   statinfo diskStats;
+   bzero(&diskStats, sizeof(diskStats));
+   diskStats.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
+@@ -258,11 +273,11 @@
+   long generation;
+   device_selection *deviceSelect = 0;
+ 
+-  if (getdevs(&diskStats) < 0)
++  if (devstat_getdevs(NULL, &diskStats) < 0)
+     return;
+ 
+   deviceAmount = diskStats.dinfo->numdevs;
+-  if (selectdevs(&deviceSelect, &selected, &selections,
++  if (devstat_selectdevs(&deviceSelect, &selected, &selections,
+      &generation, diskStats.dinfo->generation,
+      diskStats.dinfo->devices, deviceAmount,
+      0, 0, 0, 0, DS_SELECT_ONLY, 10, 1) < 0)
+@@ -275,8 +290,8 @@
+     disk = deviceSelect[i].position;
+     device = diskStats.dinfo->devices[disk];
+     blockSize = (device.block_size <= 0 ? 512 : device.block_size);
+-    readBlocks = device.bytes_read / blockSize;
+-    writeBlocks = device.bytes_written / blockSize;
++    readBlocks = bytes_read(device) / blockSize;
++    writeBlocks = bytes_written(device) / blockSize;
  
- #ifdef Q_OS_LINUX
+     DiskData diskData;
+     diskData.name = device.device_name
diff --git a/sysutils/sweeper/files/plist.base.rm b/sysutils/sweeper/files/plist.base.rm
index 197cb22fe65b..c0eb57b0ed06 100644
--- a/sysutils/sweeper/files/plist.base.rm
+++ b/sysutils/sweeper/files/plist.base.rm
@@ -33,7 +33,6 @@
 @dirrm share/doc/HTML/en/KRegExpEditor
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @dirrm share/config
 @dirrm share/apps/ksim/themes/ksim/net
 @dirrm share/apps/ksim/themes/ksim/mail