- Update to 2.7.4

3 files changed, 26 insertions, 52 deletions

diff --git a/lang/ironpython/Makefile b/lang/ironpython/Makefile
index 2533fb342910..b5c4acf600f8 100644
--- a/lang/ironpython/Makefile
+++ b/lang/ironpython/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ironpython
-PORTVERSION=	2.7.3
+PORTVERSION=	2.7.4
 CATEGORIES=	lang python
 DISTNAME=	ipy-${PORTVERSION}
 
@@ -16,8 +16,8 @@ RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 USE_GITHUB=	yes
 GH_ACCOUNT=	IronLanguages
 GH_PROJECT=	main
-GH_TAGNAME=	ipy-2.7.3
-GH_COMMIT=	2ae9aee
+GH_TAGNAME=	ipy-2.7.4
+GH_COMMIT=	568c234
 
 SUB_FILES=	ipy ipy64
 
diff --git a/lang/ironpython/distinfo b/lang/ironpython/distinfo
index da92750aaffb..bc662fcc3246 100644
--- a/lang/ironpython/distinfo
+++ b/lang/ironpython/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ipy-2.7.3.tar.gz) = c5c75cc54f4d8e006bfe8b9c61758804f5a31f179a3bc77eca0cc266b78207ef
-SIZE (ipy-2.7.3.tar.gz) = 104866745
+SHA256 (ipy-2.7.4.tar.gz) = 60a37bd1c4d01037b1ced3066bc3b720aad3955ce2a8e6a7da8374be5364eb84
+SIZE (ipy-2.7.4.tar.gz) = 104738305
diff --git a/lang/ironpython/files/patch-Solutions-Build.IronPython.proj b/lang/ironpython/files/patch-Solutions-Build.IronPython.proj
index 1305575bf1a2..5f6087fe1d78 100644
--- a/lang/ironpython/files/patch-Solutions-Build.IronPython.proj
+++ b/lang/ironpython/files/patch-Solutions-Build.IronPython.proj
@@ -1,18 +1,6 @@
---- Solutions/Build.IronPython.proj.orig	2012-07-04 09:16:08.000000000 +0200
-+++ Solutions/Build.IronPython.proj	2013-07-12 10:09:24.000000000 +0200
-@@ -37,9 +37,11 @@
-     <BuildProject Include="$(Solution)" Condition=" '$(Mono)' != 'true' ">
-       <Properties>Configuration=Silverlight5$(BaseConfiguration)</Properties>
-     </BuildProject>
-+<!--
-     <BuildProject Include="$(Solution)">
-       <Properties>Configuration=Android$(BaseConfiguration)</Properties>
-     </BuildProject>
-+-->
-     <!-- Removed because it doesn't currently work. -->
-     <!--<BuildProject Include="$(Solution)" Condition=" '$(Mono)' != 'true' ">
-       <Properties>Configuration=WP7$(BaseConfiguration)</Properties>
-@@ -94,7 +96,7 @@
+--- Solutions/Build.IronPython.proj.orig	2013-09-08 04:53:28.000000000 +0200
++++ Solutions/Build.IronPython.proj	2013-09-12 18:21:09.000000000 +0200
+@@ -81,7 +81,7 @@
      <SilverlightScriptTemplates Include="$(BaseDir)\Hosts\Silverlight\Public\script\templates\python\**\*.*" />
  
      <MiscFiles Include="$(BaseDir)\Languages\IronPython\Public\License.html" />
@@ -21,20 +9,20 @@
      <MiscFiles Include="$(BaseDir)\Languages\IronPython\Public\License.txt" />
      <MiscFiles Include="$(BaseDir)\Languages\IronPython\Public\Readme.html" />
  
-@@ -162,6 +164,7 @@
+@@ -149,6 +149,7 @@
      <Copy SourceFiles="@(TutorialFiles)" DestinationFiles="@(TutorialFiles->'$(StageDir)\Tutorial\%(RecursiveDir)%(Filename)%(Extension)')" />
  
      <!-- Continue to copy the Silverlight files here for compatibility with previous releases. -->
 +<!--
-     <Copy SourceFiles="@(DlrLibs->'$(Silverlight4BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
-     <Copy SourceFiles="@(SilverlightDlrLibs->'$(Silverlight4BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
-     <Copy SourceFiles="@(IronPythonLibs->'$(Silverlight4BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
-@@ -169,21 +172,24 @@
+     <Copy SourceFiles="@(DlrLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
+     <Copy SourceFiles="@(SilverlightDlrLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
+     <Copy SourceFiles="@(IronPythonLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
+@@ -156,33 +157,38 @@
  
      <Copy SourceFiles="@(SilverlightScriptFiles)" DestinationFiles="@(SilverlightScriptFiles->'$(StageDir)\Silverlight\script\%(RecursiveDir)%(Filename)%(Extension)')" />
      <Copy SourceFiles="@(SilverlightScriptTemplates)" DestinationFiles="@(SilverlightScriptTemplates->'$(StageDir)\Silverlight\script\templates\python\%(RecursiveDir)%(Filename)%(Extension)')" />
+-
 +-->
- 
      <!-- .NET 4 -->
 +<!--
      <Copy SourceFiles="@(DlrLibs->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net40" />
@@ -42,6 +30,15 @@
      <Copy SourceFiles="@(IronPythonLibs->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net40" />
      <Copy SourceFiles="@(v4IronPythonModules->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net40" />
      <Copy SourceFiles="@(IronPythonModules->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net40" />
+-    
++-->    
+     <!-- .NET 4.5 -->
++<!--
+     <Copy SourceFiles="@(DlrLibs->'$(v45BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net45" />
+     <Copy SourceFiles="@(ClrDlrLibs->'$(v45BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net45" />
+     <Copy SourceFiles="@(IronPythonLibs->'$(v45BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net45" />
+     <Copy SourceFiles="@(v4IronPythonModules->'$(v45BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net45" />
+     <Copy SourceFiles="@(IronPythonModules->'$(v45BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net45" />
 -
 +-->
      <!-- .NET 3.5 -->
@@ -53,36 +50,13 @@
      <Copy SourceFiles="@(IronPythonModules->'$(v2BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net35" />
 -
 +-->
-     <!-- Windows Phone 7.5 -->
-     <!--
-     <Copy SourceFiles="@(DlrLibs->'$(WP7BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl4-WP71" />
-@@ -193,23 +199,26 @@
-     -->
- 
-     <!-- Mono for Android -->
-+<!--
-     <Copy SourceFiles="@(DlrLibs->'$(AndroidBuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Android" />
-     <Copy SourceFiles="@(v2DlrLibs->'$(AndroidBuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Android" />
-     <Copy SourceFiles="@(IronPythonLibs->'$(AndroidBuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Android" />
-     <Copy SourceFiles="@(IronPythonModules->'$(AndroidBuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Android" />
--
-+-->
-     <!-- Silverlight 4 -->
-+<!--
-     <Copy SourceFiles="@(DlrLibs->'$(Silverlight4BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl4" />
-     <Copy SourceFiles="@(SilverlightDlrLibs->'$(Silverlight4BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl4" />
-     <Copy SourceFiles="@(IronPythonLibs->'$(Silverlight4BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl4" />
-     <Copy SourceFiles="@(IronPythonModules->'$(Silverlight4BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl4" />
--
-+-->
      <!-- Silverlight 5 -->
 +<!--
      <Copy SourceFiles="@(DlrLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl5" />
      <Copy SourceFiles="@(SilverlightDlrLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl5" />
      <Copy SourceFiles="@(IronPythonLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl5" />
      <Copy SourceFiles="@(IronPythonModules->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl5" />
--
 +-->
-     <!-- Windows 8 "Metro" -->
-     <!--<Copy SourceFiles="@(DlrLibs->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Metro" />
-     <Copy SourceFiles="@(IronPythonLibs->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Metro" />-->
+   </Target>
+   
+   <Target Name="NuGetPackage" DependsOnTargets="Stage" Condition="'$(OS)' == 'Windows_NT'">