Revision: 87348 http://trac.macports.org/changeset/87348 Author: ryandesign@macports.org Date: 2011-11-17 13:24:38 -0800 (Thu, 17 Nov 2011) Log Message: ----------- nant: update to 0.91 (#32097); indicate license; rewrite master_sites to avoid redirects Modified Paths: -------------- trunk/dports/devel/nant/Portfile trunk/dports/devel/nant/files/patch-PkgConfigFunctions.cs trunk/dports/devel/nant/files/patch-ScriptTask.cs Removed Paths: ------------- trunk/dports/devel/nant/files/patch-NAnt_Core-Task_cs Modified: trunk/dports/devel/nant/Portfile =================================================================== --- trunk/dports/devel/nant/Portfile 2011-11-17 21:14:32 UTC (rev 87347) +++ trunk/dports/devel/nant/Portfile 2011-11-17 21:24:38 UTC (rev 87348) @@ -4,30 +4,31 @@ PortSystem 1.0 name nant -version 0.85 +version 0.91 categories devel mono platforms darwin maintainers nomaintainer +license GPL-2+ supported_archs noarch description .NET build tool long_description NAnt is a free .NET build tool. In theory it is kind of \ - like make without makes wrinkles. In practice its a lot like Ant. + like make without make's wrinkles. In practice it's a \ + lot like Ant. homepage http://nant.sourceforge.net/ -master_sites sourceforge:nant +master_sites sourceforge:project/nant/nant/${version} distname nant-${version}-src -checksums md5 45ae065439b6cbc0e02051b855843f50 \ - sha1 df97d7b542a4e561c37a0804bb8a159803cc05cd +checksums rmd160 f23f72c4eae7d5a29d854292b845eb1b31b60c44 \ + sha256 6694f16d71f77912ba08a6d83d6a1a67afe5f57469d817918cdc7ed1912974b7 depends_build port:mono worksrcdir nant-${version} -patchfiles patch-NAnt_Core-Task_cs \ - patch-PkgConfigFunctions.cs \ +patchfiles patch-PkgConfigFunctions.cs \ patch-ScriptTask.cs use_configure no Deleted: trunk/dports/devel/nant/files/patch-NAnt_Core-Task_cs =================================================================== --- trunk/dports/devel/nant/files/patch-NAnt_Core-Task_cs 2011-11-17 21:14:32 UTC (rev 87347) +++ trunk/dports/devel/nant/files/patch-NAnt_Core-Task_cs 2011-11-17 21:24:38 UTC (rev 87348) @@ -1,17 +0,0 @@ ---- src/NAnt.Core/Task.cs.dist 2007-03-29 16:44:08.000000000 -0400 -+++ src/NAnt.Core/Task.cs 2007-03-29 16:44:21.000000000 -0400 -@@ -400,7 +400,6 @@ - #region Protected Instance Methods - - /// <summary><note>Deprecated (to be deleted).</note></summary> -- [Obsolete("Deprecated- Use InitializeTask instead")] - protected override void InitializeElement(XmlNode elementNode) { - // Just defer for now so that everything just works - InitializeTask(elementNode); -@@ -415,4 +414,4 @@ - - #endregion Protected Instance Methods - } --} -\ No newline at end of file -+} Modified: trunk/dports/devel/nant/files/patch-PkgConfigFunctions.cs =================================================================== --- trunk/dports/devel/nant/files/patch-PkgConfigFunctions.cs 2011-11-17 21:14:32 UTC (rev 87347) +++ trunk/dports/devel/nant/files/patch-PkgConfigFunctions.cs 2011-11-17 21:24:38 UTC (rev 87348) @@ -1,11 +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 +--- src/NAnt.Core/Functions/PkgConfigFunctions.cs.orig 2011-09-17 15:08:22.000000000 -0500 ++++ src/NAnt.Core/Functions/PkgConfigFunctions.cs 2011-11-17 15:17:16.000000000 -0600 @@ -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) { + 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) { Modified: trunk/dports/devel/nant/files/patch-ScriptTask.cs =================================================================== --- trunk/dports/devel/nant/files/patch-ScriptTask.cs 2011-11-17 21:14:32 UTC (rev 87347) +++ trunk/dports/devel/nant/files/patch-ScriptTask.cs 2011-11-17 21:24:38 UTC (rev 87348) @@ -1,11 +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)); +--- src/NAnt.DotNet/Tasks/ScriptTask.cs.orig 2011-09-17 15:08:23.000000000 -0500 ++++ src/NAnt.DotNet/Tasks/ScriptTask.cs 2011-11-17 15:19:28.000000000 -0600 +@@ -517,7 +517,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));
participants (1)
-
ryandesign@macports.org