Support for DragonFly. Probably still incomplete, but compilable.

PKGREVISION++

10 files changed, 143 insertions, 15 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 6c4bb263c90..47c6b77d80c 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2009/02/12 19:44:50 kefren Exp $
+# $NetBSD: Makefile,v 1.81 2009/03/04 01:09:19 kefren Exp $
 
 DISTNAME=	mono-${MONO_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mono/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 8258e007e0b..f776c499d53 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.44 2009/02/12 19:44:50 kefren Exp $
+$NetBSD: distinfo,v 1.45 2009/03/04 01:09:19 kefren Exp $
 
 SHA1 (mono-2.2.tar.bz2) = 028c061ba4f4631c4ff10a15b832211a67ec5858
 RMD160 (mono-2.2.tar.bz2) = 664f09ccd8822b62d94d242871b956b00adae7b6
 Size (mono-2.2.tar.bz2) = 24360722 bytes
-SHA1 (patch-ab) = c5011d00d34c92b32d4243adac26b531ce40df00
+SHA1 (patch-ab) = 4ce8b19286e2696b1fe8786366fb79d546d248ff
 SHA1 (patch-ac) = f88e1a034063a7f14e73d2e314e362d950c65e05
-SHA1 (patch-ae) = f0654c3103e3d69c44158456f481e5a357350cb1
+SHA1 (patch-ae) = bd667ff350c7086d2ec0d8c873f2c7e2dfc09ed7
 SHA1 (patch-af) = abe2bc406e8f58c00f4d1226bda3c5fb9d4ea36f
 SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca
 SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df
@@ -30,3 +30,9 @@ SHA1 (patch-cf) = 2ae0f528e3273a51c4e2582d6580768072c50008
 SHA1 (patch-cg) = 93a81dccbc8ac006e97be6641de9b4625263f3d5
 SHA1 (patch-ch) = 4ca88b9e6c45263c9fd75a573ff1b149197363dc
 SHA1 (patch-ci) = 9c6d77c4c76c618304e62f744b0d03bb58df5d93
+SHA1 (patch-da) = 84e572df943a65ef30205f219921a899949abac8
+SHA1 (patch-db) = c96ec3799d538af33797dea9c3687a091677e0e7
+SHA1 (patch-dc) = 1f1792e7c23cfeebabed2bd82f47b18a245e9641
+SHA1 (patch-dd) = 88feddae56ffd63bd9c783408c32bd6539b2e798
+SHA1 (patch-de) = 292bdc9baf16f5c9f2dc42645ef6d9cdc1a7add8
+SHA1 (patch-df) = a1127999bf0d73dfaeabb369e0ad6abe3fc4b255
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index 7cb5a615147..4b419793a92 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,7 +1,6 @@
-$NetBSD: patch-ab,v 1.15 2008/11/19 11:17:49 kefren Exp $
---- configure.orig	2008-02-05 14:21:50.000000000 +0200
-+++ configure	2008-02-05 14:24:06.000000000 +0200
-@@ -2890,7 +2890,7 @@
+--- configure.orig	2009-01-09 07:56:07 -0800
++++ configure	2009-03-03 16:24:30 -0800
+@@ -2938,11 +2938,11 @@
  		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
  		libmono_ldflags="-pthread"
  		need_link_unlink=yes
@@ -10,4 +9,28 @@ $NetBSD: patch-ab,v 1.15 2008/11/19 11:17:49 kefren Exp $
  		libgc_threads=pthreads
  		with_sigaltstack=no
  		;;
- # these flags will work for all versions of -STABLE
+-	*-*-*freebsd*)
++	*-*-*freebsd* | *-*-*dragonfly*)
+ 		platform_win32=no
+ 		if test "x$PTHREAD_CFLAGS" = "x"; then
+ 			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
+@@ -32216,6 +32216,9 @@
+ /* end confdefs.h.  */
+ $ac_includes_default
+ #include <$ac_header>
++#ifdef __DragonFly__
++#error extattr
++#endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -32256,6 +32259,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <$ac_header>
++#ifdef __DragonFly__
++#error extattr
++#endif
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae
index cda724cf7ca..d9f40c24686 100644
--- a/lang/mono/patches/patch-ae
+++ b/lang/mono/patches/patch-ae
@@ -1,8 +1,6 @@
-$NetBSD: patch-ae,v 1.8 2006/01/03 08:03:53 recht Exp $
-
---- libgc/configure.orig	2005-12-22 18:35:37.000000000 +0100
-+++ libgc/configure
-@@ -3940,7 +3940,27 @@ _ACEOF
+--- libgc/configure.orig	2009-01-09 07:56:17 -0800
++++ libgc/configure	2009-03-03 15:25:59 -0800
+@@ -4604,7 +4604,27 @@
  _ACEOF
  
  	;;
@@ -31,3 +29,12 @@ $NetBSD: patch-ae,v 1.8 2006/01/03 08:03:53 recht Exp $
  	cat >>confdefs.h <<\_ACEOF
  #define GC_AIX_THREADS 1
  _ACEOF
+@@ -4637,7 +4657,7 @@
+ 
+ 	THREADDLLIBS="-lpthread -lrt"
+ 	;;
+-      *-*-freebsd*)
++      *-*-freebsd* | *-*-*dragonfly*)
+ 	cat >>confdefs.h <<\_ACEOF
+ #define GC_FREEBSD_THREADS 1
+ _ACEOF
diff --git a/lang/mono/patches/patch-da b/lang/mono/patches/patch-da
new file mode 100644
index 00000000000..23e020cc745
--- /dev/null
+++ b/lang/mono/patches/patch-da
@@ -0,0 +1,12 @@
+--- libgc/include/private/gcconfig.h.orig	2009-03-03 14:22:28 -0800
++++ libgc/include/private/gcconfig.h	2009-03-03 14:24:56 -0800
+@@ -351,6 +351,9 @@
+ #   define OPENBSD
+ #   define mach_type_known
+ # endif
++# if defined(__DragonFly__)
++# define FREEBSD
++# endif
+ # if defined(FREEBSD) && (defined(i386) || defined(__i386__))
+ #   define I386
+ #   define mach_type_known
diff --git a/lang/mono/patches/patch-db b/lang/mono/patches/patch-db
new file mode 100644
index 00000000000..fb1bf79f957
--- /dev/null
+++ b/lang/mono/patches/patch-db
@@ -0,0 +1,24 @@
+--- mono/utils/mono-proclib.c.orig	2008-11-10 20:56:14 -0800
++++ mono/utils/mono-proclib.c	2009-03-03 15:30:03 -0800
+@@ -13,14 +13,19 @@
+ #endif
+ 
+ /* FIXME: bsds untested */
+-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
++#ifndef __DragonFly__
+ #include <sys/proc.h>
++#endif
+ #ifdef HAVE_SYS_USER_H
+ #include <sys/user.h>
+ #endif
+-#ifdef HAVE_STRUCT_KINFO_PROC_KP_PROC
++#ifdef __DragonFly__
++#define kinfo_pid_member kp_pid
++#define kinfo_name_member kp_comm
++#elif HAVE_STRUCT_KINFO_PROC_KP_PROC
+ #define kinfo_pid_member kp_proc.p_pid
+ #define kinfo_name_member kp_proc.p_comm
+ #else
diff --git a/lang/mono/patches/patch-dc b/lang/mono/patches/patch-dc
new file mode 100644
index 00000000000..efb0641c4c3
--- /dev/null
+++ b/lang/mono/patches/patch-dc
@@ -0,0 +1,11 @@
+--- mono/mini/mini-x86.h.orig	2009-03-03 16:01:51 -0800
++++ mono/mini/mini-x86.h	2009-03-03 16:02:17 -0800
+@@ -194,7 +194,7 @@
+ 	#define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.gregs [REG_EIP])
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ # define SC_EAX sc_eax
+ # define SC_EBX sc_ebx
+ # define SC_ECX sc_ecx
diff --git a/lang/mono/patches/patch-dd b/lang/mono/patches/patch-dd
new file mode 100644
index 00000000000..b9d260b957e
--- /dev/null
+++ b/lang/mono/patches/patch-dd
@@ -0,0 +1,23 @@
+--- mono/metadata/attach.c.orig	2009-03-03 15:32:27 -0800
++++ mono/metadata/attach.c	2009-03-03 15:48:41 -0800
+@@ -366,12 +366,20 @@ ipc_connect (void)
+ 	 */
+ 	/* FIXME: Use TMP ? */
+ 	pw = NULL;
++#ifndef HAVE_GETPWUID_R
++	pw = getpwuid(getuid());
++	if (pw == NULL) {
++		fprintf(stderr, "attach: getpwuid () failed.\n");
++		return;
++	}
++#else
+ 	res = getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw);
+ 	if (res != 0) {
+ 		fprintf (stderr, "attach: getpwuid_r () failed.\n");
+ 		return;
+ 	}
+ 	g_assert (pw);
++#endif
+ 	directory = g_strdup_printf ("/tmp/mono-%s", pw->pw_name);
+ 	res = mkdir (directory, S_IRUSR | S_IWUSR | S_IXUSR);
+ 	if (res != 0) {
diff --git a/lang/mono/patches/patch-de b/lang/mono/patches/patch-de
new file mode 100644
index 00000000000..794564eb289
--- /dev/null
+++ b/lang/mono/patches/patch-de
@@ -0,0 +1,11 @@
+--- ikvm-native/jni.c.orig	2009-03-03 16:07:20 -0800
++++ ikvm-native/jni.c	2009-03-03 16:07:43 -0800
+@@ -28,7 +28,7 @@
+ #include <malloc.h>
+ #define ALLOCA _alloca
+ #else
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <stdlib.h>
+ #else
+ #include <alloca.h>
diff --git a/lang/mono/patches/patch-df b/lang/mono/patches/patch-df
new file mode 100644
index 00000000000..79c4d8d663f
--- /dev/null
+++ b/lang/mono/patches/patch-df
@@ -0,0 +1,11 @@
+--- support/mph.h.orig	2009-03-03 16:39:06 -0800
++++ support/mph.h	2009-03-03 16:39:21 -0800
+@@ -36,7 +36,7 @@
+ #include <stdint.h>             /* for SIZE_MAX */
+ #endif
+ 
+-#if __APPLE__ || __BSD__ || __FreeBSD__
++#if __APPLE__ || __BSD__ || __FreeBSD__ || __DragonFly__
+ #define MPH_ON_BSD
+ #endif
+