aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authordbn <dbn@FreeBSD.org>2017-05-13 15:48:27 +0800
committerdbn <dbn@FreeBSD.org>2017-05-13 15:48:27 +0800
commitcdd338898168c5433c6a41ccac53bd737f1e8a65 (patch)
tree49cb02a5345106972d552c46d0d56e85303bd298 /lang
parent4ca1061cb6e6c72be5e26a1dd4ed19a2587fb0cd (diff)
downloadfreebsd-ports-gnome-cdd338898168c5433c6a41ccac53bd737f1e8a65.tar.gz
freebsd-ports-gnome-cdd338898168c5433c6a41ccac53bd737f1e8a65.tar.zst
freebsd-ports-gnome-cdd338898168c5433c6a41ccac53bd737f1e8a65.zip
Update mono and related ports
USES=mono: minor fixes - save a copy of the nuget package in the packages directory - force linking of directories, allowing nuget-extract to be rerun without `make clean` - fix makenuget: nuget requires an equals to identify the version, not a dash devel/monodevelop: update to 6.2.1.3 - update nuget packages: - link older System.Collection.Immutable 1.1.37 to newer 1.3.1 (used by C# and F# respectively) - update external github repositories - allow post-extract target to be run multiple times - change MonoDevelop.Packaging to use a newer version of NuGet.Build.Packaging (the older version is no longer fetchable) - remove patch integrated upstream - moved `nuget restore` patching from post-patch into a patch file (the former broke silently) - ChangeLog: - https://developer.xamarin.com/releases/studio/xamarin.studio_6.2/xamarin.studio_6.2/ irc/smartirc4net: update to 1.1 - add LICENSE lang/fsharp: update to 4.1.18 - add test dependency on libgdiplus - update nuget packages - update test paths for fsharp assemblies - update patches to prevent `nuget restore` from running - ChangeLog: - Set executable bit correctly on output - Integrate visualfsharp - Fix regression on binding redirects for System.Collections.Immutable - Fix regression in Microsoft.Build.FSharp.targets - Fix binding redirects for System.Collections.Immutable - Fix version of library going in %PREFIX/lib/mono/fsharp - Align fsc task and target file - Use install layout that includes mono/fsharp - Fix F# Intereactive on Mono 4.9+ - Update compiler tools - Updates to FSharp.Core nuget package for F# 4.1 - Fix #656: error FS0193: internal error: No access to the given key lang/mono: various fixes - fix linking with lld [1] - double maximum handle size [2] - add option to run acceptance tests - allow for optional bootstrapping of mono via either installed mcs (if available) or via downloaded "monolite" (default) - add python and py-pillow as dependencies for bin/mono-heapviz - add armv6 as a supported architecture (untested) - switch to github for source code: - official tarball does not include tests - patches: - recognise FreeBSD for AOT suffix - change mono-heapviz to use pillow instead of PIL multimedia/banshee: tell portscout to ignore this port - Portscout was not skipping the 2.9.1 version, and upstream appears to be quiet for the last few years. x11-toolkits/gtk-sharp20: update to 2.12.43 - ChangeLog: - fix compilation on mono-4.8.0 (incorrect use of sizeof()) - correctly set owned=true on custom constructors PR: 218885 [1] PR: 200937 [2]
Diffstat (limited to 'lang')
-rw-r--r--lang/fsharp/Makefile19
-rw-r--r--lang/fsharp/distinfo30
-rw-r--r--lang/fsharp/files/patch-Makefile11
-rw-r--r--lang/fsharp/files/patch-Makefile.in10
-rw-r--r--lang/fsharp/files/patch-src_FSharpSource.targets9
-rw-r--r--lang/fsharp/pkg-plist235
-rw-r--r--lang/mono/Makefile77
-rw-r--r--lang/mono/distinfo38
-rw-r--r--lang/mono/files/patch-configure.ac19
-rw-r--r--lang/mono/files/patch-mono_utils_mono-compiler.h18
-rw-r--r--lang/mono/files/patch-mono_utils_w32handle.c11
-rw-r--r--lang/mono/files/patch-scripts_mono-heapviz11
-rw-r--r--lang/mono/pkg-plist4
13 files changed, 294 insertions, 198 deletions
diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index 59586e44f060..2c0c4c724fc6 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fsharp
-PORTVERSION= 4.0.1.20
+PORTVERSION= 4.1.18
CATEGORIES= lang
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -15,15 +15,18 @@ 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
+TEST_DEPENDS= libgdiplus>=0:x11-toolkits/libgdiplus
-NUGET_DEPENDS= FSharp.Compiler.Tools=4.0.1.3 \
+NUGET_DEPENDS= FSharp.Compiler.Tools=4.1.5 \
FSharp.Data=2.2.5 \
- FSharp.SRGen.Build.Tasks=3.0.0 \
- fssrgen=3.0.0 \
- Microsoft.DiaSymReader=1.0.8 \
+ 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.1-beta-24227-04
+ System.Reflection.Metadata=1.4.2 \
+ System.ValueTuple=4.3.0
USE_GITHUB= yes
@@ -35,12 +38,12 @@ NO_ARCH= yes
do-test:
${MKDIR} ${WRKDIR}/bin
echo "#!/bin/sh" > ${WRKDIR}/bin/fsharpc
- echo 'exec ${LOCALBASE}/bin/mono ${WRKSRC}/lib/release/fsc.exe "$$@"' >> ${WRKDIR}/bin/fsharpc
+ echo 'exec ${LOCALBASE}/bin/mono ${WRKSRC}/Release/net40/bin/fsc.exe "$$@"' >> ${WRKDIR}/bin/fsharpc
${CHMOD} 0755 ${WRKDIR}/bin/fsharpc
(cd ${WRKSRC}/tests/fsharp/core; \
${ENV} \
PATH=${WRKDIR}/bin:${PATH} \
- MONO_PATH=${WRKSRC}/lib/release \
+ MONO_PATH=${WRKSRC}/Release/net40/bin \
./run-all.sh)
.include <bsd.port.mk>
diff --git a/lang/fsharp/distinfo b/lang/fsharp/distinfo
index c4b37e880ce5..1b4bcb6e88da 100644
--- a/lang/fsharp/distinfo
+++ b/lang/fsharp/distinfo
@@ -1,19 +1,23 @@
-TIMESTAMP = 1479572291
-SHA256 (fsharp.compiler.tools.4.0.1.3.nupkg) = 98a8792f59f4c9aa7ea02ab96644b71cf5dfe06d51fde0db1b0fe8373bee1ee4
-SIZE (fsharp.compiler.tools.4.0.1.3.nupkg) = 6323760
+TIMESTAMP = 1493555107
+SHA256 (fsharp.compiler.tools.4.1.5.nupkg) = 176081939f06903cf44b16fe78c3427c296f9647994098c02bccb9caea203f71
+SIZE (fsharp.compiler.tools.4.1.5.nupkg) = 10964228
SHA256 (fsharp.data.2.2.5.nupkg) = 449cba49c2567b0b1f27d39c0aaaab73607893072809a81563598b06e63234b1
SIZE (fsharp.data.2.2.5.nupkg) = 2542684
-SHA256 (fsharp.srgen.build.tasks.3.0.0.nupkg) = dc368423704dbfd02659452535e1a270e75c75fb066a4b47b7e0c2442ea77c00
-SIZE (fsharp.srgen.build.tasks.3.0.0.nupkg) = 457178
-SHA256 (fssrgen.3.0.0.nupkg) = 81c6ef8556fada34f184195903200977c3174329be5caa472bcf0c1ef2d6a7e4
-SIZE (fssrgen.3.0.0.nupkg) = 465727
-SHA256 (microsoft.diasymreader.1.0.8.nupkg) = 9cb62775ad29c64f904c11d5d133356e9bebc3bd572de6be45a75d8d283f661c
-SIZE (microsoft.diasymreader.1.0.8.nupkg) = 54176
+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 (microsoft.diasymreader.1.1.0.nupkg) = 083d032755638b6a31df4df90ccf7b4f59f477616512b16c687a766f8de7af11
+SIZE (microsoft.diasymreader.1.1.0.nupkg) = 78362
SHA256 (microsoft.diasymreader.portablepdb.1.1.0.nupkg) = a080613ea0dc09436e843de1189601df55fc7339b460d8697a4bdbbe219e0b6c
SIZE (microsoft.diasymreader.portablepdb.1.1.0.nupkg) = 140778
+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.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.20_GH0.tar.gz) = 380fe581d1ad99e32c8dc5974c764d90681f31dcbb1c67eb43870f524a9d0209
-SIZE (fsharp-fsharp-4.0.1.20_GH0.tar.gz) = 37326450
+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) = bb342d7ba0900486949ef271ae6db948a3cc9428859e8988ead9daaf73526379
+SIZE (fsharp-fsharp-4.1.18_GH0.tar.gz) = 41632884
diff --git a/lang/fsharp/files/patch-Makefile b/lang/fsharp/files/patch-Makefile
new file mode 100644
index 000000000000..2258440e1358
--- /dev/null
+++ b/lang/fsharp/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig 2017-04-30 09:29:26 UTC
++++ Makefile
+@@ -13,7 +13,7 @@ all:
+ $(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
diff --git a/lang/fsharp/files/patch-Makefile.in b/lang/fsharp/files/patch-Makefile.in
deleted file mode 100644
index 91ccf2bab7ed..000000000000
--- a/lang/fsharp/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig 2016-08-05 13:14:17 UTC
-+++ Makefile.in
-@@ -1,7 +1,6 @@
- include $(topsrcdir)config.make
-
- all clean install build build-proto all-monotouch-monodroid-xamarinmac all-monotouch-monodroid all-monotouch all-monodroid all-xamarinmac all-monotouch-xamarinmac:
-- MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
- $(MAKE) -C src/fsharp $@
-
- dist:
diff --git a/lang/fsharp/files/patch-src_FSharpSource.targets b/lang/fsharp/files/patch-src_FSharpSource.targets
deleted file mode 100644
index 21b05338f2b4..000000000000
--- a/lang/fsharp/files/patch-src_FSharpSource.targets
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/FSharpSource.targets.orig 2016-10-10 06:34:42 UTC
-+++ src/FSharpSource.targets
-@@ -643,6 +643,5 @@ Some other NuGET monikers to support in
- </Target>
- <Import Project="$(FSharpSourcesRoot)\..\.nuget\NuGet.targets" />
- <Target Name="BeforeBuild" BeforeTargets="Build">
-- <Exec Command="$(NuGetCommand) restore packages.config -PackagesDirectory packages -ConfigFile $(FSharpSourcesRoot)\..\.nuget\NuGet.Config" WorkingDirectory="$(FSharpSourcesRoot)\.."/>
- </Target>
- </Project>
diff --git a/lang/fsharp/pkg-plist b/lang/fsharp/pkg-plist
index 9f827c313abf..670388f8a1ca 100644
--- a/lang/fsharp/pkg-plist
+++ b/lang/fsharp/pkg-plist
@@ -1,23 +1,10 @@
bin/fsharpc
bin/fsharpi
bin/fsharpiAnyCpu
-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.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/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
-lib/mono/4.5/policy.3.3.FSharp.Core.dll
-lib/mono/4.5/policy.3.47.FSharp.Core.dll
-lib/mono/4.5/policy.3.7.FSharp.Core.dll
-lib/mono/4.5/policy.3.78.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
@@ -28,58 +15,6 @@ 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
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.259.3.1/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.259.4.0/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.259.4.0/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.259.4.0/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.259.4.0/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.3.1.0/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.3.1.0/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.3.1.0/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.3.1.0/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.7.4.0/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.7.4.0/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.7.4.0/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.7.4.0/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.78.3.1/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.78.3.1/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.78.3.1/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.78.3.1/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.78.4.0/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.78.4.0/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.78.4.0/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETCore/3.78.4.0/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.3.0.0/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.3.0.0/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.3.0.0/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.3.0.0/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.3.1.0/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.3.1.0/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.3.1.0/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.3.1.0/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.4.0.0/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.4.0.0/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.4.0.0/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETFramework/v4.0/4.4.0.0/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/2.3.5.0/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/2.3.5.0/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/2.3.5.0/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/2.3.5.0/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/2.3.5.1/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/2.3.5.1/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/2.3.5.1/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/2.3.5.1/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/3.47.4.0/FSharp.Core.dll
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/3.47.4.0/FSharp.Core.optdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/3.47.4.0/FSharp.Core.sigdata
-lib/mono/Reference Assemblies/Microsoft/FSharp/.NETPortable/3.47.4.0/FSharp.Core.xml
-lib/mono/Reference Assemblies/Microsoft/FSharp/3.0/Runtime/.NETPortable/FSharp.Core.dll
-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
@@ -96,51 +31,92 @@ 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/api/.NETCore/3.259.41.0/FSharp.Core.dll
+lib/mono/fsharp/api/.NETCore/3.259.41.0/FSharp.Core.optdata
+lib/mono/fsharp/api/.NETCore/3.259.41.0/FSharp.Core.sigdata
+lib/mono/fsharp/api/.NETCore/3.259.41.0/FSharp.Core.xml
+lib/mono/fsharp/api/.NETCore/3.7.41.0/FSharp.Core.dll
+lib/mono/fsharp/api/.NETCore/3.7.41.0/FSharp.Core.optdata
+lib/mono/fsharp/api/.NETCore/3.7.41.0/FSharp.Core.sigdata
+lib/mono/fsharp/api/.NETCore/3.7.41.0/FSharp.Core.xml
+lib/mono/fsharp/api/.NETCore/3.78.41.0/FSharp.Core.dll
+lib/mono/fsharp/api/.NETCore/3.78.41.0/FSharp.Core.optdata
+lib/mono/fsharp/api/.NETCore/3.78.41.0/FSharp.Core.sigdata
+lib/mono/fsharp/api/.NETCore/3.78.41.0/FSharp.Core.xml
+lib/mono/fsharp/api/.NETFramework/v4.0/4.3.0.0/FSharp.Core.dll
+lib/mono/fsharp/api/.NETFramework/v4.0/4.3.0.0/FSharp.Core.optdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.3.0.0/FSharp.Core.sigdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.3.0.0/FSharp.Core.xml
+lib/mono/fsharp/api/.NETFramework/v4.0/4.3.1.0/FSharp.Core.dll
+lib/mono/fsharp/api/.NETFramework/v4.0/4.3.1.0/FSharp.Core.optdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.3.1.0/FSharp.Core.sigdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.3.1.0/FSharp.Core.xml
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.0.0/FSharp.Core.dll
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.0.0/FSharp.Core.optdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.0.0/FSharp.Core.sigdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.0.0/FSharp.Core.xml
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.1.0/FSharp.Core.dll
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.1.0/FSharp.Core.optdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.1.0/FSharp.Core.sigdata
+lib/mono/fsharp/api/.NETFramework/v4.0/4.4.1.0/FSharp.Core.xml
+lib/mono/fsharp/api/.NETPortable/3.47.41.0/FSharp.Core.dll
+lib/mono/fsharp/api/.NETPortable/3.47.41.0/FSharp.Core.optdata
+lib/mono/fsharp/api/.NETPortable/3.47.41.0/FSharp.Core.sigdata
+lib/mono/fsharp/api/.NETPortable/3.47.41.0/FSharp.Core.xml
lib/mono/fsharp/fsc.exe
+lib/mono/fsharp/fsc.exe.config
lib/mono/fsharp/fsi.exe
+lib/mono/fsharp/fsi.exe.config
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.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
-lib/mono/gac/FSharp.Core/2.3.5.0__b03f5f7f11d50a3a/FSharp.Core.xml
-lib/mono/gac/FSharp.Core/2.3.5.1__b03f5f7f11d50a3a/FSharp.Core.dll
-lib/mono/gac/FSharp.Core/2.3.5.1__b03f5f7f11d50a3a/FSharp.Core.optdata
-lib/mono/gac/FSharp.Core/2.3.5.1__b03f5f7f11d50a3a/FSharp.Core.sigdata
-lib/mono/gac/FSharp.Core/2.3.5.1__b03f5f7f11d50a3a/FSharp.Core.xml
-lib/mono/gac/FSharp.Core/3.259.3.1__b03f5f7f11d50a3a/FSharp.Core.dll
-lib/mono/gac/FSharp.Core/3.259.3.1__b03f5f7f11d50a3a/FSharp.Core.optdata
-lib/mono/gac/FSharp.Core/3.259.3.1__b03f5f7f11d50a3a/FSharp.Core.sigdata
-lib/mono/gac/FSharp.Core/3.259.3.1__b03f5f7f11d50a3a/FSharp.Core.xml
-lib/mono/gac/FSharp.Core/3.259.4.0__b03f5f7f11d50a3a/FSharp.Core.dll
-lib/mono/gac/FSharp.Core/3.259.4.0__b03f5f7f11d50a3a/FSharp.Core.optdata
-lib/mono/gac/FSharp.Core/3.259.4.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
-lib/mono/gac/FSharp.Core/3.259.4.0__b03f5f7f11d50a3a/FSharp.Core.xml
-lib/mono/gac/FSharp.Core/3.3.1.0__b03f5f7f11d50a3a/FSharp.Core.dll
-lib/mono/gac/FSharp.Core/3.3.1.0__b03f5f7f11d50a3a/FSharp.Core.optdata
-lib/mono/gac/FSharp.Core/3.3.1.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
-lib/mono/gac/FSharp.Core/3.3.1.0__b03f5f7f11d50a3a/FSharp.Core.xml
-lib/mono/gac/FSharp.Core/3.47.4.0__b03f5f7f11d50a3a/FSharp.Core.dll
-lib/mono/gac/FSharp.Core/3.47.4.0__b03f5f7f11d50a3a/FSharp.Core.optdata
-lib/mono/gac/FSharp.Core/3.47.4.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
-lib/mono/gac/FSharp.Core/3.47.4.0__b03f5f7f11d50a3a/FSharp.Core.xml
-lib/mono/gac/FSharp.Core/3.7.4.0__b03f5f7f11d50a3a/FSharp.Core.dll
-lib/mono/gac/FSharp.Core/3.7.4.0__b03f5f7f11d50a3a/FSharp.Core.optdata
-lib/mono/gac/FSharp.Core/3.7.4.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
-lib/mono/gac/FSharp.Core/3.7.4.0__b03f5f7f11d50a3a/FSharp.Core.xml
-lib/mono/gac/FSharp.Core/3.78.3.1__b03f5f7f11d50a3a/FSharp.Core.dll
-lib/mono/gac/FSharp.Core/3.78.3.1__b03f5f7f11d50a3a/FSharp.Core.optdata
-lib/mono/gac/FSharp.Core/3.78.3.1__b03f5f7f11d50a3a/FSharp.Core.sigdata
-lib/mono/gac/FSharp.Core/3.78.3.1__b03f5f7f11d50a3a/FSharp.Core.xml
-lib/mono/gac/FSharp.Core/3.78.4.0__b03f5f7f11d50a3a/FSharp.Core.dll
-lib/mono/gac/FSharp.Core/3.78.4.0__b03f5f7f11d50a3a/FSharp.Core.optdata
-lib/mono/gac/FSharp.Core/3.78.4.0__b03f5f7f11d50a3a/FSharp.Core.sigdata
-lib/mono/gac/FSharp.Core/3.78.4.0__b03f5f7f11d50a3a/FSharp.Core.xml
+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
@@ -150,28 +126,24 @@ 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.dll.mdb
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/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.259.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.259.FSharp.Core.dll
-lib/mono/gac/policy.3.259.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.259.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.3.47.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.47.FSharp.Core.dll
-lib/mono/gac/policy.3.47.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.47.FSharp.Core.dll.config
-lib/mono/gac/policy.3.7.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.7.FSharp.Core.dll
-lib/mono/gac/policy.3.7.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.7.FSharp.Core.dll.config
-lib/mono/gac/policy.3.78.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.78.FSharp.Core.dll
-lib/mono/gac/policy.3.78.FSharp.Core/0.0.0.0__b03f5f7f11d50a3a/policy.3.78.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/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.Targets
lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.Portable.FSharp.Targets
lib/mono/xbuild/Microsoft/VisualStudio/v11.0/FSharp/Microsoft.FSharp.Targets
@@ -182,14 +154,3 @@ 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
-@dir lib/mono/fsharp31/portable259
-@dir lib/mono/fsharp31/portable47
-@dir lib/mono/fsharp31/portable7
-@dir lib/mono/fsharp31/portable78
-@dir lib/mono/portable259
-@dir lib/mono/portable47
-@dir lib/mono/portable7
-@dir lib/mono/portable78
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index d7e0b0c6b526..8978ea6ec749 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -3,8 +3,8 @@
PORTNAME= mono
PORTVERSION= 4.8.1.0
+PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/
MAINTAINER= mono@FreeBSD.org
COMMENT= Open source implementation of .NET Development Framework
@@ -15,44 +15,89 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
bash:shells/bash
LIB_DEPENDS= libinotify.so:devel/libinotify
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
-USES= bison compiler:c11 cpe gettext gmake iconv libtool pathfix \
- perl5 python:run shebangfix tar:bzip2
+OPTIONS_DEFINE= ACCEPTANCE_TESTS MONOLITE
+OPTIONS_DEFAULT= MONOLITE
+ACCEPTANCE_TESTS_DESC= Download and run the .Net acceptance tests
+ACCEPTANCE_TESTS_DISTFILES=nuget.31.zip:nuget31
+ACCEPTANCE_TESTS_GH_TUPLE=xamarin:benchmarker:97f618c:12/acceptance-tests/external/benchmarker \
+ dotnet:coreclr:c7da48a:13/acceptance-tests/external/coreclr \
+ dotnet:roslyn:322bd5b:14/acceptance-tests/external/roslyn
+ACCEPTANCE_TESTS_MASTER_SITES=https://dotnetci.blob.core.windows.net/roslyn/:nuget31
+ACCEPTANCE_TESTS_TEST_DEPENDS=bash:shells/bash \
+ referenceassemblies-pcl>=4.6:lang/referenceassemblies-pcl
+ACCEPTANCE_TESTS_VARS= SHEBANG_FILES+=${WRKSRC}/acceptance-tests/external/roslyn/cibuild.sh
+MONOLITE_DESC= Use monolite to bootstrap mcs (otherwise use installed mcs)
+MONOLITE_DISTFILES= monolite-${MONOLITE_VERSION}-latest.tar.gz:monolite
+MONOLITE_MASTER_SITES= http://download.mono-project.com/monolite/:monolite
+
+MONOLITE_VERSION= 156
+USE_GITHUB= yes
+GH_TAGNAME= ${PORTNAME}-${PORTVERSION}
+GH_TUPLE= mono:Lucene.Net.Light:85978b7:1/external/Lucene.Net.Light \
+ mono:Newtonsoft.Json:471c3e0:2/external/Newtonsoft.Json \
+ mono:NuGet.BuildTasks:04bdab5:3/external/nuget-buildtasks \
+ mono:aspnetwebstack:e77b12e:4/external/aspnetwebstack \
+ mono:buildtools:9b6ee86:5/external/buildtools \
+ mono:cecil:2b39856:6/external/cecil \
+ mono:cecil:33d50b8:7/external/cecil-legacy \
+ mono:ikdasm:e4deabf:8/external/ikdasm \
+ mono:ikvm-fork:367864e:9/external/ikvm \
+ mono:reference-assemblies:6c77197:10/external/binary-reference-assemblies \
+ mono:rx:b29a4b0:11/external/rx
+
+USES= autoreconf bison compiler:c11 cpe gettext gmake iconv libtool pathfix \
+ perl5 python shebangfix tar:bzip2
USE_GNOME= glib20
USE_PERL5= build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-WRKSRC= ${WRKDIR}/mono-${PORTVERSION:R}
SHEBANG_FILES= scripts/mono-heapviz
CONFIGURE_ARGS= --disable-dtrace
CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no
-# Set location for .wapi creation.
-MONO_SHARED_DIR=${WRKDIR}
-
-MAKE_ENV= MONO_SHARED_DIR="${MONO_SHARED_DIR}" \
+MAKE_ENV= MONO_SHARED_DIR="${WRKDIR}" \
INSTALL_STRIP_FLAG="${STRIP}" \
TZ=UTC
-ONLY_FOR_ARCHS= i386 amd64 powerpc
+TEST_TARGET= check
+TEST_WRKSRC= ${WRKSRC}/mono/tests
+
+ONLY_FOR_ARCHS= i386 amd64 armv6 powerpc
PORTSCOUT= limit:^\d+\.\d+\.[1-9]\d*
+LOCALBASE?= /usr/local
+.if !exists(${LOCALBASE}/bin/mcs)
+OPTIONS_SLAVE= MONOLITE
+.endif
+
+post-extract-MONOLITE-on:
+ ${MKDIR} ${WRKSRC}/mcs/class/lib
+ ${MV} ${WRKDIR}/monolite-${MONOLITE_VERSION}-latest ${WRKSRC}/mcs/class/lib/monolite
+
post-patch:
- @${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/usr/bin/env bash|g' \
+ ${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/usr/bin/env bash|g' \
${WRKSRC}/scripts/mono-find-provides.in \
${WRKSRC}/scripts/mono-find-requires.in \
${WRKSRC}/scripts/mono-test-install
- @${FIND} ${WRKSRC} -name '*.sh' | ${XARGS} ${REINPLACE_CMD} \
+ ${FIND} ${WRKSRC} -name '*.sh' | ${XARGS} ${REINPLACE_CMD} \
-e 's|^#!/bin/bash|#!/bin/sh|g'
- @${REINPLACE_CMD} 's/isinf (1)/isinf (1.0)/g' ${WRKSRC}/configure
+ ${SED} 's/tarball/${PORTVERSION}/' ${WRKSRC}/mono/mini/Makefile.am.in \
+ > ${WRKSRC}/mono/mini/Makefile.am
+
+post-patch-ACCEPTANCE_TESTS-on:
+ ${REINPLACE_CMD} -E -e 's!(~/|/tmp/)!${WRKDIR}/!g' -e '/git clean/d' \
+ ${WRKSRC}/acceptance-tests/external/roslyn/cibuild.sh
+ ${TOUCH} ${WRKDIR}/nuget.31.zip
post-configure:
- @${REINPLACE_CMD} -e 's|share\/man|man|g' \
+ ${REINPLACE_CMD} -e 's|share\/man|man|g' \
${WRKSRC}/mcs/jay/Makefile
-do-test:
- @(cd ${WRKSRC}/mono/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
- ${MAKE_FLAGS} Makefile ${MAKE_ARGS} check)
+do-test-ACCEPTANCE_TESTS-on:
+ @(cd ${WRKSRC}/acceptance-tests; \
+ ${DO_MAKE_TEST} check-full IGNORE_BENCHMARKER_VERSION=1 IGNORE_CORECLR_VERSION=1 IGNORE_ROSLYN_VERSION=1)
.include <bsd.port.mk>
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 70b7aec8fac8..60808c2181da 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,3 +1,35 @@
-TIMESTAMP = 1493409545
-SHA256 (mono-4.8.1.0.tar.bz2) = 18cb38a670e51609c36c687ed90ad42cfedabeffd0a2dc5f7f0c46249eb8dbef
-SIZE (mono-4.8.1.0.tar.bz2) = 87375499
+TIMESTAMP = 1493632048
+SHA256 (nuget.31.zip) = 727148dcfffdbb13f237e9b99ca4fee56443c7c0e0552c8f7b162e9f484f1e4b
+SIZE (nuget.31.zip) = 315117674
+SHA256 (monolite-156-latest.tar.gz) = 2cdf6cff1d82d76412461a4c8a3616bb2aa1e835fb55479941662dec3799c924
+SIZE (monolite-156-latest.tar.gz) = 4569148
+SHA256 (mono-mono-4.8.1.0-mono-4.8.1.0_GH0.tar.gz) = da32f26922adb29b2cc3341d11e20f754b95f87178578188fd6902c5cfc188e4
+SIZE (mono-mono-4.8.1.0-mono-4.8.1.0_GH0.tar.gz) = 72422583
+SHA256 (mono-Lucene.Net.Light-85978b7_GH0.tar.gz) = 6f9cbad4083c8acf214d86a61fd39585f7d82eeec80c96fc696e07c7006e3a4d
+SIZE (mono-Lucene.Net.Light-85978b7_GH0.tar.gz) = 640188
+SHA256 (mono-Newtonsoft.Json-471c3e0_GH0.tar.gz) = 38b2bc9f2290f780e58fdf1504c0bbdb25a67d7d998c4ec631ecbbf9ddcb3e13
+SIZE (mono-Newtonsoft.Json-471c3e0_GH0.tar.gz) = 1528933
+SHA256 (mono-NuGet.BuildTasks-04bdab5_GH0.tar.gz) = c9d74f01d34689c7235c0c576946de9042d218308c6e93ef59e7079d5605ada0
+SIZE (mono-NuGet.BuildTasks-04bdab5_GH0.tar.gz) = 222548
+SHA256 (mono-aspnetwebstack-e77b12e_GH0.tar.gz) = ae6995a299e815a1165b2011228f7c06e27af41aadddcbf55f51a94dfca38e66
+SIZE (mono-aspnetwebstack-e77b12e_GH0.tar.gz) = 2334980
+SHA256 (mono-buildtools-9b6ee86_GH0.tar.gz) = e4bfcf743fdd4bee05ece298d021d39033d2efde8bc4cd249e6dd37f8f785c3b
+SIZE (mono-buildtools-9b6ee86_GH0.tar.gz) = 475597
+SHA256 (mono-cecil-2b39856_GH0.tar.gz) = e88a1639db3ec8d960708c3996362c96ab573910cb270cee70a810f1c7f53b6c
+SIZE (mono-cecil-2b39856_GH0.tar.gz) = 3247853
+SHA256 (mono-cecil-33d50b8_GH0.tar.gz) = 8c6fc2c915d197df88a0f0bdbf9588b7c8c4d3a695f34053672853d85fcd3b29
+SIZE (mono-cecil-33d50b8_GH0.tar.gz) = 440059
+SHA256 (mono-ikdasm-e4deabf_GH0.tar.gz) = e137cb91cd56433f630cb598e13f185b639bd6399209636a3a0356f270dc9910
+SIZE (mono-ikdasm-e4deabf_GH0.tar.gz) = 227944
+SHA256 (mono-ikvm-fork-367864e_GH0.tar.gz) = 5c4f1a6525846f7eb193d352031d185f1bba9bd7040708625db95f3bb0002bd7
+SIZE (mono-ikvm-fork-367864e_GH0.tar.gz) = 250849
+SHA256 (mono-reference-assemblies-6c77197_GH0.tar.gz) = 4fa51050d8455e5724322efc570b191056a4f54ed8afa72c0e25f9e9d06d5dee
+SIZE (mono-reference-assemblies-6c77197_GH0.tar.gz) = 15899149
+SHA256 (mono-rx-b29a4b0_GH0.tar.gz) = f7022926bcd0bb2e7d7991a0693720aff00c89d8fdf4439d6785a612195f42a6
+SIZE (mono-rx-b29a4b0_GH0.tar.gz) = 13703602
+SHA256 (xamarin-benchmarker-97f618c_GH0.tar.gz) = b55e76e14768b62b1d7dd306a22ae58361ddd640fed1534d2b99235fdcbb5fc6
+SIZE (xamarin-benchmarker-97f618c_GH0.tar.gz) = 95511421
+SHA256 (dotnet-coreclr-c7da48a_GH0.tar.gz) = 8529ce9e9dcc524046205487ca8a8e584d8180c3fecb59bc27944326525d8c83
+SIZE (dotnet-coreclr-c7da48a_GH0.tar.gz) = 31762122
+SHA256 (dotnet-roslyn-322bd5b_GH0.tar.gz) = 9740a0922f2fafa0251f462e7f27cfd6891dc078c22b008c49e11db6637edeea
+SIZE (dotnet-roslyn-322bd5b_GH0.tar.gz) = 22058493
diff --git a/lang/mono/files/patch-configure.ac b/lang/mono/files/patch-configure.ac
new file mode 100644
index 000000000000..ffb9e0557048
--- /dev/null
+++ b/lang/mono/files/patch-configure.ac
@@ -0,0 +1,19 @@
+--- configure.ac.orig 2017-04-12 10:51:18 UTC
++++ configure.ac
+@@ -355,6 +355,7 @@ AC_SUBST(extra_runtime_ldflags)
+ AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes)
+ AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes)
+ AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux)
++AM_CONDITIONAL(PLATFORM_FREEBSD, echo x$target_os | grep -q freebsd)
+ AM_CONDITIONAL(PLATFORM_DARWIN, test x$host_darwin = xyes)
+ AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
+ AM_CONDITIONAL(PLATFORM_ANDROID, test x$platform_android = xyes)
+@@ -363,7 +364,7 @@ if test -z "$PLATFORM_DARWIN_TRUE"; then
+ PLATFORM_AOT_SUFFIX=.dylib
+ fi
+
+-if test -z "$PLATFORM_LINUX_TRUE"; then :
++if test -z "$PLATFORM_LINUX_TRUE" -o -z "$PLATFORM_FREEBSD_TRUE"; then :
+ PLATFORM_AOT_SUFFIX=.so
+ fi
+
diff --git a/lang/mono/files/patch-mono_utils_mono-compiler.h b/lang/mono/files/patch-mono_utils_mono-compiler.h
new file mode 100644
index 000000000000..a51519c7fd8d
--- /dev/null
+++ b/lang/mono/files/patch-mono_utils_mono-compiler.h
@@ -0,0 +1,18 @@
+--- mono/utils/mono-compiler.h.orig 2017-05-01 17:08:15 UTC
++++ mono/utils/mono-compiler.h
+@@ -54,13 +54,13 @@
+ For now we will disable this. */
+ #define MONO_TLS_FAST
+ #else
+-#define MONO_TLS_FAST __attribute__((tls_model("local-dynamic")))
++#define MONO_TLS_FAST __attribute__((tls_model("local-dynamic"))) __attribute__((visability("hidden")))
+ #endif
+ #endif
+
+ #else
+
+-#define MONO_TLS_FAST __attribute__((tls_model("local-exec")))
++#define MONO_TLS_FAST __attribute__((tls_model("local-exec"))) __attribute__((visability("hidden")))
+
+ #endif
+
diff --git a/lang/mono/files/patch-mono_utils_w32handle.c b/lang/mono/files/patch-mono_utils_w32handle.c
new file mode 100644
index 000000000000..383e5ca8d1b7
--- /dev/null
+++ b/lang/mono/files/patch-mono_utils_w32handle.c
@@ -0,0 +1,11 @@
+--- mono/utils/w32handle.c.orig 2017-05-01 16:30:13 UTC
++++ mono/utils/w32handle.c
+@@ -51,7 +51,7 @@
+
+ #undef DEBUG_REFS
+
+-#define SLOT_MAX (1024 * 16)
++#define SLOT_MAX (1024 * 32)
+
+ /* must be a power of 2 */
+ #define HANDLE_PER_SLOT (256)
diff --git a/lang/mono/files/patch-scripts_mono-heapviz b/lang/mono/files/patch-scripts_mono-heapviz
new file mode 100644
index 000000000000..a204c31721aa
--- /dev/null
+++ b/lang/mono/files/patch-scripts_mono-heapviz
@@ -0,0 +1,11 @@
+--- scripts/mono-heapviz.orig 2017-04-23 06:26:21 UTC
++++ scripts/mono-heapviz
+@@ -7,7 +7,7 @@
+
+ from __future__ import print_function
+ import sys, os
+-import Image, ImageDraw
++from PIL import Image, ImageDraw
+ from xml.sax import ContentHandler, make_parser
+ from xml.sax.handler import feature_namespaces
+ from optparse import OptionParser
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index 1b40e05f4bb1..f3a6c507a1ff 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -1026,10 +1026,10 @@ lib/mono/gac/Mono.CSharp/4.0.0.0__0738eb9f132ed756/Mono.CSharp.dll
lib/mono/gac/Mono.CSharp/4.0.0.0__0738eb9f132ed756/Mono.CSharp.dll.mdb
lib/mono/gac/Mono.Cairo/4.0.0.0__0738eb9f132ed756/Mono.Cairo.dll
lib/mono/gac/Mono.Cairo/4.0.0.0__0738eb9f132ed756/Mono.Cairo.dll.mdb
-lib/mono/gac/Mono.Cecil/0.9.5.0__0738eb9f132ed756/Mono.Cecil.dll
-lib/mono/gac/Mono.Cecil/0.9.5.0__0738eb9f132ed756/Mono.Cecil.dll.mdb
lib/mono/gac/Mono.Cecil/0.10.0.0__0738eb9f132ed756/Mono.Cecil.dll
lib/mono/gac/Mono.Cecil/0.10.0.0__0738eb9f132ed756/Mono.Cecil.dll.mdb
+lib/mono/gac/Mono.Cecil/0.9.5.0__0738eb9f132ed756/Mono.Cecil.dll
+lib/mono/gac/Mono.Cecil/0.9.5.0__0738eb9f132ed756/Mono.Cecil.dll.mdb
lib/mono/gac/Mono.CodeContracts/4.0.0.0__0738eb9f132ed756/Mono.CodeContracts.dll
lib/mono/gac/Mono.CodeContracts/4.0.0.0__0738eb9f132ed756/Mono.CodeContracts.dll.mdb
lib/mono/gac/Mono.CompilerServices.SymbolWriter/4.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll