9 files changed, 87 insertions, 43 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 0e6bb6627774..7af8c13a9dd0 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mono
-PORTVERSION=	0.13
-PORTREVISION=	1
+PORTVERSION=	0.17
 CATEGORIES=	lang
 MASTER_SITES=	http://www.go-mono.com/archive/
 
@@ -18,21 +17,21 @@ LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
 		gc.1:${PORTSDIR}/devel/boehm-gc
 
 USE_LIBTOOL=	yes
-USE_AUTOCONF=	yes
 USE_REINPLACE=	yes
 USE_BISON=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--program-transform-name=\'\'
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=		mcs.1 mint.1 mono.1 monoburg.1 monodis.1 monostyle.1
+MAN1=		mcs.1 mint.1 mono.1 monoburg.1 monodis.1 monostyle.1 \
+       		sqlsharpcli.1
 MAN5=		mono-config.5
 
-pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-	@find ${WRKSRC}/mono -name *.c | xargs ${REINPLACE_CMD} -e \
-		's|gc/gc.h|'${LOCALBASE}/'include/gc.h|g'
+post-patch:
+	@${REINPLACE_CMD} -e 's|<gc.h|<'${LOCALBASE}/'include/gc.h|g' \
+		${WRKSRC}/mono/os/gc_wrapper.h
 
 .include <bsd.port.mk>
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 493619f35e22..7a3f1e6e6863 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1 +1 @@
-MD5 (mono-0.13.tar.gz) = eba78b3169b0f9e016fab9b5a050883f
+MD5 (mono-0.17.tar.gz) = e148e98f0689703218abbd97179fbe84
diff --git a/lang/mono/files/patch-configure b/lang/mono/files/patch-configure
new file mode 100644
index 000000000000..892e154a52eb
--- /dev/null
+++ b/lang/mono/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Thu Dec 26 13:09:19 2002
++++ configure	Thu Dec 26 13:09:37 2002
+@@ -7501,6 +7501,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/lang/mono/files/patch-mono_jit_jit.c b/lang/mono/files/patch-mono_jit_jit.c
new file mode 100644
index 000000000000..5295734e99f7
--- /dev/null
+++ b/lang/mono/files/patch-mono_jit_jit.c
@@ -0,0 +1,11 @@
+--- mono/jit/jit.c.orig	Thu Dec 26 13:13:15 2002
++++ mono/jit/jit.c	Thu Dec 26 13:13:31 2002
+@@ -4184,7 +4184,7 @@
+ 	sigemptyset (&sa.sa_mask);
+ 	sa.sa_flags = 0;
+ 	//g_assert (syscall (SYS_sigaction, SIGILL, &sa, NULL) != -1);
+-	g_assert (sigaction (SIGRTMIN, &sa, NULL) != -1);
++	g_assert (sigaction (SIGUSR1, &sa, NULL) != -1);
+ 
+ #if 1
+ 	/* catch SIGSEGV */
diff --git a/lang/mono/files/patch-mono_metadata_debug-mono-symfile.c b/lang/mono/files/patch-mono_metadata_debug-mono-symfile.c
new file mode 100644
index 000000000000..eab4f7777fc0
--- /dev/null
+++ b/lang/mono/files/patch-mono_metadata_debug-mono-symfile.c
@@ -0,0 +1,10 @@
+--- mono/metadata/debug-mono-symfile.c.orig	Thu Dec 26 12:33:21 2002
++++ mono/metadata/debug-mono-symfile.c	Thu Dec 26 12:33:57 2002
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <signal.h>
++#include <sys/param.h>
+ #include <mono/metadata/metadata.h>
+ #include <mono/metadata/tabledefs.h>
+ #include <mono/metadata/rawbuffer.h>
diff --git a/lang/mono/files/patch-mono_metadata_debug_symfile.c b/lang/mono/files/patch-mono_metadata_debug_symfile.c
deleted file mode 100644
index d605a6adac9c..000000000000
--- a/lang/mono/files/patch-mono_metadata_debug_symfile.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- mono/metadata/debug-symfile.c.orig	Tue Sep 10 14:21:57 2002
-+++ mono/metadata/debug-symfile.c	Tue Sep 10 14:23:17 2002
-@@ -2,6 +2,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <signal.h>
-+#include <sys/param.h>
- #include <mono/metadata/metadata.h>
- #include <mono/metadata/rawbuffer.h>
- #include <mono/metadata/tokentype.h>
-@@ -165,7 +166,7 @@
- get_sections (MonoDebugSymbolFile *symfile, gboolean emit_warnings)
- {
- #ifdef HAVE_ELF_H
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && __FreeBSD_version < 500023
- 	static const char ELFMAG[] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3, 0 };
- #endif
- 	if (!strncmp (symfile->raw_contents, ELFMAG, strlen (ELFMAG)))
diff --git a/lang/mono/files/patch-mono_metadata_threads.c b/lang/mono/files/patch-mono_metadata_threads.c
new file mode 100644
index 000000000000..9a32d90d0571
--- /dev/null
+++ b/lang/mono/files/patch-mono_metadata_threads.c
@@ -0,0 +1,14 @@
+--- mono/metadata/threads.c.orig	Thu Dec 26 13:00:05 2002
++++ mono/metadata/threads.c	Thu Dec 26 13:00:28 2002
+@@ -1099,9 +1099,9 @@
+ 	/* fixme: store the state somewhere */
+ #ifndef __MINGW32__
+ #ifdef PTHREAD_POINTER_ID
+-	pthread_kill (GUINT_TO_POINTER(thread->tid), SIGRTMIN);
++	pthread_kill (GUINT_TO_POINTER(thread->tid), SIGUSR1);
+ #else
+-	pthread_kill (thread->tid, SIGRTMIN);
++	pthread_kill (thread->tid, SIGUSR1);
+ #endif
+ #else
+ 	g_assert_not_reached ();
diff --git a/lang/mono/files/patch-mono_monoburg_monoburg.y b/lang/mono/files/patch-mono_monoburg_monoburg.y
deleted file mode 100644
index 3d2c66f682d2..000000000000
--- a/lang/mono/files/patch-mono_monoburg_monoburg.y
+++ /dev/null
@@ -1,11 +0,0 @@
---- mono/monoburg/monoburg.y.orig	Sat Nov 30 14:21:57 2002
-+++ mono/monoburg/monoburg.y	Sat Nov 30 14:22:31 2002
-@@ -50,7 +50,7 @@
- 	| IDENT ':' tree optcost optcode optcfunc { create_rule ($1, $3, $5, $4, $6); } decls 
- 	;
- 
--optcode : /* empty */ { $$ = NULL }
-+optcode : /* empty */ { $$ = NULL; }
- 	| CODE 
- 	;
- 
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index d9d59972a51a..8fc12d83e385 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -4,6 +4,10 @@ bin/mint
 bin/mono
 bin/monodis
 bin/monograph
+bin/monoresgen.exe
+bin/monosn
+etc/mono/config
+etc/mono/machine.config
 include/mono/cil/opcode.def
 include/mono/io-layer/access.h
 include/mono/io-layer/atomic.h
@@ -60,22 +64,48 @@ include/mono/metadata/verify.h
 include/mono/utils/mono-digest.h
 include/mono/utils/mono-hash.h
 include/mono/utils/monobitset.h
+lib/Accessibility.dll
+lib/Cscompmgd.dll
+lib/I18N.CJK.dll
+lib/I18N.MidEast.dll
+lib/I18N.Other.dll
+lib/I18N.Rare.dll
+lib/I18N.West.dll
+lib/I18N.dll
+lib/Microsoft.VisualBasic.dll
+lib/Mono.CSharp.Debugger.dll
+lib/Mono.Data.MySql.dll
+lib/Mono.Data.PostgreSqlClient.dll
+lib/Mono.Data.SqliteClient.dll
+lib/Mono.Data.SybaseClient.dll
+lib/Mono.Data.Tds.dll
+lib/Mono.Data.TdsClient.dll
+lib/Mono.GetOptions.dll
+lib/Mono.PEToolkit.dll
+lib/NUnitCore_mono.dll
+lib/System.Configuration.Install.dll
 lib/System.Data.dll
 lib/System.Drawing.dll
+lib/System.EnterpriseServices.dll
+lib/System.Runtime.Remoting.dll
+lib/System.Runtime.Serialization.Formatters.Soap.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.a
-lib/libmono.la
+lib/libmono.so
 lib/libmono.so.0
 libdata/pkgconfig/mono.pc
 share/mono/cil/cil-opcodes.xml
+@dirrm share/mono/cil
+@dirrm share/mono
 @dirrm include/mono/cil
 @dirrm include/mono/io-layer
 @dirrm include/mono/jit
 @dirrm include/mono/metadata
 @dirrm include/mono/utils
 @dirrm include/mono
-@dirrm share/mono/cil
-@dirrm share/mono
+@dirrm etc/mono