update to mono 0.30

Lots of bug fixes and new features.
See http://www.go-mono.com/archive/mono-0.30.html for details.

Note:
Starting with this release to use the System.Drawing APIs,
libgdiplus is needed. (will be added next)

9 files changed, 103 insertions, 38 deletions

diff --git a/lang/mono/MESSAGE b/lang/mono/MESSAGE
new file mode 100644
index 00000000000..132994fcbab
--- /dev/null
+++ b/lang/mono/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/02/03 12:30:11 recht Exp $
+
+If you want to use the System.Drawing APIs then you have to install
+graphics/libgdiplus as well.
+
+===========================================================================
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 2ac9f31780a..dd79b7fb8e9 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/01/24 13:51:14 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/03 12:30:11 recht Exp $
 #
 
-DISTNAME=	mono-0.29
-PKGREVISION=	1
+DISTNAME=	mono-0.30
 CATEGORIES=	lang
 MASTER_SITES=	http://www.go-mono.org/archive/
 
@@ -10,9 +9,11 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.go-mono.org/
 COMMENT=	Open source implementation of the .NET Development Framework
 
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
+BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
+BUILD_DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+BUILD_DEPENDS+=	bash>=2.0:../../shells/bash2
 
-CONFLICTS=		pnet-[0-9]*
+CONFLICTS=	pnet-[0-9]*
 
 # XXX please test
 NOT_FOR_PLATFORM=	NetBSD-1.[0-5]*-*
@@ -20,33 +21,46 @@ NOT_FOR_PLATFORM+=	NetBSD-1.6-* NetBSD-1.6.*-*
 NOT_FOR_PLATFORM+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
 
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK2=		YES
-USE_PKGINSTALL=		YES
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gc=included
 CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
 
-USE_LIBTOOL=		YES
+USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libgc/libtool
 
+PKGCONFIG_OVERRIDE=	mint.pc.in
 PKGCONFIG_OVERRIDE=	mono.pc.in
 PKG_SYSCONFSUBDIR=	mono
 
 USE_PERL5=	build
 REPLACE_PERL=	mono/cil/make-opcodes-def.pl
 REPLACE_PERL+=	mono/metadata/make-bundle.pl
+REPLACE_PERL+=	mono/tests/test-driver
 
 EGDIR=		${PREFIX}/share/examples/mono
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
+CONF_FILES+=	${EGDIR}/browscap.ini ${PKG_SYSCONFDIR}/browscap.ini
 CONF_FILES+=	${EGDIR}/machine.config ${PKG_SYSCONFDIR}/machine.config
 CONF_FILES+=	${EGDIR}/DefaultWsdlHelpGenerator.aspx \
 		${PKG_SYSCONFDIR}/DefaultWsdlHelpGenerator.aspx
 
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/icu/buildlink2.mk"
+.include "../../mk/bsd.prefs.mk"
 
-.include "../../mk/pthread.buildlink2.mk"
+.if ${OPSYS} == "Linux"
+BUILD_DEFS+=	MONO_USE_NPTL
+.  if !empty(MONO_USE_NPTL:M[yY][eE][sS])
+# Enable support for NPTL
+CONFIGURE_ARGS+=	--with-nptl
+.  endif
+.endif
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 9a10588325b..322f0f0124f 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/03 17:08:24 recht Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/02/03 12:30:11 recht Exp $
+bin/al
+bin/al.exe
 bin/chktrust
 bin/chktrust.exe
 bin/cilc
@@ -25,6 +27,9 @@ bin/secutil
 bin/secutil.exe
 bin/signcode
 bin/signcode.exe
+bin/sn
+bin/soapsuds
+bin/soapsuds.exe
 bin/sqlsharp
 bin/sqlsharp.exe
 bin/wsdl
@@ -32,6 +37,7 @@ bin/wsdl.exe
 bin/xsd
 bin/xsd.exe
 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/context.h
@@ -93,6 +99,7 @@ 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-uri.h
 include/mono/utils/monobitset.h
 lib/Accessibility.dll
 lib/ByteFX.Data.dll
@@ -147,7 +154,11 @@ lib/System.Web.dll
 lib/System.Windows.Forms.dll
 lib/System.Xml.dll
 lib/System.dll
-lib/libgdiplus.dll.so
+lib/libmint.a
+lib/libmint.la
+lib/libmint.so
+lib/libmint.so.0
+lib/libmint.so.0.0
 lib/libmono-profiler-cov.a
 lib/libmono-profiler-cov.la
 lib/libmono-profiler-cov.so
@@ -159,9 +170,11 @@ lib/libmono.so
 lib/libmono.so.0
 lib/libmono.so.0.0
 lib/mscorlib.dll
+lib/pkgconfig/mint.pc
 lib/pkgconfig/mono.pc
 man/man1/cert2spc.1
 man/man1/cilc.1
+man/man1/disco.1
 man/man1/genxs.1
 man/man1/ilasm.1
 man/man1/mcs.1
@@ -171,9 +184,12 @@ man/man1/monoburg.1
 man/man1/monodis.1
 man/man1/monostyle.1
 man/man1/oldmono.1
+man/man1/soapsuds.1
 man/man1/sqlsharp.1
+man/man1/wsdl.1
 man/man5/mono-config.5
 share/examples/mono/DefaultWsdlHelpGenerator.aspx
+share/examples/mono/browscap.ini
 share/examples/mono/config
 share/examples/mono/machine.config
 share/mono/cil/cil-opcodes.xml
@@ -185,5 +201,6 @@ share/mono/cil/cil-opcodes.xml
 @dirrm include/mono/metadata
 @dirrm include/mono/jit
 @dirrm include/mono/io-layer
+@dirrm include/mono/interpreter
 @dirrm include/mono/cil
 @dirrm include/mono
diff --git a/lang/mono/buildlink2.mk b/lang/mono/buildlink2.mk
index 1801cfaca49..0d50011741b 100644
--- a/lang/mono/buildlink2.mk
+++ b/lang/mono/buildlink2.mk
@@ -1,15 +1,17 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/12/03 17:08:24 recht Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/02/03 12:30:11 recht Exp $
+#
 
 .if !defined(MONO_BUILDLINK2_MK)
 MONO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			mono
-BUILDLINK_DEPENDS.mono?=		mono>=0.29
+BUILDLINK_DEPENDS.mono?=		mono>=0.30
 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/interpreter/*.h
 BUILDLINK_FILES.mono+=	include/mono/io-layer/*.h
 BUILDLINK_FILES.mono+=	include/mono/jit/*.h
 BUILDLINK_FILES.mono+=	include/mono/metadata/*.h
@@ -68,7 +70,7 @@ 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/libgdiplus.dll.*
+BUILDLINK_FILES.mono+=	lib/libmint.*
 BUILDLINK_FILES.mono+=	lib/libmono-profiler-cov.*
 BUILDLINK_FILES.mono+=	lib/libmono.*
 BUILDLINK_FILES.mono+=	lib/mscorlib.dll
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
new file mode 100644
index 00000000000..83d57d8e9fe
--- /dev/null
+++ b/lang/mono/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/03 12:30:11 recht Exp $
+#
+# This Makefile fragment is included by packages that use mono.
+#
+# This file was created automatically using createbuildlink-3.0.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	mono
+.endif
+
+.if !empty(MONO_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			mono
+BUILDLINK_DEPENDS.mono?=		mono>=0.30
+BUILDLINK_PKGSRCDIR.mono?=		../../lang/mono
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+
+.endif # MONO_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index a26594548bf..ef3542ed269 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2003/12/03 17:08:24 recht Exp $
+$NetBSD: distinfo,v 1.8 2004/02/03 12:30:11 recht Exp $
 
-SHA1 (mono-0.29.tar.gz) = 882b991e85c6db2b28ed07651da6f231c6d672ac
-Size (mono-0.29.tar.gz) = 10537284 bytes
-SHA1 (patch-ac) = 3a8366001ea1f47e68a54154d773c490655a07b7
-SHA1 (patch-ad) = 039b5c7fa27656b610095a87343d840a924bbf84
+SHA1 (mono-0.30.tar.gz) = a635ab1c48df6128634d961e18547d3fec11a688
+Size (mono-0.30.tar.gz) = 9713905 bytes
+SHA1 (patch-ac) = 59dba48f800f3e1030d586d3707616eff6c59c38
+SHA1 (patch-ad) = 1490db664f52112ec0ab4fb7d85e50443de72728
 SHA1 (patch-ah) = ca67288373df96e46b1d60560cca25698ce8261e
-SHA1 (patch-ai) = af76f915b1cb00b9c662e89ddb7aaf702de4a26d
+SHA1 (patch-ai) = a4abc88e994ac4597966f9ebfd0ff15a782c5f5e
 SHA1 (patch-aj) = ab41349968d0f621c5f3e848c25d112c50558a28
 SHA1 (patch-ak) = aab1295adad7a09b9fc7d52139793bb7ec0b76d5
diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac
index efa3fc3ce73..b3562dffa07 100644
--- a/lang/mono/patches/patch-ac
+++ b/lang/mono/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2003/12/03 17:08:24 recht Exp $
+$NetBSD: patch-ac,v 1.5 2004/02/03 12:30:11 recht Exp $
 
---- data/Makefile.in.orig	2003-11-13 13:03:51.000000000 +0100
-+++ data/Makefile.in	2003-11-13 16:22:41.000000000 +0100
+--- data/Makefile.in.orig	2004-02-02 23:02:39.000000000 +0100
++++ data/Makefile.in	2004-02-03 11:53:36.000000000 +0100
 @@ -117,7 +117,7 @@
  libgc_dir = @libgc_dir@
  libmono_cflags = @libmono_cflags@
@@ -9,5 +9,5 @@ $NetBSD: patch-ac,v 1.4 2003/12/03 17:08:24 recht Exp $
 -monodir = $(sysconfdir)/mono
 +monodir = $(datadir)/examples/mono
  
- EXTRA_DIST = config.in machine.config DefaultWsdlHelpGenerator.aspx
- 
+ EXTRA_DIST = config.in \
+ 	     machine.config \
diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad
index 8c5038b7349..9d85be485fd 100644
--- a/lang/mono/patches/patch-ad
+++ b/lang/mono/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2003/12/03 17:08:24 recht Exp $
+$NetBSD: patch-ad,v 1.5 2004/02/03 12:30:11 recht Exp $
 
---- mono/metadata/icall.c.orig	2003-11-12 18:22:22.000000000 +0100
-+++ mono/metadata/icall.c	2003-11-13 16:22:57.000000000 +0100
-@@ -3796,7 +3796,7 @@
+--- mono/metadata/icall.c.orig	2004-01-30 18:01:36.000000000 +0100
++++ mono/metadata/icall.c	2004-02-03 11:53:52.000000000 +0100
+@@ -4174,7 +4174,7 @@
  
  	MONO_ARCH_SAVE_REGS;
  
diff --git a/lang/mono/patches/patch-ai b/lang/mono/patches/patch-ai
index 361e17adda4..421a8cd5c42 100644
--- a/lang/mono/patches/patch-ai
+++ b/lang/mono/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2003/12/03 17:08:24 recht Exp $
+$NetBSD: patch-ai,v 1.3 2004/02/03 12:30:11 recht Exp $
 
---- configure.orig	2003-11-27 18:35:28.000000000 +0100
-+++ configure	2003-11-27 18:39:04.000000000 +0100
-@@ -1914,7 +1914,7 @@
+--- configure.orig	2004-02-02 23:02:43.000000000 +0100
++++ configure	2004-02-03 11:54:24.000000000 +0100
+@@ -1991,7 +1991,7 @@
  _ACEOF
  
  		libdl=
@@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.2 2003/12/03 17:08:24 recht Exp $
  		;;
  	*-*-*freebsd*|*-*-*openbsd*)
  		platform_win32=no
-@@ -1931,7 +1931,7 @@
+@@ -2008,7 +2008,7 @@
  _ACEOF
  
  		libdl=