- Update to 3.1.1.25

PR:		191479 (based on)
Submitted by:	jack.pappas@gmail.com

3 files changed, 80 insertions, 89 deletions

diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index 225e7ecfcf1f..6f1d2d3c0d3f 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fsharp
-PORTVERSION=	3.0.34
+PORTVERSION=	3.1.1.25
 CATEGORIES=	lang
 
 MAINTAINER=	mono@FreeBSD.org
@@ -10,15 +10,14 @@ COMMENT=	Functional and object-oriented language for the .NET platform
 
 LICENSE=	APACHE20
 
-USES=		mono
 BUILD_DEPENDS=	mono>=3.0:${PORTSDIR}/lang/mono
 RUN_DEPENDS=	mono>=3.0:${PORTSDIR}/lang/mono
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}
-GH_COMMIT=	b0c16bb
+GH_COMMIT=	20a9d20
 
-USES=		gmake pkgconfig
+USES=		gmake mono pkgconfig
 USE_AUTOTOOLS=	autoconf
 
 .include <bsd.port.mk>
diff --git a/lang/fsharp/distinfo b/lang/fsharp/distinfo
index 420a2514b782..5e3686934a44 100644
--- a/lang/fsharp/distinfo
+++ b/lang/fsharp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fsharp-3.0.34.tar.gz) = e0023cfc43b50bfe58999dc8dbdaccfbbf4c71e25eec1730800c7c4a90294ed5
-SIZE (fsharp-3.0.34.tar.gz) = 13148706
+SHA256 (fsharp-3.1.1.25.tar.gz) = 17474ad7388f8e9a653ed4fe55dc427d053dbbc5f892acf653c6d685013a4715
+SIZE (fsharp-3.1.1.25.tar.gz) = 30733350
diff --git a/lang/fsharp/pkg-plist b/lang/fsharp/pkg-plist
index 41003ff88896..3bab40594293 100644
--- a/lang/fsharp/pkg-plist
+++ b/lang/fsharp/pkg-plist
@@ -4,14 +4,9 @@ bin/fsharpiAnyCpu
 lib/mono/2.0/FSharp.Core.dll
 lib/mono/2.0/FSharp.Core.optdata
 lib/mono/2.0/FSharp.Core.sigdata
+lib/mono/2.0/FSharp.Core.xml
 lib/mono/2.0/policy.2.0.FSharp.Core.dll
 lib/mono/2.0/policy.2.3.FSharp.Core.dll
-lib/mono/2.0/policy.4.0.FSharp.Core.dll
-lib/mono/2.0/policy.4.3.FSharp.Core.dll
-lib/mono/2.1/FSharp.Core.dll
-lib/mono/2.1/FSharp.Core.optdata
-lib/mono/2.1/FSharp.Core.sigdata
-lib/mono/2.1/FSharp.Core.xml
 lib/mono/4.0/FSharp.Build.dll
 lib/mono/4.0/FSharp.Build.xml
 lib/mono/4.0/FSharp.Compiler.Interactive.Settings.dll
@@ -29,13 +24,11 @@ lib/mono/4.0/FSharp.Data.TypeProviders.xml
 lib/mono/4.0/Microsoft.FSharp.Targets
 lib/mono/4.0/Microsoft.Portable.FSharp.Targets
 lib/mono/4.0/fsc.exe
-lib/mono/4.0/fsc.xml
 lib/mono/4.0/fsi.exe
-lib/mono/4.0/fsi.xml
 lib/mono/4.0/fsiAnyCpu.exe
-lib/mono/4.0/fsiAnyCpu.xml
 lib/mono/4.0/policy.2.0.FSharp.Core.dll
 lib/mono/4.0/policy.2.3.FSharp.Core.dll
+lib/mono/4.0/policy.3.3.FSharp.Core.dll
 lib/mono/4.0/policy.4.0.FSharp.Core.dll
 lib/mono/4.0/policy.4.3.FSharp.Core.dll
 lib/mono/Microsoft F#/v4.0/Microsoft.FSharp.Targets
@@ -44,103 +37,102 @@ lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/Microsoft.FSharp.Targets
 lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0/Microsoft.Portable.FSharp.Targets
 lib/mono/Microsoft SDKs/F#/3.1/Framework/v4.0/Microsoft.FSharp.Targets
 lib/mono/Microsoft SDKs/F#/3.1/Framework/v4.0/Microsoft.Portable.FSharp.Targets
-lib/mono/gac/FSharp.Build/4.3.0.0__f536804aa0eb945b/FSharp.Build.dll
-lib/mono/gac/FSharp.Build/4.3.0.0__f536804aa0eb945b/FSharp.Build.dll.mdb
-lib/mono/gac/FSharp.Build/4.3.0.0__f536804aa0eb945b/FSharp.Build.xml
-lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3.0.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.dll
-lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3.0.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.dll.mdb
-lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3.0.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.xml
-lib/mono/gac/FSharp.Compiler.Server.Shared/4.3.0.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.dll
-lib/mono/gac/FSharp.Compiler.Server.Shared/4.3.0.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.dll.mdb
-lib/mono/gac/FSharp.Compiler.Server.Shared/4.3.0.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.xml
-lib/mono/gac/FSharp.Compiler/4.3.0.0__f536804aa0eb945b/FSharp.Compiler.dll
-lib/mono/gac/FSharp.Compiler/4.3.0.0__f536804aa0eb945b/FSharp.Compiler.dll.mdb
-lib/mono/gac/FSharp.Compiler/4.3.0.0__f536804aa0eb945b/FSharp.Compiler.xml
+lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3.1.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.dll
+lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3.1.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.dll.mdb
+lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3.1.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.xml
+lib/mono/gac/FSharp.Compiler.Server.Shared/4.3.1.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.dll
+lib/mono/gac/FSharp.Compiler.Server.Shared/4.3.1.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.dll.mdb
+lib/mono/gac/FSharp.Compiler.Server.Shared/4.3.1.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.xml
+lib/mono/gac/FSharp.Compiler/4.3.1.0__f536804aa0eb945b/FSharp.Compiler.dll
+lib/mono/gac/FSharp.Compiler/4.3.1.0__f536804aa0eb945b/FSharp.Compiler.dll.mdb
+lib/mono/gac/FSharp.Compiler/4.3.1.0__f536804aa0eb945b/FSharp.Compiler.xml
 lib/mono/gac/FSharp.Core/2.3.0.0__b03f5f7f11d50a3a/FSharp.Core.dll
 lib/mono/gac/FSharp.Core/2.3.0.0__b03f5f7f11d50a3a/FSharp.Core.dll.mdb
 lib/mono/gac/FSharp.Core/2.3.0.0__b03f5f7f11d50a3a/FSharp.Core.optdata
 lib/mono/gac/FSharp.Core/2.3.0.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
+lib/mono/gac/FSharp.Core/2.3.0.0__b03f5f7f11d50a3a/FSharp.Core.xml
 lib/mono/gac/FSharp.Core/2.3.1.0__b03f5f7f11d50a3a/FSharp.Core.dll
 lib/mono/gac/FSharp.Core/2.3.1.0__b03f5f7f11d50a3a/FSharp.Core.dll.mdb
 lib/mono/gac/FSharp.Core/2.3.1.0__b03f5f7f11d50a3a/FSharp.Core.optdata
 lib/mono/gac/FSharp.Core/2.3.1.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
 lib/mono/gac/FSharp.Core/2.3.1.0__b03f5f7f11d50a3a/FSharp.Core.xml
+lib/mono/gac/FSharp.Core/2.3.98.1__b03f5f7f11d50a3a/FSharp.Core.dll
+lib/mono/gac/FSharp.Core/2.3.98.1__b03f5f7f11d50a3a/FSharp.Core.dll.mdb
+lib/mono/gac/FSharp.Core/2.3.98.1__b03f5f7f11d50a3a/FSharp.Core.optdata
+lib/mono/gac/FSharp.Core/2.3.98.1__b03f5f7f11d50a3a/FSharp.Core.sigdata
+lib/mono/gac/FSharp.Core/2.3.98.1__b03f5f7f11d50a3a/FSharp.Core.xml
 lib/mono/gac/FSharp.Core/4.3.0.0__b03f5f7f11d50a3a/FSharp.Core.dll
 lib/mono/gac/FSharp.Core/4.3.0.0__b03f5f7f11d50a3a/FSharp.Core.dll.mdb
 lib/mono/gac/FSharp.Core/4.3.0.0__b03f5f7f11d50a3a/FSharp.Core.optdata
 lib/mono/gac/FSharp.Core/4.3.0.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
 lib/mono/gac/FSharp.Core/4.3.0.0__b03f5f7f11d50a3a/FSharp.Core.xml
-lib/mono/gac/FSharp.Data.TypeProviders/4.3.0.0__f536804aa0eb945b/FSharp.Data.TypeProviders.dll
-lib/mono/gac/FSharp.Data.TypeProviders/4.3.0.0__f536804aa0eb945b/FSharp.Data.TypeProviders.dll.mdb
-lib/mono/gac/FSharp.Data.TypeProviders/4.3.0.0__f536804aa0eb945b/FSharp.Data.TypeProviders.xml
-lib/mono/gac/fsc/4.3.0.0__f536804aa0eb945b/fsc.exe
-lib/mono/gac/fsc/4.3.0.0__f536804aa0eb945b/fsc.exe.mdb
-lib/mono/gac/fsc/4.3.0.0__f536804aa0eb945b/fsc.xml
-lib/mono/gac/fsi/4.3.0.0__f536804aa0eb945b/fsi.exe
-lib/mono/gac/fsi/4.3.0.0__f536804aa0eb945b/fsi.exe.mdb
-lib/mono/gac/fsi/4.3.0.0__f536804aa0eb945b/fsi.xml
-lib/mono/gac/fsiAnyCpu/4.3.0.0__f536804aa0eb945b/fsiAnyCpu.exe
-lib/mono/gac/fsiAnyCpu/4.3.0.0__f536804aa0eb945b/fsiAnyCpu.exe.mdb
-lib/mono/gac/fsiAnyCpu/4.3.0.0__f536804aa0eb945b/fsiAnyCpu.xml
+lib/mono/gac/FSharp.Core/4.3.1.0__b03f5f7f11d50a3a/FSharp.Core.dll
+lib/mono/gac/FSharp.Core/4.3.1.0__b03f5f7f11d50a3a/FSharp.Core.dll.mdb
+lib/mono/gac/FSharp.Core/4.3.1.0__b03f5f7f11d50a3a/FSharp.Core.optdata
+lib/mono/gac/FSharp.Core/4.3.1.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
+lib/mono/gac/FSharp.Core/4.3.1.0__b03f5f7f11d50a3a/FSharp.Core.xml
+lib/mono/gac/FSharp.Data.TypeProviders/4.3.1.0__f536804aa0eb945b/FSharp.Data.TypeProviders.dll
+lib/mono/gac/FSharp.Data.TypeProviders/4.3.1.0__f536804aa0eb945b/FSharp.Data.TypeProviders.dll.mdb
+lib/mono/gac/FSharp.Data.TypeProviders/4.3.1.0__f536804aa0eb945b/FSharp.Data.TypeProviders.xml
 lib/mono/gac/policy.2.0.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.2.0.FSharp.Core.dll
 lib/mono/gac/policy.2.0.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.2.0.FSharp.Core.dll.config
 lib/mono/gac/policy.2.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.2.3.FSharp.Core.dll
 lib/mono/gac/policy.2.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.2.3.FSharp.Core.dll.config
+lib/mono/gac/policy.3.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.3.FSharp.Core.dll
+lib/mono/gac/policy.3.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.3.FSharp.Core.dll.config
 lib/mono/gac/policy.4.0.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.4.0.FSharp.Core.dll
 lib/mono/gac/policy.4.0.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.4.0.FSharp.Core.dll.config
 lib/mono/gac/policy.4.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.4.3.FSharp.Core.dll
 lib/mono/gac/policy.4.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.4.3.FSharp.Core.dll.config
+lib/mono/monodroid/FSharp.Core.dll
+lib/mono/monodroid/FSharp.Core.optdata
+lib/mono/monodroid/FSharp.Core.sigdata
+lib/mono/monodroid/FSharp.Core.xml
+lib/mono/monotouch/FSharp.Core.dll
+lib/mono/monotouch/FSharp.Core.optdata
+lib/mono/monotouch/FSharp.Core.sigdata
+lib/mono/monotouch/FSharp.Core.xml
 lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.Portable.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.Portable.FSharp.Targets
-@dirrmtry lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp
-@dirrmtry lib/mono/xbuild/Microsoft/VisualStudio/v12.0
-@dirrmtry lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp
-@dirrmtry lib/mono/xbuild/Microsoft/VisualStudio/v
-@dirrmtry lib/mono/xbuild/Microsoft/VisualStudio
-@dirrmtry lib/mono/xbuild/Microsoft
-@dirrmtry lib/mono/xbuild
-@dirrmtry lib/mono/gac/policy.4.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a
-@dirrmtry lib/mono/gac/policy.4.3.FSharp.Core
-@dirrmtry lib/mono/gac/policy.4.0.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a
-@dirrmtry lib/mono/gac/policy.4.0.FSharp.Core
-@dirrmtry lib/mono/gac/policy.2.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a
-@dirrmtry lib/mono/gac/policy.2.3.FSharp.Core
-@dirrmtry lib/mono/gac/policy.2.0.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a
-@dirrmtry lib/mono/gac/policy.2.0.FSharp.Core
-@dirrmtry lib/mono/gac/fsiAnyCpu/4.3.0.0__f536804aa0eb945b
-@dirrmtry lib/mono/gac/fsiAnyCpu
-@dirrmtry lib/mono/gac/fsi/4.3.0.0__f536804aa0eb945b
-@dirrmtry lib/mono/gac/fsi
-@dirrmtry lib/mono/gac/fsc/4.3.0.0__f536804aa0eb945b
-@dirrmtry lib/mono/gac/fsc
-@dirrmtry lib/mono/gac/FSharp.Data.TypeProviders/4.3.0.0__f536804aa0eb945b
-@dirrmtry lib/mono/gac/FSharp.Data.TypeProviders
-@dirrmtry lib/mono/gac/FSharp.Core/4.3.0.0__b03f5f7f11d50a3a
-@dirrmtry lib/mono/gac/FSharp.Core/2.3.1.0__b03f5f7f11d50a3a
-@dirrmtry lib/mono/gac/FSharp.Core/2.3.0.0__b03f5f7f11d50a3a
-@dirrmtry lib/mono/gac/FSharp.Core
-@dirrmtry lib/mono/gac/FSharp.Compiler/4.3.0.0__f536804aa0eb945b
-@dirrmtry lib/mono/gac/FSharp.Compiler.Server.Shared/4.3.0.0__f536804aa0eb945b
-@dirrmtry lib/mono/gac/FSharp.Compiler.Server.Shared
-@dirrmtry lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3.0.0__f536804aa0eb945b
-@dirrmtry lib/mono/gac/FSharp.Compiler.Interactive.Settings
-@dirrmtry lib/mono/gac/FSharp.Compiler
-@dirrmtry lib/mono/gac/FSharp.Build/4.3.0.0__f536804aa0eb945b
-@dirrmtry lib/mono/gac/FSharp.Build
-@dirrmtry lib/mono/gac
-@dirrmtry lib/mono/Microsoft SDKs/F#/3.1/Framework/v4.0
-@dirrmtry lib/mono/Microsoft SDKs/F#/3.1/Framework
-@dirrmtry lib/mono/Microsoft SDKs/F#/3.1
-@dirrmtry lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0
-@dirrmtry lib/mono/Microsoft SDKs/F#/3.0/Framework
-@dirrmtry lib/mono/Microsoft SDKs/F#/3.0
-@dirrmtry lib/mono/Microsoft SDKs/F#
-@dirrmtry lib/mono/Microsoft SDKs
-@dirrmtry lib/mono/Microsoft F#/v4.0
-@dirrmtry lib/mono/Microsoft F#
-@dirrmtry lib/mono/4.0
-@dirrmtry lib/mono/2.1
-@dirrmtry lib/mono/2.0
-@dirrmtry lib/mono
+@dirrm lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp
+@dirrm lib/mono/xbuild/Microsoft/VisualStudio/v12.0
+@dirrm lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp
+@dirrm lib/mono/xbuild/Microsoft/VisualStudio/v
+@dirrm lib/mono/monotouch
+@dirrm lib/mono/monodroid
+@dirrm lib/mono/gac/policy.4.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/policy.4.3.FSharp.Core
+@dirrm lib/mono/gac/policy.4.0.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/policy.4.0.FSharp.Core
+@dirrm lib/mono/gac/policy.3.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/policy.3.3.FSharp.Core
+@dirrm lib/mono/gac/policy.2.3.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/policy.2.3.FSharp.Core
+@dirrm lib/mono/gac/policy.2.0.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/policy.2.0.FSharp.Core
+@dirrm lib/mono/gac/FSharp.Data.TypeProviders/4.3.1.0__f536804aa0eb945b
+@dirrm lib/mono/gac/FSharp.Data.TypeProviders
+@dirrm lib/mono/gac/FSharp.Core/4.3.1.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/FSharp.Core/4.3.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/FSharp.Core/2.3.98.1__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/FSharp.Core/2.3.1.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/FSharp.Core/2.3.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/FSharp.Core
+@dirrm lib/mono/gac/FSharp.Compiler/4.3.1.0__f536804aa0eb945b
+@dirrm lib/mono/gac/FSharp.Compiler.Server.Shared/4.3.1.0__f536804aa0eb945b
+@dirrm lib/mono/gac/FSharp.Compiler.Server.Shared
+@dirrm lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.3.1.0__f536804aa0eb945b
+@dirrm lib/mono/gac/FSharp.Compiler.Interactive.Settings
+@dirrm lib/mono/gac/FSharp.Compiler
+@dirrm lib/mono/Microsoft SDKs/F#/3.1/Framework/v4.0
+@dirrm lib/mono/Microsoft SDKs/F#/3.1/Framework
+@dirrm lib/mono/Microsoft SDKs/F#/3.1
+@dirrm lib/mono/Microsoft SDKs/F#/3.0/Framework/v4.0
+@dirrm lib/mono/Microsoft SDKs/F#/3.0/Framework
+@dirrm lib/mono/Microsoft SDKs/F#/3.0
+@dirrm lib/mono/Microsoft SDKs/F#
+@dirrm lib/mono/Microsoft SDKs
+@dirrm lib/mono/Microsoft F#/v4.0
+@dirrm lib/mono/Microsoft F#