3 files changed, 36 insertions, 51 deletions

diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index e0c5d43f6275..df5ec829bdda 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fsharp
-PORTVERSION=	4.0.1.10
+PORTVERSION=	4.0.1.15
 CATEGORIES=	lang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -16,48 +16,22 @@ BUILD_DEPENDS=	mono>=3.0:lang/mono \
 		referenceassemblies-pcl>=4.6-1:lang/referenceassemblies-pcl
 RUN_DEPENDS=	mono>=3.0:lang/mono
 
-NUGET_DEPENDS=	FSharp.Compiler.Tools-4.0.1.3 \
-		FSharp.Data-2.2.5 \
-		FSharp.SRGen.Build.Tasks-3.0.0 \
-		fssrgen-3.0.0 \
-		Microsoft.DiaSymReader-1.0.8 \
-		Microsoft.DiaSymReader.PortablePdb-1.1.0 \
-		System.Collections.Immutable-1.2.0 \
-		System.Reflection.Metadata-1.4.1-beta-24227-04
+NUGET_DEPENDS=	FSharp.Compiler.Tools=4.0.1.3 \
+		FSharp.Data=2.2.5 \
+		FSharp.SRGen.Build.Tasks=3.0.0 \
+		fssrgen=3.0.0 \
+		Microsoft.DiaSymReader=1.0.8 \
+		Microsoft.DiaSymReader.PortablePdb=1.1.0 \
+		System.Collections.Immutable=1.2.0 \
+		System.Reflection.Metadata=1.4.1-beta-24227-04
 
 USE_GITHUB=	yes
 
-USES=		autoreconf gmake mono pkgconfig
+USES=		autoreconf gmake mono:nuget pkgconfig
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	Build not parallelizable
 NO_ARCH=	yes
 
-NUGET_PACKAGEDIR=	${WRKSRC}/packages
-
-.for depend in ${NUGET_DEPENDS}
-id=		${depend:C/-.*$//}
-version=	${depend:C/^[^-]*-//}
-group=		nuget_${id:S/.//g}
-nupkg=		${id:tl}.${version}.nupkg
-DISTFILES_${group}:=	${nupkg}:${group}
-MASTER_SITES_${group}:=	https://www.nuget.org/api/v2/package/${id}/${version}?dummy=/:${group}
-NUGET_NUPKGS_${group}:=	${nupkg}:${id}-${version}
-
-DISTFILES+=	${DISTFILES_nuget_${depend:C/-.*$//:S/.//g}}
-MASTER_SITES+=	${MASTER_SITES_nuget_${depend:C/-.*$//:S/.//g}}
-NUGET_NUPKGS+=	${NUGET_NUPKGS_nuget_${depend:C/-.*$//:S/.//g}}
-.endfor
-
-post-extract:
-.for nupkg in ${NUGET_NUPKGS}
-	@${MKDIR} ${NUGET_PACKAGEDIR}/${nupkg:C/^.*://:S/-/./}
-	@tar -xf ${DISTDIR}/${nupkg:C/:.*$//} -C ${NUGET_PACKAGEDIR}/${nupkg:C/^.*://:S/-/./} \
-		-s/%2B/\+/g -s/%2B/\+/g -s/%2B/\+/g \
-		--exclude '\[Content_Types\].xml' \
-		--exclude package/ \
-		--exclude _rels/
-.endfor
-
 do-test:
 	${MKDIR} ${WRKDIR}/bin
 	echo "#!/bin/sh" > ${WRKDIR}/bin/fsharpc
diff --git a/lang/fsharp/distinfo b/lang/fsharp/distinfo
index 004836ed7cb1..f1e79cc82856 100644
--- a/lang/fsharp/distinfo
+++ b/lang/fsharp/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1476128531
+TIMESTAMP = 1477322407
 SHA256 (fsharp.compiler.tools.4.0.1.3.nupkg) = 98a8792f59f4c9aa7ea02ab96644b71cf5dfe06d51fde0db1b0fe8373bee1ee4
 SIZE (fsharp.compiler.tools.4.0.1.3.nupkg) = 6323760
 SHA256 (fsharp.data.2.2.5.nupkg) = 449cba49c2567b0b1f27d39c0aaaab73607893072809a81563598b06e63234b1
@@ -15,5 +15,5 @@ SHA256 (system.collections.immutable.1.2.0.nupkg) = 7c9eec8208414eebce34f3af5c94
 SIZE (system.collections.immutable.1.2.0.nupkg) = 300738
 SHA256 (system.reflection.metadata.1.4.1-beta-24227-04.nupkg) = 0f077b4184d04f7db02e41169b9471e7c630c7dc873398f12eaf70b7a00a7993
 SIZE (system.reflection.metadata.1.4.1-beta-24227-04.nupkg) = 435719
-SHA256 (fsharp-fsharp-4.0.1.10_GH0.tar.gz) = 04659c8b89fc414fd6b5a8bf7842e187a3484abd4d858710339ee122219aa91b
-SIZE (fsharp-fsharp-4.0.1.10_GH0.tar.gz) = 37296094
+SHA256 (fsharp-fsharp-4.0.1.15_GH0.tar.gz) = 59dd17ca62d1a91f124b3cce8522bd01855ee15abf5ad38ad5d7b6b607a01f45
+SIZE (fsharp-fsharp-4.0.1.15_GH0.tar.gz) = 37324140
diff --git a/lang/fsharp/pkg-plist b/lang/fsharp/pkg-plist
index f84cfd9a8fd9..9f827c313abf 100644
--- a/lang/fsharp/pkg-plist
+++ b/lang/fsharp/pkg-plist
@@ -1,23 +1,14 @@
 bin/fsharpc
 bin/fsharpi
 bin/fsharpiAnyCpu
-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/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.259.FSharp.Core.dll
@@ -35,6 +26,8 @@ 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/Microsoft SDKs/F#/4.0/Framework/v4.0/Microsoft.FSharp.Targets
 lib/mono/Microsoft SDKs/F#/4.0/Framework/v4.0/Microsoft.Portable.FSharp.Targets
+lib/mono/Microsoft SDKs/F#/4.1/Framework/v4.0/Microsoft.FSharp.Targets
+lib/mono/Microsoft SDKs/F#/4.1/Framework/v4.0/Microsoft.Portable.FSharp.Targets
 lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.259.3.1/FSharp.Core.dll
 lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.259.3.1/FSharp.Core.optdata
 lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.259.3.1/FSharp.Core.sigdata
@@ -87,15 +80,31 @@ lib/mono/Reference Assemblies/Microsoft/FSharp/3.0/Runtime/.NETPortable/FSharp.C
 lib/mono/Reference Assemblies/Microsoft/FSharp/3.0/Runtime/.NETPortable/FSharp.Core.optdata
 lib/mono/Reference Assemblies/Microsoft/FSharp/3.0/Runtime/.NETPortable/FSharp.Core.sigdata
 lib/mono/Reference Assemblies/Microsoft/FSharp/3.0/Runtime/.NETPortable/FSharp.Core.xml
+lib/mono/fsharp/FSharp.Build.dll
+lib/mono/fsharp/FSharp.Build.xml
+lib/mono/fsharp/FSharp.Compiler.Interactive.Settings.dll
+lib/mono/fsharp/FSharp.Compiler.Interactive.Settings.xml
+lib/mono/fsharp/FSharp.Compiler.Server.Shared.dll
+lib/mono/fsharp/FSharp.Compiler.Server.Shared.xml
+lib/mono/fsharp/FSharp.Compiler.dll
+lib/mono/fsharp/FSharp.Compiler.xml
+lib/mono/fsharp/FSharp.Core.dll
+lib/mono/fsharp/FSharp.Core.optdata
+lib/mono/fsharp/FSharp.Core.sigdata
+lib/mono/fsharp/FSharp.Core.xml
+lib/mono/fsharp/Microsoft.FSharp.Targets
+lib/mono/fsharp/Microsoft.Portable.FSharp.Targets
+lib/mono/fsharp/System.Collections.Immutable.dll
+lib/mono/fsharp/System.Reflection.Metadata.dll
+lib/mono/fsharp/fsc.exe
+lib/mono/fsharp/fsi.exe
+lib/mono/fsharp/fsiAnyCpu.exe
 lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.4.0.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.dll
 lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.4.0.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.dll.mdb
 lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.4.0.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.xml
 lib/mono/gac/FSharp.Compiler.Server.Shared/4.4.0.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.dll
 lib/mono/gac/FSharp.Compiler.Server.Shared/4.4.0.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.dll.mdb
 lib/mono/gac/FSharp.Compiler.Server.Shared/4.4.0.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.xml
-lib/mono/gac/FSharp.Compiler/4.4.0.0__f536804aa0eb945b/FSharp.Compiler.dll
-lib/mono/gac/FSharp.Compiler/4.4.0.0__f536804aa0eb945b/FSharp.Compiler.dll.mdb
-lib/mono/gac/FSharp.Compiler/4.4.0.0__f536804aa0eb945b/FSharp.Compiler.xml
 lib/mono/gac/FSharp.Core/2.3.5.0__b03f5f7f11d50a3a/FSharp.Core.dll
 lib/mono/gac/FSharp.Core/2.3.5.0__b03f5f7f11d50a3a/FSharp.Core.optdata
 lib/mono/gac/FSharp.Core/2.3.5.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
@@ -171,6 +180,8 @@ lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.Portable.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp/Microsoft.FSharp.Targets
 lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp/Microsoft.Portable.FSharp.Targets
+lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.FSharp.Targets
+lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.Portable.FSharp.Targets
 @dir lib/mono/fsharp30/4.5
 @dir lib/mono/fsharp30/portable47
 @dir lib/mono/fsharp31/4.5