Some fixes for DragonFly (not completed).

5 files changed, 43 insertions, 24 deletions

diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index c799686de1a..552c2f8746a 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2010/12/01 16:49:13 kefren Exp $
+$NetBSD: distinfo,v 1.71 2010/12/29 05:41:20 obache Exp $
 
 SHA1 (mono-2.8.1.tar.bz2) = c46f9d8282803e8fd137acdb126e34421762b13c
 RMD160 (mono-2.8.1.tar.bz2) = 1d3c2a71fa46fcb93f201cdce2a19407cb1cd2ef
@@ -6,11 +6,11 @@ Size (mono-2.8.1.tar.bz2) = 31181201 bytes
 SHA1 (patch-aa) = f3c88247c143cba6d0475f1dabb653adbc841bdb
 SHA1 (patch-ab) = ea20eb85d29c36de8f830a5225cd271d75225407
 SHA1 (patch-ac) = 78f3b0786480e066959cc191e3f45d3f773220e2
-SHA1 (patch-ad) = 0e3dd3a5fccae70025e32ee92c8b6023030db177
+SHA1 (patch-ad) = 55ccdedbdf80c24be110dcebc73644e1e68909b3
 SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53
 SHA1 (patch-af) = c109a9a742cb70d83cf99df0ad6c907c68809d52
-SHA1 (patch-ag) = c9563d5870c7adc44c241f08b89fb73a98fa018a
-SHA1 (patch-ah) = 5e38b9d7eadb65da697d9bdd1ebbd053f56c0f5b
+SHA1 (patch-ag) = 425f470151cc8a60d1ac301b9fd1cc2abb399ea3
+SHA1 (patch-ah) = 35a76fa725ab507538e37cbf391492614a78507f
 SHA1 (patch-ai) = cd5593a7e95039980b839bdabdf59d9e68fb9f56
 SHA1 (patch-aj) = a5aab739e01fd969edb85b5b3e08c087554d0a72
 SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df
@@ -32,7 +32,7 @@ SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69
 SHA1 (patch-cc) = 97b247ea353c6b0e08b96bdf0e6de74c5dcb60ef
 SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0
 SHA1 (patch-da) = 877ed8ec92ec25686c5a9a59db107f122d49035d
-SHA1 (patch-db) = 2b11ad4e37c4487f53c34b4ac85a526c31af3292
+SHA1 (patch-db) = e99e8a6c40bc2dac626b3f48a8c8e09132b9856a
 SHA1 (patch-dc) = e139e349217b213eea53a17fcae44fda0bbfe636
 SHA1 (patch-de) = d9867210a90389ff9ff5b9376b7091f923960973
 SHA1 (patch-df) = b817bb4dd09c4490efba749bf9c4a663253da11b
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
index cd428c166e2..d173cef4e3c 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,6 +1,23 @@
-$NetBSD: patch-ad,v 1.20 2010/12/01 16:49:13 kefren Exp $
---- mono/utils/mono-sigcontext.h.orig	2010-11-12 12:24:41.000000000 +0200
-+++ mono/utils/mono-sigcontext.h	2010-12-01 18:02:44.000000000 +0200
+$NetBSD: patch-ad,v 1.21 2010/12/29 05:41:20 obache Exp $
+--- mono/utils/mono-sigcontext.h.orig	2010-11-12 10:24:41.000000000 +0000
++++ mono/utils/mono-sigcontext.h
+@@ -8,14 +8,14 @@
+ 
+ #if defined(__i386__)
+ 
+-#if defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ #include <ucontext.h>
+ #endif
+ #if defined(__APPLE__)
+ #include <AvailabilityMacros.h>
+ #endif
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 	#define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_eax)
+ 	#define UCONTEXT_REG_EBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ebx)
+ 	#define UCONTEXT_REG_ECX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ecx)
 @@ -101,6 +101,20 @@
  	#define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__r15)
  #elif defined(__FreeBSD__)
diff --git a/lang/mono/patches/patch-ag b/lang/mono/patches/patch-ag
index 0c54fbfbaab..481fa10091a 100644
--- a/lang/mono/patches/patch-ag
+++ b/lang/mono/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.8 2010/10/16 04:32:18 kefren Exp $
+$NetBSD: patch-ag,v 1.9 2010/12/29 05:41:20 obache Exp $
 --- mono/metadata/threadpool.c.orig	2010-10-07 22:59:36.000000000 +0300
 +++ mono/metadata/threadpool.c	2010-10-07 23:00:03.000000000 +0300
 @@ -1898,7 +1898,7 @@ async_invoke_thread (gpointer data)
@@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.8 2010/10/16 04:32:18 kefren Exp $
  			TP_DEBUG ("Waiting");
  			InterlockedIncrement (&tp->waiting);
 -#if defined(__OpenBSD__)
-+#if (defined(__OpenBSD__) || defined(__NetBSD__))
++#if (defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
  			while ((res = mono_sem_wait (&tp->new_job, TRUE)) == -1) {// && errno == EINTR) {
  #else
  			while ((res = mono_sem_timedwait (&tp->new_job, 2000, TRUE)) == -1) {// && errno == EINTR) {
diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah
index 2f2b36abbdb..a2866e83469 100644
--- a/lang/mono/patches/patch-ah
+++ b/lang/mono/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.11 2010/10/16 04:32:18 kefren Exp $
+$NetBSD: patch-ah,v 1.12 2010/12/29 05:41:20 obache Exp $
 --- mono/utils/mono-semaphore.c.orig	2010-10-07 23:41:21.000000000 +0300
 +++ mono/utils/mono-semaphore.c	2010-10-07 23:44:31.000000000 +0300
 @@ -22,7 +22,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-ah,v 1.11 2010/10/16 04:32:18 kefren Exp $
  #    define TIMESPEC mach_timespec_t
  #    define WAIT_BLOCK(a,b) semaphore_timedwait (*(a), *(b))
 -#  elif defined(__OpenBSD__)
-+#  elif (defined(__OpenBSD__) || defined(__NetBSD__))
++#  elif (defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
  #    define TIMESPEC struct timespec
  #    define WAIT_BLOCK(a) sem_trywait(a)
  #  else
@@ -14,7 +14,7 @@ $NetBSD: patch-ah,v 1.11 2010/10/16 04:32:18 kefren Exp $
  int
  mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable)
  {
-+#if (defined(__NetBSD__) || defined(__OpenBSD__))
++#if (defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
 +	uint32_t timeout = timeout_ms;
 +#else
  	TIMESPEC ts, copy;
@@ -33,7 +33,7 @@ $NetBSD: patch-ah,v 1.11 2010/10/16 04:32:18 kefren Exp $
  	if (timeout_ms == (guint32) 0xFFFFFFFF)
  		return mono_sem_wait (sem, alertable);
  
-+#if (defined(__NetBSD__) || defined(__OpenBSD__))
++#if (defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
 +	if (timeout < 50)
 +		timeout += 50;
 +	do {
diff --git a/lang/mono/patches/patch-db b/lang/mono/patches/patch-db
index caf3bdba21c..4758ebf8aab 100644
--- a/lang/mono/patches/patch-db
+++ b/lang/mono/patches/patch-db
@@ -1,7 +1,7 @@
-$NetBSD: patch-db,v 1.3 2010/04/29 08:44:30 kefren Exp $
---- mono/utils/mono-proclib.c.orig	2010-04-22 18:37:45.000000000 +0300
-+++ mono/utils/mono-proclib.c	2010-04-29 09:47:24.000000000 +0300
-@@ -13,15 +13,20 @@
+$NetBSD: patch-db,v 1.4 2010/12/29 05:41:20 obache Exp $
+--- mono/utils/mono-proclib.c.orig	2010-11-12 10:24:41.000000000 +0000
++++ mono/utils/mono-proclib.c
+@@ -13,11 +13,13 @@
  #endif
  
  /* FIXME: bsds untested */
@@ -16,11 +16,13 @@ $NetBSD: patch-db,v 1.3 2010/04/29 08:44:30 kefren Exp $
  #ifdef HAVE_SYS_USER_H
  #include <sys/user.h>
  #endif
--#ifdef HAVE_STRUCT_KINFO_PROC_KP_PROC
-+#if !(defined(__NetBSD__) || defined(__DragonFly__))
+@@ -29,6 +31,9 @@
+ #    define kinfo_pid_member kp_proc.p_pid
+ #    define kinfo_name_member kp_proc.p_comm
+ #  endif
++#elif defined(__DragonFly__)
 +#define kinfo_pid_member kp_pid
 +#define kinfo_name_member kp_comm
-+#elif HAVE_STRUCT_KINFO_PROC_KP_PROC
- #  ifdef KERN_PROC2
- #    define kinfo_pid_member p_pid
- #    define kinfo_name_member p_comm
+ #else
+ #define kinfo_pid_member ki_pid
+ #define kinfo_name_member ki_comm