[41516] trunk/dports/devel/nant

[jmr at macports.org]

Revision: 41516
          http://trac.macports.org/changeset/41516
Author:   jmr at macports.org
Date:     2008-11-05 02:30:42 -0800 (Wed, 05 Nov 2008)
Log Message:
-----------
nant: fix building with current mono (#15137)

Modified Paths:
--------------
    trunk/dports/devel/nant/Portfile

Added Paths:
-----------
    trunk/dports/devel/nant/files/patch-PkgConfigFunctions.cs
    trunk/dports/devel/nant/files/patch-ScriptTask.cs

Modified: trunk/dports/devel/nant/Portfile
===================================================================
--- trunk/dports/devel/nant/Portfile	2008-11-05 08:51:35 UTC (rev 41515)
+++ trunk/dports/devel/nant/Portfile	2008-11-05 10:30:42 UTC (rev 41516)
@@ -18,7 +18,9 @@
 			sha1 df97d7b542a4e561c37a0804bb8a159803cc05cd
 
 worksrcdir		nant-${version}
-patchfiles		patch-NAnt_Core-Task_cs
+patchfiles		patch-NAnt_Core-Task_cs \
+			patch-PkgConfigFunctions.cs \
+			patch-ScriptTask.cs
 
 depends_build		port:mono
 

Added: trunk/dports/devel/nant/files/patch-PkgConfigFunctions.cs
===================================================================
--- trunk/dports/devel/nant/files/patch-PkgConfigFunctions.cs	                        (rev 0)
+++ trunk/dports/devel/nant/files/patch-PkgConfigFunctions.cs	2008-11-05 10:30:42 UTC (rev 41516)
@@ -0,0 +1,11 @@
+--- src/NAnt.Core/Functions/PkgConfigFunctions.cs.orig	2008-04-26 23:08:21.000000000 -0400
++++ src/NAnt.Core/Functions/PkgConfigFunctions.cs	2008-04-26 23:09:10.000000000 -0400
+@@ -260,7 +260,7 @@
+                 execTask.Execute();
+                 ms.Position = 0;
+                 StreamReader sr = new StreamReader(ms);
+-                string output = sr.ReadLine();
++                string output = sr.ReadLine().Replace("\x00", "");
+                 sr.Close();
+                 return output;
+             } catch (Exception ex) {

Added: trunk/dports/devel/nant/files/patch-ScriptTask.cs
===================================================================
--- trunk/dports/devel/nant/files/patch-ScriptTask.cs	                        (rev 0)
+++ trunk/dports/devel/nant/files/patch-ScriptTask.cs	2008-11-05 10:30:42 UTC (rev 41516)
@@ -0,0 +1,11 @@
+--- src/NAnt.DotNet/Tasks/ScriptTask.cs.orig	2008-04-26 23:06:17.000000000 -0400
++++ src/NAnt.DotNet/Tasks/ScriptTask.cs	2008-04-26 23:07:28.000000000 -0400
+@@ -516,7 +516,7 @@
+         #region Private Static Methods
+ 
+         private static CodeDomProvider CreateCodeDomProvider(string typeName, string assemblyName) {
+-            Assembly providerAssembly = Assembly.LoadWithPartialName(assemblyName);
++            Assembly providerAssembly = Assembly.Load(assemblyName);
+             if (providerAssembly == null) {
+                 throw new ArgumentException(string.Format(CultureInfo.InvariantCulture,
+                     ResourceUtils.GetString("NA2037"), assemblyName));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081105/0198acfc/attachment.html>