12 files changed, 165 insertions, 27 deletions

diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo
index a0b42f46435e..ab98e68d1b5c 100644
--- a/sysutils/kdeadmin3/distinfo
+++ b/sysutils/kdeadmin3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeadmin-3.5.7.tar.bz2) = fdf4e7e230d9b5688d72f0e1a8039e12
-SHA256 (KDE/kdeadmin-3.5.7.tar.bz2) = 8eac329d1a996fe39da777ba286351585a429050b0a2718711bd3789fd3f6db1
-SIZE (KDE/kdeadmin-3.5.7.tar.bz2) = 2120666
+MD5 (KDE/kdeadmin-3.5.8.tar.bz2) = 324a44d854a92177e71954f9264c98a8
+SHA256 (KDE/kdeadmin-3.5.8.tar.bz2) = 501c8dd591d112e4641b802dee175037616da7f492c865cccb13bb3aadcd6aea
+SIZE (KDE/kdeadmin-3.5.8.tar.bz2) = 2123522
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index a0b42f46435e..ab98e68d1b5c 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeadmin-3.5.7.tar.bz2) = fdf4e7e230d9b5688d72f0e1a8039e12
-SHA256 (KDE/kdeadmin-3.5.7.tar.bz2) = 8eac329d1a996fe39da777ba286351585a429050b0a2718711bd3789fd3f6db1
-SIZE (KDE/kdeadmin-3.5.7.tar.bz2) = 2120666
+MD5 (KDE/kdeadmin-3.5.8.tar.bz2) = 324a44d854a92177e71954f9264c98a8
+SHA256 (KDE/kdeadmin-3.5.8.tar.bz2) = 501c8dd591d112e4641b802dee175037616da7f492c865cccb13bb3aadcd6aea
+SIZE (KDE/kdeadmin-3.5.8.tar.bz2) = 2123522
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 3d6a9064e821..5c3d382e1973 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.7.tar.bz2) = 5f167f53bdbf0b8c71c2d0f0ff7593fd
-SHA256 (KDE/kdeutils-3.5.7.tar.bz2) = e72de75dd40e1422e4da5957acafc06278418f60850aea21524d857abb97adf8
-SIZE (KDE/kdeutils-3.5.7.tar.bz2) = 3068596
+MD5 (KDE/kdeutils-3.5.8.tar.bz2) = d1a0fcc83f35428a76cf7523a04ba19c
+SHA256 (KDE/kdeutils-3.5.8.tar.bz2) = 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
+SIZE (KDE/kdeutils-3.5.8.tar.bz2) = 3059172
diff --git a/sysutils/kdf/files/patch-ksim_monitors_filesystem-filesystemstats.cpp b/sysutils/kdf/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
new file mode 100644
index 000000000000..7a29e570a1b7
--- /dev/null
+++ b/sysutils/kdf/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
@@ -0,0 +1,46 @@
+--- ksim/monitors/filesystem/filesystemstats.cpp.orig	2007-10-08 11:49:45.000000000 +0200
++++ ksim/monitors/filesystem/filesystemstats.cpp	2007-10-26 19:32:09.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ 
+-#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
++#ifdef HAVE_SYS_STATVFS_H
+ #include <sys/statvfs.h>
+ #elif defined( HAVE_SYS_STATFS_H )
+ #include <sys/statfs.h>
+@@ -59,12 +59,10 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ 
+-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
++#ifdef HAVE_STATVFS
+ typedef struct statvfs ksim_statfs;
+-#define ksim_getfsstat getvfsstat
+ #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
+ typedef struct statfs ksim_statfs;
+-#define ksim_getfsstat getfsstat
+ #else
+ typedef struct // fall back for (possibly) non-supported systems
+ {
+@@ -75,7 +73,7 @@
+ 
+ int fsystemStats( const char * file, ksim_statfs & stats )
+ {
+-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
++#ifdef HAVE_STATVFS
+   return statvfs( file, &stats );
+ #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
+   return statfs( file, &stats );
+@@ -164,9 +162,9 @@
+ #endif
+ 
+ #ifdef USE_FSSTAT
+-  ksim_statfs sfs[32];
++  struct statfs sfs[32];
+   int fs_count;
+-  if ( ( fs_count = ksim_getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
++  if ( ( fs_count = getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
+   {
+     for ( int i = 0; i < fs_count; i++ )
+     {
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 3d6a9064e821..5c3d382e1973 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.7.tar.bz2) = 5f167f53bdbf0b8c71c2d0f0ff7593fd
-SHA256 (KDE/kdeutils-3.5.7.tar.bz2) = e72de75dd40e1422e4da5957acafc06278418f60850aea21524d857abb97adf8
-SIZE (KDE/kdeutils-3.5.7.tar.bz2) = 3068596
+MD5 (KDE/kdeutils-3.5.8.tar.bz2) = d1a0fcc83f35428a76cf7523a04ba19c
+SHA256 (KDE/kdeutils-3.5.8.tar.bz2) = 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
+SIZE (KDE/kdeutils-3.5.8.tar.bz2) = 3059172
diff --git a/sysutils/kfloppy/files/patch-ksim_monitors_filesystem-filesystemstats.cpp b/sysutils/kfloppy/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
new file mode 100644
index 000000000000..7a29e570a1b7
--- /dev/null
+++ b/sysutils/kfloppy/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
@@ -0,0 +1,46 @@
+--- ksim/monitors/filesystem/filesystemstats.cpp.orig	2007-10-08 11:49:45.000000000 +0200
++++ ksim/monitors/filesystem/filesystemstats.cpp	2007-10-26 19:32:09.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ 
+-#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
++#ifdef HAVE_SYS_STATVFS_H
+ #include <sys/statvfs.h>
+ #elif defined( HAVE_SYS_STATFS_H )
+ #include <sys/statfs.h>
+@@ -59,12 +59,10 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ 
+-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
++#ifdef HAVE_STATVFS
+ typedef struct statvfs ksim_statfs;
+-#define ksim_getfsstat getvfsstat
+ #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
+ typedef struct statfs ksim_statfs;
+-#define ksim_getfsstat getfsstat
+ #else
+ typedef struct // fall back for (possibly) non-supported systems
+ {
+@@ -75,7 +73,7 @@
+ 
+ int fsystemStats( const char * file, ksim_statfs & stats )
+ {
+-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
++#ifdef HAVE_STATVFS
+   return statvfs( file, &stats );
+ #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
+   return statfs( file, &stats );
+@@ -164,9 +162,9 @@
+ #endif
+ 
+ #ifdef USE_FSSTAT
+-  ksim_statfs sfs[32];
++  struct statfs sfs[32];
+   int fs_count;
+-  if ( ( fs_count = ksim_getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
++  if ( ( fs_count = getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
+   {
+     for ( int i = 0; i < fs_count; i++ )
+     {
diff --git a/sysutils/klaptopdaemon/Makefile b/sysutils/klaptopdaemon/Makefile
index 0730785819f6..8fc854a11a96 100644
--- a/sysutils/klaptopdaemon/Makefile
+++ b/sysutils/klaptopdaemon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	klaptopdaemon
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,7 +16,7 @@ DISTNAME=	kdeutils-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Power management utility for KDE
+COMMENT=	APM monitor for KDE
 
 CONFLICTS=	kdeutils-3.1.* kdeutils-3.2.[0-3]
 
diff --git a/sysutils/klaptopdaemon/distinfo b/sysutils/klaptopdaemon/distinfo
index 3d6a9064e821..5c3d382e1973 100644
--- a/sysutils/klaptopdaemon/distinfo
+++ b/sysutils/klaptopdaemon/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.7.tar.bz2) = 5f167f53bdbf0b8c71c2d0f0ff7593fd
-SHA256 (KDE/kdeutils-3.5.7.tar.bz2) = e72de75dd40e1422e4da5957acafc06278418f60850aea21524d857abb97adf8
-SIZE (KDE/kdeutils-3.5.7.tar.bz2) = 3068596
+MD5 (KDE/kdeutils-3.5.8.tar.bz2) = d1a0fcc83f35428a76cf7523a04ba19c
+SHA256 (KDE/kdeutils-3.5.8.tar.bz2) = 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
+SIZE (KDE/kdeutils-3.5.8.tar.bz2) = 3059172
diff --git a/sysutils/klaptopdaemon/files/patch-klaptopdaemon-Makefile.in b/sysutils/klaptopdaemon/files/patch-klaptopdaemon-Makefile.in
index f9067f1ebec5..0e5c98adccbe 100644
--- a/sysutils/klaptopdaemon/files/patch-klaptopdaemon-Makefile.in
+++ b/sysutils/klaptopdaemon/files/patch-klaptopdaemon-Makefile.in
@@ -1,11 +1,11 @@
---- klaptopdaemon/Makefile.in.orig	Sun Jul  8 01:27:01 2007
-+++ klaptopdaemon/Makefile.in	Sun Jul  8 01:27:58 2007
-@@ -488,7 +488,7 @@
+--- klaptopdaemon/Makefile.in.orig	2007-10-08 16:31:35.000000000 +0200
++++ klaptopdaemon/Makefile.in	2007-10-25 14:32:46.000000000 +0200
+@@ -463,7 +463,7 @@
  #>- kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel  
  #>+ 1
  kded_klaptopdaemon_la_SOURCES=$(MESSAGE_SOURCES)    laptop_daemon_skel.cc
 -kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst
 +kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst -lXss
- kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) libkcmlaptop.la
+ kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) $(LIB_XSS) libkcmlaptop.la
  klaptop_acpi_helper_SOURCES = acpi_helper.cpp
  klaptop_check_SOURCES = laptop_check.cpp 
diff --git a/sysutils/kmilo/distinfo b/sysutils/kmilo/distinfo
index 3d6a9064e821..5c3d382e1973 100644
--- a/sysutils/kmilo/distinfo
+++ b/sysutils/kmilo/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.7.tar.bz2) = 5f167f53bdbf0b8c71c2d0f0ff7593fd
-SHA256 (KDE/kdeutils-3.5.7.tar.bz2) = e72de75dd40e1422e4da5957acafc06278418f60850aea21524d857abb97adf8
-SIZE (KDE/kdeutils-3.5.7.tar.bz2) = 3068596
+MD5 (KDE/kdeutils-3.5.8.tar.bz2) = d1a0fcc83f35428a76cf7523a04ba19c
+SHA256 (KDE/kdeutils-3.5.8.tar.bz2) = 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
+SIZE (KDE/kdeutils-3.5.8.tar.bz2) = 3059172
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index 3d6a9064e821..5c3d382e1973 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.7.tar.bz2) = 5f167f53bdbf0b8c71c2d0f0ff7593fd
-SHA256 (KDE/kdeutils-3.5.7.tar.bz2) = e72de75dd40e1422e4da5957acafc06278418f60850aea21524d857abb97adf8
-SIZE (KDE/kdeutils-3.5.7.tar.bz2) = 3068596
+MD5 (KDE/kdeutils-3.5.8.tar.bz2) = d1a0fcc83f35428a76cf7523a04ba19c
+SHA256 (KDE/kdeutils-3.5.8.tar.bz2) = 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
+SIZE (KDE/kdeutils-3.5.8.tar.bz2) = 3059172
diff --git a/sysutils/sweeper/files/patch-ksim_monitors_filesystem-filesystemstats.cpp b/sysutils/sweeper/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
new file mode 100644
index 000000000000..7a29e570a1b7
--- /dev/null
+++ b/sysutils/sweeper/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
@@ -0,0 +1,46 @@
+--- ksim/monitors/filesystem/filesystemstats.cpp.orig	2007-10-08 11:49:45.000000000 +0200
++++ ksim/monitors/filesystem/filesystemstats.cpp	2007-10-26 19:32:09.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ 
+-#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
++#ifdef HAVE_SYS_STATVFS_H
+ #include <sys/statvfs.h>
+ #elif defined( HAVE_SYS_STATFS_H )
+ #include <sys/statfs.h>
+@@ -59,12 +59,10 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ 
+-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
++#ifdef HAVE_STATVFS
+ typedef struct statvfs ksim_statfs;
+-#define ksim_getfsstat getvfsstat
+ #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
+ typedef struct statfs ksim_statfs;
+-#define ksim_getfsstat getfsstat
+ #else
+ typedef struct // fall back for (possibly) non-supported systems
+ {
+@@ -75,7 +73,7 @@
+ 
+ int fsystemStats( const char * file, ksim_statfs & stats )
+ {
+-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
++#ifdef HAVE_STATVFS
+   return statvfs( file, &stats );
+ #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
+   return statfs( file, &stats );
+@@ -164,9 +162,9 @@
+ #endif
+ 
+ #ifdef USE_FSSTAT
+-  ksim_statfs sfs[32];
++  struct statfs sfs[32];
+   int fs_count;
+-  if ( ( fs_count = ksim_getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
++  if ( ( fs_count = getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
+   {
+     for ( int i = 0; i < fs_count; i++ )
+     {