6 files changed, 51 insertions, 21 deletions

diff --git a/lang/mono-basic/Makefile b/lang/mono-basic/Makefile
index 6e3f885d1d32..5f8a0493f5d5 100644
--- a/lang/mono-basic/Makefile
+++ b/lang/mono-basic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mono-basic
-PORTVERSION=	2.6.2
+PORTVERSION=	2.10
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
diff --git a/lang/mono-basic/distinfo b/lang/mono-basic/distinfo
index 6854a08055ec..7a78e7595f1b 100644
--- a/lang/mono-basic/distinfo
+++ b/lang/mono-basic/distinfo
@@ -1,3 +1,2 @@
-MD5 (mono-basic-2.6.2.tar.bz2) = 00272ba29c55b56d67b2ad0c7ae7ef2b
-SHA256 (mono-basic-2.6.2.tar.bz2) = ba03bd8a7f521fae9dc5e2ea78dac0e19224c548f1108407afa04d9b89898f01
-SIZE (mono-basic-2.6.2.tar.bz2) = 1212428
+SHA256 (mono-basic-2.10.tar.bz2) = 1cd87b634d4d862527c548bb827542d11a607569005df0123678e381ad12b186
+SIZE (mono-basic-2.10.tar.bz2) = 1902672
diff --git a/lang/mono-basic/files/patch-vbnc_vbnc_Makefile b/lang/mono-basic/files/patch-vbnc_vbnc_Makefile
new file mode 100644
index 000000000000..b4284b01ce60
--- /dev/null
+++ b/lang/mono-basic/files/patch-vbnc_vbnc_Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- vbnc/vbnc/Makefile.orig
++++ vbnc/vbnc/Makefile
+@@ -31,7 +31,7 @@
+ 	-$(topdir)/vbnc/vbnc/setversion.sh $(topdir)/vbnc/vbnc/source/General/Version.vb
+ 
+ all-local: vbnc.Errors.resources vbnc.exe.sources version.tmp
+-	@cp -pu vbnc.vbnc.rsp ../../class/lib/$(PROFILE)/vbnc.rsp
++	@cp -R vbnc.vbnc.rsp ../../class/lib/$(PROFILE)/vbnc.rsp
+ 	
+ vbnc.Errors.resources: source/Resources/Errors.resx
+ 	resgen2 source/Resources/Errors.resx vbnc.Errors.resources
diff --git a/lang/mono-basic/files/patch-vbnc_vbnc_setversion.sh b/lang/mono-basic/files/patch-vbnc_vbnc_setversion.sh
new file mode 100644
index 000000000000..1b95c3cffdf4
--- /dev/null
+++ b/lang/mono-basic/files/patch-vbnc_vbnc_setversion.sh
@@ -0,0 +1,11 @@
+
+$FreeBSD$
+
+--- vbnc/vbnc/setversion.sh.orig
++++ vbnc/vbnc/setversion.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash -ex
++#!/usr/bin/env bash -ex
+ 
+ VERSION_VB=$1
+ VERSION_TMP=version.tmp
diff --git a/lang/mono-basic/files/patch-vbruntime_Test_Makefile b/lang/mono-basic/files/patch-vbruntime_Test_Makefile
deleted file mode 100644
index 388551a5b67e..000000000000
--- a/lang/mono-basic/files/patch-vbruntime_Test_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- vbruntime/Test/Makefile.orig
-+++ vbruntime/Test/Makefile
-@@ -62,7 +62,7 @@
- 	MONO_PATH=$(MONO_VB_PATH) mono ../../tools/extract-source/extract-source.exe -s:2005VB_test_CS.csproj -d:2005VB_test_CS.dll.sources.win -m:w
- 
- test-first:
--	cd ../Microsoft.VisualBasic && make && cp ../../class/lib/vbnc/Microsoft.VisualBasic.dll* ../Test/bin
-+	cd ../Microsoft.VisualBasic && ${MAKE} && cp ../../class/lib/vbnc/Microsoft.VisualBasic.dll* ../Test/bin
- 
- test-cs: test-first 2005VB_test_CS.dll.sources
- 	$(CSCOMPILER) "-out:bin/2005VB_test_CS.dll" @2005VB_test_CS.dll.rsp @2005VB_test_CS.dll.sources -lib:bin $(CSDEFINES)
diff --git a/lang/mono-basic/pkg-plist b/lang/mono-basic/pkg-plist
index d585c542abcd..002dc6125bc5 100644
--- a/lang/mono-basic/pkg-plist
+++ b/lang/mono-basic/pkg-plist
@@ -1,10 +1,30 @@
 @comment $FreeBSD$
 bin/vbnc
+bin/vbnc2
 lib/mono/2.0/Microsoft.VisualBasic.dll
-lib/mono/2.0/vbnc.exe
-lib/mono/2.0/vbnc.exe.mdb
-lib/mono/2.0/vbnc.rsp
+lib/mono/4.0/Microsoft.VisualBasic.dll
+lib/mono/4.0/Mono.Cecil.VB.Mdb.dll
+lib/mono/4.0/Mono.Cecil.VB.Pdb.dll
+lib/mono/4.0/Mono.Cecil.VB.dll
+lib/mono/4.0/vbnc.exe
+lib/mono/4.0/vbnc.exe.mdb
+lib/mono/4.0/vbnc.rsp
+lib/mono/gac/Microsoft.VisualBasic/10.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
+lib/mono/gac/Microsoft.VisualBasic/10.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll.mdb
 lib/mono/gac/Microsoft.VisualBasic/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
 lib/mono/gac/Microsoft.VisualBasic/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll.mdb
+lib/mono/gac/Mono.Cecil.VB.Mdb/0.9.3.0__0738eb9f132ed756/Mono.Cecil.VB.Mdb.dll
+lib/mono/gac/Mono.Cecil.VB.Mdb/0.9.3.0__0738eb9f132ed756/Mono.Cecil.VB.Mdb.dll.mdb
+lib/mono/gac/Mono.Cecil.VB.Pdb/0.9.3.0__0738eb9f132ed756/Mono.Cecil.VB.Pdb.dll
+lib/mono/gac/Mono.Cecil.VB.Pdb/0.9.3.0__0738eb9f132ed756/Mono.Cecil.VB.Pdb.dll.mdb
+lib/mono/gac/Mono.Cecil.VB/0.9.3.0__0738eb9f132ed756/Mono.Cecil.VB.dll
+lib/mono/gac/Mono.Cecil.VB/0.9.3.0__0738eb9f132ed756/Mono.Cecil.VB.dll.mdb
+@dirrm lib/mono/gac/Mono.Cecil.VB/0.9.3.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cecil.VB.Pdb/0.9.3.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cecil.VB.Pdb
+@dirrm lib/mono/gac/Mono.Cecil.VB.Mdb/0.9.3.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Mono.Cecil.VB.Mdb
+@dirrm lib/mono/gac/Mono.Cecil.VB
 @dirrm lib/mono/gac/Microsoft.VisualBasic/8.0.0.0__b03f5f7f11d50a3a
+@dirrm lib/mono/gac/Microsoft.VisualBasic/10.0.0.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.VisualBasic