diff options
author | Alan Eldridge <alane@FreeBSD.org> | 2003-04-05 22:16:12 +0000 |
---|---|---|
committer | Alan Eldridge <alane@FreeBSD.org> | 2003-04-05 22:16:12 +0000 |
commit | b294b98273d5cae35ab470c066f683c7b5e8d837 (patch) | |
tree | eee9e6143a38af1c4219aaf69eb7096627c2e625 /archivers/ark | |
parent | Add missing files (diff) |
Rejoice, for the long awaited upgrade to kde 3.1.1 is here!
Notes
Notes:
svn path=/head/; revision=78353
Diffstat (limited to 'archivers/ark')
-rw-r--r-- | archivers/ark/distinfo | 2 | ||||
-rw-r--r-- | archivers/ark/files/patch-ksimcpu.cpp | 31 | ||||
-rw-r--r-- | archivers/ark/files/patch-ksimdisk.cpp | 58 | ||||
-rw-r--r-- | archivers/ark/files/plist.base.rm | 1 |
4 files changed, 40 insertions, 52 deletions
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo index a8af40a21512..d93b5e24f10b 100644 --- a/archivers/ark/distinfo +++ b/archivers/ark/distinfo @@ -1 +1 @@ -MD5 (KDE/kdeutils-3.1.tar.bz2) = 81e2916ba0fa865053aff858982c040e +MD5 (KDE/kdeutils-3.1.1.tar.bz2) = fd2fef424ffb3de13e4fc8d55b995b73 diff --git a/archivers/ark/files/patch-ksimcpu.cpp b/archivers/ark/files/patch-ksimcpu.cpp deleted file mode 100644 index 38fa88cabeec..000000000000 --- a/archivers/ark/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/archivers/ark/files/patch-ksimdisk.cpp b/archivers/ark/files/patch-ksimdisk.cpp index be1790d8ec21..ecb5bd17da08 100644 --- a/archivers/ark/files/patch-ksimdisk.cpp +++ b/archivers/ark/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/archivers/ark/files/plist.base.rm b/archivers/ark/files/plist.base.rm index 197cb22fe65b..c0eb57b0ed06 100644 --- a/archivers/ark/files/plist.base.rm +++ b/archivers/ark/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 |