Index: lang/fsharp/Makefile =================================================================== --- lang/fsharp/Makefile +++ lang/fsharp/Makefile @@ -2,38 +2,24 @@ # $FreeBSD: head/lang/fsharp/Makefile 460430 2018-01-30 19:00:27Z dbn $ PORTNAME= fsharp -PORTVERSION= 4.1.18 -PORTREVISION= 1 +PORTVERSION= 10.0.2 CATEGORIES= lang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= mono@FreeBSD.org COMMENT= Functional and object-oriented language for the .NET platform -LICENSE= APACHE20 +LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= mono>=3.0:lang/mono \ - referenceassemblies-pcl>=4.6-1:lang/referenceassemblies-pcl -RUN_DEPENDS= mono>=3.0:lang/mono +BUILD_DEPENDS= msbuild:devel/msbuild TEST_DEPENDS= libgdiplus>=0:x11-toolkits/libgdiplus -NUGET_DEPENDS= FSharp.Compiler.Tools=4.1.5 \ - FSharp.Data=2.2.5 \ - FsCheck=2.6.2 \ - FsLexYacc=7.0.4 \ - Microsoft.DiaSymReader=1.1.0 \ - Microsoft.DiaSymReader.PortablePdb=1.1.0 \ - NUnit=3.5.0 \ - System.Collections.Immutable=1.2.0 \ - System.Reflection.Metadata=1.4.2 \ - System.ValueTuple=4.3.0 - USE_GITHUB= yes -USES= autoreconf gmake mono:nuget pkgconfig -GNU_CONFIGURE= yes +USES= gmake mono:nuget pkgconfig MAKE_JOBS_UNSAFE= Build not parallelizable +NUGET_LAYOUT= legacy NO_ARCH= yes do-test: Index: lang/fsharp/distinfo =================================================================== --- lang/fsharp/distinfo +++ lang/fsharp/distinfo @@ -1,23 +1,39 @@ -TIMESTAMP = 1516477948 -SHA256 (fsharp.compiler.tools.4.1.5.nupkg) = 176081939f06903cf44b16fe78c3427c296f9647994098c02bccb9caea203f71 -SIZE (fsharp.compiler.tools.4.1.5.nupkg) = 10964228 +TIMESTAMP = 1530287193 +SHA256 (fsharp.compiler.tools.4.1.27.nupkg) = de71f1fc7985036abc137e33220bd5c4159eea1750f3c273d10ea23d92fe7d25 +SIZE (fsharp.compiler.tools.4.1.27.nupkg) = 11484408 +SHA256 (fsharp.core.3.0.2.nupkg) = 8257c6eb51ff3725592a0c98b2694a1d511900d887f0447c9417d961067c51ed +SIZE (fsharp.core.3.0.2.nupkg) = 1891844 +SHA256 (fsharp.core.3.1.2.5.nupkg) = cc20a2e8784ba0ad5ce43056bc65e78ac85b1b580f3928b9130d71886291375c +SIZE (fsharp.core.3.1.2.5.nupkg) = 4928202 +SHA256 (fsharp.core.4.0.0.1.nupkg) = f67929917b5d91f03019718ea5eec5aefcd38b7f15feb677c981a2df3a93d006 +SIZE (fsharp.core.4.0.0.1.nupkg) = 5323731 +SHA256 (fsharp.core.4.1.17.nupkg) = c8a7828e21491c638e6dd8af65ae4feb85fe3e7f2bad1075251a24e60f43061a +SIZE (fsharp.core.4.1.17.nupkg) = 8780247 SHA256 (fsharp.data.2.2.5.nupkg) = 449cba49c2567b0b1f27d39c0aaaab73607893072809a81563598b06e63234b1 SIZE (fsharp.data.2.2.5.nupkg) = 2542684 SHA256 (fscheck.2.6.2.nupkg) = 743b3c58664595b4ef2a6efab02f29ad77b3e5330d0087c3f8c144c2f4f6093a SIZE (fscheck.2.6.2.nupkg) = 1581783 -SHA256 (fslexyacc.7.0.4.nupkg) = 91fb4128718677d9ff8a57d42e91b5958117d63d8d6701fc02ae2d7fc16af707 -SIZE (fslexyacc.7.0.4.nupkg) = 647181 +SHA256 (fslexyacc.7.0.6.nupkg) = 5052d8eff11e0f08c375812f89c1cb4a2f4855e434935bbb93a3aab72bb8435b +SIZE (fslexyacc.7.0.6.nupkg) = 728844 SHA256 (microsoft.diasymreader.1.1.0.nupkg) = 083d032755638b6a31df4df90ccf7b4f59f477616512b16c687a766f8de7af11 SIZE (microsoft.diasymreader.1.1.0.nupkg) = 78362 -SHA256 (microsoft.diasymreader.portablepdb.1.1.0.nupkg) = 694e0b200583a9c73d45dd138b82826113422ed2770fc7f685dfcd3e9cd53cee -SIZE (microsoft.diasymreader.portablepdb.1.1.0.nupkg) = 140770 +SHA256 (microsoft.diasymreader.portablepdb.1.2.0.nupkg) = bfd182f3b326dd4e1bf1a5e151bb0591aab96646d1bb39a97ae97f0a1ed64861 +SIZE (microsoft.diasymreader.portablepdb.1.2.0.nupkg) = 152175 +SHA256 (microsoft.build.14.3.0.nupkg) = b0859445d955b62a1e3601f9315fa80437fcb6196855089dfc3a490cd6d55f9a +SIZE (microsoft.build.14.3.0.nupkg) = 645770 +SHA256 (microsoft.build.framework.14.3.0.nupkg) = b073ad40cae69893f1c75fc7e94ab3a474b3b3dc7e81a7ba4b20e2d18ee0e1a6 +SIZE (microsoft.build.framework.14.3.0.nupkg) = 71558 +SHA256 (microsoft.build.utilities.core.14.3.0.nupkg) = 919a6748daa0b82cfebe29cd6c95f808d6dd6684b4afd37255a3704022b16576 +SIZE (microsoft.build.utilities.core.14.3.0.nupkg) = 177716 +SHA256 (microsoft.build.tasks.core.14.3.0.nupkg) = ac6e6f690bc36a0bdfbbfb2b348ac05a7647004a71e09f612f76a7a25e823f06 +SIZE (microsoft.build.tasks.core.14.3.0.nupkg) = 484922 SHA256 (nunit.3.5.0.nupkg) = df846860c416b24821e6d2a4554fecee86a3f10f362356547b9e94e358c2dda5 SIZE (nunit.3.5.0.nupkg) = 1321223 -SHA256 (system.collections.immutable.1.2.0.nupkg) = 7c9eec8208414eebce34f3af5c946f2911e74fd906738f058114d341f0df91fb -SIZE (system.collections.immutable.1.2.0.nupkg) = 300738 +SHA256 (system.collections.immutable.1.3.1.nupkg) = 82210f4527d0d1f8de5c1ffa86c466130d0664540b96dd88e031e533cf652e91 +SIZE (system.collections.immutable.1.3.1.nupkg) = 371114 SHA256 (system.reflection.metadata.1.4.2.nupkg) = f16413c3739d246d93790c8e93cf3edb1e80e1cdfcc1c9fc13e5f932da6bd0a5 SIZE (system.reflection.metadata.1.4.2.nupkg) = 486695 -SHA256 (system.valuetuple.4.3.0.nupkg) = 085953297af7b0ba0b9f34d7a4431d33b01bdcb5660e9ed509a4c03ecad1e502 -SIZE (system.valuetuple.4.3.0.nupkg) = 77825 -SHA256 (fsharp-fsharp-4.1.18_GH0.tar.gz) = 9009e79b3b57dda81c2ec4436713d57f01550d139e920461286673714b5f2de1 -SIZE (fsharp-fsharp-4.1.18_GH0.tar.gz) = 41632921 +SHA256 (system.valuetuple.4.3.1.nupkg) = 9770fd40d3a635c377f8a5eb37f663b9d943c95743c22b5b9619a8d22d75a3d8 +SIZE (system.valuetuple.4.3.1.nupkg) = 79198 +SHA256 (fsharp-fsharp-10.0.2_GH0.tar.gz) = 1ae5e5e842df91f9f27aafa97109d74812219bc695384c5d8f1e8fbc5991d0ce +SIZE (fsharp-fsharp-10.0.2_GH0.tar.gz) = 45328911 Index: lang/fsharp/files/patch-Makefile =================================================================== --- lang/fsharp/files/patch-Makefile +++ lang/fsharp/files/patch-Makefile @@ -1,11 +1,10 @@ ---- Makefile.orig 2017-04-30 09:29:26 UTC +--- Makefile.orig 2018-04-30 23:30:26 UTC +++ Makefile -@@ -13,7 +13,7 @@ all: +@@ -20,7 +20,6 @@ all: + @echo monolibdir=$(monolibdir) + @echo monobindir=$(monobindir) + @echo ----------- +- $(MAKE) restore $(MAKE) build-proto $(MAKE) build --build-proto: restore -+build-proto: - MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj - MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj - MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/Fsc-proto/Fsc-proto.fsproj Index: lang/fsharp/nupkg-nuget =================================================================== --- /dev/null +++ lang/fsharp/nupkg-nuget @@ -0,0 +1,18 @@ +FSharp.Compiler.Tools=4.1.27 +FSharp.Core=3.0.2 +FSharp.Core=3.1.2.5 +FSharp.Core=4.0.0.1 +FSharp.Core=4.1.17 +FSharp.Data=2.2.5 +FsCheck=2.6.2 +FsLexYacc=7.0.6 +Microsoft.DiaSymReader=1.1.0 +Microsoft.DiaSymReader.PortablePdb=1.2.0 +Microsoft.Build=14.3.0 +Microsoft.Build.Framework=14.3.0 +Microsoft.Build.Utilities.Core=14.3.0 +Microsoft.Build.Tasks.Core=14.3.0 +NUnit=3.5.0 +System.Collections.Immutable=1.3.1 +System.Reflection.Metadata=1.4.2 +System.ValueTuple=4.3.1 Index: lang/fsharp/pkg-plist =================================================================== --- lang/fsharp/pkg-plist +++ lang/fsharp/pkg-plist @@ -1,10 +1,6 @@ bin/fsharpc bin/fsharpi bin/fsharpiAnyCpu -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/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 @@ -19,10 +15,10 @@ 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.Private.dll +lib/mono/fsharp/FSharp.Compiler.Private.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 @@ -69,88 +65,23 @@ lib/mono/fsharp/fsi.exe.config lib/mono/fsharp/fsiAnyCpu.exe lib/mono/fsharp/fsiAnyCpu.exe.config -lib/mono/fsharp/policy.2.0.FSharp.Core.dll -lib/mono/fsharp/policy.2.0.FSharp.Core.dll.config -lib/mono/fsharp/policy.2.3.FSharp.Core.dll -lib/mono/fsharp/policy.2.3.FSharp.Core.dll.config -lib/mono/fsharp/policy.3.259.FSharp.Core.dll -lib/mono/fsharp/policy.3.259.FSharp.Core.dll.config -lib/mono/fsharp/policy.3.3.FSharp.Core.dll -lib/mono/fsharp/policy.3.3.FSharp.Core.dll.config -lib/mono/fsharp/policy.3.47.FSharp.Core.dll -lib/mono/fsharp/policy.3.47.FSharp.Core.dll.config -lib/mono/fsharp/policy.3.7.FSharp.Core.dll -lib/mono/fsharp/policy.3.7.FSharp.Core.dll.config -lib/mono/fsharp/policy.3.78.FSharp.Core.dll -lib/mono/fsharp/policy.3.78.FSharp.Core.dll.config -lib/mono/fsharp/policy.4.0.FSharp.Core.dll -lib/mono/fsharp/policy.4.0.FSharp.Core.dll.config -lib/mono/fsharp/policy.4.3.FSharp.Core.dll -lib/mono/fsharp/policy.4.3.FSharp.Core.dll.config -lib/mono/fsharp/policy.4.4.FSharp.Core.dll -lib/mono/fsharp/policy.4.4.FSharp.Core.dll.config -lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.4.1.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.dll -lib/mono/gac/FSharp.Compiler.Interactive.Settings/4.4.1.0__f536804aa0eb945b/FSharp.Compiler.Interactive.Settings.xml -lib/mono/gac/FSharp.Compiler.Server.Shared/4.4.1.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.dll -lib/mono/gac/FSharp.Compiler.Server.Shared/4.4.1.0__f536804aa0eb945b/FSharp.Compiler.Server.Shared.xml -lib/mono/gac/FSharp.Core/3.259.41.0__b03f5f7f11d50a3a/FSharp.Core.dll -lib/mono/gac/FSharp.Core/3.259.41.0__b03f5f7f11d50a3a/FSharp.Core.optdata -lib/mono/gac/FSharp.Core/3.259.41.0__b03f5f7f11d50a3a/FSharp.Core.sigdata -lib/mono/gac/FSharp.Core/3.259.41.0__b03f5f7f11d50a3a/FSharp.Core.xml -lib/mono/gac/FSharp.Core/3.47.41.0__b03f5f7f11d50a3a/FSharp.Core.dll -lib/mono/gac/FSharp.Core/3.47.41.0__b03f5f7f11d50a3a/FSharp.Core.optdata -lib/mono/gac/FSharp.Core/3.47.41.0__b03f5f7f11d50a3a/FSharp.Core.sigdata -lib/mono/gac/FSharp.Core/3.47.41.0__b03f5f7f11d50a3a/FSharp.Core.xml -lib/mono/gac/FSharp.Core/3.7.41.0__b03f5f7f11d50a3a/FSharp.Core.dll -lib/mono/gac/FSharp.Core/3.7.41.0__b03f5f7f11d50a3a/FSharp.Core.optdata -lib/mono/gac/FSharp.Core/3.7.41.0__b03f5f7f11d50a3a/FSharp.Core.sigdata -lib/mono/gac/FSharp.Core/3.7.41.0__b03f5f7f11d50a3a/FSharp.Core.xml -lib/mono/gac/FSharp.Core/3.78.41.0__b03f5f7f11d50a3a/FSharp.Core.dll -lib/mono/gac/FSharp.Core/3.78.41.0__b03f5f7f11d50a3a/FSharp.Core.optdata -lib/mono/gac/FSharp.Core/3.78.41.0__b03f5f7f11d50a3a/FSharp.Core.sigdata -lib/mono/gac/FSharp.Core/3.78.41.0__b03f5f7f11d50a3a/FSharp.Core.xml -lib/mono/gac/FSharp.Core/3.98.41.0__b03f5f7f11d50a3a/FSharp.Core.dll -lib/mono/gac/FSharp.Core/3.98.41.0__b03f5f7f11d50a3a/FSharp.Core.optdata -lib/mono/gac/FSharp.Core/3.98.41.0__b03f5f7f11d50a3a/FSharp.Core.sigdata -lib/mono/gac/FSharp.Core/3.98.41.0__b03f5f7f11d50a3a/FSharp.Core.xml -lib/mono/gac/FSharp.Core/3.99.41.0__b03f5f7f11d50a3a/FSharp.Core.dll -lib/mono/gac/FSharp.Core/3.99.41.0__b03f5f7f11d50a3a/FSharp.Core.optdata -lib/mono/gac/FSharp.Core/3.99.41.0__b03f5f7f11d50a3a/FSharp.Core.sigdata -lib/mono/gac/FSharp.Core/3.99.41.0__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.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.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.Core/4.4.0.0__b03f5f7f11d50a3a/FSharp.Core.dll -lib/mono/gac/FSharp.Core/4.4.0.0__b03f5f7f11d50a3a/FSharp.Core.optdata -lib/mono/gac/FSharp.Core/4.4.0.0__b03f5f7f11d50a3a/FSharp.Core.sigdata -lib/mono/gac/FSharp.Core/4.4.0.0__b03f5f7f11d50a3a/FSharp.Core.xml -lib/mono/gac/FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/FSharp.Core.dll -lib/mono/gac/FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/FSharp.Core.dll.mdb -lib/mono/gac/FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/FSharp.Core.optdata -lib/mono/gac/FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/FSharp.Core.sigdata -lib/mono/gac/FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/FSharp.Core.xml -lib/mono/gac/policy.2.0.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.2.0.FSharp.Core.dll -lib/mono/gac/policy.2.3.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.2.3.FSharp.Core.dll -lib/mono/gac/policy.3.259.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.3.259.FSharp.Core.dll -lib/mono/gac/policy.3.3.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.3.3.FSharp.Core.dll -lib/mono/gac/policy.3.47.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.3.47.FSharp.Core.dll -lib/mono/gac/policy.3.7.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.3.7.FSharp.Core.dll -lib/mono/gac/policy.3.78.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.3.78.FSharp.Core.dll -lib/mono/gac/policy.4.0.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.4.0.FSharp.Core.dll -lib/mono/gac/policy.4.3.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.4.3.FSharp.Core.dll -lib/mono/gac/policy.4.4.FSharp.Core/4.4.1.0__b03f5f7f11d50a3a/policy.4.4.FSharp.Core.dll +lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.NetSdk.props +lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.NetSdk.targets 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/v11.0/FSharp/Microsoft.FSharp.NetSdk.props +lib/mono/xbuild/Microsoft/VisualStudio/v11.0/FSharp/Microsoft.FSharp.NetSdk.targets lib/mono/xbuild/Microsoft/VisualStudio/v11.0/FSharp/Microsoft.FSharp.Targets lib/mono/xbuild/Microsoft/VisualStudio/v11.0/FSharp/Microsoft.Portable.FSharp.Targets +lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.FSharp.NetSdk.props +lib/mono/xbuild/Microsoft/VisualStudio/v12.0/FSharp/Microsoft.FSharp.NetSdk.targets 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.NetSdk.props +lib/mono/xbuild/Microsoft/VisualStudio/v14.0/FSharp/Microsoft.FSharp.NetSdk.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.NetSdk.props +lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.FSharp.NetSdk.targets lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.FSharp.Targets lib/mono/xbuild/Microsoft/VisualStudio/v15.0/FSharp/Microsoft.Portable.FSharp.Targets