--- kdeutils-3.5.8/klaptopdaemon/Makefile.am	2007-10-08 05:49:45.000000000 -0400
+++ kdeutils-3.5.8-new/klaptopdaemon/Makefile.am	2007-10-15 13:11:26.000000000 -0400
@@ -21,7 +21,7 @@
 kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
 	acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp  
 kcm_laptop_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module
-kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la
+kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la $(LIBZ)
 kcm_laptop_la_COMPILE_FIRST = crcresult.h
 
 AM_CPPFLAGS = $(all_includes)
--- kdeutils-3.5.8/ksim/monitors/filesystem/filesystemstats.cpp	2007-10-08 05:49:45.000000000 -0400
+++ kdeutils-3.5.8-new/ksim/monitors/filesystem/filesystemstats.cpp	2007-10-15 14:15:16.000000000 -0400
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 
-#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
+#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__) && !defined(__APPLE__)
 #include <sys/statvfs.h>
 #elif defined( HAVE_SYS_STATFS_H )
 #include <sys/statfs.h>
@@ -59,7 +59,8 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
+#if defined(HAVE_STATVFS) && !defined(__DragonFly__) && !defined(__APPLE__)
+#warning "have statvfs"
 typedef struct statvfs ksim_statfs;
 #define ksim_getfsstat getvfsstat
 #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
@@ -75,7 +76,7 @@
 
 int fsystemStats( const char * file, ksim_statfs & stats )
 {
-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
+#if defined(HAVE_STATVFS) && !defined(__DragonFly__) && !defined(__APPLE__)
   return statvfs( file, &stats );
 #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
   return statfs( file, &stats );
--- kdeutils-3.5.8/ksim/monitors/lm_sensors/Makefile.am	2005-10-10 10:59:12.000000000 -0400
+++ kdeutils-3.5.8-new/ksim/monitors/lm_sensors/Makefile.am	2007-10-15 13:11:27.000000000 -0400
@@ -1,9 +1,9 @@
 kde_module_LTLIBRARIES = ksim_sensors.la
 
 if include_nv
-NVCTRL_LIB= NVCtrl.la
-NVCtrl_la_SOURCES = NVCtrl.c
-NVCtrl_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+NVCTRL_LIB=libNVCtrl.la
+libNVCtrl_la_SOURCES = NVCtrl.c
+libNVCtrl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 endif
 
 noinst_LTLIBRARIES = $(NVCTRL_LIB)
--- kdeutils-3.5.8/ksim/monitors/snmp/configure.in.in	2006-07-22 04:12:20.000000000 -0400
+++ kdeutils-3.5.8-new/ksim/monitors/snmp/configure.in.in	2007-10-15 13:11:26.000000000 -0400
@@ -37,4 +37,4 @@
   fi
 fi
 
-AM_CONDITIONAL(include_ksim_monitors_snmp, test "x$enable_snmp" = xyes)
+AM_CONDITIONAL(include_ksim_monitors_snmp, /usr/bin/false)
--- kdeutils-3.5.8/superkaramba/configure.in.in	2006-01-20 01:49:18.000000000 -0500
+++ kdeutils-3.5.8-new/superkaramba/configure.in.in	2007-10-15 13:11:26.000000000 -0400
@@ -75,3 +75,5 @@
 if test -z "$PYTHONINC" ; then
         DO_NOT_COMPILE="$DO_NOT_COMPILE superkaramba"
 fi
+
+AC_CHECK_HEADERS(netinet/in.h sys/sockio.h)
--- kdeutils-3.5.8/superkaramba/src/Makefile.am	2006-01-19 11:49:35.000000000 -0500
+++ kdeutils-3.5.8-new/superkaramba/src/Makefile.am	2007-10-15 13:11:26.000000000 -0400
@@ -40,7 +40,7 @@
 
 # kde_cfg_DATA = superkaramba.kcfg
 
-superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(XMMS_LDFLAGS)
+superkaramba_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(XMMS_LDFLAGS)
 #superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LDADD) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
 superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LIBS) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
 
--- kdeutils-3.5.8/superkaramba/src/misc_python.cpp	2007-10-08 05:49:47.000000000 -0400
+++ kdeutils-3.5.8-new/superkaramba/src/misc_python.cpp	2007-10-15 13:11:56.000000000 -0400
@@ -653,7 +653,7 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <arpa/inet.h>
-#if defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(HAVE_NETINET_IN_H)
 #include <netinet/in.h>
 #endif
 #if defined(Q_OS_SOLARIS)