Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

19 files changed, 75 insertions, 16 deletions

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 6e35ca7db..21ec42001 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -14,6 +14,20 @@
 
 tde_setup_architecture_flags( )
 
+
+##### check for libdl ###########################
+
+set( DL_LIBRARIES dl )
+check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL )
+if( NOT HAVE_LIBDL )
+  unset( DL_LIBRARIES )
+  check_function_exists( dlopen HAVE_DLOPEN )
+  if( HAVE_DLOPEN )
+    set( HAVE_LIBDL 1 )
+  endif( HAVE_DLOPEN )
+endif( NOT HAVE_LIBDL )
+
+
 # termios.h (tdm, tdeioslave)
 if( BUILD_TDM OR BUILD_TDEIOSLAVES )
   check_include_file( termios.h HAVE_TERMIOS_H )
diff --git a/cmake b/cmake
-Subproject 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac
+Subproject 08c6f54d6f80554caa671847417cf04326adb63
diff --git a/config.h.cmake b/config.h.cmake
index cacb97cb2..6e27a2787 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -174,8 +174,8 @@
 #cmakedefine USE_PAM 1
 #cmakedefine TDM_PAM_SERVICE "@TDM_PAM_SERVICE@"
 
-#define USESHADOW 1
-#define HAVE_SHADOW 1
+#cmakedefine USESHADOW "@USESHADOW@"
+#cmakedefine HAVE_SHADOW "@HAVE_SHADOW@"
 
 #cmakedefine XDMCP 1
 
diff --git a/kate/data/externaltools b/kate/data/externaltools
index 9057b7340..3dceaded7 100644
--- a/kate/data/externaltools
+++ b/kate/data/externaltools
@@ -9,7 +9,7 @@ externaltool_RunScript=Ctrl+Shift+X
 [externaltool_CVSLogforCurrentDocument]
 acname=externaltool_CVSLogforCurrentDocument
 cmdname=cvs-log
-command=if grep %filename %directory/CVS/Entries 2>&1>/dev/null ; then\n  cd %directory && cervisia -log %filename\nelse\n  kdialog --title Error --msgbox "The file '%filename' is not in CVS."\nfi
+command=if grep %filename %directory/CVS/Entries 2>&1 >/dev/null ; then\n  cd %directory && cervisia -log %filename\nelse\n  kdialog --title Error --msgbox "The file '%filename' is not in CVS."\nfi
 executable=cervisia
 icon=cervisia
 mimetypes=
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index 5508d91ac..a59599b71 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -80,8 +80,13 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
 void KclockModule::save()
 {
 //  The order here is important
+#ifdef __OpenBSD__
+  tzone->save();
+  dtime->save();
+#else
   dtime->save();
   tzone->save();
+#endif
 
   // Tell the clock applet about the change so that it can update its timezone
   kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() );
diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp
index 12ec8ee2d..7b484da76 100644
--- a/kcontrol/info/info_openbsd.cpp
+++ b/kcontrol/info/info_openbsd.cpp
@@ -235,7 +235,7 @@ bool GetInfo_Sound (TQListView *lbox)
 		if ((pos = s.find("at ")) >= 0) {
 			pos += 3;	// skip "at "
 			start = end = s.ascii();
-			for(; (*end!=':') && (*end!='\n'); end++);
+			for(; *end && (*end!=':') && (*end!='\n'); end++);
 			len = end - start;
 			dev = (char *) malloc(len + 1);
 			strncpy(dev, start, len);
diff --git a/kcontrol/tdefontinst/tdefontinst/GetPid.c b/kcontrol/tdefontinst/tdefontinst/GetPid.c
index 015ea7ce9..1a633a76b 100644
--- a/kcontrol/tdefontinst/tdefontinst/GetPid.c
+++ b/kcontrol/tdefontinst/tdefontinst/GetPid.c
@@ -55,6 +55,7 @@
         Linux         Tested on Linux 2.4
         FreeBSD       Tested on FreeBSD 5.1 by Brian Ledbetter <brian@shadowcom.net>
         NetBSD
+        OpenBSD
         Irix
         Solaris       Tested on Solaris 8 x86 by Torsten Kasch <tk@Genetik.Uni-Bielefeld.DE>
         HP-UX         Tested on HP-UX B.11.11 U 9000/800
@@ -82,7 +83,7 @@
     6. Email me and let me know if it works!
 */
 
-#if defined OS_Linux || defined __Linux__
+#if defined OS_Linux || defined __linux__
 
 #include <dirent.h>
 #include <ctype.h>
@@ -160,7 +161,7 @@ unsigned int kfi_getPid(const char *proc, unsigned int ppid)
     return error ? 0 : pid;
 }
 
-#elif defined OS_FreeBSD || defined OS_NetBSD || defined __FreeBSD__ || defined __NetBSD__ || defined OS_Darwin
+#elif defined OS_FreeBSD || defined OS_NetBSD || defined __FreeBSD__ || defined __NetBSD__ || defined OS_Darwin || defined OS_OpenBSD || defined __OpenBSD__
 
 #include <ctype.h>
 #include <dirent.h>
@@ -202,6 +203,8 @@ unsigned int kfi_getPid(const char *proc, unsigned int ppid)
         mib[3] = p[num].ki_pid;
 #elif defined(__DragonFly__) && __DragonFly_version >= 190000
         mib[3] = p[num].kp_pid;
+#elif defined(__OpenBSD__)
+        mib[3] = p[num].p_pid;
 #else
         mib[3] = p[num].kp_proc.p_pid;
 #endif
@@ -225,15 +228,22 @@ unsigned int kfi_getPid(const char *proc, unsigned int ppid)
                     pid=p[num].kp_pid;
 #else
 #if defined(__DragonFly__)
-	    if(proc_p.kp_eproc.e_ppid==ppid && p[num].kp_thread.td_comm && 0==strcmp(p[num].kp_thread.td_comm, proc))
+            if(proc_p.kp_eproc.e_ppid==ppid && p[num].kp_thread.td_comm && 0==strcmp(p[num].kp_thread.td_comm, proc))
+#elif defined(__OpenBSD__)
+            if(proc_p.p_ppid==ppid && p[num].p_comm && 0==strcmp(p[num].p_comm, proc))
 #else
             if(proc_p.kp_eproc.e_ppid==ppid && p[num].kp_proc.p_comm && 0==strcmp(p[num].kp_proc.p_comm, proc))
 #endif
-                if(pid)
+                if(pid) {
                     error=true;
-                else
+                } else {
+#if defined(__OpenBSD__)
+                    pid=p[num].p_pid;
+#else
                     pid=p[num].kp_proc.p_pid;
 #endif
+                }
+#endif
         }
     }
     free(p);
diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp
index c24f22dd2..14e681d18 100644
--- a/kcontrol/tdm/tdm-shut.cpp
+++ b/kcontrol/tdm/tdm-shut.cpp
@@ -209,7 +209,11 @@ void TDMSessionsWidget::load()
 
   config->setGroup("Shutdown");
   restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot"));
+#if defined(__OpenBSD__)
+  shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt -p"));
+#else
   shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff"));
+#endif
 
   bm_combo->setCurrentId(config->readEntry("BootManager", "None"));
 }
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index 80ea9c21a..743a3453e 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -97,7 +97,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
   LINK
     kdesktopsettings-static bgnd-static dmctl-static
     konq-shared tdeutils-shared
-    ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
+    ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${DL_LIBRARIES}
     ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES}
 )
 
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 773a0710a..1de0b6753 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -79,7 +79,9 @@
 
 #include <kcrash.h>
 
+#ifdef __linux__
 #include <linux/stat.h>
+#endif
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index c71ba6e2f..dbd3a0580 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -409,12 +409,21 @@ NaughtyProcessMonitor::pidList() const
   d->cacheLoadMap_.clear () ;
   d->uidMap_.clear () ;
   for (i = 0; i < nentries; i++) {
+#ifdef __OpenBSD__
+      l << (unsigned long) kp[i].p_pid ;
+      d->cacheLoadMap_.insert (kp[i].p_pid,
+                              (kp[i].p_uticks +
+                               kp[i].p_sticks)) ;
+      d->uidMap_.insert (kp[i].p_pid,
+                        kp[i].p_uid) ;
+#else
       l << (unsigned long) kp[i].kp_proc.p_pid ;
       d->cacheLoadMap_.insert (kp[i].kp_proc.p_pid,
 			       (kp[i].kp_proc.p_uticks + 
 				kp[i].kp_proc.p_sticks)) ;
       d->uidMap_.insert (kp[i].kp_proc.p_pid,
 			 kp[i].kp_eproc.e_ucred.cr_uid) ;
+#endif
   }
 
   free (kp) ;
diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt
index 9473db291..68566de4c 100644
--- a/konsole/konsole/CMakeLists.txt
+++ b/konsole/konsole/CMakeLists.txt
@@ -74,5 +74,5 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} dl
+  LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} ${DL_LIBRARIES}
 )
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
index 3fc77d57d..bf371fd1a 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
@@ -174,6 +174,12 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
 		aliases.insert("wwwoffled", new TQString("daemon"));
 		aliases.insert("xntpd", new TQString("daemon"));
 		aliases.insert("ypbind", new TQString("daemon"));
+		aliases.insert("apmd", new TQString("daemon"));
+		aliases.insert("getty", new TQString("daemon"));
+		aliases.insert("mountd", new TQString("daemon"));
+		aliases.insert("inetd", new TQString("daemon"));
+		aliases.insert("nfsd", new TQString("daemon"));
+		aliases.insert("wsmoused", new TQString("daemon"));
 		/* kde applications */
 		aliases.insert("appletproxy", new TQString("tdeapp"));
 		aliases.insert("dcopserver", new TQString("tdeapp"));
@@ -210,6 +216,7 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
 		aliases.insert("tcsh", new TQString("shell"));
 		aliases.insert("tee", new TQString("tools"));
 		aliases.insert("vi", new TQString("wordprocessing"));
+		aliases.insert("vim", new TQString("wordprocessing"));
 	}
 
 	/* The filter mode is controlled by a combo box of the parent. If
diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt
index 89e0ef32b..e3149cadb 100644
--- a/nsplugins/viewer/CMakeLists.txt
+++ b/nsplugins/viewer/CMakeLists.txt
@@ -30,6 +30,6 @@ tde_add_executable( nspluginviewer AUTOMOC
     ../NSPluginCallbackIface.stub NSPluginClassIface.skel
     nsplugin.cpp viewer.cpp qxteventloop.cpp
     glibevents.cpp
-  LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt dl
+  LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt ${DL_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/nfs/CMakeLists.txt b/tdeioslave/nfs/CMakeLists.txt
index c6ccd04f8..b45824d73 100644
--- a/tdeioslave/nfs/CMakeLists.txt
+++ b/tdeioslave/nfs/CMakeLists.txt
@@ -11,6 +11,7 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cc
index 43c15ecd2..00dff3684 100644
--- a/tdeioslave/smtp/smtp.cc
+++ b/tdeioslave/smtp/smtp.cc
@@ -30,6 +30,11 @@
 
 #include <config.h>
 
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <stdio.h>
+
 #ifdef HAVE_LIBSASL2
 extern "C" {
 #include <sasl/sasl.h>
@@ -71,12 +76,8 @@ using std::auto_ptr;
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <assert.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
diff --git a/tdm/backend/ctrl.c b/tdm/backend/ctrl.c
index 4e10309e6..4acd6d293 100644
--- a/tdm/backend/ctrl.c
+++ b/tdm/backend/ctrl.c
@@ -42,7 +42,9 @@ from the copyright holder.
 #include <signal.h>
 #include <pwd.h>
 
+#ifdef __linux__
 #include <linux/vt.h>
+#endif
 #include "getfd.h"
 
 static void
diff --git a/tdm/backend/getfd.c b/tdm/backend/getfd.c
index 3632161d3..6bf8c8783 100644
--- a/tdm/backend/getfd.c
+++ b/tdm/backend/getfd.c
@@ -4,7 +4,9 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/ioctl.h>
+#ifdef __linux__
 #include <linux/kd.h>
+#endif
 #include "getfd.h"
 
 /*
diff --git a/twin/utils.cpp b/twin/utils.cpp
index ddd5a3387..e7e5c7d32 100644
--- a/twin/utils.cpp
+++ b/twin/utils.cpp
@@ -21,6 +21,8 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <string.h>
 #include <netdb.h>
 
+#include <sys/socket.h>
+
 #ifndef KCMRULES
 
 #include <tqapplication.h>