5 files changed, 83 insertions, 30 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index df88de06a011..7f9fee751da6 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -3,12 +3,10 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.98 2007/12/13 19:31:45 killfill Exp $
 #
 
 PORTNAME=	mono
-PORTVERSION=	2.6.4
-PORTREVISION=	1
+PORTVERSION=	2.6.7
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
diff --git a/lang/mono/bsd.mono.mk b/lang/mono/bsd.mono.mk
index ed202ad57cf3..c5564d825111 100644
--- a/lang/mono/bsd.mono.mk
+++ b/lang/mono/bsd.mono.mk
@@ -6,7 +6,6 @@
 # the FreeBSD ports system.
 #
 # $FreeBSD$
-#   $Id: bsd.mono.mk,v 1.27 2007/11/22 15:31:04 killfill Exp $
 #
 
 # USE_NANT		- If set, the port uses nant.
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 2a96cb130cb0..fbb326a887c9 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,3 +1,3 @@
-MD5 (mono-2.6.4.tar.bz2) = 342a7ca3bea3cbec0c8ac48b9322fcb4
-SHA256 (mono-2.6.4.tar.bz2) = c05b9f3bcc3b038db860cdf0da81a0010c148a673a311054efffc5f613cd7922
-SIZE (mono-2.6.4.tar.bz2) = 27690544
+MD5 (mono-2.6.7.tar.bz2) = cc8b7bf061bd11fbd0fcc1c95eb79d34
+SHA256 (mono-2.6.7.tar.bz2) = ae21a997d72e2fb8ea88644c87ab52471e9c97117b937e205ea1835b5a028ce4
+SIZE (mono-2.6.7.tar.bz2) = 27921963
diff --git a/lang/mono/files/patch-mono_utils_mono-sigcontext.h b/lang/mono/files/patch-mono_utils_mono-sigcontext.h
new file mode 100644
index 000000000000..3b6c88da1e30
--- /dev/null
+++ b/lang/mono/files/patch-mono_utils_mono-sigcontext.h
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- mono/utils/mono-sigcontext.h.orig
++++ mono/utils/mono-sigcontext.h
+@@ -80,6 +80,19 @@
+ 
+ #ifdef __FreeBSD__
+ #define UCONTEXT_GREGS(ctx)	&(((ucontext_t*)(ctx))->uc_mcontext)
++	#define UCONTEXT_REG_RAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rax)
++	#define UCONTEXT_REG_RBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rbx)
++	#define UCONTEXT_REG_RCX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rcx)
++	#define UCONTEXT_REG_RDX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rdx)
++	#define UCONTEXT_REG_RBP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rbp)
++	#define UCONTEXT_REG_RSP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rsp)
++	#define UCONTEXT_REG_RSI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rsi)
++	#define UCONTEXT_REG_RDI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rdi)
++	#define UCONTEXT_REG_RIP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_rip)
++	#define UCONTEXT_REG_R12(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_r12)
++	#define UCONTEXT_REG_R13(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_r13)
++	#define UCONTEXT_REG_R14(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_r14)
++	#define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_r15)
+ #elif defined(__OpenBSD__)
+ 	/* OpenBSD/amd64 has no gregs array, ucontext_t == sigcontext */
+ 	#define UCONTEXT_REG_RAX(ctx) ((ctx)->sc_rax)
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index d8cc8e023d04..8149656af853 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -502,11 +502,21 @@ lib/mono/2.0/xbuild.exe.mdb
 lib/mono/2.0/xbuild.rsp
 lib/mono/2.0/xsd.exe
 lib/mono/2.0/xsd.exe.mdb
+%%PROFILE2%%lib/mono/3.5/MSBuild/Microsoft.Build.CommonTypes.xsd
+%%PROFILE2%%lib/mono/3.5/MSBuild/Microsoft.Build.Core.xsd
 %%PROFILE2%%lib/mono/3.5/Microsoft.Build.Engine.dll
 %%PROFILE2%%lib/mono/3.5/Microsoft.Build.Framework.dll
 %%PROFILE2%%lib/mono/3.5/Microsoft.Build.Tasks.v3.5.dll
 %%PROFILE2%%lib/mono/3.5/Microsoft.Build.Utilities.v3.5.dll
+%%PROFILE2%%lib/mono/3.5/Microsoft.Build.xsd
+%%PROFILE2%%lib/mono/3.5/Microsoft.CSharp.targets
+%%PROFILE2%%lib/mono/3.5/Microsoft.Common.targets
+%%PROFILE2%%lib/mono/3.5/Microsoft.Common.tasks
+%%PROFILE2%%lib/mono/3.5/Microsoft.VisualBasic.targets
 %%PROFILE2%%lib/mono/3.5/System.Web.Extensions.Design.dll
+%%PROFILE2%%lib/mono/3.5/xbuild.exe
+%%PROFILE2%%lib/mono/3.5/xbuild.exe.mdb
+%%PROFILE2%%lib/mono/3.5/xbuild.rsp
 %%PROFILE4%%lib/mono/4.0/Accessibility.dll
 %%PROFILE4%%lib/mono/4.0/ByteFX.Data.dll
 %%PROFILE4%%lib/mono/4.0/Commons.Xml.Relaxng.dll
@@ -519,12 +529,19 @@ lib/mono/2.0/xsd.exe.mdb
 %%PROFILE4%%lib/mono/4.0/I18N.dll
 %%PROFILE4%%lib/mono/4.0/IBM.Data.DB2.dll
 %%PROFILE4%%lib/mono/4.0/ICSharpCode.SharpZipLib.dll
+%%PROFILE4%%lib/mono/4.0/MSBuild/Microsoft.Build.CommonTypes.xsd
+%%PROFILE4%%lib/mono/4.0/MSBuild/Microsoft.Build.Core.xsd
 %%PROFILE4%%lib/mono/4.0/Microsoft.Build.Engine.dll
 %%PROFILE4%%lib/mono/4.0/Microsoft.Build.Framework.dll
-%%PROFILE4%%lib/mono/4.0/Microsoft.Build.Tasks.dll
-%%PROFILE4%%lib/mono/4.0/Microsoft.Build.Utilities.dll
+%%PROFILE4%%lib/mono/4.0/Microsoft.Build.Tasks.v4.0.dll
+%%PROFILE4%%lib/mono/4.0/Microsoft.Build.Utilities.v4.0.dll
+%%PROFILE4%%lib/mono/4.0/Microsoft.Build.xsd
 %%PROFILE4%%lib/mono/4.0/Microsoft.CSharp.dll
+%%PROFILE4%%lib/mono/4.0/Microsoft.CSharp.targets
+%%PROFILE4%%lib/mono/4.0/Microsoft.Common.targets
+%%PROFILE4%%lib/mono/4.0/Microsoft.Common.tasks
 %%PROFILE4%%lib/mono/4.0/Microsoft.JScript.dll
+%%PROFILE4%%lib/mono/4.0/Microsoft.VisualBasic.targets
 %%PROFILE4%%lib/mono/4.0/Microsoft.VisualC.dll
 %%PROFILE4%%lib/mono/4.0/Microsoft.Vsa.dll
 %%PROFILE4%%lib/mono/4.0/Mono.C5.dll
@@ -553,6 +570,8 @@ lib/mono/2.0/xsd.exe.mdb
 %%PROFILE4%%lib/mono/4.0/Npgsql.dll
 %%PROFILE4%%lib/mono/4.0/OpenSystem.C.dll
 %%PROFILE4%%lib/mono/4.0/PEAPI.dll
+%%PROFILE4%%lib/mono/4.0/RabbitMQ.Client.Apigen.exe
+%%PROFILE4%%lib/mono/4.0/RabbitMQ.Client.Apigen.exe.mdb
 %%PROFILE4%%lib/mono/4.0/RabbitMQ.Client.dll
 %%PROFILE4%%lib/mono/4.0/System.ComponentModel.DataAnnotations.dll
 %%PROFILE4%%lib/mono/4.0/System.Configuration.Install.dll
@@ -658,12 +677,14 @@ lib/mono/2.0/xsd.exe.mdb
 %%PROFILE4%%lib/mono/4.0/wsdl.exe.mdb
 %%PROFILE4%%lib/mono/4.0/xbuild.exe
 %%PROFILE4%%lib/mono/4.0/xbuild.exe.mdb
+%%PROFILE4%%lib/mono/4.0/xbuild.rsp
 %%PROFILE4%%lib/mono/4.0/xsd.exe
 %%PROFILE4%%lib/mono/4.0/xsd.exe.mdb
 lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll
 lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll
 lib/mono/compat-2.0/System.Web.Extensions.Design.dll
 lib/mono/compat-2.0/System.Web.Extensions.dll
+lib/mono/compat-2.0/System.Web.Mvc.dll
 %%PROFILE4%%lib/mono/compat-4.0/ICSharpCode.SharpZipLib.dll
 lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll
 lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll.mdb
@@ -751,14 +772,14 @@ lib/mono/gac/Microsoft.Build.Framework/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build
 %%PROFILE2%%lib/mono/gac/Microsoft.Build.Tasks.v3.5/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.v3.5.dll.mdb
 lib/mono/gac/Microsoft.Build.Tasks/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.dll
 lib/mono/gac/Microsoft.Build.Tasks/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.dll.mdb
-%%PROFILE4%%lib/mono/gac/Microsoft.Build.Tasks/4.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.dll
-%%PROFILE4%%lib/mono/gac/Microsoft.Build.Tasks/4.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.dll.mdb
+%%PROFILE4%%lib/mono/gac/Microsoft.Build.Tasks.v4.0/4.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.v4.0.dll
+%%PROFILE4%%lib/mono/gac/Microsoft.Build.Tasks.v4.0/4.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Tasks.v4.0.dll.mdb
 %%PROFILE2%%lib/mono/gac/Microsoft.Build.Utilities.v3.5/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.v3.5.dll
 %%PROFILE2%%lib/mono/gac/Microsoft.Build.Utilities.v3.5/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.v3.5.dll.mdb
+%%PROFILE4%%lib/mono/gac/Microsoft.Build.Utilities.v4.0/4.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.v4.0.dll
+%%PROFILE4%%lib/mono/gac/Microsoft.Build.Utilities.v4.0/4.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.v4.0.dll.mdb
 lib/mono/gac/Microsoft.Build.Utilities/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.dll
 lib/mono/gac/Microsoft.Build.Utilities/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.dll.mdb
-%%PROFILE4%%lib/mono/gac/Microsoft.Build.Utilities/4.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.dll
-%%PROFILE4%%lib/mono/gac/Microsoft.Build.Utilities/4.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Utilities.dll.mdb
 %%PROFILE4%%lib/mono/gac/Microsoft.CSharp/4.0.0.0__b03f5f7f11d50a3a/Microsoft.CSharp.dll
 %%PROFILE4%%lib/mono/gac/Microsoft.CSharp/4.0.0.0__b03f5f7f11d50a3a/Microsoft.CSharp.dll.mdb
 %%PROFILE4%%lib/mono/gac/Microsoft.JScript/0.0.0.0__b03f5f7f11d50a3a/Microsoft.JScript.dll
@@ -1080,6 +1101,8 @@ lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35/System.Web.Extensio
 %%PROFILE4%%lib/mono/gac/System.Web.Extensions/4.0.0.0__31bf3856ad364e35/System.Web.Extensions.dll.mdb
 lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
 lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll.mdb
+lib/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
+lib/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll.mdb
 lib/mono/gac/System.Web.Routing/3.5.0.0__31bf3856ad364e35/System.Web.Routing.dll
 lib/mono/gac/System.Web.Routing/3.5.0.0__31bf3856ad364e35/System.Web.Routing.dll.mdb
 %%PROFILE4%%lib/mono/gac/System.Web.Routing/4.0.0.0__31bf3856ad364e35/System.Web.Routing.dll
@@ -1155,6 +1178,12 @@ lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77/nunit.util.dll
 lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77/nunit.util.dll.mdb
 lib/mono/monodoc/monodoc.dll
 lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/Microsoft.WebApplication.targets
+lib/mono/xbuild/Microsoft/Silverlight/v2.0/Microsoft.Silverlight.Common.targets
+lib/mono/xbuild/Microsoft/Silverlight/v2.0/Microsoft.Silverlight.CSharp.targets
+lib/mono/xbuild/Microsoft/Silverlight/v2.0/Microsoft.Silverlight.VisualBasic.targets
+lib/mono/xbuild/Microsoft/Silverlight/v3.0/Microsoft.Silverlight.CSharp.targets
+lib/mono/xbuild/Microsoft/Silverlight/v3.0/Microsoft.Silverlight.Common.targets
+lib/mono/xbuild/Microsoft/Silverlight/v3.0/Microsoft.Silverlight.VisualBasic.targets
 lib/monodoc/monodoc.xml
 lib/monodoc/sources/Mono.source
 lib/monodoc/sources/Mono.tree
@@ -1168,14 +1197,8 @@ lib/monodoc/sources/ecma334.tree
 lib/monodoc/sources/ecma334.zip
 lib/monodoc/sources/lang-csharp.source
 lib/monodoc/sources/mono-file-formats.source
-lib/monodoc/sources/mono-file-formats.tree
-lib/monodoc/sources/mono-file-formats.zip
 lib/monodoc/sources/mono-tools.source
-lib/monodoc/sources/mono-tools.tree
-lib/monodoc/sources/mono-tools.zip
 lib/monodoc/sources/monoapi.source
-lib/monodoc/sources/monoapi.tree
-lib/monodoc/sources/monoapi.zip
 lib/monodoc/sources/netdocs.source
 lib/monodoc/sources/netdocs.tree
 lib/monodoc/sources/netdocs.zip
@@ -1243,13 +1266,16 @@ share/locale/ja/LC_MESSAGES/mcs.mo
 @dirrm %%DATADIR%%-1.0
 @dirrm share/libgc-mono
 @dirrm share/jay
-@dirrm lib/monodoc/sources
-@dirrm lib/monodoc
+@dirrmtry lib/monodoc/sources
+@dirrmtry lib/monodoc
 @dirrm lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications
 @dirrm lib/mono/xbuild/Microsoft/VisualStudio/v9.0
 @dirrm lib/mono/xbuild/Microsoft/VisualStudio
+@dirrm lib/mono/xbuild/Microsoft/Silverlight/v3.0
+@dirrm lib/mono/xbuild/Microsoft/Silverlight/v2.0
+@dirrm lib/mono/xbuild/Microsoft/Silverlight
 @dirrm lib/mono/xbuild/Microsoft
-@dirrm lib/mono/xbuild
+@dirrmtry lib/mono/xbuild
 @dirrm lib/mono/monodoc
 @dirrm lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77
 @dirrm lib/mono/gac/nunit.util
@@ -1304,6 +1330,7 @@ share/locale/ja/LC_MESSAGES/mcs.mo
 %%PROFILE4%%@dirrm lib/mono/gac/System.Web.Routing/4.0.0.0__31bf3856ad364e35
 @dirrm lib/mono/gac/System.Web.Routing/3.5.0.0__31bf3856ad364e35
 @dirrm lib/mono/gac/System.Web.Routing
+@dirrm lib/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35
 @dirrm lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35
 @dirrm lib/mono/gac/System.Web.Mvc
 %%PROFILE4%%@dirrm lib/mono/gac/System.Web.Extensions/4.0.0.0__31bf3856ad364e35
@@ -1533,13 +1560,15 @@ share/locale/ja/LC_MESSAGES/mcs.mo
 @dirrm lib/mono/gac/Microsoft.JScript
 %%PROFILE4%%@dirrm lib/mono/gac/Microsoft.CSharp/4.0.0.0__b03f5f7f11d50a3a
 %%PROFILE4%%@dirrm lib/mono/gac/Microsoft.CSharp
-%%PROFILE4%%@dirrm lib/mono/gac/Microsoft.Build.Utilities/4.0.0.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.Build.Utilities/2.0.0.0__b03f5f7f11d50a3a
+%%PROFILE4%%@dirrm lib/mono/gac/Microsoft.Build.Utilities.v4.0/4.0.0.0__b03f5f7f11d50a3a
+%%PROFILE4%%@dirrm lib/mono/gac/Microsoft.Build.Utilities.v4.0
 %%PROFILE2%%@dirrm lib/mono/gac/Microsoft.Build.Utilities.v3.5/3.5.0.0__b03f5f7f11d50a3a
 %%PROFILE2%%@dirrm lib/mono/gac/Microsoft.Build.Utilities.v3.5
 @dirrm lib/mono/gac/Microsoft.Build.Utilities
-%%PROFILE4%%@dirrm lib/mono/gac/Microsoft.Build.Tasks/4.0.0.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.Build.Tasks/2.0.0.0__b03f5f7f11d50a3a
+%%PROFILE4%%@dirrm lib/mono/gac/Microsoft.Build.Tasks.v4.0/4.0.0.0__b03f5f7f11d50a3a
+%%PROFILE4%%@dirrm lib/mono/gac/Microsoft.Build.Tasks.v4.0
 %%PROFILE2%%@dirrm lib/mono/gac/Microsoft.Build.Tasks.v3.5/3.5.0.0__b03f5f7f11d50a3a
 %%PROFILE2%%@dirrm lib/mono/gac/Microsoft.Build.Tasks.v3.5
 @dirrm lib/mono/gac/Microsoft.Build.Tasks
@@ -1599,17 +1628,19 @@ share/locale/ja/LC_MESSAGES/mcs.mo
 @dirrm lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Accessibility
-@dirrm lib/mono/gac
+@dirrmtry lib/mono/gac
 %%PROFILE4%%@dirrm lib/mono/compat-4.0
 @dirrm lib/mono/compat-2.0
 @dirrm lib/mono/compat-1.0
-%%PROFILE4%%@dirrm lib/mono/4.0
-%%PROFILE2%%@dirrm lib/mono/3.5
+%%PROFILE4%%@dirrm lib/mono/4.0/MSBuild
+%%PROFILE4%%@dirrmtry lib/mono/4.0
+%%PROFILE2%%@dirrm lib/mono/3.5/MSBuild
+%%PROFILE2%%@dirrmtry lib/mono/3.5
 @dirrm lib/mono/2.0/MSBuild
-@dirrm lib/mono/2.0
-@dirrm lib/mono/1.0
+@dirrmtry lib/mono/2.0
+@dirrmtry lib/mono/1.0
 @dirrm lib/mono-source-libs
-@dirrm lib/mono
+@dirrmtry lib/mono
 @dirrm include/mono-1.0/mono/utils
 @dirrm include/mono-1.0/mono/metadata
 @dirrm include/mono-1.0/mono/jit