update to mono 1.1.8

Patch provided by Jerome Laban. The patch also includes improved also includes
improved NetBSD support (implemented by Jerome).

Hi

mono 1.1.8:

Debugger

The Mono Debugger is being released in sync for the first time with the
Mono runtime. We need testers to try it out (the command line debugger
is called `mdb').

Windows.Forms

Here a toplevel list of all things new for 1.1.8 MWF:

DomainUpDown and NumericUpDown implemented First version with DataGrid
support (still incomplete) First version with MDI support (still
incomplete) Drag & Drop implemented for X11 and Win32 Clipboard
implemented for X11 and Win32 HelpProvider implemented ErrorProvider
implemented Cursor class completed ResXWriter and ResXReader completed
SWF.Timers now working properly A bunch of compatibility fixes Image I/O
now working on Win32 (this is actually in System.Drawing) Scaling,
Performance

Harinath has been fine tuning our Regular Expressions class library to
reduce allocations which translate into an increase in performance
(about 10% on the output match). Regexp.Replace will now be O(number of
$s in the replacement string) instead of O(length of replacement
string). The

The 1024 limit on Socket.Select is gone, Mono will now use poll when
available.

System.Web will consume less memory as well (Gonzalo).

Code Access Security

Sebastien's progress in this release:

AppDomain based sandboxes are supported (limited by #74411); Stack
propagation for async code, threads and SWF; Default policies (like
LocalIntranet, Internet...) are now supported; The new features allows
NRobot 0.20 (http://home.gna.org/nrobot/) to "work" (as much as the
permissions are currently present in the class libraries) on Mono 1.1.8
with a single modification (change the imperative assert in
NRobot/Engine/GameArena.cs to a declarative assert).

ASP.NET 2.x controls

Lluis completed various new controls for ASP.NET 2.x: ImageMap, Wizard,
SiteMapDataSource and SiteMapPath.

Reflection

Lluis added support for producing debugging information from
Reflection.Emit. This means that all the Reflection-based compilers and
VMs will be able to produce debugging information and have the Mono
debugger step through the code.

Packaging

mono-ikvm has been merged into mono-core. Should make it easier for
people to get ikvm

mono-nunit is back with the nunit stuff. Needed for mono-tools

Mono-shlib-cop

Jonathan Pryor has contributed this tool to assist developers that use
P/Invoke.

mono-shlib-cop is a tool that inspects a managed assembly looking for
erroneous or suspecious behavior of shared libraries.

The tool takes one or more assembly filenames, and inspects each
assembly specified.

The errors checked for include:

Does the shared library exist? Does the requested symbol exist within
the shared library? It also checks if a program uses shared libraries
that are part of a -devel package.

VB.NET

New on this release: late binding, decimal, named arguments, optiona
byrefs,

Mono.Unix

The Mono.Unix namespace will be replacing the old Mono.Posix in Mono 1.2
and is still under development. In this release cleanups continued and a
few new features are present.

Changes since the last release:

Removed types: MapAttribute, IncludeAttribute, ErrorMarshal,
ErrorMarshal.ErrorTranslator Removed
UnixMarshal.IsErrorDescriptionThreadSafe property Renamed LockFlags enum
to LockfCommand Removed StdioFileStream.FilePosition property and
replaced with RestoreFilePosition() and SaveFilePosition() methods
Renamed UnixConvert.ToFilePermissions(string) to
UnixConvert.FromOctalPermissionString(string) Additions

Syscall.execv(), Syscall.execve(), Syscall.execvp(), Syscall.fexecve()
Syscall.fcntl (int, FcntlCommand, DirectoryNotifyFlags) Syscall.mmap,
Syscall.munmap, Syscall.msync, Syscall.mlock, Syscall.munlock,
Syscall.mlockall, Syscall.munlockall, Syscall.mremap, Syscall.mincore,
Syscall.remap_file_pages Syscall.mkstemp Thread safety for "obvious"
exports from Stdlib, Syscall UnixConvert.ToOctalPermissionString,
UnixConvert.FromUnixPermissionString, UnixConvert.ToUnixPermissionString
UnixFileInfo uses stat(2) now, not lstat(2), so a UnixFileInfo created
on a symlink will give information about the target, not the link. Lots
of documentation added

JScript

Cesar implemented access to local variables in nested functions in
JScript.

Bug fixes, scalability

There are plenty of bug fixes, performance and scalability improvements
that are too detailed to list on the release notes.

mono 1.1.7: The Mono core is pretty much complete for the 1.2 release,
at this point we are only waiting for Windows.Forms to be completed
before we can ship it. At this point we are scheduled to release Mono
1.2 in September.

In the meantime, Mono development has fallen into two categories:

New code: Windows.Forms, libraries from the 2.x profile (ASP.NET 2,
ADO.NET 2), new compilers (JScript, Basic, C# 2.0). ie, non-core
components. New VM features: cross-platform register allocator, new
string collation framework, precise garbage collector. These are being
developed on either branches or on separate trees and do not affect
trunk. The above setup allows us to continue development without
interfering with the stability of Mono 1.1.x.

New I/O Layer

In Mono 1.1.7 we are including Dick Porter's new IO-Layer, which is
daemon-less. Before 1.1.7 Mono would always launch an auxiliary process
that would be used by multiple Mono programs to share information like:
global mutexes (named mutexes), file sharing status per-file, process
and thread status.

Mono no longer requires a separate shared process to provide the
previous features, this has significantly improved Mono's I/O
performance. Beagle is three times as fast indexing files and xsp
tripled its speed.

Http Client Interactions

In the past the HttpWebRequest could starve the ThreadPool and it would
lead to deadlocks as documented on our web site.

Gonzalo deployed a new implementation that does not have these problems
and can take advantage of Linux epoll or kqueue.

This code not only eliminated the potential deadlocks, but also improved
the client http throughput by avoiding unnecessary context switches.

Also ReadWriteTimeout is supported and Abort works properly now.

FreeBSD support

Thanks to Bill Middleton support for i386 FreeBSD (tested against 5.4
and 6.x-CURRENT) is now available.

Windows.Forms

Extensive progress on the Windows.Forms support code since the March
18th release. Jackson wrote a new double-buffering framework to bring
our implementation in line with the expected behavior.

Databinding is now supported on this release (simple and complex data
binding), not all controls are ready though, controls that support it:
ListBox, CheckedListBox and ComboBox (Jackson and Jordi).

Alexander Olk implemented the file dialogs and did various touch-ups to
other dialogs and widgets.

Complete widgets: ImageListStreamer (Jackson),

Prototype widgets: DataGrid widget and data container widgets (Jordi)
and RichTextBox (Peter)

ASP.NET

New ASP.NET 2.0 controls completed: ButtonField, DetailsView, FormView,
GridView, CheckBoxField, HyperlinkField, ImageField, TemplateField by
Lluis.

Implemented support for two-way bindings in ASP.NET, ObjectDataSource
and various improvements to the Menu control.

Gonzalo added support for code render syntax inside non-server tags,
ie., <span <%= (firefox) ? class="cool" : "" %>>

C# Compiler

Hari and Marek continue the work on making the compiler comply more
strictly to the C# specification. In some areas the compiler is faster,
and consumes less memory, but it also provides better error messages and
includes many new warnings that before were ignored.

Martin synchronized the generics compiler codebase with our main
compiler codebase. Also all bug reported on the generics compiler
(except two parsing errors) have now been fixed and the generics class
libraries have been modified to match the Beta2 libraries.

Marek implemented C# 2.0 conditional attributes and DefaultCharSet
attribute.

SSL/TLS

Many important fixes from Sebastien:

Fixed asynchronous operations; Fixed support for client-side
certificates; Performance enhancements; Security

Continued work on the CAS from Sebastien (--security flag).

Exposed more of the Mono.Security libraries as the .NET 2.x framework
includes more features.

New Assemblies.

The following assemblies are now functional:

System.Configuration.Install Written by Muthu Kannan and Harinath Raja.

System.ServiceProcess: Joerg Rosenkranz Completed the support and
implemented the service host daemon.

JavaScript

Cesar's effort on JScript continue, not the compiler implements:

Strict-Equality operators Eval RegularExpressionLiteral For-in statement
Custom constructors Increment/Decrement operators First-class functions
Plus bug fixing.

The JScript's runtime support now supports:

ArrayConstructor's CreateInstance function ArrayPrototype's join method
JSFieldInfo's GetValue and SetValue functions JScriptException's
constructor Initial implementation of LateBinding's CallValue and
SetIndexedPropertyValueStatic Basic Language

Manjula, Sudha and Ankit continued working on the Basic compiler and the
Basic runtime:

Implemented "End statement" Support "Exit Function" Support declaration
of decimal numbers. Support 'Or' argument of AttributeTargets in
AttributeUsage Conditional Constant Directives Support expressions for
directives Support Reference Parameter when parameters and arguments are
different The runtime now features late binding: it is 75% complete. It
works with sub, functions, properties and fields, arrays. Late binding
fit in well with simple expressions (like in conditional expressions and
arithmatic expressions).

Finally, there is support for default values using an attribute by
round-tripping and patching the runtime.

ADO.NET

SQLServer: Added support for Asynchronous command execution (Ankit and
Suresh).

Various disconnected mode improvements: loading datatables.

Mono.Posix assembly

There is a new UnixListener and UnixClient classes in the Mono.Unix
namespace.

Build System

Users will have to do make at least once in Mono before they can do make
in any directory.

20 files changed, 828 insertions, 116 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index c4980d5d706..22680764d5b 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/31 15:26:58 recht Exp $
 
-DISTNAME=	mono-1.1.6
+DISTNAME=	mono-1.1.8.3
 CATEGORIES=	lang
-MASTER_SITES=	http://www.go-mono.com/archive/1.1.6/
+MASTER_SITES=	http://go-mono.com/sources/mono-1.1/	
 
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/
 COMMENT=	Open source implementation of the .NET Development Framework
 
 BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+DEPENDS+=	gtar>=1.13.25:../../archivers/gtar
+
 
 CONFLICTS=	pnet-[0-9]*
 
@@ -16,26 +18,23 @@ CONFLICTS=	pnet-[0-9]*
 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]-*
-# XXX currently broken on -3/-current
-NOT_FOR_PLATFORM+=	NetBSD-2.9*-* NetBSD-3.*-*
 
 # LP64 problems
 NOT_FOR_PLATFORM+=	*-*-alpha *-*-sparc64
 
-USE_TOOLS+=		bison gmake perl
+USE_TOOLS+=		bison gmake gtar perl
 USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
+USE_GMAKE=		yes
+TAR=			gtar
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-ikvm-native=no
-CONFIGURE_ARGS+=	--with-icu=yes
-CONFIGURE_ARGS+=	--with-jit=yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 MAKE_FLAGS+=		PERL=${PERL5}
 UNLIMIT_RESOURCES=	datasize
 UNLIMIT_RESOURCES+=	stacksize
-UNLIMIT_RESOURCES.=	memorysize
+UNLIMIT_RESOURCES+=	memorysize
 
 PKGCONFIG_OVERRIDE=	mint.pc.in
 PKGCONFIG_OVERRIDE+=	mono.pc.in
@@ -61,16 +60,11 @@ TEST_TARGET=	check
 
 .include "../../mk/bsd.prefs.mk"
 
-# mcs coredumps with sigaltstack
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-sigaltstack=no
-.endif
-
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pkg-config/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index bbb02fe7d0d..d5339114d5a 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/04/04 07:22:34 recht Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/07/31 15:26:58 recht Exp $
 bin/al
 bin/caspol
 bin/cert2spc
@@ -21,11 +21,12 @@ bin/mkbundle
 bin/mono
 bin/mono-find-provides
 bin/mono-find-requires
+bin/mono-service
+bin/mono-shlib-cop
 bin/monodiet
 bin/monodis
 bin/monograph
 bin/monop
-bin/monoresgen
 bin/pedump
 bin/permview
 bin/prj2make
@@ -47,6 +48,7 @@ include/mono/cil/opcode.def
 include/mono/interpreter/embed.h
 include/mono/io-layer/access.h
 include/mono/io-layer/atomic.h
+include/mono/io-layer/collection.h
 include/mono/io-layer/context.h
 include/mono/io-layer/critical-sections.h
 include/mono/io-layer/error.h
@@ -100,9 +102,11 @@ include/mono/utils/mono-digest.h
 include/mono/utils/mono-hash.h
 include/mono/utils/mono-logger.h
 include/mono/utils/mono-math.h
+include/mono/utils/mono-poll.h
 include/mono/utils/mono-uri.h
 include/mono/utils/monobitset.h
 lib/libMonoPosixHelper.la
+lib/libikvm-native.la
 lib/libmono-profiler-cov.la
 lib/libmono.la
 lib/mono/1.0/Accessibility.dll
@@ -198,10 +202,10 @@ lib/mono/1.0/mkbundle.exe
 lib/mono/1.0/mkbundle.exe.mdb
 lib/mono/1.0/mono-api-diff.exe
 lib/mono/1.0/mono-api-info.exe
-lib/mono/1.0/mono-find-provides.exe
-lib/mono/1.0/mono-find-provides.exe.mdb
-lib/mono/1.0/mono-find-requires.exe
-lib/mono/1.0/mono-find-requires.exe.mdb
+lib/mono/1.0/mono-service.exe
+lib/mono/1.0/mono-service.exe.mdb
+lib/mono/1.0/mono-shlib-cop.exe
+lib/mono/1.0/mono-shlib-cop.exe.mdb
 lib/mono/1.0/monop.exe
 lib/mono/1.0/monop.exe.mdb
 lib/mono/1.0/mscorlib.dll
@@ -231,108 +235,263 @@ lib/mono/1.0/wsdl.exe
 lib/mono/1.0/wsdl.exe.mdb
 lib/mono/1.0/xsd.exe
 lib/mono/1.0/xsd.exe.mdb
+lib/mono/2.0/Accessibility.dll
+lib/mono/2.0/ByteFX.Data.dll
+lib/mono/2.0/Commons.Xml.Relaxng.dll
+lib/mono/2.0/I18N.CJK.dll
+lib/mono/2.0/I18N.MidEast.dll
+lib/mono/2.0/I18N.Other.dll
+lib/mono/2.0/I18N.Rare.dll
+lib/mono/2.0/I18N.West.dll
+lib/mono/2.0/I18N.dll
+lib/mono/2.0/ICSharpCode.SharpZipLib.dll
+lib/mono/2.0/Microsoft.JScript.dll
+lib/mono/2.0/Microsoft.VisualBasic.dll
+lib/mono/2.0/Microsoft.VisualC.dll
+lib/mono/2.0/Microsoft.Vsa.dll
+lib/mono/2.0/Mono.C5.dll
+lib/mono/2.0/Mono.Cairo.dll
+lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll
+lib/mono/2.0/Mono.Data.SqliteClient.dll
+lib/mono/2.0/Mono.Data.SybaseClient.dll
+lib/mono/2.0/Mono.Data.Tds.dll
+lib/mono/2.0/Mono.Data.TdsClient.dll
+lib/mono/2.0/Mono.Data.dll
+lib/mono/2.0/Mono.GetOptions.dll
+lib/mono/2.0/Mono.Http.dll
+lib/mono/2.0/Mono.Posix.dll
+lib/mono/2.0/Mono.Security.Win32.dll
+lib/mono/2.0/Mono.Security.dll
+lib/mono/2.0/Novell.Directory.Ldap.dll
+lib/mono/2.0/Npgsql.dll
+lib/mono/2.0/PEAPI.dll
+lib/mono/2.0/System.Configuration.Install.dll
+lib/mono/2.0/System.Data.OracleClient.dll
+lib/mono/2.0/System.Data.dll
+lib/mono/2.0/System.Design.dll
+lib/mono/2.0/System.DirectoryServices.dll
+lib/mono/2.0/System.Drawing.Design.dll
+lib/mono/2.0/System.Drawing.dll
+lib/mono/2.0/System.EnterpriseServices.dll
+lib/mono/2.0/System.Management.dll
+lib/mono/2.0/System.Messaging.dll
+lib/mono/2.0/System.Runtime.Remoting.dll
+lib/mono/2.0/System.Runtime.Serialization.Formatters.Soap.dll
+lib/mono/2.0/System.Security.dll
+lib/mono/2.0/System.ServiceProcess.dll
+lib/mono/2.0/System.Web.Services.dll
+lib/mono/2.0/System.Web.dll
+lib/mono/2.0/System.Windows.Forms.dll
+lib/mono/2.0/System.Xml.dll
+lib/mono/2.0/System.dll
+lib/mono/2.0/cscompmgd.dll
+lib/mono/2.0/gmcs.exe
+lib/mono/2.0/gmcs.exe.config
+lib/mono/2.0/gmcs.exe.mdb
+lib/mono/2.0/mono-api-info.exe
+lib/mono/2.0/mscorlib.dll
+lib/mono/2.0/mscorlib.dll.mdb
+lib/mono/2.0/nunit.util.dll
+lib/mono/2.0/wsdl2.exe
+lib/mono/2.0/wsdl2.exe.mdb
 lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll
 lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll.mdb
+lib/mono/gac/Accessibility/2.0.3600.0__b03f5f7f11d50a3a/Accessibility.dll
+lib/mono/gac/Accessibility/2.0.3600.0__b03f5f7f11d50a3a/Accessibility.dll.mdb
 lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756/ByteFX.Data.dll
 lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756/ByteFX.Data.dll.mdb
+lib/mono/gac/ByteFX.Data/0.7.6.2__0738eb9f132ed756/ByteFX.Data.dll
+lib/mono/gac/ByteFX.Data/0.7.6.2__0738eb9f132ed756/ByteFX.Data.dll.mdb
 lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll
 lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll.mdb
+lib/mono/gac/Commons.Xml.Relaxng/2.0.3600.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll
+lib/mono/gac/Commons.Xml.Relaxng/2.0.3600.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll.mdb
 lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/I18N.CJK.dll
 lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/I18N.CJK.dll.mdb
+lib/mono/gac/I18N.CJK/2.0.3600.0__0738eb9f132ed756/I18N.CJK.dll
+lib/mono/gac/I18N.CJK/2.0.3600.0__0738eb9f132ed756/I18N.CJK.dll.mdb
 lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756/I18N.MidEast.dll
 lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756/I18N.MidEast.dll.mdb
+lib/mono/gac/I18N.MidEast/2.0.3600.0__0738eb9f132ed756/I18N.MidEast.dll
+lib/mono/gac/I18N.MidEast/2.0.3600.0__0738eb9f132ed756/I18N.MidEast.dll.mdb
 lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll
 lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll.mdb
+lib/mono/gac/I18N.Other/2.0.3600.0__0738eb9f132ed756/I18N.Other.dll
+lib/mono/gac/I18N.Other/2.0.3600.0__0738eb9f132ed756/I18N.Other.dll.mdb
 lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll
 lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll.mdb
+lib/mono/gac/I18N.Rare/2.0.3600.0__0738eb9f132ed756/I18N.Rare.dll
+lib/mono/gac/I18N.Rare/2.0.3600.0__0738eb9f132ed756/I18N.Rare.dll.mdb
 lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll
 lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll.mdb
+lib/mono/gac/I18N.West/2.0.3600.0__0738eb9f132ed756/I18N.West.dll
+lib/mono/gac/I18N.West/2.0.3600.0__0738eb9f132ed756/I18N.West.dll.mdb
 lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll
 lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll.mdb
-lib/mono/gac/IBM.Data.DB2/1.0.1919.40788__7c307b91aa13d208/IBM.Data.DB2.dll
-lib/mono/gac/IBM.Data.DB2/1.0.1919.40788__7c307b91aa13d208/IBM.Data.DB2.dll.mdb
+lib/mono/gac/I18N/2.0.3600.0__0738eb9f132ed756/I18N.dll
+lib/mono/gac/I18N/2.0.3600.0__0738eb9f132ed756/I18N.dll.mdb
+lib/mono/gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208/IBM.Data.DB2.dll
+lib/mono/gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208/IBM.Data.DB2.dll.mdb
 lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
 lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb
-lib/mono/gac/Microsoft.JScript/0.0.0.0__b03f5f7f11d50a3a/Microsoft.JScript.dll
-lib/mono/gac/Microsoft.JScript/0.0.0.0__b03f5f7f11d50a3a/Microsoft.JScript.dll.mdb
+lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
+lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb
+lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.JScript.dll
+lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.JScript.dll.mdb
+lib/mono/gac/Microsoft.JScript/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.JScript.dll
+lib/mono/gac/Microsoft.JScript/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.JScript.dll.mdb
 lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
-lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll.mdb
+lib/mono/gac/Microsoft.VisualBasic/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
 lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll
 lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll.mdb
+lib/mono/gac/Microsoft.VisualC/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll
+lib/mono/gac/Microsoft.VisualC/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll.mdb
 lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
 lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb
+lib/mono/gac/Microsoft.Vsa/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
+lib/mono/gac/Microsoft.Vsa/8.0.3600.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb
 lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd/Mono.C5.dll
 lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd/Mono.C5.dll.mdb
 lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll
 lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll.mdb
+lib/mono/gac/Mono.Cairo/2.0.3600.0__0738eb9f132ed756/Mono.Cairo.dll
+lib/mono/gac/Mono.Cairo/2.0.3600.0__0738eb9f132ed756/Mono.Cairo.dll.mdb
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll
 lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb
+lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.3600.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll
+lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.3600.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb
 lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll
 lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll.mdb
+lib/mono/gac/Mono.Data.SqliteClient/2.0.3600.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll
+lib/mono/gac/Mono.Data.SqliteClient/2.0.3600.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll.mdb
 lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll
 lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll.mdb
+lib/mono/gac/Mono.Data.SybaseClient/2.0.3600.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll
+lib/mono/gac/Mono.Data.SybaseClient/2.0.3600.0__0738eb9f132ed756/Mono.Data.SybaseClient.dll.mdb
 lib/mono/gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756/Mono.Data.Tds.dll
 lib/mono/gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756/Mono.Data.Tds.dll.mdb
+lib/mono/gac/Mono.Data.Tds/2.0.3600.0__0738eb9f132ed756/Mono.Data.Tds.dll
+lib/mono/gac/Mono.Data.Tds/2.0.3600.0__0738eb9f132ed756/Mono.Data.Tds.dll.mdb
 lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.TdsClient.dll
 lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.TdsClient.dll.mdb
+lib/mono/gac/Mono.Data.TdsClient/2.0.3600.0__0738eb9f132ed756/Mono.Data.TdsClient.dll
+lib/mono/gac/Mono.Data.TdsClient/2.0.3600.0__0738eb9f132ed756/Mono.Data.TdsClient.dll.mdb
 lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756/Mono.Data.dll
 lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756/Mono.Data.dll.mdb
+lib/mono/gac/Mono.Data/2.0.3600.0__0738eb9f132ed756/Mono.Data.dll
+lib/mono/gac/Mono.Data/2.0.3600.0__0738eb9f132ed756/Mono.Data.dll.mdb
 lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll
 lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll.mdb
+lib/mono/gac/Mono.GetOptions/2.0.3600.0__0738eb9f132ed756/Mono.GetOptions.dll
+lib/mono/gac/Mono.GetOptions/2.0.3600.0__0738eb9f132ed756/Mono.GetOptions.dll.mdb
 lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll
 lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll.mdb
+lib/mono/gac/Mono.Http/2.0.3600.0__0738eb9f132ed756/Mono.Http.dll
+lib/mono/gac/Mono.Http/2.0.3600.0__0738eb9f132ed756/Mono.Http.dll.mdb
 lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll
 lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll.mdb
+lib/mono/gac/Mono.Posix/2.0.3600.0__0738eb9f132ed756/Mono.Posix.dll
+lib/mono/gac/Mono.Posix/2.0.3600.0__0738eb9f132ed756/Mono.Posix.dll.mdb
 lib/mono/gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756/Mono.Security.Win32.dll
 lib/mono/gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756/Mono.Security.Win32.dll.mdb
+lib/mono/gac/Mono.Security.Win32/2.0.3600.0__0738eb9f132ed756/Mono.Security.Win32.dll
+lib/mono/gac/Mono.Security.Win32/2.0.3600.0__0738eb9f132ed756/Mono.Security.Win32.dll.mdb
 lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll
 lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll.mdb
+lib/mono/gac/Mono.Security/2.0.3600.0__0738eb9f132ed756/Mono.Security.dll
+lib/mono/gac/Mono.Security/2.0.3600.0__0738eb9f132ed756/Mono.Security.dll.mdb
 lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll
 lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll.mdb
+lib/mono/gac/Novell.Directory.Ldap/2.0.3600.0__0738eb9f132ed756/Novell.Directory.Ldap.dll
+lib/mono/gac/Novell.Directory.Ldap/2.0.3600.0__0738eb9f132ed756/Novell.Directory.Ldap.dll.mdb
 lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll
 lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll.mdb
+lib/mono/gac/Npgsql/2.0.3600.0__5d8b90d52f46fda7/Npgsql.dll
+lib/mono/gac/Npgsql/2.0.3600.0__5d8b90d52f46fda7/Npgsql.dll.mdb
 lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll
 lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll.mdb
+lib/mono/gac/PEAPI/2.0.3600.0__0738eb9f132ed756/PEAPI.dll
+lib/mono/gac/PEAPI/2.0.3600.0__0738eb9f132ed756/PEAPI.dll.mdb
 lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a/System.Configuration.Install.dll
 lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a/System.Configuration.Install.dll.mdb
+lib/mono/gac/System.Configuration.Install/2.0.3600.0__b03f5f7f11d50a3a/System.Configuration.Install.dll
+lib/mono/gac/System.Configuration.Install/2.0.3600.0__b03f5f7f11d50a3a/System.Configuration.Install.dll.mdb
 lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll
 lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb
+lib/mono/gac/System.Data.OracleClient/2.0.3600.0__b77a5c561934e089/System.Data.OracleClient.dll
+lib/mono/gac/System.Data.OracleClient/2.0.3600.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb
 lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll
 lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll.mdb
+lib/mono/gac/System.Data/2.0.3600.0__b77a5c561934e089/System.Data.dll
+lib/mono/gac/System.Data/2.0.3600.0__b77a5c561934e089/System.Data.dll.mdb
 lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Design.dll
 lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Design.dll.mdb
+lib/mono/gac/System.Design/2.0.3600.0__b03f5f7f11d50a3a/System.Design.dll
+lib/mono/gac/System.Design/2.0.3600.0__b03f5f7f11d50a3a/System.Design.dll.mdb
 lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a/System.DirectoryServices.dll
 lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a/System.DirectoryServices.dll.mdb
+lib/mono/gac/System.DirectoryServices/2.0.3600.0__b03f5f7f11d50a3a/System.DirectoryServices.dll
+lib/mono/gac/System.DirectoryServices/2.0.3600.0__b03f5f7f11d50a3a/System.DirectoryServices.dll.mdb
 lib/mono/gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.Design.dll
 lib/mono/gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.Design.dll.mdb
+lib/mono/gac/System.Drawing.Design/2.0.3600.0__b03f5f7f11d50a3a/System.Drawing.Design.dll
+lib/mono/gac/System.Drawing.Design/2.0.3600.0__b03f5f7f11d50a3a/System.Drawing.Design.dll.mdb
 lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.dll
 lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.dll.mdb
+lib/mono/gac/System.Drawing/2.0.3600.0__b03f5f7f11d50a3a/System.Drawing.dll
+lib/mono/gac/System.Drawing/2.0.3600.0__b03f5f7f11d50a3a/System.Drawing.dll.mdb
 lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll
 lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll.mdb
+lib/mono/gac/System.EnterpriseServices/2.0.3600.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll
+lib/mono/gac/System.EnterpriseServices/2.0.3600.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll.mdb
 lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll
 lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll.mdb
+lib/mono/gac/System.Management/2.0.3600.0__b03f5f7f11d50a3a/System.Management.dll
+lib/mono/gac/System.Management/2.0.3600.0__b03f5f7f11d50a3a/System.Management.dll.mdb
 lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll
 lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll.mdb
+lib/mono/gac/System.Messaging/2.0.3600.0__b03f5f7f11d50a3a/System.Messaging.dll
+lib/mono/gac/System.Messaging/2.0.3600.0__b03f5f7f11d50a3a/System.Messaging.dll.mdb
 lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime.Remoting.dll
 lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089/System.Runtime.Remoting.dll.mdb
+lib/mono/gac/System.Runtime.Remoting/2.0.3600.0__b77a5c561934e089/System.Runtime.Remoting.dll
+lib/mono/gac/System.Runtime.Remoting/2.0.3600.0__b77a5c561934e089/System.Runtime.Remoting.dll.mdb
 lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll
 lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll.mdb
+lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/2.0.3600.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll
+lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/2.0.3600.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll.mdb
 lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/System.Security.dll
 lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/System.Security.dll.mdb
+lib/mono/gac/System.Security/2.0.0.0__b03f5f7f11d50a3a/System.Security.dll
+lib/mono/gac/System.Security/2.0.0.0__b03f5f7f11d50a3a/System.Security.dll.mdb
 lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll
 lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll.mdb
+lib/mono/gac/System.ServiceProcess/2.0.3600.0__b03f5f7f11d50a3a/System.ServiceProcess.dll
+lib/mono/gac/System.ServiceProcess/2.0.3600.0__b03f5f7f11d50a3a/System.ServiceProcess.dll.mdb
 lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll
 lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll.mdb
+lib/mono/gac/System.Web.Services/2.0.3600.0__b03f5f7f11d50a3a/System.Web.Services.dll
+lib/mono/gac/System.Web.Services/2.0.3600.0__b03f5f7f11d50a3a/System.Web.Services.dll.mdb
 lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a/System.Web.dll
 lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a/System.Web.dll.mdb
+lib/mono/gac/System.Web/2.0.3600.0__b03f5f7f11d50a3a/System.Web.dll
+lib/mono/gac/System.Web/2.0.3600.0__b03f5f7f11d50a3a/System.Web.dll.mdb
 lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Forms.dll
 lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Forms.dll.mdb
+lib/mono/gac/System.Windows.Forms/2.0.3600.0__b77a5c561934e089/System.Windows.Forms.dll
+lib/mono/gac/System.Windows.Forms/2.0.3600.0__b77a5c561934e089/System.Windows.Forms.dll.mdb
 lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll
 lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll.mdb
+lib/mono/gac/System.Xml/2.0.3600.0__b77a5c561934e089/System.Xml.dll
+lib/mono/gac/System.Xml/2.0.3600.0__b77a5c561934e089/System.Xml.dll.mdb
 lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll
 lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll.mdb
+lib/mono/gac/System/2.0.3600.0__b77a5c561934e089/System.dll
+lib/mono/gac/System/2.0.3600.0__b77a5c561934e089/System.dll.mdb
 lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll
 lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll.mdb
+lib/mono/gac/cscompmgd/8.0.3600.0__b03f5f7f11d50a3a/cscompmgd.dll
+lib/mono/gac/cscompmgd/8.0.3600.0__b03f5f7f11d50a3a/cscompmgd.dll.mdb
 lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77/nunit.core.dll
 lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77/nunit.core.dll.mdb
 lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77/nunit.framework.dll
@@ -357,6 +516,8 @@ man/man1/makecert.1
 man/man1/mcs.1
 man/man1/mint.1
 man/man1/mkbundle.1
+man/man1/mono-service.1
+man/man1/mono-shlib-cop.1
 man/man1/mono.1
 man/man1/monoburg.1
 man/man1/monodis.1
@@ -427,109 +588,159 @@ share/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/gac/nunit.framework
 @dirrm lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77
 @dirrm lib/mono/gac/nunit.core
+@dirrm lib/mono/gac/cscompmgd/8.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/cscompmgd
+@dirrm lib/mono/gac/System/2.0.3600.0__b77a5c561934e089
 @dirrm lib/mono/gac/System/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Xml/2.0.3600.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Xml
+@dirrm lib/mono/gac/System.Windows.Forms/2.0.3600.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Windows.Forms
+@dirrm lib/mono/gac/System.Web/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Web.Services/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Web.Services
 @dirrm lib/mono/gac/System.Web
+@dirrm lib/mono/gac/System.ServiceProcess/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.ServiceProcess
+@dirrm lib/mono/gac/System.Security/2.0.0.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Security
+@dirrm lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Runtime.Serialization.Formatters.Soap
+@dirrm lib/mono/gac/System.Runtime.Remoting/2.0.3600.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Runtime.Remoting/1.0.5000.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Runtime.Remoting
+@dirrm lib/mono/gac/System.Messaging/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Messaging
+@dirrm lib/mono/gac/System.Management/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Management
+@dirrm lib/mono/gac/System.EnterpriseServices/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.EnterpriseServices
+@dirrm lib/mono/gac/System.Drawing/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/System.Drawing.Design/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Drawing.Design/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Drawing.Design
 @dirrm lib/mono/gac/System.Drawing
+@dirrm lib/mono/gac/System.DirectoryServices/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.DirectoryServices
+@dirrm lib/mono/gac/System.Design/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Design
+@dirrm lib/mono/gac/System.Data/2.0.3600.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089
+@dirrm lib/mono/gac/System.Data.OracleClient/2.0.3600.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089
 @dirrm lib/mono/gac/System.Data.OracleClient
 @dirrm lib/mono/gac/System.Data
+@dirrm lib/mono/gac/System.Configuration.Install/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/System.Configuration.Install
 @dirrm lib/mono/gac/System
+@dirrm lib/mono/gac/PEAPI/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/PEAPI
+@dirrm lib/mono/gac/Npgsql/2.0.3600.0__5d8b90d52f46fda7
 @dirrm lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7
 @dirrm lib/mono/gac/Npgsql
+@dirrm lib/mono/gac/Novell.Directory.Ldap/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Novell.Directory.Ldap
+@dirrm lib/mono/gac/Mono.Security/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Security.Win32/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Security.Win32/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Security.Win32
 @dirrm lib/mono/gac/Mono.Security
+@dirrm lib/mono/gac/Mono.Posix/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Posix
+@dirrm lib/mono/gac/Mono.Http/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Http
+@dirrm lib/mono/gac/Mono.GetOptions/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.GetOptions
+@dirrm lib/mono/gac/Mono.Data/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Data.TdsClient/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.TdsClient
+@dirrm lib/mono/gac/Mono.Data.Tds/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.Tds/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.Tds
+@dirrm lib/mono/gac/Mono.Data.SybaseClient/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.SybaseClient
+@dirrm lib/mono/gac/Mono.Data.SqliteClient/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Data.SqliteClient
 @dirrm lib/mono/gac/Mono.Data
+@dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter
+@dirrm lib/mono/gac/Mono.Cairo/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Cairo
 @dirrm lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd
 @dirrm lib/mono/gac/Mono.C5
+@dirrm lib/mono/gac/Microsoft.Vsa/8.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.Vsa
+@dirrm lib/mono/gac/Microsoft.VisualC/8.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.VisualC
+@dirrm lib/mono/gac/Microsoft.VisualBasic/8.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.VisualBasic
-@dirrm lib/mono/gac/Microsoft.JScript/0.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.JScript/8.0.3600.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.JScript
+@dirrm lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73
 @dirrm lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73
 @dirrm lib/mono/gac/ICSharpCode.SharpZipLib
-@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1919.40788__7c307b91aa13d208
+@dirrm lib/mono/gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208
 @dirrm lib/mono/gac/IBM.Data.DB2
+@dirrm lib/mono/gac/I18N/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756
+@dirrm lib/mono/gac/I18N.West/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.West
+@dirrm lib/mono/gac/I18N.Rare/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.Rare
+@dirrm lib/mono/gac/I18N.Other/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.Other
+@dirrm lib/mono/gac/I18N.MidEast/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.MidEast
+@dirrm lib/mono/gac/I18N.CJK/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.CJK
 @dirrm lib/mono/gac/I18N
+@dirrm lib/mono/gac/Commons.Xml.Relaxng/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Commons.Xml.Relaxng
+@dirrm lib/mono/gac/ByteFX.Data/0.7.6.2__0738eb9f132ed756
 @dirrm lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756
 @dirrm lib/mono/gac/ByteFX.Data
+@dirrm lib/mono/gac/Accessibility/2.0.3600.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Accessibility
 @dirrm lib/mono/gac
+@dirrm lib/mono/2.0
 @dirrm lib/mono/1.0
 @dirrm lib/mono
 @dirrm include/mono/utils
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index adb6bbe9974..97c17875ec2 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2005/04/04 07:22:34 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2005/07/31 15:26:58 recht Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono}
 BUILDLINK_PACKAGES+=	mono
 
 .if !empty(MONO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mono+=	mono>=1.1.6
+BUILDLINK_DEPENDS.mono+=	mono>=1.1.8.3
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 .endif	# MONO_BUILDLINK3_MK
 
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index ded8083b332..a950ff09085 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,13 +1,21 @@
-$NetBSD: distinfo,v 1.22 2005/04/05 06:45:47 recht Exp $
+$NetBSD: distinfo,v 1.23 2005/07/31 15:26:58 recht Exp $
 
-SHA1 (mono-1.1.6.tar.gz) = 4d658f6a1998e99397640b37d9a3aa61005c23ac
-RMD160 (mono-1.1.6.tar.gz) = 1037ee313bca245e28c0a2a29bf411fbaf361fba
-Size (mono-1.1.6.tar.gz) = 13752717 bytes
-SHA1 (patch-aa) = e54a579655eb089157e92fdf90ad93cb53cfc726
-SHA1 (patch-ab) = 22130412ae38127e6aa706c015c2aa4e25ec9ad1
-SHA1 (patch-ac) = af3d05b390d98b68c4ce9ed0235fde951fbbea63
-SHA1 (patch-ad) = 8f4f3cae08eff6e25b5dc49133b211ea49732f63
-SHA1 (patch-ae) = a67257165298572db7cb2d28c5b1d95e7b8b1c45
-SHA1 (patch-af) = 54bc1e6a85a4183187e908965b1d1be7d94fb976
-SHA1 (patch-ba) = 991c487871c9a6e9f1a1aa358ba6c61c6475961a
-SHA1 (patch-bc) = fcd29d5183bec99c4f1e0cd66fcc16a1c13febba
+SHA1 (mono-1.1.8.3.tar.gz) = f6aaf1021c4ac58a768abc36e7f95f8195554cc2
+RMD160 (mono-1.1.8.3.tar.gz) = a012252c76797c230cb9a62ee713314a44325932
+Size (mono-1.1.8.3.tar.gz) = 15348432 bytes
+SHA1 (patch-aa) = 72796e338f1aaace559f18b7e71903008b3c6dc4
+SHA1 (patch-ab) = 88cfdd6adc177a925f21372e4c965718e1d741f5
+SHA1 (patch-ac) = b555271abc48eea013e8e5e8a43034b384e31c15
+SHA1 (patch-ad) = ed4fcf6b112f5ec833df4b3f8a9d43c42f691e5e
+SHA1 (patch-ae) = 02d14e8e18888d3759daaf2081e18042b1ae7241
+SHA1 (patch-af) = d5817526249ac367bbec00703e00427173f23ab8
+SHA1 (patch-ag) = 8fbe737e05ea8051ff95b2cac6ed6b702a3e13b4
+SHA1 (patch-ah) = 6f05a2a7460ea243fa9d294dc8bde4db6dbed55b
+SHA1 (patch-ai) = ef4aedc6f6e200704b3754be7277e8d3a047624c
+SHA1 (patch-aj) = 2826047d73981594bc19834896b14d4753bfe5ae
+SHA1 (patch-ak) = 812a02811003cc1bad84ee900cf7d4d558d69fe8
+SHA1 (patch-al) = 96e7125b2e9046784e3cf1b1c094de26d55d073e
+SHA1 (patch-am) = d2cf278efc2fd67b134358e28e992273814500b3
+SHA1 (patch-an) = 35ddf59316e222f7a25ab4b9f1cbf824d233d9ba
+SHA1 (patch-ba) = 396940ffa910fcb76b196a6ec38385d4e6fd72f4
+SHA1 (patch-bc) = f5a81ff506ae14f764ceab14acc38ebc2b604257
diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa
index 02dc2863d8a..c51e1fdf868 100644
--- a/lang/mono/patches/patch-aa
+++ b/lang/mono/patches/patch-aa
@@ -1,12 +1,23 @@
-$NetBSD: patch-aa,v 1.11 2005/04/05 06:45:47 recht Exp $
+$NetBSD: patch-aa,v 1.12 2005/07/31 15:26:58 recht Exp $
 
---- mono/metadata/metadata.c.orig	Wed Mar 30 23:26:16 2005
-+++ mono/metadata/metadata.c
-@@ -551,6 +551,7 @@ mono_metadata_compute_size (MonoImage *m
- 				g_assert (i == 4 || i == 5);
- 				field_size = i == 4 ? idx_size (MONO_TABLE_FIELD):
- 					idx_size(MONO_TABLE_METHOD);
-+				break;
- 			case MONO_TABLE_GENERICPARAM:
- 				g_assert (i == 2 || i == 4 || i == 5);
- 				if (i == 2)
+--- configure.in.orig	2005-07-27 02:06:43.000000000 +0200
++++ configure.in
+@@ -70,6 +70,18 @@ case "$host" in
+ 		;;
+ 	*-*-*netbsd*)
+ 		platform_win32=no
++		CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE"
++		libmono_cflags="-D_REENTRANT"
++		LDFLAGS="$LDFLAGS -pthread"
++		libmono_ldflags="-pthread"
++		need_link_unlink=yes
++		libdl="-ldl /libexec/ld.elf_so"
++		libgc_threads=pthreads
++		with_tls=__thread
++		with_sigaltstack=yes
++		;;
++	*-*-*netbsd*)
++		platform_win32=no
+ 		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+ 		libmono_cflags="-D_REENTRANT"
+ 		LDFLAGS="$LDFLAGS -pthread"
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index a115fff8709..46e99be34d5 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,20 +1,23 @@
-$NetBSD: patch-ab,v 1.10 2005/04/05 06:45:47 recht Exp $
+$NetBSD: patch-ab,v 1.11 2005/07/31 15:26:58 recht Exp $
 
---- mono/dis/dis-cil.c.orig	Wed Mar 30 23:26:14 2005
-+++ mono/dis/dis-cil.c
-@@ -19,6 +19,7 @@
- #include "dis-cil.h"
- #include "mono/metadata/opcodes.h"
- 
-+#ifndef HAVE_ISINF
- #ifdef HAVE_IEEEFP_H
- #include <ieeefp.h>
- int isinf (double);
-@@ -37,7 +38,6 @@ isinf (double num)
- 	return 0;
- }
- #else
--#ifndef HAVE_ISINF
- #error "Don't know how to implement isinf for this platform."
- #endif
- #endif
+--- configure.orig	2005-07-27 02:08:41.000000000 +0200
++++ configure
+@@ -2224,6 +2224,18 @@ _ACEOF
+ 		;;
+ 	*-*-*netbsd*)
+ 		platform_win32=no
++		CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE"
++		libmono_cflags="-D_REENTRANT"
++		LDFLAGS="$LDFLAGS -pthread"
++		libmono_ldflags="-pthread"
++		need_link_unlink=yes
++		libdl="-ldl /libexec/ld.elf_so"
++		libgc_threads=pthreads
++		with_tls=__thread
++		with_sigaltstack=yes
++		;;
++	*-*-*netbsd*)
++		platform_win32=no
+ 		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+ 		libmono_cflags="-D_REENTRANT"
+ 		LDFLAGS="$LDFLAGS -pthread"
diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac
index 7bfecbb7cab..e145a46f30d 100644
--- a/lang/mono/patches/patch-ac
+++ b/lang/mono/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.11 2005/04/05 06:45:47 recht Exp $
+$NetBSD: patch-ac,v 1.12 2005/07/31 15:26:58 recht Exp $
 
---- data/Makefile.in.orig	Thu Mar 31 02:49:46 2005
+--- data/Makefile.in.orig	2005-07-27 02:08:24.000000000 +0200
 +++ data/Makefile.in
-@@ -255,7 +255,7 @@ target_cpu = @target_cpu@
+@@ -264,7 +264,7 @@ target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
  SUBDIRS = net_1_1 net_2_0
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
index a23dc364592..e947bc5dbf7 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,15 +1,21 @@
-$NetBSD: patch-ad,v 1.11 2005/04/05 06:45:47 recht Exp $
+$NetBSD: patch-ad,v 1.12 2005/07/31 15:26:58 recht Exp $
 
---- mono/dis/dump.c.orig	Wed Mar 30 23:26:14 2005
-+++ mono/dis/dump.c
-@@ -18,8 +18,10 @@
- #include "mono/metadata/loader.h"
- #include "mono/metadata/class.h"
- 
-+#ifndef HAVE_ISINF
- #ifdef HAVE_IEEEFP_H
- extern int isinf (double);
-+#endif
- #endif
- 
- void
+--- libgc/configure.in.orig	2005-05-19 15:24:22.000000000 +0200
++++ libgc/configure.in
+@@ -84,7 +84,15 @@ case "$THREADS" in
+ 	AC_DEFINE(GC_LINUX_THREADS)
+ 	AC_DEFINE(_REENTRANT)
+ 	;;
+-     *-*-aix*)
++	 *-*-netbsd*)
++	AC_DEFINE(GC_NETBSD_THREADS)
++	AC_DEFINE(_REENTRANT)
++	AC_DEFINE(THREAD_LOCAL_ALLOC)
++		if test "${enable_parallel_mark}" = yes; then
++			AC_DEFINE(PARALLEL_MARK)
++		fi
++	;;
++	*-*-aix*)
+ 	AC_DEFINE(GC_AIX_THREADS)
+ 	AC_DEFINE(_REENTRANT)
+ 	;;
diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae
index 6afce070216..e121d4893c2 100644
--- a/lang/mono/patches/patch-ae
+++ b/lang/mono/patches/patch-ae
@@ -1,20 +1,88 @@
-$NetBSD: patch-ae,v 1.6 2005/04/05 06:45:47 recht Exp $
+$NetBSD: patch-ae,v 1.7 2005/07/31 15:26:58 recht Exp $
 
---- mono/metadata/boehm-gc.c.orig	Wed Mar 30 23:26:16 2005
-+++ mono/metadata/boehm-gc.c
-@@ -59,10 +59,14 @@ mono_gc_enable (void)
- gboolean
- mono_gc_is_gc_thread (void)
- {
--#ifdef USE_INCLUDED_LIBGC
-+#if defined(USE_INCLUDED_LIBGC) && !defined(__NetBSD__)
- 	return GC_thread_is_registered ();
- #else
-+#ifdef __NetBSD__
-+	return FALSE;
-+#else
- 	return TRUE;
-+#endif
- #endif
- }
+--- libgc/configure.orig	2005-07-27 02:08:52.000000000 +0200
++++ libgc/configure
+@@ -465,7 +465,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
  
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os GC_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GC_CFLAGS THREADLIBS POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE EXTRA_TEST_LIBS target_all CPLUSPLUS_TRUE CPLUSPLUS_FALSE INCLUDES CXXINCLUDES addobjs addincludes addlibs addtests EGREP LN_S ECHO CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MY_CFLAGS UNWINDLIBS USE_LIBDIR_TRUE USE_LIBDIR_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os GC_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GC_CFLAGS THREADLIBS POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE EXTRA_TEST_LIBS target_all CPLUSPLUS_TRUE CPLUSPLUS_FALSE INCLUDES CXXINCLUDES addobjs addincludes addlibs addtests EGREP LN_S ECHO CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MY_CFLAGS UNWINDLIBS USE_LIBDIR_TRUE USE_LIBDIR_FALSE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -930,14 +930,6 @@ ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ ac_env_CXXFLAGS_value=$CXXFLAGS
+ ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+-ac_env_CCAS_set=${CCAS+set}
+-ac_env_CCAS_value=$CCAS
+-ac_cv_env_CCAS_set=${CCAS+set}
+-ac_cv_env_CCAS_value=$CCAS
+-ac_env_CCASFLAGS_set=${CCASFLAGS+set}
+-ac_env_CCASFLAGS_value=$CCASFLAGS
+-ac_cv_env_CCASFLAGS_set=${CCASFLAGS+set}
+-ac_cv_env_CCASFLAGS_value=$CCASFLAGS
+ ac_env_CPP_set=${CPP+set}
+ ac_env_CPP_value=$CPP
+ ac_cv_env_CPP_set=${CPP+set}
+@@ -1074,8 +1066,6 @@ Some influential environment variables:
+               headers in a nonstandard directory <include dir>
+   CXX         C++ compiler command
+   CXXFLAGS    C++ compiler flags
+-  CCAS        assembler compiler command (defaults to CC)
+-  CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
+   CPP         C preprocessor
+   CXXCPP      C++ preprocessor
+   F77         Fortran 77 compiler command
+@@ -3588,12 +3578,6 @@ fi
+ 
+ 
+ 
+-# By default we simply use the C compiler to build assembly code.
+-
+-test "${CCAS+set}" = set || CCAS=$CC
+-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+-
+-
+ 
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+@@ -3933,7 +3917,27 @@ _ACEOF
+ _ACEOF
+ 
+ 	;;
+-     *-*-aix*)
++	 *-*-netbsd*)
++	cat >>confdefs.h <<\_ACEOF
++#define GC_NETBSD_THREADS 1
++_ACEOF
++
++	cat >>confdefs.h <<\_ACEOF
++#define _REENTRANT 1
++_ACEOF
++
++	cat >>confdefs.h <<\_ACEOF
++#define THREAD_LOCAL_ALLOC 1
++_ACEOF
++
++		if test "${enable_parallel_mark}" = yes; then
++			cat >>confdefs.h <<\_ACEOF
++#define PARALLEL_MARK 1
++_ACEOF
++
++		fi
++	;;
++	*-*-aix*)
+ 	cat >>confdefs.h <<\_ACEOF
+ #define GC_AIX_THREADS 1
+ _ACEOF
+@@ -21287,8 +21291,6 @@ s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+ s,@CXXDEPMODE@,$CXXDEPMODE,;t t
+ s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+ s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+-s,@CCAS@,$CCAS,;t t
+-s,@CCASFLAGS@,$CCASFLAGS,;t t
+ s,@AR@,$AR,;t t
+ s,@ac_ct_AR@,$ac_ct_AR,;t t
+ s,@RANLIB@,$RANLIB,;t t
diff --git a/lang/mono/patches/patch-af b/lang/mono/patches/patch-af
index 705bf79d2ad..86a6009a364 100644
--- a/lang/mono/patches/patch-af
+++ b/lang/mono/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.6 2005/04/05 06:45:47 recht Exp $
+$NetBSD: patch-af,v 1.7 2005/07/31 15:26:58 recht Exp $
 
---- mono/metadata/Makefile.in.orig	Thu Mar 31 02:49:50 2005
+--- mono/metadata/Makefile.in.orig	2005-07-27 02:08:30.000000000 +0200
 +++ mono/metadata/Makefile.in
 @@ -68,7 +68,7 @@ am__objects_1 = reflection.lo object.lo 
  am_libmonoruntime_static_la_OBJECTS = $(am__objects_1)
diff --git a/lang/mono/patches/patch-ag b/lang/mono/patches/patch-ag
new file mode 100644
index 00000000000..1f7203a3842
--- /dev/null
+++ b/lang/mono/patches/patch-ag
@@ -0,0 +1,49 @@
+$NetBSD: patch-ag,v 1.5 2005/07/31 15:26:58 recht Exp $
+
+--- libgc/dyn_load.c.orig	2005-04-11 16:12:45.000000000 +0200
++++ libgc/dyn_load.c
+@@ -70,6 +70,12 @@
+ #   include <dlfcn.h>
+ #   include <link.h>
+ #endif
++
++#ifdef NETBSD 
++#include <machine/db_machdep.h>
++#include <dlfcn.h>
++#endif
++
+ #ifdef SUNOS4
+ #   include <dlfcn.h>
+ #   include <link.h>
+@@ -509,6 +515,31 @@ GC_FirstDLOpenedLinkMap()
+                 break;
+             }
+         }
++
++#if defined(NETBSD)
++#undef dlopen
++#undef dlsym
++#undef dlclose
++		/* This is a hack. For now, it seems that NetBSD 2.0 does not provide
++		   a _DYNAMIC with the neccessary DT_DEBUG information. A simple dlopen(0, RTLD_LAZY)
++		   does the job. Maybe a NetBSD guru could explain this...
++	     */		
++		if(cachedResult == 0) {
++			void* startupSyms = dlopen(0, RTLD_LAZY);
++			dp = (ElfW(Dyn)*)dlsym(startupSyms, "_DYNAMIC");
++
++			for(; (tag = dp->d_tag) != 0; dp++ ) {
++				if( tag == DT_DEBUG ) {
++					struct link_map *lm
++							= ((struct r_debug *)(dp->d_un.d_ptr))->r_map;
++					if( lm != 0 ) cachedResult = lm->l_next; /* might be NIL */
++					break;
++				}
++			}
++
++			dlclose(startupSyms);
++		}
++#endif
+     }
+     return cachedResult;
+ }
diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah
new file mode 100644
index 00000000000..60b92204095
--- /dev/null
+++ b/lang/mono/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.6 2005/07/31 15:26:58 recht Exp $
+
+--- libgc/include/gc_config_macros.h.orig	2004-05-18 20:43:26.000000000 +0200
++++ libgc/include/gc_config_macros.h
+@@ -56,7 +56,7 @@
+ 	defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) || \
+ 	defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \
+ 	defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
+-	defined(GC_AIX_THREADS) || \
++	defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \
+         (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__))
+ #   define GC_PTHREADS
+ # endif
diff --git a/lang/mono/patches/patch-ai b/lang/mono/patches/patch-ai
new file mode 100644
index 00000000000..16fdc5de6de
--- /dev/null
+++ b/lang/mono/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.5 2005/07/31 15:26:58 recht Exp $
+
+--- libgc/include/private/gc_priv.h.orig	2005-02-07 18:00:32.000000000 +0100
++++ libgc/include/private/gc_priv.h
+@@ -1936,7 +1936,7 @@ void GC_err_puts GC_PROTO((GC_CONST char
+   /* in Linux glibc, but it's not exported.)  Thus we continue to use	*/
+   /* the same hard-coded signals we've always used.			*/
+ #  if !defined(SIG_SUSPEND)
+-#   if defined(GC_LINUX_THREADS) || defined(GC_DGUX386_THREADS)
++#   if defined(GC_LINUX_THREADS) || defined(GC_DGUX386_THREADS) || defined(GC_NETBSD_THREADS)
+ #    if defined(SPARC) && !defined(SIGPWR)
+        /* SPARC/Linux doesn't properly define SIGPWR in <signal.h>.
+         * It is aliased to SIGLOST in asm/signal.h, though.		*/
diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj
new file mode 100644
index 00000000000..72e9e3d3ddd
--- /dev/null
+++ b/lang/mono/patches/patch-aj
@@ -0,0 +1,174 @@
+$NetBSD: patch-aj,v 1.4 2005/07/31 15:26:58 recht Exp $
+
+--- libgc/pthread_stop_world.c.orig	2005-07-05 20:46:03.000000000 +0200
++++ libgc/pthread_stop_world.c
+@@ -99,6 +99,7 @@ word GC_stop_count;	/* Incremented at th
+ #  endif
+ #endif
+ 
++#if !defined(GC_NETBSD_THREADS)
+ sem_t GC_suspend_ack_sem;
+ 
+ static void _GC_suspend_handler(int sig)
+@@ -208,6 +209,7 @@ static void _GC_restart_handler(int sig)
+     GC_printf1("In GC_restart_handler for 0x%lx\n", pthread_self());
+ #endif
+ }
++#endif /* !GC_NETBSD_THREADS */
+ 
+ # ifdef IA64
+ #   define IF_IA64(x) x
+@@ -283,12 +285,14 @@ static void pthread_push_all_stacks()
+       ABORT("Collecting from unknown thread.");
+ }
+ 
++#if !defined(GC_NETBSD_THREADS)
+ void GC_restart_handler(int sig)
+ {
+ 	int old_errno = errno;
+ 	_GC_restart_handler (sig);
+ 	errno = old_errno;
+ }
++#endif
+ 
+ /* We hold allocation lock.  Should do exactly the right thing if the	*/
+ /* world is stopped.  Should not fail if it isn't.			*/
+@@ -297,6 +301,28 @@ void GC_push_all_stacks()
+     gc_thread_vtable->push_all_stacks();
+ }
+ 
++#if defined(GC_NETBSD_THREADS)
++/* 
++ * Get the stack start address for the specified address.
++ */ 
++int 
++np_stackinfo(pthread_t p, void **addr) 
++{ 
++	pthread_attr_t attr; 
++	int ret = -1; 
++
++	if (pthread_attr_init(&attr)) 
++		return -1;
++
++	if (!pthread_attr_get_np(p, &attr))
++		if (!pthread_attr_getstackaddr(&attr, addr)) 
++			ret = 0;
++
++	pthread_attr_destroy(&attr); 
++	return ret; 
++}
++#endif
++
+ /* There seems to be a very rare thread stopping problem.  To help us  */
+ /* debug that, we save the ids of the stopping thread. */
+ pthread_t GC_stopping_thread;
+@@ -322,6 +348,7 @@ int GC_suspend_all()
+             if (p -> stop_info.last_stop_count == GC_stop_count) continue;
+ 	    if (p -> thread_blocked) /* Will wait */ continue;
+             n_live_threads++;
++#if !defined(GC_NETBSD_THREADS)
+ 	    #if DEBUG_THREADS
+ 	      GC_printf1("Sending suspend signal to 0x%lx\n", p -> id);
+ 	    #endif
+@@ -337,6 +364,23 @@ int GC_suspend_all()
+                 default:
+                     ABORT("pthread_kill failed");
+             }
++#else
++	    #if DEBUG_THREADS
++	      GC_printf1("Suspending 0x%lx ...\n", p -> id);
++	    #endif
++
++		if(pthread_suspend_np(p -> id) != 0)
++			GC_printf1("Could not susend thread... 0x%lx\n", p -> id);
++
++		/* Right now, this is not enough. Retreiving the stack base address is not the correct */
++		/* info to give to the GC, but since there is no way to get the current stack pointer  */
++		/* for the suspended thread, base pointer will have to be enough. Mono seems to be     */
++		/* happy with it so... */
++		if(np_stackinfo(p -> id, &(p -> stop_info.stack_ptr)) != 0)
++			GC_err_printf1("Could not get thread stack address... 0x%lx\n", p -> id);			
++
++        n_live_threads--;
++#endif /* !GC_NETBSD_THREADS */
+         }
+       }
+     }
+@@ -356,6 +400,7 @@ static void pthread_stop_world()
+        
+     n_live_threads = GC_suspend_all();
+ 
++#if !defined(GC_NETBSD_THREADS)
+       if (GC_retry_signals) {
+ 	  unsigned long wait_usecs = 0;  /* Total wait since retry.	*/
+ #	  define WAIT_UNIT 3000
+@@ -393,6 +438,8 @@ static void pthread_stop_world()
+ 	      }
+ 	  }
+     }
++#endif /* !GC_NETBSD_THREADS */
++
+     #if DEBUG_THREADS
+       GC_printf1("World stopped from 0x%lx\n", pthread_self());
+     #endif
+@@ -439,6 +486,7 @@ static void pthread_start_world()
+             if (p -> flags & FINISHED) continue;
+ 	    if (p -> thread_blocked) continue;
+             n_live_threads++;
++#if !defined(GC_NETBSD_THREADS)
+ 	    #if DEBUG_THREADS
+ 	      GC_printf1("Sending restart signal to 0x%lx\n", p -> id);
+ 	    #endif
+@@ -454,10 +502,18 @@ static void pthread_start_world()
+                 default:
+                     ABORT("pthread_kill failed");
+             }
++#else
++	    #if DEBUG_THREADS
++	      GC_printf1("Resuming Thread 0x%lx\n", p -> id);
++	    #endif
++		pthread_resume_np(p -> id);
++		n_live_threads--;
++#endif /* !GC_NETBSD_THREADS */
+         }
+       }
+     }
+ 
++#if !defined(GC_NETBSD_THREADS)
+     #if DEBUG_THREADS
+     GC_printf0 ("All threads signaled");
+     #endif
+@@ -470,6 +526,7 @@ static void pthread_start_world()
+ 	    }
+ 	}
+     }
++#endif /* !GC_NETBSD_THREADS */
+   
+     #if DEBUG_THREADS
+       GC_printf0("World started\n");
+@@ -482,6 +539,8 @@ void GC_start_world()
+ }
+ 
+ static void pthread_stop_init() {
++
++#if !defined(GC_NETBSD_THREADS)
+     struct sigaction act;
+     
+     if (sem_init(&GC_suspend_ack_sem, 0, 0) != 0)
+@@ -522,6 +581,16 @@ static void pthread_stop_init() {
+               GC_printf0("Will retry suspend signal if necessary.\n");
+ 	  }
+ #     endif
++#else
++    struct sigaction act;
++
++    act.sa_flags = SA_RESTART;
++    if (sigfillset(&act.sa_mask) != 0) {
++    	ABORT("sigfillset() failed");
++    }
++    GC_remove_allowed_signals(&act.sa_mask);
++
++#endif /* !GC_NETBSD_THREADS */
+ }
+ 
+ /* We hold the allocation lock.	*/
diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak
new file mode 100644
index 00000000000..3013ed1964f
--- /dev/null
+++ b/lang/mono/patches/patch-ak
@@ -0,0 +1,80 @@
+$NetBSD: patch-ak,v 1.6 2005/07/31 15:26:58 recht Exp $
+
+--- libgc/pthread_support.c.orig	2005-06-19 11:59:53.000000000 +0200
++++ libgc/pthread_support.c
+@@ -68,7 +68,7 @@
+ # endif
+ 
+ # if (defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) || \
+-      defined(GC_DARWIN_THREADS)) && !defined(USE_PTHREAD_SPECIFIC)
++      defined(GC_DARWIN_THREADS) || defined(GC_NETBSD_THREADS)) && !defined(USE_PTHREAD_SPECIFIC)
+ #   define USE_PTHREAD_SPECIFIC
+ # endif
+ 
+@@ -120,7 +120,10 @@
+ # include <sys/sysctl.h>
+ #endif /* GC_DARWIN_THREADS */
+ 
+-
++#if defined(GC_NETBSD_THREADS)
++# include <sys/param.h>
++# include <sys/sysctl.h>
++#endif
+ 
+ #if defined(GC_DGUX386_THREADS)
+ # include <sys/dg_sys_info.h>
+@@ -956,7 +959,7 @@ void GC_thr_init()
+ #       if defined(GC_FREEBSD_THREADS)
+           GC_nprocs = 1;
+ #       endif
+-#       if defined(GC_DARWIN_THREADS)
++#       if defined(GC_DARWIN_THREADS) || defined(GC_NETBSD_THREADS)
+ 	  int ncpus = 1;
+ 	  size_t len = sizeof(ncpus);
+ 	  sysctl((int[2]) {CTL_HW, HW_NCPU}, 2, &ncpus, &len, NULL, 0);
+@@ -1093,8 +1096,24 @@ void GC_end_blocking(void) {
+ #define __d10_sleep sleep
+ #endif /* GC_DGUX386_THREADS */
+ 
++#undef nanosleep
++#undef usleep
++#undef sleep
++
++/* A wrapper for the standard C nanosleep function	*/
++int WRAP_FUNC(nanosleep) (const struct timespec *rqtp, struct timespec *rmtp)
++{
++    int result;
++
++    GC_start_blocking();
++    result = REAL_FUNC(nanosleep)(rqtp, rmtp);
++    GC_end_blocking();
++
++    return result;
++}
++
+ /* A wrapper for the standard C sleep function	*/
+-int WRAP_FUNC(sleep) (unsigned int seconds)
++unsigned int WRAP_FUNC(sleep) (unsigned int seconds)
+ {
+     int result;
+ 
+@@ -1104,6 +1123,19 @@ int WRAP_FUNC(sleep) (unsigned int secon
+     return result;
+ }
+ 
++/* A wrapper for the standard C usleep function	*/
++int WRAP_FUNC(usleep) (useconds_t microseconds)
++{
++    int result;
++
++    GC_start_blocking();
++    result = REAL_FUNC(usleep)(microseconds);
++    GC_end_blocking();
++
++    return result;
++}
++
++
+ struct start_info {
+     void *(*start_routine)(void *);
+     void *arg;
diff --git a/lang/mono/patches/patch-al b/lang/mono/patches/patch-al
new file mode 100644
index 00000000000..0c062b4f156
--- /dev/null
+++ b/lang/mono/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2005/07/31 15:26:58 recht Exp $
+
+--- libgc/specific.c.orig	2003-03-31 16:33:32.000000000 +0200
++++ libgc/specific.c
+@@ -11,7 +11,7 @@
+  * modified is included with the above copyright notice.
+  */
+ 
+-#if defined(GC_LINUX_THREADS)
++#if defined(GC_LINUX_THREADS) || defined(GC_NETBSD_THREADS)
+ 
+ #include "private/gc_priv.h" /* For GC_compare_and_exchange, GC_memory_barrier */
+ #include "private/specific.h"
diff --git a/lang/mono/patches/patch-am b/lang/mono/patches/patch-am
new file mode 100644
index 00000000000..33ccba0881a
--- /dev/null
+++ b/lang/mono/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2005/07/31 15:26:58 recht Exp $
+
+--- mono/io-layer/collection.c.orig	2005-04-21 13:46:55.000000000 +0200
++++ mono/io-layer/collection.c
+@@ -53,7 +53,7 @@ void _wapi_collection_init (void)
+ 	g_assert (ret == 0);
+ 	
+ #ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ 	ret = pthread_attr_setstacksize (&attr, 65536);
+ #else
+ 	ret = pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
diff --git a/lang/mono/patches/patch-an b/lang/mono/patches/patch-an
new file mode 100644
index 00000000000..5771fa5e4da
--- /dev/null
+++ b/lang/mono/patches/patch-an
@@ -0,0 +1,56 @@
+$NetBSD: patch-an,v 1.1 2005/07/31 15:26:58 recht Exp $
+
+--- mono/mini/exceptions-x86.c.orig	2005-04-11 16:16:27.000000000 +0200
++++ mono/mini/exceptions-x86.c
+@@ -563,7 +563,17 @@ mono_arch_sigctx_to_monoctx (void *sigct
+ 	mctx->esi = ctx->uc_mcontext.mc_esi;
+ 	mctx->edi = ctx->uc_mcontext.mc_edi;
+ 	mctx->eip = ctx->uc_mcontext.mc_eip;
+-#else
++#elif defined(__NetBSD__)
++        mctx->eax = ctx->uc_mcontext.__gregs[_REG_EAX];
++        mctx->ebx = ctx->uc_mcontext.__gregs[_REG_EBX];
++        mctx->ecx = ctx->uc_mcontext.__gregs[_REG_ECX];
++        mctx->edx = ctx->uc_mcontext.__gregs[_REG_EDX];
++        mctx->ebp = ctx->uc_mcontext.__gregs[_REG_EBP];
++        mctx->esp = ctx->uc_mcontext.__gregs[_REG_ESP];
++        mctx->esi = ctx->uc_mcontext.__gregs[_REG_ESI];
++        mctx->edi = ctx->uc_mcontext.__gregs[_REG_EDI];
++        mctx->eip = ctx->uc_mcontext.__gregs[_REG_EIP];
++#else 
+ 	mctx->eax = ctx->uc_mcontext.gregs [REG_EAX];
+ 	mctx->ebx = ctx->uc_mcontext.gregs [REG_EBX];
+ 	mctx->ecx = ctx->uc_mcontext.gregs [REG_ECX];
+@@ -600,12 +610,21 @@ mono_arch_monoctx_to_sigctx (MonoContext
+ 	ctx->uc_mcontext.mc_ebx = mctx->ebx;
+ 	ctx->uc_mcontext.mc_ecx = mctx->ecx;
+ 	ctx->uc_mcontext.mc_edx = mctx->edx;
+-	ctx->uc_mcontext.mc_ebp  = mctx->ebp;
++	ctx->uc_mcontext.mc_ebp = mctx->ebp;
+ 	ctx->uc_mcontext.mc_esp = mctx->esp;
+ 	ctx->uc_mcontext.mc_esi = mctx->esi;
+ 	ctx->uc_mcontext.mc_edi = mctx->edi;
+ 	ctx->uc_mcontext.mc_eip = mctx->eip;
+-
++#elif defined(__NetBSD__)
++        ctx->uc_mcontext.__gregs[_REG_EAX] = mctx->eax;
++        ctx->uc_mcontext.__gregs[_REG_EBX] = mctx->ebx;
++        ctx->uc_mcontext.__gregs[_REG_ECX] = mctx->ecx;
++        ctx->uc_mcontext.__gregs[_REG_EDX] = mctx->edx;
++        ctx->uc_mcontext.__gregs[_REG_EBP] = mctx->ebp;
++        ctx->uc_mcontext.__gregs[_REG_ESP] = mctx->esp;
++        ctx->uc_mcontext.__gregs[_REG_ESI] = mctx->esi;
++        ctx->uc_mcontext.__gregs[_REG_EDI] = mctx->edi;
++        ctx->uc_mcontext.__gregs[_REG_EIP] = mctx->eip;
+ #else
+ 	ctx->uc_mcontext.gregs [REG_EAX] = mctx->eax;
+ 	ctx->uc_mcontext.gregs [REG_EBX] = mctx->ebx;
+@@ -639,6 +658,8 @@ mono_arch_ip_from_context (void *sigctx)
+ 	ucontext_t *ctx = (ucontext_t*)sigctx;
+ #if defined(__FreeBSD__)
+ 	return (gpointer)ctx->uc_mcontext.mc_eip;
++#elif defined(__NetBSD__)
++	return (gpointer)ctx->uc_mcontext.__gregs[_REG_EIP];
+ #else
+ 	return (gpointer)ctx->uc_mcontext.gregs [REG_EIP];
+ #endif
diff --git a/lang/mono/patches/patch-ba b/lang/mono/patches/patch-ba
index 460e663b5a1..a6c89d938c6 100644
--- a/lang/mono/patches/patch-ba
+++ b/lang/mono/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.4 2005/04/05 06:45:47 recht Exp $
+$NetBSD: patch-ba,v 1.5 2005/07/31 15:26:58 recht Exp $
 
---- mono/cil/Makefile.in.orig	Thu Mar 31 02:49:49 2005
+--- mono/cil/Makefile.in.orig	2005-07-27 02:08:28.000000000 +0200
 +++ mono/cil/Makefile.in
-@@ -450,7 +450,7 @@ uninstall-am: uninstall-defDATA uninstal
+@@ -459,7 +459,7 @@ uninstall-am: uninstall-defDATA uninstal
  	uninstall-info-am uninstall-xmlDATA
  
  opcode.def: make-opcodes-def.pl cil-opcodes.xml
diff --git a/lang/mono/patches/patch-bc b/lang/mono/patches/patch-bc
index 10ffc01a6b1..bc2970c31f5 100644
--- a/lang/mono/patches/patch-bc
+++ b/lang/mono/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.4 2005/04/05 06:45:47 recht Exp $
+$NetBSD: patch-bc,v 1.5 2005/07/31 15:26:58 recht Exp $
 
---- mono/mini/Makefile.in.orig	Thu Mar 31 02:49:50 2005
+--- mono/mini/Makefile.in.orig	2005-07-27 02:08:30.000000000 +0200
 +++ mono/mini/Makefile.in
-@@ -1124,15 +1124,15 @@ mbench: test.exe
+@@ -1111,15 +1111,15 @@ mbench: test.exe
  
  stat1: mono bench.exe
  	$(RUNTIME) --verbose --statfile stats.pl --regression bench.exe