4 files changed, 27 insertions, 77 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index bf299fffe20a..f2c2e0ab77f7 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	mono
-PORTVERSION=	0.95
+PORTVERSION=	0.97
 CATEGORIES=	lang
-MASTER_SITES=	http://www.go-mono.com/archive/beta2/
+MASTER_SITES=	http://www.go-mono.com/archive/rc/
 
 MAINTAINER=	coop9211@uidaho.edu
 COMMENT=	An open source implementation of .NET Development Framework
@@ -20,9 +20,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--program-transform-name=\'\' \
-		--with-gc=included
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		--with-gc=included \
+		--with-nptl=no
 
 MAN1=		cert2spc.1 certmgr.1 chktrust.1 cilc.1 disco.1 gacutil.1 \
 		genxs.1 ilasm.1 makecert.1 mcs.1 mint.1 mono.1 \
@@ -42,6 +41,8 @@ IGNORE=	"Does not work on 5.X before 502113"
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name configure | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|-pthread|${PTHREAD_LIBS}|g'
+		-e 's|-pthread|${PTHREAD_LIBS}|g' \
+		-e 's|-D_REENTRANT|${PTHREAD_CFLAGS}|g'
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/libgc/threadlibs.c
 
 .include <bsd.port.post.mk>
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 2805c06a79d1..461cc91b7bee 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,2 +1,2 @@
-MD5 (mono-0.95.tar.gz) = f00e5c7bc267b7efaee2617234f5d7cb
-SIZE (mono-0.95.tar.gz) = 17489740
+MD5 (mono-0.97.tar.gz) = e0a1cff236eb92a61da04b5df26a242d
+SIZE (mono-0.97.tar.gz) = 18213505
diff --git a/lang/mono/files/patch-configure b/lang/mono/files/patch-configure
index 1e64efcb2b39..4b353afe41ce 100644
--- a/lang/mono/files/patch-configure
+++ b/lang/mono/files/patch-configure
@@ -1,20 +1,24 @@
---- configure.orig	Mon May 31 15:12:04 2004
-+++ configure	Sat Jun 12 17:59:33 2004
-@@ -1995,7 +1995,7 @@
- 		with_sigaltstack=no
- 
+--- configure.orig	Fri Jun 25 19:28:48 2004
++++ configure	Fri Jun 25 19:35:06 2004
+@@ -2020,8 +2020,8 @@
  		;;
--	*-*-*netbsd*)
-+	*-*-*netbsd*|*-*-*freebsd4*)
+ 	*-*-*freebsd*|*-*-*openbsd*)
  		platform_win32=no
- 		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
- 		libmono_cflags="-D_REENTRANT"
-@@ -13893,7 +13893,7 @@
+-		CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
+-		libmono_cflags="-D_THREAD_SAFE"
++		CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -D_REENTRANT -DGC_FREEBSD_THREADS"
++		libmono_cflags="-D_THREAD_SAFE -D_REENTRANT"
+ 		LDFLAGS="$LDFLAGS -pthread"
+ 		libmono_ldflags="-pthread"
+ 		need_link_unlink=yes
+@@ -14003,8 +14003,8 @@
  ACCESS_UNALIGNED="yes"
  
  JIT_SUPPORTED=no
 -LIBC="libc.so.6"
+-INTL="libc.so.6"
 +LIBC="libc.so"
++INTL="libc.so"
  
  jit_wanted=false
  case "$host" in
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index 0ef9adaa625c..988e2feab75d 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -86,7 +86,6 @@ include/mono/jit/jit.h
 include/mono/metadata/appdomain.h
 include/mono/metadata/assembly.h
 include/mono/metadata/blob.h
-include/mono/metadata/cil-coff.h
 include/mono/metadata/class.h
 include/mono/metadata/debug-helpers.h
 include/mono/metadata/debug-mono-symfile.h
@@ -94,23 +93,15 @@ include/mono/metadata/environment.h
 include/mono/metadata/exception.h
 include/mono/metadata/image.h
 include/mono/metadata/loader.h
-include/mono/metadata/locales.h
 include/mono/metadata/mempool.h
 include/mono/metadata/metadata.h
-include/mono/metadata/monitor.h
 include/mono/metadata/mono-debug-debugger.h
 include/mono/metadata/mono-debug.h
-include/mono/metadata/mono-endian.h
 include/mono/metadata/object.h
 include/mono/metadata/opcodes.h
 include/mono/metadata/profiler.h
-include/mono/metadata/rand.h
-include/mono/metadata/rawbuffer.h
 include/mono/metadata/reflection.h
 include/mono/metadata/row-indexes.h
-include/mono/metadata/tabledefs.h
-include/mono/metadata/threadpool.h
-include/mono/metadata/threads-types.h
 include/mono/metadata/threads.h
 include/mono/metadata/tokentype.h
 include/mono/metadata/verify.h
@@ -143,6 +134,7 @@ lib/mono/1.0/I18N.Other.dll
 lib/mono/1.0/I18N.Rare.dll
 lib/mono/1.0/I18N.West.dll
 lib/mono/1.0/I18N.dll
+lib/mono/1.0/IBM.Data.DB2.dll
 lib/mono/1.0/ICSharpCode.SharpZipLib.dll
 lib/mono/1.0/Microsoft.VisualBasic.dll
 lib/mono/1.0/Microsoft.VisualC.dll
@@ -189,104 +181,55 @@ lib/mono/1.0/nunit.util.dll
 lib/mono/2.0/gmcs.exe
 lib/mono/2.0/mscorlib.dll
 lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll
-lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756/ByteFX.Data.dll
-lib/mono/gac/ByteFX.Data/0.7.6.1__0738eb9f132ed756/__AssemblyInfo__
 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/__AssemblyInfo__
 lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/I18N.CJK.dll
-lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756/I18N.MidEast.dll
-lib/mono/gac/I18N.MidEast/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll
-lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll
-lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll
-lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll
-lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
+lib/mono/gac/IBM.Data.DB2/1.0.1636.35700__7c307b91aa13d208/IBM.Data.DB2.dll
 lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
-lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73/__AssemblyInfo__
 lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
-lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll
-lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
-lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/Mono.CSharp.Debugger/1.0.5000.0__0738eb9f132ed756/Mono.CSharp.Debugger.dll
-lib/mono/gac/Mono.CSharp.Debugger/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll
-lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 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/__AssemblyInfo__
 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/__AssemblyInfo__
 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/__AssemblyInfo__
 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/__AssemblyInfo__
 lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll
-lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll
-lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll
-lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 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/__AssemblyInfo__
 lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll
-lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 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/__AssemblyInfo__
 lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll
-lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/__AssemblyInfo__
 lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll
-lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/__AssemblyInfo__
 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/__AssemblyInfo__
 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/__AssemblyInfo__
 lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll
-lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/__AssemblyInfo__
 lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a/System.Design.dll
-lib/mono/gac/System.Design/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a/System.DirectoryServices.dll
-lib/mono/gac/System.DirectoryServices/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 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/__AssemblyInfo__
 lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a/System.Drawing.dll
-lib/mono/gac/System.Drawing/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll
-lib/mono/gac/System.EnterpriseServices/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/System.Management.dll
-lib/mono/gac/System.Management/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/System.Messaging.dll
-lib/mono/gac/System.Messaging/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 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/__AssemblyInfo__
 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/__AssemblyInfo__
 lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/System.Security.dll
-lib/mono/gac/System.Security/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll
-lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 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/__AssemblyInfo__
 lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a/System.Web.dll
-lib/mono/gac/System.Web/1.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 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/__AssemblyInfo__
 lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll
-lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/__AssemblyInfo__
 lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll
-lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/__AssemblyInfo__
-lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/__AssemblyInfo__
 lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll
-lib/mono/gac/nunit.core/2.1.91.0__96d09a1eb7f44a77/__AssemblyInfo__
 lib/mono/gac/nunit.core/2.1.91.0__96d09a1eb7f44a77/nunit.core.dll
-lib/mono/gac/nunit.framework/2.1.91.0__96d09a1eb7f44a77/__AssemblyInfo__
 lib/mono/gac/nunit.framework/2.1.91.0__96d09a1eb7f44a77/nunit.framework.dll
-lib/mono/gac/nunit.util/2.1.91.0__96d09a1eb7f44a77/__AssemblyInfo__
 lib/mono/gac/nunit.util/2.1.91.0__96d09a1eb7f44a77/nunit.util.dll
 lib/mscorlib.dll
 libdata/pkgconfig/mint.pc
@@ -376,6 +319,8 @@ share/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/gac/Microsoft.VisualBasic
 @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.1636.35700__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
 @dirrm lib/mono/gac/I18N.West