Add support for building on DragonFly.

Add mkfontdir as build tool, non-native bulk builds fail otherwise.

11 files changed, 248 insertions, 18 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 3121cdbb0e8..3db274b1dd6 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2005/10/13 12:38:49 markd Exp $
+# $NetBSD: Makefile,v 1.94 2005/11/08 18:25:44 joerg Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 UNLIMIT_RESOURCES=	datasize
 USE_DIRS+=		xdg-1.2
 USE_PKGINSTALL=		yes
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		pkg-config mkfontdir
 
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 CONFIGURE_ARGS+=	--with-ldap="${BUILDLINK_PREFIX.openldap}"
@@ -119,6 +119,7 @@ SUBST_SED.varlock=	s:/var/lock:/var/spool/lock:
 .endif
 
 pre-configure:
+	ln -s FreeBSD ${WRKSRC}/ksysguard/ksysguardd/DragonFly
 	cd ${WRKSRC};							\
 	files="kcontrol/kdm/main.cpp kioslave/info/kde-info2html.conf";	\
 	for file in $${files}; do					\
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 5a75b091296..3a5b860a779 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2005/10/13 12:38:49 markd Exp $
+$NetBSD: distinfo,v 1.75 2005/11/08 18:25:44 joerg Exp $
 
 SHA1 (kdebase-3.4.3.tar.bz2) = 87b72aaf291fdb78fa9feb9acf4476d41485e486
 RMD160 (kdebase-3.4.3.tar.bz2) = 7af02903b0fc750e7b9778391ef8948b54f69ce7
@@ -12,7 +12,7 @@ Size (Daemon.README) = 2191 bytes
 SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
 RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
 Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (patch-aa) = be18dabe9c66af9a7384ee652a80b7d971d4b5d6
+SHA1 (patch-aa) = 9d4454b56193adaafe093b1fc7e0f50cd4c7038c
 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
 SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
 SHA1 (patch-ae) = e281920c63ab6cea8ed41c406275e63120d27490
@@ -24,6 +24,12 @@ SHA1 (patch-al) = 555384dc03ab59845e5794e081dd5d1a92e2959e
 SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba
 SHA1 (patch-bc) = c236cc8b3f9caebf2540425232f2d90ec66c70d1
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
+SHA1 (patch-da) = 06da421a8adcb54712e7c04125cffa9bef9003fb
+SHA1 (patch-db) = f67ffaf0676484db40759574cc2822ad0d6933bd
+SHA1 (patch-dc) = dd44652ad806d49d45ef86cbff58a01e506deeee
+SHA1 (patch-dd) = 4c98e62275ce9a632f79f99110e8fb4995e3f017
+SHA1 (patch-de) = 94d7f083784b8b56c2b23c320772a80a27df19d1
+SHA1 (patch-df) = ee6f6967d77d13217055d69dcf8be98b48d40598
 SHA1 (patch-ep) = 10e341753321415043b08cad0494a269f8d19643
 SHA1 (patch-er) = 77df7513b54e09ef81100a75da45c2ed2e520380
 SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
@@ -37,5 +43,5 @@ SHA1 (patch-ff) = a027ccd5f578d41560e970aa54fca9b5760da0ac
 SHA1 (patch-fg) = bdd6fbbf1f82e174d5ceb70e67763813c13b14dd
 SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29
 SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e
-SHA1 (patch-gc) = f3d732fc8d7754b86a0fd9a160857f08ce7a5254
-SHA1 (patch-gd) = 32450558645a51699f04c4721fb9218c2f700095
+SHA1 (patch-gc) = e02ddb93ae7aa249b3b3e68690f587b2c98255b8
+SHA1 (patch-gd) = ded2a08514f818b25603fbd54d6750afceff4636
diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa
index 46771bd5ce2..78c8204e5ec 100644
--- a/x11/kdebase3/patches/patch-aa
+++ b/x11/kdebase3/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.14 2005/09/03 21:34:44 markd Exp $
+$NetBSD: patch-aa,v 1.15 2005/11/08 18:25:44 joerg Exp $
 
---- configure.orig	2005-07-21 09:08:37.000000000 +1200
+--- configure.orig	2005-11-06 18:05:17.000000000 +0100
 +++ configure
 @@ -30769,7 +30769,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
  	# if you're trying to debug this check and think it's incorrect,
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.14 2005/09/03 21:34:44 markd Exp $
  		kde_cv_uic_plugins=yes
  	fi
  fi
-@@ -42372,6 +42372,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -42502,6 +42502,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  
                    ac_cv_have_dpms="-lXdpms"
  
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.14 2005/09/03 21:34:44 markd Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -45004,6 +45021,9 @@ case "$host" in
+@@ -45346,6 +45363,9 @@ case "$host" in
    *-*-freebsd*)
  	FOUND_USBVIEW=yes
  	;;
@@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.14 2005/09/03 21:34:44 markd Exp $
  esac
  
  
-@@ -46214,7 +46234,7 @@ acimake:
+@@ -46730,7 +46750,7 @@ acimake:
  
  EOF
      if $XMKMF >&5 2>&1 && test -f Makefile; then
@@ -54,7 +54,24 @@ $NetBSD: patch-aa,v 1.14 2005/09/03 21:34:44 markd Exp $
  	kde_cv_defines_imake_version=$imkv
      else
          echo "$as_me:$LINENO: result: failed" >&5
-@@ -53104,6 +53124,7 @@ fi
+@@ -53339,6 +53359,7 @@ case "$host" in
+   *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
+   *-*-irix*) ksysguardd_compile=yes; UNAME='Irix' ;;
+   *-*-openbsd*) ksysguardd_compile=yes; UNAME='OpenBSD' ;;
++  *-*-dragonfly*) ksysguardd_compile=yes; UNAME='DragonFly' ;;
+   *) ksysguardd_compile=no; UNAME='' ;;
+ esac
+ 
+@@ -53367,7 +53388,7 @@ fi
+ 
+ 
+ 
+-if test "$UNAME" = FreeBSD; then
++if test "$UNAME" = FreeBSD || test "$UNAME" = DragonFly; then
+   include_ksysguardd_freebsd_TRUE=
+   include_ksysguardd_freebsd_FALSE='#'
+ else
+@@ -53523,6 +53544,7 @@ fi
  case "$UNAME" in
  	Linux) LIBHOSTS="$LIBSENSORS" ;;
  	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
diff --git a/x11/kdebase3/patches/patch-da b/x11/kdebase3/patches/patch-da
new file mode 100644
index 00000000000..a5bcbe02f52
--- /dev/null
+++ b/x11/kdebase3/patches/patch-da
@@ -0,0 +1,13 @@
+$NetBSD: patch-da,v 1.4 2005/11/08 18:25:44 joerg Exp $
+
+--- kcontrol/info/info.cpp.orig	2005-08-17 23:33:43.000000000 +0000
++++ kcontrol/info/info.cpp
+@@ -468,7 +468,7 @@ static int GetInfo_ReadfromPipe( QListVi
+ #include "info_linux.cpp"
+ #elif defined(sgi) && sgi
+ #include "info_sgi.cpp"
+-#elif __FreeBSD__
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #include "info_fbsd.cpp"
+ #elif __hpux
+ #include "info_hpux.cpp"
diff --git a/x11/kdebase3/patches/patch-db b/x11/kdebase3/patches/patch-db
new file mode 100644
index 00000000000..e3eca59dc2a
--- /dev/null
+++ b/x11/kdebase3/patches/patch-db
@@ -0,0 +1,22 @@
+$NetBSD: patch-db,v 1.4 2005/11/08 18:25:44 joerg Exp $
+
+--- kcontrol/clock/dtime.cpp.orig	2005-08-17 23:34:03.000000000 +0000
++++ kcontrol/clock/dtime.cpp
+@@ -306,7 +306,7 @@ void Dtime::save()
+     KProcess c_proc;
+ 
+   // BSD systems reverse year compared to Susv3
+-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+     BufS.sprintf("%04d%02d%02d%02d%02d.%02d",
+                date.year(),
+                date.month(), date.day(),
+@@ -324,7 +324,7 @@ void Dtime::save()
+     c_proc.start( KProcess::Block );
+     int result = c_proc.exitStatus();
+     if (result != 0
+-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+   	  && result != 2	// can only set local date, which is okay
+ #endif
+       ) {
diff --git a/x11/kdebase3/patches/patch-dc b/x11/kdebase3/patches/patch-dc
new file mode 100644
index 00000000000..ce43723ee48
--- /dev/null
+++ b/x11/kdebase3/patches/patch-dc
@@ -0,0 +1,13 @@
+$NetBSD: patch-dc,v 1.4 2005/11/08 18:25:44 joerg Exp $
+
+--- kcontrol/info/memory.cpp.orig	2005-08-17 23:34:47.000000000 +0000
++++ kcontrol/info/memory.cpp
+@@ -458,7 +458,7 @@ void KMemoryWidget::update_Values()
+ #include "memory_sgi.cpp"
+ #elif defined(__svr4__) && defined(sun)
+ #include "memory_solaris.cpp"
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #include "memory_fbsd.cpp"
+ #elif defined(__hpux)
+ #include "memory_hpux.cpp"
diff --git a/x11/kdebase3/patches/patch-dd b/x11/kdebase3/patches/patch-dd
new file mode 100644
index 00000000000..898714e3a6f
--- /dev/null
+++ b/x11/kdebase3/patches/patch-dd
@@ -0,0 +1,13 @@
+$NetBSD: patch-dd,v 1.5 2005/11/08 18:25:44 joerg Exp $
+
+--- kdm/backend/sessreg.c.orig	2005-08-17 23:36:04.000000000 +0000
++++ kdm/backend/sessreg.c
+@@ -63,7 +63,7 @@ from The Open Group.
+ #endif
+ 
+ #ifdef BSD
+-# if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
++# if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ /* *BSD doesn't like a ':0' type entry in utmp */
+ #  define NO_UTMP
+ # endif
diff --git a/x11/kdebase3/patches/patch-de b/x11/kdebase3/patches/patch-de
new file mode 100644
index 00000000000..de4a4128610
--- /dev/null
+++ b/x11/kdebase3/patches/patch-de
@@ -0,0 +1,109 @@
+$NetBSD: patch-de,v 1.5 2005/11/08 18:25:44 joerg Exp $
+
+--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig	2005-05-23 12:15:08.000000000 +0000
++++ ksysguard/ksysguardd/FreeBSD/CPU.c
+@@ -22,7 +22,10 @@
+ #include <osreldate.h>
+ 
+ #include <sys/types.h>
+-#if __FreeBSD_version < 500101
++#if defined(__DragonFly__)
++#include <sys/param.h>
++#include <kinfo.h>
++#elif __FreeBSD_version < 500101
+ 	#include <sys/dkstat.h>
+ #else
+ 	#include <sys/resource.h>
+@@ -40,6 +43,18 @@
+ #include "Command.h"
+ #include "ksysguardd.h"
+ 
++#if defined(__DragonFly__)
++static void	cputime_percentages(int[4], struct kinfo_cputime *,
++            			    struct kinfo_cputime *);
++static struct kinfo_cputime cp_time, cp_old;
++
++#define	CPUSTATES	4
++#define	CP_USER		0
++#define	CP_NICE		1
++#define	CP_SYS		2
++#define	CP_IDLE		3
++
++#else
+ long percentages(int cnt, int *out, long *new, long *old, long *diffs);
+ 
+ unsigned long cp_time_offset;
+@@ -47,6 +62,8 @@ unsigned long cp_time_offset;
+ long cp_time[CPUSTATES];
+ long cp_old[CPUSTATES];
+ long cp_diff[CPUSTATES];
++#endif
++
+ int cpu_states[CPUSTATES];
+ 
+ void
+@@ -73,9 +90,14 @@ exitCpuInfo(void)
+ int
+ updateCpuInfo(void)
+ {
++#if defined(__DragonFly__)
++	kinfo_get_sched_cputime(&cp_time);
++	cputime_percentages(cpu_states, &cp_time, &cp_old);
++#else
+ 	size_t len = sizeof(cp_time);
+         sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0);
+         percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff);
++#endif
+ 	return (0);
+ }
+ 
+@@ -148,7 +170,44 @@ printCPUIdleInfo(const char* cmd)
+  *	The routine assumes modulo arithmetic.  This function is especially
+  *	useful on BSD mchines for calculating cpu state percentages.
+  */
++#if defined(__DragonFly__)
++static void
++cputime_percentages(int out[4], struct kinfo_cputime *new, struct kinfo_cputime * old)
++{
++        struct kinfo_cputime diffs;
++        int i;
++        uint64_t total_change, half_total;
++
++        /* initialization */
++        total_change = 0;
++
++        diffs.cp_user = new->cp_user - old->cp_user;
++        diffs.cp_nice = new->cp_nice - old->cp_nice;
++        diffs.cp_sys = new->cp_sys - old->cp_sys;
++        diffs.cp_intr = new->cp_intr - old->cp_intr;
++        diffs.cp_idle = new->cp_idle - old->cp_idle;
++        total_change = diffs.cp_user + diffs.cp_nice + diffs.cp_sys +
++            diffs.cp_intr + diffs.cp_idle;
++        old->cp_user = new->cp_user;
++        old->cp_nice = new->cp_nice;
++        old->cp_sys = new->cp_sys;
++        old->cp_intr = new->cp_intr;
++        old->cp_idle = new->cp_idle;
++
++        /* avoid divide by zero potential */
++        if (total_change == 0)
++                total_change = 1;
++
++        /* calculate percentages based on overall change, rounding up */
++        half_total = total_change >> 1;
++
++        out[0] = ((diffs.cp_user * 1000LL + half_total) / total_change);
++        out[1] = ((diffs.cp_nice * 1000LL + half_total) / total_change);
++        out[2] = (((diffs.cp_sys + diffs.cp_intr) * 1000LL + half_total) / total_change);
++        out[4] = ((diffs.cp_idle * 1000LL + half_total) / total_change);
++}
+ 
++#else
+ long percentages(cnt, out, new, old, diffs)
+ 
+ int cnt;
+@@ -201,3 +260,4 @@ long *diffs;
+     /* return the total in case the caller wants to use it */
+     return(total_change);
+ }
++#endif
diff --git a/x11/kdebase3/patches/patch-df b/x11/kdebase3/patches/patch-df
new file mode 100644
index 00000000000..f0673d46979
--- /dev/null
+++ b/x11/kdebase3/patches/patch-df
@@ -0,0 +1,34 @@
+$NetBSD: patch-df,v 1.9 2005/11/08 18:25:44 joerg Exp $
+
+--- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig	2005-08-18 00:27:47.000000000 +0000
++++ ksysguard/ksysguardd/FreeBSD/ProcessList.c
+@@ -217,23 +217,25 @@ updateProcess(int pid)
+         ps->ppid      = p.kp_eproc.e_ppid;
+         ps->uid       = p.kp_eproc.e_ucred.cr_uid;
+         ps->gid       = p.kp_eproc.e_pgid;
++#if defined(__DragonFly__)
++        ps->priority  = p.kp_thread.td_pri;
++#else
+         ps->priority  = p.kp_proc.p_priority;
++#endif
+         ps->niceLevel = p.kp_proc.p_nice;
+ #endif
+ 
+         /* this isn't usertime -- it's total time (??) */
+ #if __FreeBSD_version >= 500015
+         ps->userTime = p.ki_runtime / 10000;
+-#elif __FreeBSD_version >= 300000
+-#if defined(__DragonFly__)
++#elif defined(__DragonFly__)
+ 	if (!getrusage(p.kp_proc.p_pid, &pru))
+ 	{
+ 		errx(1, "failed to get rusage info");
+ 	}
+ 	ps->userTime = pru.ru_utime.tv_usec / 1000; /*p_runtime / 1000*/ 
+-#else
++#elif __FreeBSD_version >= 300000
+         ps->userTime = p.kp_proc.p_runtime / 10000;
+-#endif
+ #else
+ 	ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100;
+ #endif
diff --git a/x11/kdebase3/patches/patch-gc b/x11/kdebase3/patches/patch-gc
index 39b4d6d4ca7..e2186a047a8 100644
--- a/x11/kdebase3/patches/patch-gc
+++ b/x11/kdebase3/patches/patch-gc
@@ -1,17 +1,19 @@
-$NetBSD: patch-gc,v 1.1 2005/04/14 21:01:48 markd Exp $
+$NetBSD: patch-gc,v 1.2 2005/11/08 18:25:44 joerg Exp $
 
 --- kcontrol/usbview/usbdevices.h.orig	2005-01-04 03:50:45.000000000 +1300
 +++ kcontrol/usbview/usbdevices.h
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,9 @@
  #include <qstring.h>
  #include <qptrlist.h>
  
 -#ifdef Q_OS_FREEBSD
-+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
++#if defined(__DragonFly__)
++#include <bus/usb/usb.h>
++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
  #include <dev/usb/usb.h>
  #endif
  
-@@ -63,7 +63,7 @@ private:
+@@ -63,7 +65,7 @@ private:
  
    unsigned int _vendorID, _prodID, _revMajor, _revMinor;
  
diff --git a/x11/kdebase3/patches/patch-gd b/x11/kdebase3/patches/patch-gd
index be35850bcea..21670030eed 100644
--- a/x11/kdebase3/patches/patch-gd
+++ b/x11/kdebase3/patches/patch-gd
@@ -1,4 +1,4 @@
-$NetBSD: patch-gd,v 1.2 2005/05/31 14:21:23 markd Exp $
+$NetBSD: patch-gd,v 1.3 2005/11/08 18:25:44 joerg Exp $
 
 --- kcontrol/usbview/usbdevices.cpp.orig	2005-05-24 00:13:32.000000000 +1200
 +++ kcontrol/usbview/usbdevices.cpp
@@ -43,7 +43,7 @@ $NetBSD: patch-gd,v 1.2 2005/05/31 14:21:23 markd Exp $
  	
  	// determine the speed
 -#if __FreeBSD_version > 490102
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version > 490102) || defined(Q_OS_NETBSD)
++#if defined(__DragonFly__) || (defined(Q_OS_FREEBSD) && __FreeBSD_version > 490102) || defined(Q_OS_NETBSD)
  	switch (di.udi_speed) {
  		case USB_SPEED_LOW:  _speed = 1.5;   break;
  		case USB_SPEED_FULL: _speed = 12.0;  break;