Add support for DragonFly (incomplete, but builds). Fix PLIST for Linux,
Solaris and FreeBSD. Bump PKGREVISION.


(hasso)

$NetBSD: patch-da,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- configure.orig	2009-04-13 22:32:32 +0300
+++ configure	2009-07-11 14:14:29 +0300
@@ -21527,7 +21527,7 @@ echo $ECHO_N "checking for libgtop sysde
 	  libgtop_need_server=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
 	  ;;
-	freebsd*|kfreebsd*)
+	freebsd*|kfreebsd*|dragonfly*)
 	  libgtop_sysdeps_dir=freebsd
 	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
@@ -21594,7 +21594,7 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6
 
 
 	case "$host_os" in
-	*bsd*)
+	*bsd*|dragonfly*)
 		case "$host_os" in
 		*kfreebsd*)
 		{ echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5

$NetBSD: patch-db,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/glibtop_machine.h.orig	2009-07-10 22:47:31 +0300
+++ sysdeps/freebsd/glibtop_machine.h	2009-07-10 22:47:58 +0300
@@ -25,7 +25,9 @@
 #include <sys/param.h>
 #include <nlist.h>
 #include <kvm.h>
+#ifndef __DragonFly__
 #include <sys/dkstat.h>
+#endif
 #include <time.h>
 #include <sys/user.h>
 #include <sys/types.h>

$NetBSD: patch-dc,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/cpu.c.orig	2009-07-10 22:48:38 +0300
+++ sysdeps/freebsd/cpu.c	2009-07-10 22:51:26 +0300
@@ -53,6 +53,7 @@ _glibtop_init_cpu_s (glibtop *server)
 void
 glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 {
+#ifndef __DragonFly__
 	long cpts [CPUSTATES];
 	struct clockinfo ci;
 	size_t length;
@@ -111,4 +112,5 @@ glibtop_get_cpu_s (glibtop *server, glib
 	if (ncpu > 1) {
 		buf->flags |= _glibtop_sysdeps_cpu_smp;
 	}
+#endif
 }

$NetBSD: patch-dd,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/open.c.orig	2009-07-10 22:52:03 +0300
+++ sysdeps/freebsd/open.c	2009-07-10 22:53:37 +0300
@@ -65,6 +65,8 @@ glibtop_open_p (glibtop *server, const c
 	server->machine.egid = getegid ();
 #if defined(__FreeBSD_kernel__)
 	server->os_version_code = __FreeBSD_kernel_version;
+#elif defined(__DragonFly__)
+	server->os_version_code = __DragonFly_version;
 #else
 	server->os_version_code = __FreeBSD_version;
 #endif

$NetBSD: patch-de,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/proclist.c.orig	2009-07-10 23:21:10 +0300
+++ sysdeps/freebsd/proclist.c	2009-07-10 23:30:28 +0300
@@ -95,7 +95,11 @@ glibtop_get_proclist_p (glibtop *server,
 	for (i = 0; i < len; i++) {
 		pid_t pid;
 
+#ifdef __DragonFly__
+		pid = (pid_t) pinfo[i].kp_pid;
+#else
 		pid = (pid_t) pinfo[i].ki_pid;
+#endif
 
 		switch (which & GLIBTOP_KERN_PROC_MASK) {
 			case GLIBTOP_KERN_PROC_ALL:
@@ -105,29 +109,53 @@ glibtop_get_proclist_p (glibtop *server,
 					continue;
 				break;
 			case GLIBTOP_KERN_PROC_UID:
+#ifdef __DragonFly__
+				if ((uid_t) arg != pinfo[i].kp_ruid)
+#else
 				if ((uid_t) arg != pinfo[i].ki_ruid)
+#endif
 					continue;
 				break;
 			case GLIBTOP_KERN_PROC_PGRP:
+#ifdef __DragonFly__
+				if ((pid_t) arg != pinfo[i].kp_pgid)
+#else
 				if ((pid_t) arg != pinfo[i].ki_pgid)
+#endif
 					continue;
 				break;
 			case GLIBTOP_KERN_PROC_SESSION:
+#ifdef __DragonFly__
+				if ((pid_t) arg != pinfo[i].kp_sid)
+#else
 				if ((pid_t) arg != pinfo[i].ki_sid)
+#endif
 					continue;
 				break;
 			case GLIBTOP_KERN_PROC_TTY:
+#ifdef __DragonFly__
+				if ((dev_t) arg != pinfo[i].kp_tdev)
+#else
 				if ((dev_t) arg != pinfo[i].ki_tdev)
+#endif
 					continue;
 				break;
 			case GLIBTOP_KERN_PROC_RUID:
+#ifdef __DragonFly__
+				if ((uid_t) arg != pinfo[i].kp_ruid)
+#else
 				if ((uid_t) arg != pinfo[i].ki_ruid)
+#endif
 					continue;
 				break;
 			}
 
 		if (which & GLIBTOP_EXCLUDE_NOTTY)
+#ifdef __DragonFly__
+			if (pinfo[i].kp_tdev == (dev_t) -1) continue;
+#else
 			if (pinfo[i].ki_tdev == (dev_t) -1) continue;
+#endif
 
 		if (which & GLIBTOP_EXCLUDE_IDLE) {
 			glibtop_get_proc_state_p (server, &procstate, pid);
@@ -136,7 +164,11 @@ glibtop_get_proclist_p (glibtop *server,
 		}
 
 		if (which & GLIBTOP_EXCLUDE_SYSTEM)
+#ifdef __DragonFly__
+			if (pinfo[i].kp_ruid == (uid_t) 0) continue;
+#else
 			if (pinfo[i].ki_ruid == (uid_t) 0) continue;
+#endif
 
 		g_array_append_val (pids, pid);
 	}

$NetBSD: patch-df,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/procstate.c.orig	2008-05-24 01:13:23 +0300
+++ sysdeps/freebsd/procstate.c	2009-07-11 15:26:10 +0300
@@ -64,6 +64,37 @@ glibtop_get_proc_state_p (glibtop *serve
 		return;
 	}
 
+#ifdef __DragonFly__
+	buf->uid = pinfo[0].kp_ruid;
+	buf->gid = pinfo[0].kp_rgid;
+
+	g_strlcpy (buf->cmd, pinfo[0].kp_comm, sizeof (buf->cmd));
+
+	switch (pinfo[0].kp_stat) {
+		case SACTIVE:
+			switch (pinfo[0].kp_lwp.kl_stat) {
+				case LSRUN:
+					buf->state = GLIBTOP_PROCESS_RUNNING;
+					break;
+				case LSSLEEP:
+					buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
+					break;
+				case LSSTOP:
+					buf->state = GLIBTOP_PROCESS_STOPPED;
+					break;
+				default:
+					buf->state = 0;
+					break;
+			}
+		case SZOMB:
+			buf->state = GLIBTOP_PROCESS_ZOMBIE;
+			break;
+		case SIDL:
+		default:
+			buf->state = 0;
+			break;
+	}
+#else
 	buf->uid = pinfo[0].ki_ruid;
 	buf->gid = pinfo[0].ki_rgid;
 
@@ -91,6 +122,7 @@ glibtop_get_proc_state_p (glibtop *serve
 			buf->state = 0;
 			break;
 	}
+#endif
 
 	buf->flags = _glibtop_sysdeps_proc_state;
 }

$NetBSD: patch-dg,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/procuid.c.orig	2009-07-10 23:41:21 +0300
+++ sysdeps/freebsd/procuid.c	2009-07-10 23:43:41 +0300
@@ -64,6 +64,17 @@ glibtop_get_proc_uid_p (glibtop *server,
 		return;
 	}
 
+#ifdef __DragonFly__
+#define	PROC_RUID	kp_ruid
+#define	PROC_EUID	kp_uid
+#define	PROC_RGID	kp_rgid
+#define	PROC_SVGID	kp_svgid
+#define	PROC_PPID	kp_ppid
+#define	PROC_PGID	kp_pgid
+#define	PROC_TPGID	kp_tpgid
+#define	PROC_NICE	kp_nice
+#define	PROC_PRIORITY	kp_lwp.kl_tdprio
+#else
 #define	PROC_RUID	ki_ruid
 #define	PROC_EUID	ki_uid
 #define	PROC_RGID	ki_rgid
@@ -73,6 +84,7 @@ glibtop_get_proc_uid_p (glibtop *server,
 #define	PROC_TPGID	ki_tpgid
 #define	PROC_NICE	ki_nice
 #define	PROC_PRIORITY	ki_pri.pri_user
+#endif
 
 	buf->uid  = pinfo [0].PROC_RUID;
 	buf->euid = pinfo [0].PROC_EUID;

$NetBSD: patch-dh,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/proctime.c.orig	2009-07-10 23:46:59 +0300
+++ sysdeps/freebsd/proctime.c	2009-07-10 23:53:38 +0300
@@ -80,7 +80,9 @@ glibtop_get_proc_time_p (glibtop *server
 
 	glibtop_suid_leave (server);
 
+#ifndef __DragonFly__ /* TODO */
 	buf->rtime = pinfo [0].ki_runtime * 1e-6;
+#endif
 
 	len = sizeof (ci);
 	if (sysctlbyname ("kern.clockrate", &ci, &len, NULL, 0)) {
@@ -94,6 +96,7 @@ glibtop_get_proc_time_p (glibtop *server
 
 	buf->rtime *= buf->frequency;
 
+#ifndef __DragonFly__ /* TODO */
        if ((pinfo [0].ki_flag & PS_INMEM)) {
            buf->utime = (pinfo [0].ki_runtime * 1e-6) * buf->frequency;
 	   buf->stime = tv2sec (pinfo [0].ki_rusage.ru_stime) * buf->frequency;
@@ -106,4 +109,5 @@ glibtop_get_proc_time_p (glibtop *server
            buf->start_time = tv2sec (pinfo [0].ki_start);
            buf->flags |= _glibtop_sysdeps_proc_time_user;
        }
+#endif
 }

$NetBSD: patch-di,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/procmem.c.orig	2009-07-10 23:55:49 +0300
+++ sysdeps/freebsd/procmem.c	2009-07-11 00:04:52 +0300
@@ -34,8 +34,10 @@
 #include <vm/vm_map.h>
 
 #include <sys/vnode.h>
+#ifndef __DragonFly__
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
+#endif
 
 #include <sys/ucred.h>
 #include <sys/user.h>
@@ -93,6 +95,7 @@ glibtop_get_proc_mem_p (glibtop *server,
 		return;
 	}
 
+#ifndef __DragonFly__ /* TODO */
 #define        PROC_VMSPACE   ki_vmspace
 
        buf->rss_rlim = pinfo [0].ki_rssize;
@@ -157,4 +160,5 @@ glibtop_get_proc_mem_p (glibtop *server,
 
 	buf->flags = _glibtop_sysdeps_proc_mem |
 		_glibtop_sysdeps_proc_mem_share;
+#endif
 }

$NetBSD: patch-dj,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/procsignal.c.orig	2009-07-11 00:06:33 +0300
+++ sysdeps/freebsd/procsignal.c	2009-07-11 00:08:36 +0300
@@ -66,10 +66,17 @@ glibtop_get_proc_signal_p (glibtop *serv
 		return;
 	}
 
+#ifdef __DragonFly__
+#define	PROC_SIGLIST	kp_siglist
+#define	PROC_SIGMASK	kp_lwp.kl_sigmask
+#define	PROC_SIGIGNORE	kp_sigignore
+#define	PROC_SIGCATCH	kp_sigcatch
+#else
 #define	PROC_SIGLIST	ki_siglist
 #define	PROC_SIGMASK	ki_sigmask
 #define	PROC_SIGIGNORE	ki_sigignore
 #define	PROC_SIGCATCH	ki_sigcatch
+#endif
 
 	/* signal: mask of pending signals.
 	 *         pinfo [0].kp_proc.p_siglist

$NetBSD: patch-dk,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/procmap.c.orig	2008-08-18 18:23:36 +0300
+++ sysdeps/freebsd/procmap.c	2009-07-11 14:53:45 +0300
@@ -19,6 +19,8 @@
    Boston, MA 02111-1307, USA.
 */
 
+#ifndef __DragonFly__ /* TODO */
+
 #include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
@@ -299,3 +301,29 @@ glibtop_get_proc_map_p (glibtop *server,
 
         return (glibtop_map_entry*) g_array_free(maps, FALSE);
 }
+#else /* __DragonFly__ */
+
+#include <config.h>
+#include <glibtop.h>
+#include <glibtop/error.h>
+#include <glibtop/procmap.h>
+
+static const unsigned long _glibtop_sysdeps_proc_map = 0;
+
+/* Init function. */
+
+void
+_glibtop_init_proc_map_p (glibtop *server)
+{
+        server->sysdeps.proc_map = _glibtop_sysdeps_proc_map;
+}
+
+/* Provides detailed information about a process. */
+
+glibtop_map_entry *
+glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf, pid_t pid)
+{
+        memset (buf, 0, sizeof (glibtop_proc_map));
+        return NULL;
+}
+#endif /* __DragonFly__ */

$NetBSD: patch-dl,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/procsegment.c.orig	2009-07-11 00:17:02 +0300
+++ sysdeps/freebsd/procsegment.c	2009-07-11 00:18:25 +0300
@@ -69,8 +69,13 @@ glibtop_get_proc_segment_p (glibtop *ser
 		return;
 	}
 
+#ifdef __DragonFly__
+	buf->text_rss = pinfo[0].kp_vm_tsize * pagesize;
+	buf->data_rss = pinfo[0].kp_vm_dsize * pagesize;
+#else
 	buf->text_rss = pinfo[0].ki_tsize * pagesize;
 	buf->data_rss = pinfo[0].ki_dsize * pagesize;
+#endif
 
 	buf->flags = _glibtop_sysdeps_proc_segment;
 }

$NetBSD: patch-dm,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/netload.c.orig	2009-07-11 13:42:20 +0300
+++ sysdeps/freebsd/netload.c	2009-07-11 14:01:00 +0300
@@ -91,6 +91,7 @@ void
 glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
                        const char *interface)
 {
+#ifndef __DragonFly__ /* TODO */
         struct ifnet ifnet;
         u_long ifnetaddr, ifnetfound;
         struct sockaddr *sa = NULL;
@@ -251,4 +252,5 @@ glibtop_get_netload_p (glibtop *server, 
                 }
                 return;
         }
+#endif /* !__DragonFly__ */
 }

$NetBSD: patch-dn,v 1.1 2009/07/11 13:14:13 hasso Exp $

--- sysdeps/freebsd/prockernel.c.orig	2009-07-11 14:07:07 +0300
+++ sysdeps/freebsd/prockernel.c	2009-07-11 14:11:59 +0300
@@ -91,9 +91,13 @@ glibtop_get_proc_kernel_p (glibtop *serv
 
 	glibtop_suid_leave (server);
 
+#ifdef __DragonFly__
+#define	PROC_WCHAN	kp_lwp.kl_wchan
+#define	PROC_WMESG	kp_lwp.kl_wmesg
+#else
 #define	PROC_WCHAN	ki_wchan
 #define	PROC_WMESG	ki_wmesg
-#define	PROC_WMESG	ki_wmesg
+#endif
 
 	buf->nwchan = (unsigned long) pinfo [0].PROC_WCHAN;
 
@@ -107,6 +111,11 @@ glibtop_get_proc_kernel_p (glibtop *serv
 		buf->wchan [0] = 0;
 	}
 
+#ifdef __DragonFly__
+	buf->k_flags = (unsigned long) pinfo [0].kp_flags;
+	buf->min_flt = (unsigned long) pinfo [0].kp_ru.ru_minflt;
+	buf->maj_flt = (unsigned long) pinfo [0].kp_ru.ru_majflt;
+#else
 	buf->k_flags = (unsigned long) pinfo [0].ki_flag;
 	buf->min_flt = (unsigned long) pinfo [0].ki_rusage.ru_minflt;
 	buf->maj_flt = (unsigned long) pinfo [0].ki_rusage.ru_majflt;
@@ -114,6 +123,7 @@ glibtop_get_proc_kernel_p (glibtop *serv
 	buf->cmin_flt = (unsigned long) buf->min_flt + pinfo [0].ki_rusage_ch.ru_minflt;
 	buf->cmaj_flt = (unsigned long) buf->maj_flt + pinfo [0].ki_rusage_ch.ru_majflt;
 #endif
+#endif
 
 	buf->flags |= _glibtop_sysdeps_proc_kernel_pstats;