- Update lang/mono to 2.6.4;

- Update a bunch of C# ports as well (audio/taglib-sharp, deskutils/tomboy,
  devel/mono-tools, devel/monodevelop, devel/monodevelop-boo,
  devel/monodevelop-database, devel/monodevelop-java, devel/monodevelop-vala,
  graphics/f-spot, lang/boo [1], lang/mono-basic, mail/gmime24, gmime24-sharp,
  multimedia/banshee, multimedia/banshee-mirage, multimedia/moonlight,
  www/mod_mono, www/webkit-sharp, www/xsp, x11-toolkits/gnome-desktop-sharp20,
  x11-toolkits/gtk-sharp20, x11-toolkits/libgdiplus).

PR:		ports/143657 [1]
Submitted by:	glewis [1]

4 files changed, 188 insertions, 30 deletions

diff --git a/lang/boo/Makefile b/lang/boo/Makefile
index 2914413748e8..24d30ee7271b 100644
--- a/lang/boo/Makefile
+++ b/lang/boo/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	boo
-PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTVERSION=	0.9.3
 CATEGORIES=	lang
 MASTER_SITES=	http://dist.codehaus.org/boo/distributions/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.${BUILD_NUMBER}-src
@@ -24,8 +23,17 @@ WRKSRC=		${WRKDIR}
 USE_GNOME=	gtksourceview
 USE_NANT=	yes
 USE_ZIP=	yes
+# These two lines seems to help to prevent some weird random bug in nant.
+#  - Without them, nant fails to build boo sort of 'really often';
+#  - With them it seems to fail less.
+#  I (romain@) have not yet found a test condition that triggers the failure in
+#  a deterministic way.  This is under investigation.
+MAKE_ENV=	LC_ALL=C
+NANT_FLAGS+=	-debug
 
-BUILD_NUMBER=	3383
+BUILD_NUMBER=	3457
+
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git a/lang/boo/distinfo b/lang/boo/distinfo
index 87f1cd5c253f..b1544e48ae78 100644
--- a/lang/boo/distinfo
+++ b/lang/boo/distinfo
@@ -1,3 +1,3 @@
-MD5 (boo-0.9.2.3383-src.zip) = 0ba8853303f678795f7b51d00d98ac18
-SHA256 (boo-0.9.2.3383-src.zip) = bec53f2542c76a0d30404c10c9e398020ecf180869c93fa2dbb707d3663576ea
-SIZE (boo-0.9.2.3383-src.zip) = 3659721
+MD5 (boo-0.9.3.3457-src.zip) = c7f225468aac17d25845dfc92407ab95
+SHA256 (boo-0.9.3.3457-src.zip) = f1835afc94ebaa787192084eca55b5f9cc7daa2925469cfee40e320d5c44c224
+SIZE (boo-0.9.3.3457-src.zip) = 3701418
diff --git a/lang/boo/files/patch-aa b/lang/boo/files/patch-aa
new file mode 100644
index 000000000000..1c88ffbdd65f
--- /dev/null
+++ b/lang/boo/files/patch-aa
@@ -0,0 +1,150 @@
+$FreeBSD$
+
+This patch was checked-out from the boo SVN repository, r3468.
+It prevents build failures if an older lang/boo is already installed, more details at:
+http://jira.codehaus.org/browse/BOO-1282
+
+Index: src/Boo.Lang.Compiler/Compilation.cs
+===================================================================
+--- src/Boo.Lang.Compiler/Compilation.cs	(révision 3467)
++++ src/Boo.Lang.Compiler/Compilation.cs	(révision 3468)
+@@ -87,16 +87,26 @@
+ 			return compiler.Run(unit);

+ 		}

+ 

++		public static CompilerContext compile_(CompileUnit unit, params ICompileUnit[] references)

++		{

++			return NewCompilerWithReferences(references).Run(unit);

++		}

++

+ 		private static BooCompiler NewCompilerWithReferences(IEnumerable<ICompileUnit> references)

+ 		{

+-			BooCompiler compiler = NewCompiler();

++			BooCompiler compiler = NewCompiler(false);

+ 			compiler.Parameters.References.AddAll(references);

+ 			return compiler;

+ 		}

+ 

+ 		private static BooCompiler NewCompiler()

+ 		{

+-			BooCompiler compiler = new BooCompiler();

++			return NewCompiler(true);

++		}

++

++		private static BooCompiler NewCompiler(bool loadDefaultReferences)

++		{

++			BooCompiler compiler = new BooCompiler(new CompilerParameters(loadDefaultReferences));

+ 			compiler.Parameters.OutputType = CompilerOutputType.Auto;

+ 			compiler.Parameters.Pipeline = new Boo.Lang.Compiler.Pipelines.CompileToMemory();

+ 			return compiler;

+@@ -114,10 +124,5 @@
+ 			module.Members.Add(klass);

+ 			return module;

+ 		}

+-

+-		public static CompilerContext compile_(CompileUnit unit, params ICompileUnit[] references)

+-		{

+-			return NewCompilerWithReferences(references).Run(unit);

+-		}

+ 	}

+ }

+Index: src/Boo.Lang.Compiler/Steps/MacroProcessing/MacroCompiler.cs
+===================================================================
+--- src/Boo.Lang.Compiler/Steps/MacroProcessing/MacroCompiler.cs	(révision 3467)
++++ src/Boo.Lang.Compiler/Steps/MacroProcessing/MacroCompiler.cs	(révision 3468)
+@@ -121,9 +121,7 @@
+ 			m.Namespace = CleanClone(node.EnclosingModule.Namespace);
+ 			m.Name = node.Name;
+ 			foreach (Import i in node.EnclosingModule.Imports)
+-			{
+ 				m.Imports.Add(CleanClone(i));
+-			}
+ 			m.Members.Add(CleanClone(node));
+ 			return m;
+ 		}
+@@ -139,17 +137,13 @@
+ 		private void ReportErrors(CompilerErrorCollection errors)
+ 		{
+ 			foreach (CompilerError e in errors)
+-			{
+ 				Errors.Add(e);
+-			}
+ 		}
+ 
+ 		private void ReportWarnings(CompilerWarningCollection warnings)
+ 		{
+ 			foreach (CompilerWarning w in warnings)
+-			{
+ 				Warnings.Add(w);
+-			}
+ 		}
+ 
+ 		private static void CacheType(TypeDefinition node, Type type)
+Index: tests/BooCompiler.Tests/ExtensionsCompilationTest.cs
+===================================================================
+--- tests/BooCompiler.Tests/ExtensionsCompilationTest.cs	(révision 0)
++++ tests/BooCompiler.Tests/ExtensionsCompilationTest.cs	(révision 3468)
+@@ -0,0 +1,33 @@
++using System.Collections.Generic;

++using System.IO;

++using Boo.Lang.Compiler;

++using Boo.Lang.Compiler.IO;

++using NUnit.Framework;

++

++namespace BooCompiler.Tests

++{

++	[TestFixture]

++	public class ExtensionsCompilationTest

++	{

++		[Test]

++		public void MacroMacroCompilation()

++		{

++			var parameters = new CompilerParameters(false);

++			parameters.References.Add(typeof(IEnumerable<>).Assembly);

++			

++			parameters.Input.Add(BooLangExtensionsSource("Macros/MacroMacro.boo"));

++			parameters.Input.Add(BooLangExtensionsSource("Macros/AssertMacro.boo"));

++

++			parameters.Pipeline = new Boo.Lang.Compiler.Pipelines.ResolveExpressions();

++

++			var compiler = new Boo.Lang.Compiler.BooCompiler(parameters);

++			var results = compiler.Run();

++			Assert.AreEqual(0, results.Errors.Count, results.Errors.ToString());

++		}

++

++		private FileInput BooLangExtensionsSource(string file)

++		{

++			return new FileInput(Path.Combine(BooTestCaseUtil.BasePath, "src/Boo.Lang.Extensions/" + file));

++		}

++	}

++}

+Index: tests/BooCompiler.Tests/BooTestCaseUtil.cs
+===================================================================
+--- tests/BooCompiler.Tests/BooTestCaseUtil.cs	(révision 3467)
++++ tests/BooCompiler.Tests/BooTestCaseUtil.cs	(révision 3468)
+@@ -31,7 +31,6 @@
+ 	using System;

+ 	using System.IO;

+ 	using System.Reflection;

+-	using System.Xml;

+ 	using System.Xml.Serialization;

+ 	using Boo.Lang.Compiler.Ast;

+ 	using NUnit.Framework;

+@@ -43,11 +42,15 @@
+ 	{

+ 		public static string TestCasesPath

+ 		{

++			get { return Path.Combine(BasePath, "tests/testcases"); }

++		}

++

++		public static string BasePath

++		{

+ 			get

+ 			{

+ 				Uri codebase = new Uri(Assembly.GetExecutingAssembly().CodeBase);

+-				Uri path = new Uri(codebase, "../testcases");

+-				return path.LocalPath;

++				return new Uri(codebase, "../..").LocalPath;

+ 			}

+ 		}

+ 

diff --git a/lang/boo/pkg-plist b/lang/boo/pkg-plist
index 4ef588107f6a..44079ae89f0d 100644
--- a/lang/boo/pkg-plist
+++ b/lang/boo/pkg-plist
@@ -19,41 +19,41 @@ lib/mono/boo/Boo.Lang.Parser.dll
 lib/mono/boo/Boo.Lang.PatternMatching.dll
 lib/mono/boo/Boo.Lang.Useful.dll
 lib/mono/boo/Boo.Lang.dll
-lib/mono/gac/Boo.Lang.CodeDom/2.0.9.2__32c39770e9a21a67/Boo.Lang.CodeDom.dll
-lib/mono/gac/Boo.Lang.CodeDom/2.0.9.2__32c39770e9a21a67/Boo.Lang.CodeDom.dll.mdb
-lib/mono/gac/Boo.Lang.Compiler/2.0.9.2__32c39770e9a21a67/Boo.Lang.Compiler.dll
-lib/mono/gac/Boo.Lang.Compiler/2.0.9.2__32c39770e9a21a67/Boo.Lang.Compiler.dll.mdb
-lib/mono/gac/Boo.Lang.Extensions/2.0.9.2__32c39770e9a21a67/Boo.Lang.Extensions.dll
-lib/mono/gac/Boo.Lang.Extensions/2.0.9.2__32c39770e9a21a67/Boo.Lang.Extensions.dll.mdb
-lib/mono/gac/Boo.Lang.Interpreter/2.0.9.2__32c39770e9a21a67/Boo.Lang.Interpreter.dll
-lib/mono/gac/Boo.Lang.Interpreter/2.0.9.2__32c39770e9a21a67/Boo.Lang.Interpreter.dll.mdb
-lib/mono/gac/Boo.Lang.Parser/2.0.9.2__32c39770e9a21a67/Boo.Lang.Parser.dll
-lib/mono/gac/Boo.Lang.Parser/2.0.9.2__32c39770e9a21a67/Boo.Lang.Parser.dll.mdb
-lib/mono/gac/Boo.Lang.PatternMatching/2.0.9.2__32c39770e9a21a67/Boo.Lang.PatternMatching.dll
-lib/mono/gac/Boo.Lang.PatternMatching/2.0.9.2__32c39770e9a21a67/Boo.Lang.PatternMatching.dll.mdb
-lib/mono/gac/Boo.Lang.Useful/2.0.9.2__32c39770e9a21a67/Boo.Lang.Useful.dll
-lib/mono/gac/Boo.Lang.Useful/2.0.9.2__32c39770e9a21a67/Boo.Lang.Useful.dll.mdb
-lib/mono/gac/Boo.Lang/2.0.9.2__32c39770e9a21a67/Boo.Lang.dll
-lib/mono/gac/Boo.Lang/2.0.9.2__32c39770e9a21a67/Boo.Lang.dll.mdb
+lib/mono/gac/Boo.Lang.CodeDom/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.CodeDom.dll
+lib/mono/gac/Boo.Lang.CodeDom/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.CodeDom.dll.mdb
+lib/mono/gac/Boo.Lang.Compiler/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Compiler.dll
+lib/mono/gac/Boo.Lang.Compiler/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Compiler.dll.mdb
+lib/mono/gac/Boo.Lang.Extensions/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Extensions.dll
+lib/mono/gac/Boo.Lang.Extensions/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Extensions.dll.mdb
+lib/mono/gac/Boo.Lang.Interpreter/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Interpreter.dll
+lib/mono/gac/Boo.Lang.Interpreter/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Interpreter.dll.mdb
+lib/mono/gac/Boo.Lang.Parser/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Parser.dll
+lib/mono/gac/Boo.Lang.Parser/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Parser.dll.mdb
+lib/mono/gac/Boo.Lang.PatternMatching/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.PatternMatching.dll
+lib/mono/gac/Boo.Lang.PatternMatching/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.PatternMatching.dll.mdb
+lib/mono/gac/Boo.Lang.Useful/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Useful.dll
+lib/mono/gac/Boo.Lang.Useful/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.Useful.dll.mdb
+lib/mono/gac/Boo.Lang/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.dll
+lib/mono/gac/Boo.Lang/2.%%PORTVERSION%%__32c39770e9a21a67/Boo.Lang.dll.mdb
 libdata/pkgconfig/boo.pc
 share/mime/packages/boo-mime-info.xml
 share/mime/text/x-boo.xml
 share/mime-info/boo.keys
 share/mime-info/boo.mime
-@dirrm lib/mono/gac/Boo.Lang/2.0.9.2__32c39770e9a21a67
-@dirrm lib/mono/gac/Boo.Lang.Useful/2.0.9.2__32c39770e9a21a67
+@dirrm lib/mono/gac/Boo.Lang/2.%%PORTVERSION%%__32c39770e9a21a67
+@dirrm lib/mono/gac/Boo.Lang.Useful/2.%%PORTVERSION%%__32c39770e9a21a67
 @dirrm lib/mono/gac/Boo.Lang.Useful
-@dirrm lib/mono/gac/Boo.Lang.PatternMatching/2.0.9.2__32c39770e9a21a67
+@dirrm lib/mono/gac/Boo.Lang.PatternMatching/2.%%PORTVERSION%%__32c39770e9a21a67
 @dirrm lib/mono/gac/Boo.Lang.PatternMatching
-@dirrm lib/mono/gac/Boo.Lang.Parser/2.0.9.2__32c39770e9a21a67
+@dirrm lib/mono/gac/Boo.Lang.Parser/2.%%PORTVERSION%%__32c39770e9a21a67
 @dirrm lib/mono/gac/Boo.Lang.Parser
-@dirrm lib/mono/gac/Boo.Lang.Interpreter/2.0.9.2__32c39770e9a21a67
+@dirrm lib/mono/gac/Boo.Lang.Interpreter/2.%%PORTVERSION%%__32c39770e9a21a67
 @dirrm lib/mono/gac/Boo.Lang.Interpreter
-@dirrm lib/mono/gac/Boo.Lang.Extensions/2.0.9.2__32c39770e9a21a67
+@dirrm lib/mono/gac/Boo.Lang.Extensions/2.%%PORTVERSION%%__32c39770e9a21a67
 @dirrm lib/mono/gac/Boo.Lang.Extensions
-@dirrm lib/mono/gac/Boo.Lang.Compiler/2.0.9.2__32c39770e9a21a67
+@dirrm lib/mono/gac/Boo.Lang.Compiler/2.%%PORTVERSION%%__32c39770e9a21a67
 @dirrm lib/mono/gac/Boo.Lang.Compiler
-@dirrm lib/mono/gac/Boo.Lang.CodeDom/2.0.9.2__32c39770e9a21a67
+@dirrm lib/mono/gac/Boo.Lang.CodeDom/2.%%PORTVERSION%%__32c39770e9a21a67
 @dirrm lib/mono/gac/Boo.Lang.CodeDom
 @dirrm lib/mono/gac/Boo.Lang
 @dirrm lib/mono/boo