update to mono-1.1.6

This is a micro-release and only contains some bug fixes:

* Packaging Fixes: Mono 1.1.5 RPM packages were compiled with an option that
  would allow users to downgrade their kernel, but the feature had not been
  tested.
  One simple fix was to compile from source code, but we decided that redoing
  the packages was the major burden of a release, and we could include a few
  other fixes.
* Apple G3 Support: The G3 was not previously supported, this version adds
  support for it.
* KEvent on BSD: A crashing bug on BSD-based systems (OSX included) were
  fixed.
* Cookies: A couple of small bugs were found on the Cookie handling with
  certain web sites, this has now been fixed.
* AMD compilation: Makes sure that libraries are installed in lib, not lib64.
* Compilation: Compilation on some older systems has been fixed.
* SQL Server reset: The reset operation is not supported on all SQL servers.

7 files changed, 32 insertions, 69 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 7b341043630..3b95e7d8477 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.33 2005/03/27 10:25:51 recht Exp $
+# $NetBSD: Makefile,v 1.34 2005/04/04 07:22:34 recht Exp $
 
-DISTNAME=	mono-1.1.5
+DISTNAME=	mono-1.1.6
 CATEGORIES=	lang
-MASTER_SITES=	http://www.go-mono.com/archive/1.1.5/
+MASTER_SITES=	http://www.go-mono.com/archive/1.1.6/
 
 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
+BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 
 CONFLICTS=	pnet-[0-9]*
 
@@ -34,6 +34,9 @@ CONFIGURE_ARGS+=	--with-jit=yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 MAKE_FLAGS+=		PERL=${PERL5}
+UNLIMIT_RESOURCES=	datasize
+UNLIMIT_RESOURCES+=	stacksize
+UNLIMIT_RESOURCES.=	memorysize
 
 PKGCONFIG_OVERRIDE=	mint.pc.in
 PKGCONFIG_OVERRIDE+=	mono.pc.in
@@ -56,6 +59,8 @@ CONF_FILES+=	${EGDIR}/browscap.ini ${PKG_SYSCONFDIR}/mono/browscap.ini
 #CONF_FILES+=	${EGDIR}/DefaultWsdlHelpGenerator.aspx \
 #		${PKG_SYSCONFDIR}/DefaultWsdlHelpGenerator.aspx
 
+TEST_TARGET=	check
+
 .include "../../mk/bsd.prefs.mk"
 
 # mcs coredumps with sigaltstack
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 9de353b2bcf..bbb02fe7d0d 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/03/27 10:25:51 recht Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/04/04 07:22:34 recht Exp $
 bin/al
 bin/caspol
 bin/cert2spc
@@ -249,8 +249,8 @@ 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/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.1912.20974__7c307b91aa13d208/IBM.Data.DB2.dll
-lib/mono/gac/IBM.Data.DB2/1.0.1912.20974__7c307b91aa13d208/IBM.Data.DB2.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/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
@@ -509,7 +509,7 @@ share/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/gac/Microsoft.JScript
 @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.1912.20974__7c307b91aa13d208
+@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1919.40788__7c307b91aa13d208
 @dirrm lib/mono/gac/IBM.Data.DB2
 @dirrm lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index df38fcf53ca..adb6bbe9974 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2005/03/27 10:25:51 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2005/04/04 07:22:34 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.5
+BUILDLINK_DEPENDS.mono+=	mono>=1.1.6
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 .endif	# MONO_BUILDLINK3_MK
 
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 1141ab1424f..7abaf40dcfb 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.20 2005/03/27 10:25:51 recht Exp $
+$NetBSD: distinfo,v 1.21 2005/04/04 07:22:34 recht Exp $
 
-SHA1 (mono-1.1.5.tar.gz) = cd3f5c0484c60824b95218dfc41b521dbe9cdbf1
-RMD160 (mono-1.1.5.tar.gz) = 7e1b547a4fabc68a4baf4684eaa6658393ecd59c
-Size (mono-1.1.5.tar.gz) = 13689959 bytes
+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) = 97ba186275854c6f925ff7db679cbc4f6fd26686
-SHA1 (patch-ab) = 931e6bcdf00511a041cfc7999beb8ee1e9d33fb8
 SHA1 (patch-ac) = 13465fc8e9581b534e746df39622e7a144307d6e
 SHA1 (patch-ae) = 8e089d1134345516e7d3797f23f24600a742cb8f
-SHA1 (patch-af) = 16f7702caf7aa33e0818ef961aa23263925f9295
-SHA1 (patch-ag) = e5b949de714eec5571d644344d5b8cf6e770c9e4
+SHA1 (patch-af) = 93412fc4186cfb0198badc1bbfe322009ee03f32
 SHA1 (patch-ba) = f5fe3778dfedd8c46e04f9f02fce3758fa0d5104
 SHA1 (patch-bc) = 0caee250fb829fba945e4132942e4b630d65c19c
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
deleted file mode 100644
index 183ad603c1e..00000000000
--- a/lang/mono/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2005/03/27 10:33:08 recht Exp $
-
---- mono/mini/exceptions-ppc.c.orig	Sat Jan 29 07:13:05 2005
-+++ mono/mini/exceptions-ppc.c
-@@ -199,6 +199,7 @@ arch_get_restore_context (void)
- 	ppc_break (code);
- 
- 	g_assert ((code - start) < sizeof(start));
-+	mono_arch_flush_icache (start, code - start);
- 	return start;
- }
- 
-@@ -268,6 +269,7 @@ arch_get_call_filter (void)
- 	ppc_blr (code);
- 
- 	g_assert ((code - start) < sizeof(start));
-+	mono_arch_flush_icache (start, code - start);
- 	return start;
- }
- 
-@@ -371,6 +373,7 @@ mono_arch_get_throw_exception_generic (g
- 	/* we should never reach this breakpoint */
- 	ppc_break (code);
- 	g_assert ((code - start) < size);
-+	mono_arch_flush_icache (start, code - start);
- 	return start;
- }
- 
diff --git a/lang/mono/patches/patch-af b/lang/mono/patches/patch-af
index ce56a29cd2f..e9bcfaefe7d 100644
--- a/lang/mono/patches/patch-af
+++ b/lang/mono/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.4 2005/03/27 10:25:51 recht Exp $
+$NetBSD: patch-af,v 1.5 2005/04/04 07:22:34 recht Exp $
 
---- mono/metadata/Makefile.in.orig	Fri Mar 18 16:08:49 2005
-+++ mono/metadata/Makefile.in
-@@ -476,7 +476,7 @@ pedump_SOURCES = \
- 
- pedump_LDADD = libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
- 	$(PLATFORM_LIB)			\
--	$(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) -lm
-+	$(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(ICU_LIBS) -lm
- 
- monodiet_SOURCES = monodiet.c
- monodiet_LDADD = \
+--- mono/metadata/Makefile.in.orig	Sun Apr  3 20:00:19 2005
++++ mono/metadata/Makefile.in	Sun Apr  3 20:01:57 2005
+@@ -68,7 +68,7 @@
+ am_libmonoruntime_static_la_OBJECTS = $(am__objects_1)
+ libmonoruntime_static_la_OBJECTS =  \
+ 	$(am_libmonoruntime_static_la_OBJECTS)
+-libmonoruntime_la_LIBADD =
++libmonoruntime_la_LIBADD = $(ICU_LIBS)
+ am_libmonoruntime_la_OBJECTS = reflection.lo object.lo icall.lo \
+ 	decimal.lo boehm-gc.lo null-gc.lo gc.lo marshal.lo monitor.lo \
+ 	threads.lo threadpool.lo file-io.lo socket-io.lo exception.lo \
diff --git a/lang/mono/patches/patch-ag b/lang/mono/patches/patch-ag
deleted file mode 100644
index 1907e23c378..00000000000
--- a/lang/mono/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2005/03/27 10:25:51 recht Exp $
-
---- mono/mini/tramp-ppc.c.orig	Tue Mar 15 00:01:22 2005
-+++ mono/mini/tramp-ppc.c
-@@ -537,6 +537,7 @@ mono_debugger_create_notification_functi
- 	if (notification_address)
- 		*notification_address = buf;
- 	ppc_blr (buf);
-+	mono_arch_flush_icache (ptr, buf - ptr);
- 
- 	return ptr;
- }