Index: head/lang/fsharp/Makefile
===================================================================
--- head/lang/fsharp/Makefile
+++ head/lang/fsharp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fsharp
-PORTVERSION=	3.1.1.25
+PORTVERSION=	3.1.2.5
 CATEGORIES=	lang
 
 MAINTAINER=	mono@FreeBSD.org
@@ -10,8 +10,6 @@
 
 LICENSE=	APACHE20
 
-BROKEN=		Fails to build with mono 4
-
 BUILD_DEPENDS=	mono>=3.0:${PORTSDIR}/lang/mono
 RUN_DEPENDS=	mono>=3.0:${PORTSDIR}/lang/mono
 
Index: head/lang/fsharp/distinfo
===================================================================
--- head/lang/fsharp/distinfo
+++ head/lang/fsharp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fsharp-fsharp-3.1.1.25_GH0.tar.gz) = 6dc0f240d0e91b11c7868ae7c688f28fad98b30b2ab0aba4ace83c32f1e12fef
-SIZE (fsharp-fsharp-3.1.1.25_GH0.tar.gz) = 30733889
+SHA256 (fsharp-fsharp-3.1.2.5_GH0.tar.gz) = 017edcbdc96d5c1f2cc2f359e5e5d806de5a33eba9aab4340bd22109f7b7d4c8
+SIZE (fsharp-fsharp-3.1.2.5_GH0.tar.gz) = 41465153
Index: head/lang/fsharp/pkg-plist
===================================================================
--- head/lang/fsharp/pkg-plist
+++ head/lang/fsharp/pkg-plist
@@ -1,97 +1,74 @@
 bin/fsharpc
 bin/fsharpi
 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/4.0/FSharp.Build.dll
-lib/mono/4.0/FSharp.Build.xml
-lib/mono/4.0/FSharp.Compiler.Interactive.Settings.dll
-lib/mono/4.0/FSharp.Compiler.Interactive.Settings.xml
-lib/mono/4.0/FSharp.Compiler.Server.Shared.dll
-lib/mono/4.0/FSharp.Compiler.Server.Shared.xml
-lib/mono/4.0/FSharp.Compiler.dll
-lib/mono/4.0/FSharp.Compiler.xml
 lib/mono/4.0/FSharp.Core.dll
 lib/mono/4.0/FSharp.Core.optdata
 lib/mono/4.0/FSharp.Core.sigdata
 lib/mono/4.0/FSharp.Core.xml
-lib/mono/4.0/FSharp.Data.TypeProviders.dll
-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/fsi.exe
-lib/mono/4.0/fsiAnyCpu.exe
-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/4.5/FSharp.Build.dll
+lib/mono/4.5/FSharp.Build.xml
+lib/mono/4.5/FSharp.Compiler.Interactive.Settings.dll
+lib/mono/4.5/FSharp.Compiler.Interactive.Settings.xml
+lib/mono/4.5/FSharp.Compiler.Server.Shared.dll
+lib/mono/4.5/FSharp.Compiler.Server.Shared.xml
+lib/mono/4.5/FSharp.Compiler.dll
+lib/mono/4.5/FSharp.Compiler.xml
+lib/mono/4.5/FSharp.Core.dll
+lib/mono/4.5/FSharp.Core.optdata
+lib/mono/4.5/FSharp.Core.sigdata
+lib/mono/4.5/FSharp.Core.xml
+lib/mono/4.5/FSharp.Data.TypeProviders.dll
+lib/mono/4.5/FSharp.Data.TypeProviders.xml
+lib/mono/4.5/Microsoft.FSharp.Targets
+lib/mono/4.5/Microsoft.Portable.FSharp.Targets
+lib/mono/4.5/fsc.exe
+lib/mono/4.5/fsi.exe
+lib/mono/4.5/fsiAnyCpu.exe
+lib/mono/4.5/policy.2.0.FSharp.Core.dll
+lib/mono/4.5/policy.2.3.FSharp.Core.dll
+lib/mono/4.5/policy.3.3.FSharp.Core.dll
+lib/mono/4.5/policy.4.0.FSharp.Core.dll
+lib/mono/4.5/policy.4.3.FSharp.Core.dll
 lib/mono/Microsoft F#/v4.0/Microsoft.FSharp.Targets
 lib/mono/Microsoft F#/v4.0/Microsoft.Portable.FSharp.Targets
 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.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.xml
+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.optdata
+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.xml
+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.optdata
+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.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.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.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.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