Update to 0.26.

Lots of new features and fixes.
Details:
http://www.go-mono.com/archive/mono-0.25.html
http://www.go-mono.com/archive/mono-0.26.html

Use the included gc instead of boehm-gc, because of the mono debugger.
While here also allow mono to be build on other platforms than Linux/x86
and NetBSD/x86 (please test). Raise the bar for NetBSD to 1.6ZC to get all
the pthread related fixes.

Added patches from Marius Aamodt Eriksen to work around missing signbit macro.
Added a patch from Gonzalo Paniagua Javier to work around missing
SOL_IP/SOL_IPV6.

12 files changed, 282 insertions, 150 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 9a145cb385c..fc19995b50d 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/08/09 21:09:22 recht Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/25 16:05:21 recht Exp $
 #
 
-DISTNAME=	mono-0.24
-PKGREVISION=	2
+DISTNAME=	mono-0.26
 CATEGORIES=	lang
 MASTER_SITES=	http://www.go-mono.org/archive/
 
@@ -12,19 +11,21 @@ COMMENT=	Open source implementation of the .NET Development Framework
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
-# XXX: Is this really true?  As seen in the website, mono should work on
-# other platforms; please test.
-ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86
-ONLY_FOR_PLATFORM+=	NetBSD-1.6[M-Z]-i386 NetBSD-[2-9]*-i386
+# XXX please test
+NOT_FOR_PLATFORM=	NetBSD-1.[0-5]*-*
+NOT_FOR_PLATFORM+=	NetBSD-1.6-* NetBSD-1.6.*-*
+NOT_FOR_PLATFORM+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
 
 GNU_CONFIGURE=		YES
+USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE=	${WRKSRC}/mono.pc.in
+PKGCONFIG_OVERRIDE=	mono.pc.in
 
+CONFIGURE_ARGS+=	--with-gc=included
 CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
 
 PKG_SYSCONFSUBDIR=	mono
@@ -32,7 +33,6 @@ EGDIR=		${PREFIX}/share/examples/mono
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
 CONF_FILES+=	${EGDIR}/machine.config ${PKG_SYSCONFDIR}/machine.config
 
-.include "../../devel/boehm-gc/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 9ee1646c494..ada842b8b0b 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/09 13:03:21 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/09/25 16:05:21 recht Exp $
 bin/cilc
 bin/cilc.exe
-bin/genmdesc
 bin/ilasm
 bin/ilasm.exe
 bin/mbas
@@ -12,12 +11,15 @@ bin/mint
 bin/mono
 bin/monodis
 bin/monograph
+bin/monoresgen
 bin/monoresgen.exe
 bin/monosn
-bin/oldmono
 bin/pedump
+bin/secutil
 bin/secutil.exe
-bin/sqlsharp.exe
+bin/sqlsharp
+bin/xsd
+bin/xsd.exe
 include/mono/cil/opcode.def
 include/mono/io-layer/access.h
 include/mono/io-layer/atomic.h
@@ -44,7 +46,6 @@ include/mono/io-layer/versioninfo.h
 include/mono/io-layer/wait.h
 include/mono/io-layer/wapi.h
 include/mono/jit/jit.h
-include/mono/jit/regset.h
 include/mono/metadata/appdomain.h
 include/mono/metadata/assembly.h
 include/mono/metadata/blob.h
@@ -75,14 +76,14 @@ include/mono/metadata/threads-types.h
 include/mono/metadata/threads.h
 include/mono/metadata/tokentype.h
 include/mono/metadata/verify.h
-include/mono/mini/mini-ops.h
-include/mono/mini/mini.h
-include/mono/mini/regalloc.h
+include/mono/private/libgc-mono-debugger.h
 include/mono/utils/mono-digest.h
 include/mono/utils/mono-hash.h
+include/mono/utils/mono-logger.h
 include/mono/utils/monobitset.h
 lib/Accessibility.dll
 lib/ByteFX.Data.dll
+lib/Commons.Xml.Relaxng.dll
 lib/Cscompmgd.dll
 lib/I18N.CJK.dll
 lib/I18N.MidEast.dll
@@ -93,7 +94,9 @@ lib/I18N.dll
 lib/ICSharpCode.SharpZipLib.dll
 lib/Microsoft.VisualBasic.dll
 lib/Microsoft.VisualC.dll
+lib/Microsoft.Vsa.dll
 lib/Mono.CSharp.Debugger.dll
+lib/Mono.Cairo.dll
 lib/Mono.Data.DB2Client.dll
 lib/Mono.Data.MySql.dll
 lib/Mono.Data.PostgreSqlClient.dll
@@ -101,9 +104,13 @@ lib/Mono.Data.SqliteClient.dll
 lib/Mono.Data.SybaseClient.dll
 lib/Mono.Data.Tds.dll
 lib/Mono.Data.TdsClient.dll
+lib/Mono.Directory.LDAP.dll
 lib/Mono.GetOptions.dll
+lib/Mono.Http.dll
 lib/Mono.PEToolkit.dll
 lib/Mono.Posix.dll
+lib/Mono.Security.Win32.dll
+lib/Mono.Security.dll
 lib/NUnit.Framework.dll
 lib/NUnit.Util.dll
 lib/Npgsql.dll
@@ -112,27 +119,37 @@ lib/System.Configuration.Install.dll
 lib/System.Data.OracleClient.dll
 lib/System.Data.dll
 lib/System.Design.dll
+lib/System.DirectoryServices.dll
+lib/System.Drawing.Design.dll
 lib/System.Drawing.dll
 lib/System.EnterpriseServices.dll
+lib/System.Management.dll
+lib/System.Messaging.dll
 lib/System.Runtime.Remoting.dll
 lib/System.Runtime.Serialization.Formatters.Soap.dll
 lib/System.Security.dll
+lib/System.ServiceProcess.dll
 lib/System.Web.Services.dll
 lib/System.Web.dll
 lib/System.Windows.Forms.dll
 lib/System.Xml.dll
 lib/System.dll
 lib/corlib.dll
+lib/libmono-profiler-cov.a
+lib/libmono-profiler-cov.la
+lib/libmono-profiler-cov.so
+lib/libmono-profiler-cov.so.0
+lib/libmono-profiler-cov.so.0.0
 lib/libmono.a
 lib/libmono.la
 lib/libmono.so
 lib/libmono.so.0
 lib/libmono.so.0.0
-lib/liboldmono.a
-lib/liboldmono.la
-lib/liboldmono.so
-lib/liboldmono.so.0
-lib/liboldmono.so.0.0
+lib/libmonogc.a
+lib/libmonogc.la
+lib/libmonogc.so
+lib/libmonogc.so.1
+lib/libmonogc.so.1.1
 lib/pkgconfig/mono.pc
 man/man1/cert2spc.1
 man/man1/cilc.1
@@ -153,7 +170,7 @@ share/mono/cil/cil-opcodes.xml
 @dirrm share/mono
 @dirrm share/examples/mono
 @dirrm include/mono/utils
-@dirrm include/mono/mini
+@dirrm include/mono/private
 @dirrm include/mono/metadata
 @dirrm include/mono/jit
 @dirrm include/mono/io-layer
diff --git a/lang/mono/buildlink2.mk b/lang/mono/buildlink2.mk
index 83eeaefa02a..2204dfd63c6 100644
--- a/lang/mono/buildlink2.mk
+++ b/lang/mono/buildlink2.mk
@@ -1,84 +1,23 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:52:22 wiz Exp $
-#
-# This Makefile fragment is included by packages that use mono.
-#
-# This file was created automatically using createbuildlink 2.6.
-#
+# $NetBSD: buildlink2.mk,v 1.7 2003/09/25 16:05:21 recht Exp $
 
 .if !defined(MONO_BUILDLINK2_MK)
 MONO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			mono
-BUILDLINK_DEPENDS.mono?=		mono>=0.24nb2
+BUILDLINK_DEPENDS.mono?=		mono>=0.26
 BUILDLINK_PKGSRCDIR.mono?=		../../lang/mono
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.mono=mono
 BUILDLINK_PREFIX.mono_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.mono+=	include/mono/cil/opcode.def
-BUILDLINK_FILES.mono+=	include/mono/io-layer/access.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/atomic.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/context.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/critical-sections.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/error.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/events.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/handles.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/io-layer.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/io.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/macros.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/mono-mutex.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/mutexes.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/processes.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/semaphores.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/sockets.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/status.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/system.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/threads.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/timefuncs.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/types.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/uglify.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/versioninfo.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/wait.h
-BUILDLINK_FILES.mono+=	include/mono/io-layer/wapi.h
-BUILDLINK_FILES.mono+=	include/mono/jit/jit.h
-BUILDLINK_FILES.mono+=	include/mono/jit/regset.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/appdomain.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/assembly.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/blob.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/cil-coff.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/class.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/debug-helpers.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/debug-mono-symfile.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/environment.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/exception.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/image.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/loader.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/mempool.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/metadata.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/monitor.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/mono-debug-debugger.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/mono-debug.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/mono-endian.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/object.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/opcodes.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/profiler.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/rand.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/rawbuffer.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/reflection.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/row-indexes.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/tabledefs.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/threadpool.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/threads-types.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/threads.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/tokentype.h
-BUILDLINK_FILES.mono+=	include/mono/metadata/verify.h
-BUILDLINK_FILES.mono+=	include/mono/mini/mini-ops.h
-BUILDLINK_FILES.mono+=	include/mono/mini/mini.h
-BUILDLINK_FILES.mono+=	include/mono/mini/regalloc.h
-BUILDLINK_FILES.mono+=	include/mono/utils/mono-digest.h
-BUILDLINK_FILES.mono+=	include/mono/utils/mono-hash.h
-BUILDLINK_FILES.mono+=	include/mono/utils/monobitset.h
+BUILDLINK_FILES.mono+=	include/mono/io-layer/*.h
+BUILDLINK_FILES.mono+=	include/mono/jit/*.h
+BUILDLINK_FILES.mono+=	include/mono/metadata/*.h
+BUILDLINK_FILES.mono+=	include/mono/private/*.h
+BUILDLINK_FILES.mono+=	include/mono/utils/*.h
 BUILDLINK_FILES.mono+=	lib/Accessibility.dll
 BUILDLINK_FILES.mono+=	lib/ByteFX.Data.dll
+BUILDLINK_FILES.mono+=	lib/Commons.Xml.Relaxng.dll
 BUILDLINK_FILES.mono+=	lib/Cscompmgd.dll
 BUILDLINK_FILES.mono+=	lib/I18N.CJK.dll
 BUILDLINK_FILES.mono+=	lib/I18N.MidEast.dll
@@ -89,7 +28,9 @@ BUILDLINK_FILES.mono+=	lib/I18N.dll
 BUILDLINK_FILES.mono+=	lib/ICSharpCode.SharpZipLib.dll
 BUILDLINK_FILES.mono+=	lib/Microsoft.VisualBasic.dll
 BUILDLINK_FILES.mono+=	lib/Microsoft.VisualC.dll
+BUILDLINK_FILES.mono+=	lib/Microsoft.Vsa.dll
 BUILDLINK_FILES.mono+=	lib/Mono.CSharp.Debugger.dll
+BUILDLINK_FILES.mono+=	lib/Mono.Cairo.dll
 BUILDLINK_FILES.mono+=	lib/Mono.Data.DB2Client.dll
 BUILDLINK_FILES.mono+=	lib/Mono.Data.MySql.dll
 BUILDLINK_FILES.mono+=	lib/Mono.Data.PostgreSqlClient.dll
@@ -97,9 +38,13 @@ BUILDLINK_FILES.mono+=	lib/Mono.Data.SqliteClient.dll
 BUILDLINK_FILES.mono+=	lib/Mono.Data.SybaseClient.dll
 BUILDLINK_FILES.mono+=	lib/Mono.Data.Tds.dll
 BUILDLINK_FILES.mono+=	lib/Mono.Data.TdsClient.dll
+BUILDLINK_FILES.mono+=	lib/Mono.Directory.LDAP.dll
 BUILDLINK_FILES.mono+=	lib/Mono.GetOptions.dll
+BUILDLINK_FILES.mono+=	lib/Mono.Http.dll
 BUILDLINK_FILES.mono+=	lib/Mono.PEToolkit.dll
 BUILDLINK_FILES.mono+=	lib/Mono.Posix.dll
+BUILDLINK_FILES.mono+=	lib/Mono.Security.Win32.dll
+BUILDLINK_FILES.mono+=	lib/Mono.Security.dll
 BUILDLINK_FILES.mono+=	lib/NUnit.Framework.dll
 BUILDLINK_FILES.mono+=	lib/NUnit.Util.dll
 BUILDLINK_FILES.mono+=	lib/Npgsql.dll
@@ -108,22 +53,27 @@ BUILDLINK_FILES.mono+=	lib/System.Configuration.Install.dll
 BUILDLINK_FILES.mono+=	lib/System.Data.OracleClient.dll
 BUILDLINK_FILES.mono+=	lib/System.Data.dll
 BUILDLINK_FILES.mono+=	lib/System.Design.dll
+BUILDLINK_FILES.mono+=	lib/System.DirectoryServices.dll
+BUILDLINK_FILES.mono+=	lib/System.Drawing.Design.dll
 BUILDLINK_FILES.mono+=	lib/System.Drawing.dll
 BUILDLINK_FILES.mono+=	lib/System.EnterpriseServices.dll
+BUILDLINK_FILES.mono+=	lib/System.Management.dll
+BUILDLINK_FILES.mono+=	lib/System.Messaging.dll
 BUILDLINK_FILES.mono+=	lib/System.Runtime.Remoting.dll
 BUILDLINK_FILES.mono+=	lib/System.Runtime.Serialization.Formatters.Soap.dll
 BUILDLINK_FILES.mono+=	lib/System.Security.dll
+BUILDLINK_FILES.mono+=	lib/System.ServiceProcess.dll
 BUILDLINK_FILES.mono+=	lib/System.Web.Services.dll
 BUILDLINK_FILES.mono+=	lib/System.Web.dll
 BUILDLINK_FILES.mono+=	lib/System.Windows.Forms.dll
 BUILDLINK_FILES.mono+=	lib/System.Xml.dll
 BUILDLINK_FILES.mono+=	lib/System.dll
 BUILDLINK_FILES.mono+=	lib/corlib.dll
+BUILDLINK_FILES.mono+=	lib/libmono-profiler-cov.*
 BUILDLINK_FILES.mono+=	lib/libmono.*
-BUILDLINK_FILES.mono+=	lib/liboldmono.*
+BUILDLINK_FILES.mono+=	lib/libmonogc.*
 BUILDLINK_FILES.mono+=	lib/pkgconfig/mono.pc
 
-.include "../../devel/boehm-gc/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	mono-buildlink
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 5b748c2a664..ed0c171d3f1 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.3 2003/05/09 13:03:21 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/09/25 16:05:21 recht Exp $
 
-SHA1 (mono-0.24.tar.gz) = 02175ebb19d76a3792380a58a60914f8da50fb9a
-Size (mono-0.24.tar.gz) = 4020161 bytes
-SHA1 (patch-aa) = 558bbd42c3cf99c2a70849027bef7793db84334e
-SHA1 (patch-ab) = f484e680ccfe2b98fdf03ea95fb2cb45ba3c0249
-SHA1 (patch-ac) = a26a9d9c23014ed97e23667dff04732ef03c4343
-SHA1 (patch-ad) = 324c55058bcb3c4dad1c1db7a19601ae909da181
+SHA1 (mono-0.26.tar.gz) = 48a0a9e4452f8162e10d0f1193e7325f535feacb
+Size (mono-0.26.tar.gz) = 8939242 bytes
+SHA1 (patch-ac) = ef7f68603eaaf9c6ad7a3d65005a9cc62cd04a40
+SHA1 (patch-ad) = e285318469300f9da370b69f355d885a0a89b688
+SHA1 (patch-ae) = 11adc136723cf56d6cae51e59a58da1f0152e98d
+SHA1 (patch-af) = 1966d20a48f4162acedd486b0939b704190fb07e
+SHA1 (patch-ag) = c0b458ff387fba231db3a536cba507d3c16e0286
+SHA1 (patch-ah) = 51cd3f04762d4f4754ec260bdbbdb0119498d7cf
diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa
deleted file mode 100644
index b4b86d5745f..00000000000
--- a/lang/mono/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/03/15 08:27:45 jmmv Exp $
-
---- mono/jit/jit.c.orig	2003-03-13 11:31:58.000000000 +0100
-+++ mono/jit/jit.c	2003-03-13 11:32:37.000000000 +0100
-@@ -4208,8 +4208,8 @@
- 	sigemptyset (&sa.sa_mask);
- 	sa.sa_flags = 0;
- 	//g_assert (syscall (SYS_sigaction, SIGILL, &sa, NULL) != -1);
--	g_assert (syscall (SYS_sigaction, mono_thread_get_abort_signal (), &sa, NULL) != -1);
--	//g_assert (sigaction (mono_thread_get_abort_signal (), &sa, NULL) != -1);
-+	//g_assert (syscall (SYS_sigaction, mono_thread_get_abort_signal (), &sa, NULL) != -1);
-+	g_assert (sigaction (mono_thread_get_abort_signal (), &sa, NULL) != -1);
- 
- #if 1
- 	/* catch SIGSEGV */
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
deleted file mode 100644
index c8f2813ec30..00000000000
--- a/lang/mono/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/03/15 08:27:45 jmmv Exp $
-
---- configure.orig	2003-03-13 11:32:56.000000000 +0100
-+++ configure	2003-03-13 11:33:00.000000000 +0100
-@@ -1545,7 +1545,19 @@
- 		CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS"
- 		libdl=
- 		;;
--	*-*-*bsd*)
-+	*-*-*netbsd*)
-+		platform_win32=no
-+		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-+		libmono_cflags="-D_REENTRANT"
-+		LDFLAGS="$LDFLAGS -pthread"
-+		libmono_ldflags="-pthread"
-+		cat >>confdefs.h <<\_ACEOF
-+#define NEED_LINK_UNLINK 1
-+_ACEOF
-+
-+		libdl=
-+		;;
-+        *-*-freebsd*|*-*-openbsd*)
- 		platform_win32=no
- 		CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
- 		libmono_cflags="-D_THREAD_SAFE"
diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac
index ede070b42e0..89654510563 100644
--- a/lang/mono/patches/patch-ac
+++ b/lang/mono/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2003/05/09 13:03:21 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2003/09/25 16:05:21 recht Exp $
 
---- data/Makefile.in.orig	2003-05-06 23:40:03.000000000 +0200
-+++ data/Makefile.in
-@@ -108,7 +108,7 @@ arch_target = @arch_target@
- install_sh = @install_sh@
+--- data/Makefile.in.orig	2003-08-14 08:00:52.000000000 +0200
++++ data/Makefile.in	2003-09-25 01:58:12.000000000 +0200
+@@ -114,7 +114,7 @@
+ libgc_dir = @libgc_dir@
  libmono_cflags = @libmono_cflags@
  libmono_ldflags = @libmono_ldflags@
 -monodir = $(sysconfdir)/mono
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
index 0dd9838cb0a..a0fa48fab1b 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/03/01 13:11:47 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2003/09/25 16:05:21 recht Exp $
 
---- mono/metadata/icall.c.orig	2003-02-21 23:42:15.000000000 +0100
-+++ mono/metadata/icall.c
-@@ -3074,7 +3074,7 @@ ves_icall_System_Configuration_DefaultCo
+--- mono/metadata/icall.c.orig	2003-08-02 14:39:37.000000000 +0200
++++ mono/metadata/icall.c	2003-09-25 01:58:13.000000000 +0200
+@@ -3551,7 +3551,7 @@
  	if (mcpath != NULL)
  		return mcpath;
  
diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae
new file mode 100644
index 00000000000..2dc91e85408
--- /dev/null
+++ b/lang/mono/patches/patch-ae
@@ -0,0 +1,41 @@
+$NetBSD: patch-ae,v 1.3 2003/09/25 16:05:21 recht Exp $
+
+--- mono/mini/mini-x86.c.orig	2003-08-05 12:32:07.000000000 +0200
++++ mono/mini/mini-x86.c	2003-09-25 01:55:36.000000000 +0200
+@@ -7,6 +7,10 @@
+  *
+  * (C) 2003 Ximian, Inc.
+  */
++
++#include <sys/types.h>
++#include <sys/mman.h>
++
+ #include "mini.h"
+ #include <string.h>
+ #include <math.h>
+@@ -19,6 +23,13 @@
+ #include "inssel.h"
+ #include "cpu-pentium.h"
+ 
++/* XXX OpenBSD port.  */
++extern int    OPENBSD__signbitd(double);
++extern int    OPENBSD__signbitf(float);
++#undef signbit
++#define signbit(x) (sizeof(x) == sizeof(float) ? \
++    OPENBSD__signbitf(x) : OPENBSD__signbitd(x))
++
+ const char*
+ mono_arch_regname (int reg) {
+ 	switch (reg) {
+@@ -400,7 +411,11 @@
+ 
+ 	if (have_cpuid) {
+ 		CpuidFunc func = (CpuidFunc)cpuid_impl;
++		if (mprotect (func, sizeof(cpuid_impl), PROT_EXEC | PROT_READ) == -1)
++			g_error ("mprotect failed\n");
+ 		func (id, p_eax, p_ebx, p_ecx, p_edx);
++		/*if (mprotect (func, sizeof(cpuid_impl), PROT_WRITE | PROT_READ) == -1)
++		  g_error ("mprotect failed\n");*/
+ 		/*
+ 		 * We use this approach because of issues with gcc and pic code, see:
+ 		 * http://gcc.gnu.org/cgi-bin/gnatsweb.pl?cmd=view%20audit-trail&database=gcc&pr=7329
diff --git a/lang/mono/patches/patch-af b/lang/mono/patches/patch-af
new file mode 100644
index 00000000000..de8090fb56a
--- /dev/null
+++ b/lang/mono/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 2003/09/25 16:05:21 recht Exp $
+
+--- mono/mini/Makefile.in.orig	2003-08-14 08:00:57.000000000 +0200
++++ mono/mini/Makefile.in	2003-09-25 01:55:36.000000000 +0200
+@@ -180,6 +180,7 @@
+ 	mini-x86.c		\
+ 	mini-x86.h		\
+ 	exceptions-x86.c	\
++	OPENBSD_signbit.c       \
+ 	tramp-x86.c
+ 
+ 
+@@ -268,7 +269,7 @@
+ 	linear-scan.lo aot.lo graph.lo
+ am__objects_2 = mini-ppc.lo exceptions-ppc.lo tramp-ppc.lo
+ am__objects_3 = mini-sparc.lo exceptions-sparc.lo tramp-sparc.lo
+-am__objects_4 = mini-x86.lo exceptions-x86.lo tramp-x86.lo
++am__objects_4 = mini-x86.lo exceptions-x86.lo tramp-x86.lo OPENBSD_signbit.lo
+ @POWERPC_TRUE@am_libmono_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+ @SPARC_TRUE@am_libmono_la_OBJECTS = $(am__objects_1) $(am__objects_3)
+ @X86_TRUE@am_libmono_la_OBJECTS = $(am__objects_1) $(am__objects_4)
diff --git a/lang/mono/patches/patch-ag b/lang/mono/patches/patch-ag
new file mode 100644
index 00000000000..491643126c7
--- /dev/null
+++ b/lang/mono/patches/patch-ag
@@ -0,0 +1,88 @@
+$NetBSD: patch-ag,v 1.1 2003/09/25 16:05:21 recht Exp $
+
+--- /dev/null	2003-09-25 01:52:37.000000000 +0200
++++ mono/mini/OPENBSD_signbit.c	2003-09-25 01:55:36.000000000 +0200
+@@ -0,0 +1,83 @@
++/*
++ * Copyright 2003 Marius Aamodt Eriksen <marius@monkey.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/* XXX this is for little endian machines */
++
++#include <sys/types.h>
++
++int OPENBSD__signbitd(double);
++int OPENBSD__signbitf(float);
++
++typedef union 
++{
++  double value;
++  struct 
++  {
++    u_int32_t lsw;
++    u_int32_t msw;
++  } parts;
++} ieee_double_shape_type;
++
++typedef union
++{
++  float value;
++  u_int32_t word;
++} ieee_float_shape_type;
++
++#define GET_HIGH_WORD(i,d)                                      \
++do {                                                            \
++  ieee_double_shape_type gh_u;                                  \
++  gh_u.value = (d);                                             \
++  (i) = gh_u.parts.msw;                                         \
++} while (0)
++
++#define GET_FLOAT_WORD(i,d)                                     \
++do {                                                            \
++  ieee_float_shape_type gf_u;                                   \
++  gf_u.value = (d);                                             \
++  (i) = gf_u.word;                                              \
++} while (0)
++
++int
++OPENBSD__signbitd(double d)
++{
++	int32_t hw;
++
++	GET_HIGH_WORD(hw, d);
++
++ 	return (hw >> 31);
++}
++
++int
++OPENBSD__signbitf(float f)
++{
++	int32_t hw;
++
++	GET_FLOAT_WORD(hw, f);
++
++	return (hw >> 31);
++}
diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah
new file mode 100644
index 00000000000..d8aeafef4e6
--- /dev/null
+++ b/lang/mono/patches/patch-ah
@@ -0,0 +1,53 @@
+$NetBSD: patch-ah,v 1.1 2003/09/25 16:05:21 recht Exp $
+
+--- mono/metadata/socket-io.c.orig	2003-07-29 18:58:31.000000000 +0200
++++ mono/metadata/socket-io.c	2003-09-25 02:08:50.000000000 +0200
+@@ -1465,6 +1465,30 @@
+ 	int system_level;
+ 	int system_name;
+ 	int ret;
++#ifdef AF_INET6
++	int sol_ip;
++	int sol_ipv6;
++
++#ifdef HAVE_SOL_IPV6
++	sol_ipv6 = SOL_IPV6;
++#else
++	{
++		struct protoent *pent;
++		pent = getprotobyname ("ipv6");
++		sol_ipv6 = (pent != NULL) ? pent->p_proto : 41;
++	}
++#endif
++
++#ifdef HAVE_SOL_IP
++	sol_ip = SOL_IP;
++#else
++	{
++		struct protoent *pent;
++		pent = getprotobyname ("ip");
++		sol_ip = (pent != NULL) ? pent->p_proto : 0;
++	}
++#endif
++#endif /* AF_INET6 */
+ 
+ 	MONO_ARCH_SAVE_REGS;
+ 
+@@ -1510,7 +1534,7 @@
+ 			MonoObject *address = NULL;
+ 
+ #ifdef AF_INET6
+-			if(system_level == SOL_IPV6) {
++			if(system_level == sol_ipv6) {
+ 				struct ipv6_mreq mreq6;
+ 
+ 				/*
+@@ -1529,7 +1553,7 @@
+ 				ret = setsockopt (sock, system_level,
+ 						  system_name, &mreq6,
+ 						  sizeof (mreq6));
+-			} else if(system_level == SOL_IP)
++			} else if(system_level == sol_ip)
+ #endif /* AF_INET6 */
+ 			{
+ #ifdef HAVE_STRUCT_IP_MREQN