Attachment 175758 Details for Bug 213484 – update to 4.6.1.5

[patch] update to 4.6.1.5

mono.diff (text/plain), 14.43 KB, created by David Naylor on 2016-10-14 17:56:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Naylor

Created: 2016-10-14 17:56:22 UTC

Size: 14.43 KB

patch

obsolete

>diff --git a/lang/mono/Makefile b/lang/mono/Makefile
>index 5d8a408..aff85b6 100644
>--- a/lang/mono/Makefile
>+++ b/lang/mono/Makefile
>@@ -1,21 +1,17 @@
> # Created by: Yukihiro Nakai <nakai@FreeBSD.org>
>-# $FreeBSD: head/lang/mono/Makefile 423356 2016-10-05 17:46:10Z tj $
>+# $FreeBSD$
> 
> PORTNAME=	mono
>-PORTVERSION=	4.4.2.11
>-PORTREVISION=	1
>+PORTVERSION=	4.6.1.5
> CATEGORIES=	lang
> MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
> 
>-PATCHFILES=
>-PATCH_SITES=	https://github.com/mono/mono/commit/
>-PATCH_DIST_STRIP=-p1
>-
> MAINTAINER=	mono@FreeBSD.org
> COMMENT=	Open source implementation of .NET Development Framework
> 
> BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
> 		bash:shells/bash
>+LIB_DEPENDS=	libinotify.so:devel/libinotify
> 
> USES=		bison compiler:c11 cpe gettext gmake iconv libtool pathfix perl5 tar:bzip2
> USE_GNOME=	glib20
>@@ -51,19 +47,17 @@ post-patch:
> 		-e 's|^#!/bin/bash|#!/bin/sh|g'
> 	@${REINPLACE_CMD} 's/isinf (1)/isinf (1.0)/g' ${WRKSRC}/configure
> 
>-tests: build
>-	@${ECHO_MSG} "===> Running mono regression tests"
>-	@(cd ${WRKSRC}/mono/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>-		${MAKE_FLAGS} Makefile ${MAKE_ARGS} check)
>-
> post-configure:
> 	@${REINPLACE_CMD} -e 's|share\/man|man|g' \
> 		${WRKSRC}/mcs/jay/Makefile
>-
> # Fix build on FreeBSD 9.3 (and maybe other unsupported releases)
> .if ${OSVERSION} < 1000000
> 	@${REINPLACE_CMD} 's/^#define HAVE_LOCALCHARSET_H 1/#undef HAVE_LOCALCHARSET_H/' \
> 		${WRKSRC}/eglib/config.h
> .endif
> 
>+do-test:
>+	@(cd ${WRKSRC}/mono/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>+		${MAKE_FLAGS} Makefile ${MAKE_ARGS} check)
>+
> .include <bsd.port.post.mk>
>diff --git a/lang/mono/distinfo b/lang/mono/distinfo
>index 77dc532..d4620e2 100644
>--- a/lang/mono/distinfo
>+++ b/lang/mono/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1469961908
>-SHA256 (mono-4.4.2.11.tar.bz2) = 900c2cc25ee55adeec04e1ae889316efc127c82cc0c392f928421f19f8f5b633
>-SIZE (mono-4.4.2.11.tar.bz2) = 86090698
>+TIMESTAMP = 1476285918
>+SHA256 (mono-4.6.1.5.tar.bz2) = 3871ee72bdfc2ea5d636ffff22cf49ae6bac7c4a4f3d687214dd8ac236bbf7c3
>+SIZE (mono-4.6.1.5.tar.bz2) = 83174665
>diff --git a/lang/mono/files/patch-eglib_src_gfile-posix.c b/lang/mono/files/patch-eglib_src_gfile-posix.c
>index d8fcb08..d667532 100644
>--- a/lang/mono/files/patch-eglib_src_gfile-posix.c
>+++ b/lang/mono/files/patch-eglib_src_gfile-posix.c
>@@ -1,4 +1,4 @@
>---- eglib/src/gfile-posix.c.orig	2016-07-29 09:10:29 UTC
>+--- eglib/src/gfile-posix.c.orig	2016-10-11 12:53:43 UTC
> +++ eglib/src/gfile-posix.c
> @@ -170,7 +170,7 @@ g_get_current_dir (void)
>  	do {
>diff --git a/lang/mono/files/patch-mono_metadata_socket-io.c b/lang/mono/files/patch-mono_metadata_socket-io.c
>index 6282a2b..c2205dc 100644
>--- a/lang/mono/files/patch-mono_metadata_socket-io.c
>+++ b/lang/mono/files/patch-mono_metadata_socket-io.c
>@@ -1,9 +1,9 @@
> Fix build on FreeBSD 8
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198404#c6
> 
>---- mono/metadata/socket-io.c.orig	2016-07-29 09:10:33 UTC
>+--- mono/metadata/socket-io.c.orig	2016-10-11 12:53:47 UTC
> +++ mono/metadata/socket-io.c
>-@@ -26,6 +26,7 @@
>+@@ -27,6 +27,7 @@
>  #ifdef HOST_WIN32
>  #include <ws2tcpip.h>
>  #else
>diff --git a/lang/mono/files/patch-mono_utils_patch-mono__utils__mono-proclib.c b/lang/mono/files/patch-mono_utils_patch-mono__utils__mono-proclib.c
>index 906199b..3c2c817 100644
>--- a/lang/mono/files/patch-mono_utils_patch-mono__utils__mono-proclib.c
>+++ b/lang/mono/files/patch-mono_utils_patch-mono__utils__mono-proclib.c
>@@ -1,4 +1,4 @@
>---- mono/utils/patch-mono_utils_mono-proclib.c.orig	2016-10-05 17:28:38 UTC
>+--- mono/utils/patch-mono_utils_mono-proclib.c.orig	2016-10-12 15:29:11 UTC
> +++ mono/utils/patch-mono_utils_mono-proclib.c
> @@ -0,0 +1,16 @@
> +--- mono/utils/mono-proclib.c.orig	2016-07-29 09:10:33 UTC
>diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
>index 2cb15c3..98baa60 100644
>--- a/lang/mono/pkg-plist
>+++ b/lang/mono/pkg-plist
>@@ -37,6 +37,7 @@ bin/mdvalidater
> bin/mkbundle
> bin/mod
> bin/mono
>+bin/mono-api-html
> bin/mono-api-info
> bin/mono-boehm
> bin/mono-cil-strip
>@@ -144,10 +145,12 @@ lib/libmono-2.0.a
> lib/libmono-2.0.so
> lib/libmono-2.0.so.1
> lib/libmono-2.0.so.1.0.0
>+lib/libmono-profiler-aot-static.a
> lib/libmono-profiler-aot.a
> lib/libmono-profiler-aot.so
> lib/libmono-profiler-aot.so.0
> lib/libmono-profiler-aot.so.0.0.0
>+lib/libmono-profiler-iomap-static.a
> lib/libmono-profiler-iomap.a
> lib/libmono-profiler-iomap.so
> lib/libmono-profiler-iomap.so.0
>@@ -430,7 +433,6 @@ lib/mono/4.5-api/Microsoft.Web.Infrastructure.dll
> lib/mono/4.5-api/Mono.C5.dll
> lib/mono/4.5-api/Mono.CSharp.dll
> lib/mono/4.5-api/Mono.Cairo.dll
>-lib/mono/4.5-api/Mono.Cecil.Mdb.dll
> lib/mono/4.5-api/Mono.Cecil.dll
> lib/mono/4.5-api/Mono.CodeContracts.dll
> lib/mono/4.5-api/Mono.CompilerServices.SymbolWriter.dll
>@@ -536,7 +538,6 @@ lib/mono/4.5-api/System.Xml.Linq.dll
> lib/mono/4.5-api/System.Xml.Serialization.dll
> lib/mono/4.5-api/System.Xml.dll
> lib/mono/4.5-api/System.dll
>-lib/mono/4.5-api/SystemWebTestShim.dll
> lib/mono/4.5-api/WebMatrix.Data.dll
> lib/mono/4.5-api/WindowsBase.dll
> lib/mono/4.5-api/cscompmgd.dll
>@@ -564,7 +565,6 @@ lib/mono/4.5/Facades/System.Data.SqlClient.dll
> lib/mono/4.5/Facades/System.Diagnostics.Contracts.dll
> lib/mono/4.5/Facades/System.Diagnostics.Debug.dll
> lib/mono/4.5/Facades/System.Diagnostics.FileVersionInfo.dll
>-lib/mono/4.5/Facades/System.Diagnostics.PerformanceCounter.dll
> lib/mono/4.5/Facades/System.Diagnostics.Process.dll
> lib/mono/4.5/Facades/System.Diagnostics.StackTrace.dll
> lib/mono/4.5/Facades/System.Diagnostics.TextWriterTraceListener.dll
>@@ -594,7 +594,6 @@ lib/mono/4.5/Facades/System.Linq.Queryable.dll
> lib/mono/4.5/Facades/System.Linq.dll
> lib/mono/4.5/Facades/System.Net.AuthenticationManager.dll
> lib/mono/4.5/Facades/System.Net.Cache.dll
>-lib/mono/4.5/Facades/System.Net.Http.WebRequestHandler.dll
> lib/mono/4.5/Facades/System.Net.HttpListener.dll
> lib/mono/4.5/Facades/System.Net.Mail.dll
> lib/mono/4.5/Facades/System.Net.NameResolution.dll
>@@ -609,8 +608,6 @@ lib/mono/4.5/Facades/System.Net.WebHeaderCollection.dll
> lib/mono/4.5/Facades/System.Net.WebSockets.Client.dll
> lib/mono/4.5/Facades/System.Net.WebSockets.dll
> lib/mono/4.5/Facades/System.ObjectModel.dll
>-lib/mono/4.5/Facades/System.Private.CoreLib.InteropServices.dll
>-lib/mono/4.5/Facades/System.Private.CoreLib.Threading.dll
> lib/mono/4.5/Facades/System.Reflection.Emit.ILGeneration.dll
> lib/mono/4.5/Facades/System.Reflection.Emit.Lightweight.dll
> lib/mono/4.5/Facades/System.Reflection.Emit.dll
>@@ -632,7 +629,6 @@ lib/mono/4.5/Facades/System.Runtime.Serialization.Xml.dll
> lib/mono/4.5/Facades/System.Runtime.dll
> lib/mono/4.5/Facades/System.Security.AccessControl.dll
> lib/mono/4.5/Facades/System.Security.Claims.dll
>-lib/mono/4.5/Facades/System.Security.Cryptography.Algorithms.dll
> lib/mono/4.5/Facades/System.Security.Cryptography.DeriveBytes.dll
> lib/mono/4.5/Facades/System.Security.Cryptography.Encoding.dll
> lib/mono/4.5/Facades/System.Security.Cryptography.Encryption.Aes.dll
>@@ -738,6 +734,7 @@ lib/mono/4.5/System.Data.OracleClient.dll
> lib/mono/4.5/System.Data.Services.Client.dll
> lib/mono/4.5/System.Data.Services.dll
> lib/mono/4.5/System.Data.dll
>+lib/mono/4.5/System.Deployment.dll
> lib/mono/4.5/System.Design.dll
> lib/mono/4.5/System.DirectoryServices.Protocols.dll
> lib/mono/4.5/System.DirectoryServices.dll
>@@ -795,8 +792,10 @@ lib/mono/4.5/System.Web.Extensions.dll
> lib/mono/4.5/System.Web.Http.SelfHost.dll
> lib/mono/4.5/System.Web.Http.WebHost.dll
> lib/mono/4.5/System.Web.Http.dll
>+lib/mono/4.5/System.Web.Mobile.dll
> lib/mono/4.5/System.Web.Mvc.dll
> lib/mono/4.5/System.Web.Razor.dll
>+lib/mono/4.5/System.Web.RegularExpressions.dll
> lib/mono/4.5/System.Web.Routing.dll
> lib/mono/4.5/System.Web.Services.dll
> lib/mono/4.5/System.Web.WebPages.Deployment.dll
>@@ -806,6 +805,9 @@ lib/mono/4.5/System.Web.dll
> lib/mono/4.5/System.Windows.Forms.DataVisualization.dll
> lib/mono/4.5/System.Windows.Forms.dll
> lib/mono/4.5/System.Windows.dll
>+lib/mono/4.5/System.Workflow.Activities.dll
>+lib/mono/4.5/System.Workflow.ComponentModel.dll
>+lib/mono/4.5/System.Workflow.Runtime.dll
> lib/mono/4.5/System.Xaml.dll
> lib/mono/4.5/System.Xml.Linq.dll
> lib/mono/4.5/System.Xml.Serialization.dll
>@@ -880,7 +882,10 @@ lib/mono/4.5/mkbundle.exe
> lib/mono/4.5/mkbundle.exe.mdb
> lib/mono/4.5/mod.exe
> lib/mono/4.5/mod.exe.mdb
>+lib/mono/4.5/mono-api-html.exe
>+lib/mono/4.5/mono-api-html.exe.mdb
> lib/mono/4.5/mono-api-info.exe
>+lib/mono/4.5/mono-api-info.exe.mdb
> lib/mono/4.5/mono-cil-strip.exe
> lib/mono/4.5/mono-cil-strip.exe.mdb
> lib/mono/4.5/mono-service.exe
>@@ -1086,6 +1091,8 @@ lib/mono/gac/System.Data.Services/4.0.0.0__b77a5c561934e089/System.Data.Services
> lib/mono/gac/System.Data.Services/4.0.0.0__b77a5c561934e089/System.Data.Services.dll.mdb
> lib/mono/gac/System.Data/4.0.0.0__b77a5c561934e089/System.Data.dll
> lib/mono/gac/System.Data/4.0.0.0__b77a5c561934e089/System.Data.dll.mdb
>+lib/mono/gac/System.Deployment/4.0.0.0__b03f5f7f11d50a3a/System.Deployment.dll
>+lib/mono/gac/System.Deployment/4.0.0.0__b03f5f7f11d50a3a/System.Deployment.dll.mdb
> lib/mono/gac/System.Design/4.0.0.0__b03f5f7f11d50a3a/System.Design.dll
> lib/mono/gac/System.Design/4.0.0.0__b03f5f7f11d50a3a/System.Design.dll.mdb
> lib/mono/gac/System.DirectoryServices.Protocols/4.0.0.0__b03f5f7f11d50a3a/System.DirectoryServices.Protocols.dll
>@@ -1200,10 +1207,14 @@ lib/mono/gac/System.Web.Http.WebHost/4.0.0.0__31bf3856ad364e35/System.Web.Http.W
> lib/mono/gac/System.Web.Http.WebHost/4.0.0.0__31bf3856ad364e35/System.Web.Http.WebHost.dll.mdb
> lib/mono/gac/System.Web.Http/4.0.0.0__31bf3856ad364e35/System.Web.Http.dll
> lib/mono/gac/System.Web.Http/4.0.0.0__31bf3856ad364e35/System.Web.Http.dll.mdb
>+lib/mono/gac/System.Web.Mobile/4.0.0.0__b03f5f7f11d50a3a/System.Web.Mobile.dll
>+lib/mono/gac/System.Web.Mobile/4.0.0.0__b03f5f7f11d50a3a/System.Web.Mobile.dll.mdb
> lib/mono/gac/System.Web.Mvc/%%GTK3_VERSION%%.0__31bf3856ad364e35/System.Web.Mvc.dll
> lib/mono/gac/System.Web.Mvc/%%GTK3_VERSION%%.0__31bf3856ad364e35/System.Web.Mvc.dll.mdb
> lib/mono/gac/System.Web.Razor/2.0.0.0__31bf3856ad364e35/System.Web.Razor.dll
> lib/mono/gac/System.Web.Razor/2.0.0.0__31bf3856ad364e35/System.Web.Razor.dll.mdb
>+lib/mono/gac/System.Web.RegularExpressions/4.0.0.0__b03f5f7f11d50a3a/System.Web.RegularExpressions.dll
>+lib/mono/gac/System.Web.RegularExpressions/4.0.0.0__b03f5f7f11d50a3a/System.Web.RegularExpressions.dll.mdb
> lib/mono/gac/System.Web.Routing/4.0.0.0__31bf3856ad364e35/System.Web.Routing.dll
> lib/mono/gac/System.Web.Routing/4.0.0.0__31bf3856ad364e35/System.Web.Routing.dll.mdb
> lib/mono/gac/System.Web.Services/4.0.0.0__b03f5f7f11d50a3a/System.Web.Services.dll
>@@ -1221,6 +1232,12 @@ lib/mono/gac/System.Windows.Forms.DataVisualization/4.0.0.0__31bf3856ad364e35/Sy
> lib/mono/gac/System.Windows.Forms/4.0.0.0__b77a5c561934e089/System.Windows.Forms.dll
> lib/mono/gac/System.Windows.Forms/4.0.0.0__b77a5c561934e089/System.Windows.Forms.dll.mdb
> lib/mono/gac/System.Windows/4.0.0.0__b03f5f7f11d50a3a/System.Windows.dll
>+lib/mono/gac/System.Workflow.Activities/4.0.0.0__31bf3856ad364e35/System.Workflow.Activities.dll
>+lib/mono/gac/System.Workflow.Activities/4.0.0.0__31bf3856ad364e35/System.Workflow.Activities.dll.mdb
>+lib/mono/gac/System.Workflow.ComponentModel/4.0.0.0__31bf3856ad364e35/System.Workflow.ComponentModel.dll
>+lib/mono/gac/System.Workflow.ComponentModel/4.0.0.0__31bf3856ad364e35/System.Workflow.ComponentModel.dll.mdb
>+lib/mono/gac/System.Workflow.Runtime/4.0.0.0__31bf3856ad364e35/System.Workflow.Runtime.dll
>+lib/mono/gac/System.Workflow.Runtime/4.0.0.0__31bf3856ad364e35/System.Workflow.Runtime.dll.mdb
> lib/mono/gac/System.Xaml/4.0.0.0__b77a5c561934e089/System.Xaml.dll
> lib/mono/gac/System.Xaml/4.0.0.0__b77a5c561934e089/System.Xaml.dll.mdb
> lib/mono/gac/System.Xml.Linq/4.0.0.0__b77a5c561934e089/System.Xml.Linq.dll
>@@ -1273,6 +1290,10 @@ lib/mono/xbuild-frameworks/.NETFramework/v4.5.2/RedistList/FrameworkList.xml
> lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml
> lib/mono/xbuild-frameworks/.NETFramework/v4.6.1/RedistList/FrameworkList.xml
> lib/mono/xbuild-frameworks/.NETFramework/v4.6/RedistList/FrameworkList.xml
>+lib/mono/xbuild-frameworks/.NETPortable/v5.0/RedistList/FrameworkList.xml
>+lib/mono/xbuild-frameworks/.NETPortable/v5.0/SupportedFrameworks/.NET Framework 4.6.xml
>+lib/mono/xbuild-frameworks/.NETPortable/v5.0/SupportedFrameworks/ASP.NET Core 1.0.xml
>+lib/mono/xbuild-frameworks/.NETPortable/v5.0/SupportedFrameworks/Windows Universal 10.0.xml
> lib/mono/xbuild/12.0/bin/MSBuild/Microsoft.Build.CommonTypes.xsd
> lib/mono/xbuild/12.0/bin/MSBuild/Microsoft.Build.Core.xsd
> lib/mono/xbuild/12.0/bin/Microsoft.Build.Engine.dll
>@@ -1290,6 +1311,9 @@ lib/mono/xbuild/12.0/bin/xbuild.exe
> lib/mono/xbuild/12.0/bin/xbuild.exe.config
> lib/mono/xbuild/12.0/bin/xbuild.exe.mdb
> lib/mono/xbuild/12.0/bin/xbuild.rsp
>+lib/mono/xbuild/14.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
>+lib/mono/xbuild/14.0/Microsoft.Common.props
>+lib/mono/xbuild/14.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
> lib/mono/xbuild/14.0/bin/MSBuild/Microsoft.Build.CommonTypes.xsd
> lib/mono/xbuild/14.0/bin/MSBuild/Microsoft.Build.Core.xsd
> lib/mono/xbuild/14.0/bin/Microsoft.Build.Engine.dll
>@@ -1307,6 +1331,10 @@ lib/mono/xbuild/14.0/bin/xbuild.exe
> lib/mono/xbuild/14.0/bin/xbuild.exe.config
> lib/mono/xbuild/14.0/bin/xbuild.exe.mdb
> lib/mono/xbuild/14.0/bin/xbuild.rsp
>+lib/mono/xbuild/Microsoft/NuGet/Microsoft.NuGet.Build.Tasks.dll
>+lib/mono/xbuild/Microsoft/NuGet/Microsoft.NuGet.Build.Tasks.dll.mdb
>+lib/mono/xbuild/Microsoft/NuGet/Microsoft.NuGet.props
>+lib/mono/xbuild/Microsoft/NuGet/Microsoft.NuGet.targets
> lib/mono/xbuild/Microsoft/Portable/Microsoft.Portable.Core.props
> lib/mono/xbuild/Microsoft/Portable/Microsoft.Portable.Core.targets
> lib/mono/xbuild/Microsoft/Portable/v4.0/Microsoft.Portable.CSharp.targets
>@@ -1318,6 +1346,9 @@ lib/mono/xbuild/Microsoft/Portable/v4.5/Microsoft.Portable.VisualBasic.targets
> lib/mono/xbuild/Microsoft/Portable/v4.6/Microsoft.Portable.CSharp.targets
> lib/mono/xbuild/Microsoft/Portable/v4.6/Microsoft.Portable.Common.targets
> lib/mono/xbuild/Microsoft/Portable/v4.6/Microsoft.Portable.VisualBasic.targets
>+lib/mono/xbuild/Microsoft/Portable/v5.0/Microsoft.Portable.CSharp.targets
>+lib/mono/xbuild/Microsoft/Portable/v5.0/Microsoft.Portable.Common.targets
>+lib/mono/xbuild/Microsoft/Portable/v5.0/Microsoft.Portable.VisualBasic.targets
> lib/mono/xbuild/Microsoft/VisualStudio/v10.0/WebApplications/Microsoft.WebApplication.targets
> lib/mono/xbuild/Microsoft/VisualStudio/v11.0/WebApplications/Microsoft.WebApplication.targets
> lib/mono/xbuild/Microsoft/VisualStudio/v12.0/WebApplications/Microsoft.WebApplication.targets

Actions: View | Diff

Attachments on bug 213484: 175758 | 175894 | 176176 | 176259