7 files changed, 25 insertions, 126 deletions

diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 1cdcedc319d8..ca493b243eb6 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	monodevelop
-PORTVERSION=	2.4.2
+PORTVERSION=	2.6.0.1
 CATEGORIES=	devel
-MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
+MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	IDE for the .NET platform
@@ -24,14 +24,12 @@ USE_GNOME=	gnomehack gtksharp20 gnomesharp20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-CONFIGURE_ARGS+=	DATADIRNAME=share GMSGFMT=msgfmt \
-			--enable-aspnet --enable-aspnetedit
 MAN1=		mdtool.1 monodevelop.1
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 
 OPTIONS=	MONOEXT "Enable extensions for Mono development" on \
-		VCS "Enable version control support" on \
+		GIT "Enable git support" on \
 		SVN "Enable subversion support" on
 
 # Restrict to stable (even) versions, indicated by the second component.
@@ -47,12 +45,13 @@ CONFIGURE_ARGS+=--disable-monoextensions
 PLIST_SUB+=	MONOEXT="@comment "
 .endif
 
-.if defined(WITH_VCS) && !defined(WITHOUT_VCS)
-CONFIGURE_ARGS+=--enable-versioncontrol
-PLIST_SUB+=	VCS=""
+.if !defined(WITHOUT_GIT)
+RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
+CONFIGURE_ARGS+=--enable-git
+PLIST_SUB+=	GIT=""
 .else
-CONFIGURE_ARGS+=--disable-versioncontrol
-PLIST_SUB+=	VCS="@comment "
+CONFIGURE_ARGS+=--disable-git
+PLIST_SUB+=	GIT="@comment "
 .endif
 
 .if !defined(WITHOUT_SVN)
diff --git a/devel/monodevelop/distinfo b/devel/monodevelop/distinfo
index 7ec73325050b..fe41b129053b 100644
--- a/devel/monodevelop/distinfo
+++ b/devel/monodevelop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (monodevelop-2.4.2.tar.bz2) = c0371e4766e83ca75ed1f555adbe72c12011471f6892578f2c6147048970fa8d
-SIZE (monodevelop-2.4.2.tar.bz2) = 6228006
+SHA256 (monodevelop-2.6.0.1.tar.bz2) = 95bb8adc2fdb81367dbf45e4d46b1e2fc5fc06d9efa1b66f97b2355267220a3a
+SIZE (monodevelop-2.6.0.1.tar.bz2) = 7688780
diff --git a/devel/monodevelop/files/patch-LibApr.cs b/devel/monodevelop/files/patch-LibApr.cs
deleted file mode 100644
index 8b34bc2d3ff5..000000000000
--- a/devel/monodevelop/files/patch-LibApr.cs
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs.orig	2008-12-22 19:02:40.000000000 -0300
-+++ src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs	2008-12-22 19:02:53.000000000 -0300
-@@ -65,7 +65,7 @@
- 
- 	public class LibApr0: LibApr
- 	{
--		private const string aprlib = "libapr-0.so.0";
-+		private const string aprlib = "libapr-1.so.4";
- 		
- 		public override void initialize() { apr_initialize (); }
- 		public override IntPtr pool_create_ex (out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator) { return apr_pool_create_ex(out pool, parent, abort, allocator); }
diff --git a/devel/monodevelop/files/patch-LibSvnClient.cs b/devel/monodevelop/files/patch-LibSvnClient.cs
deleted file mode 100644
index 0e441a5a2b98..000000000000
--- a/devel/monodevelop/files/patch-LibSvnClient.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-
-$FreeBSD$
-
---- src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs.orig
-+++ src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
-@@ -600,6 +600,7 @@
- 	
- 	public class LibSvnClient0 : LibSvnClient {
- 		private const string svnclientlib = "libsvn_client-1.so.0";
-+		private const string svnsubrlib = "libsvn_subr-1.so.0";
- 		
- 		public override void config_ensure (string config_dir, IntPtr pool)
- 		{
-@@ -843,11 +844,11 @@
- 			return svn_client_prop_get (out value, name, target, ref revision, recurse, ctx, pool);
- 		}
- 		
--		[DllImport(svnclientlib)] static extern void svn_config_ensure (string config_dir, IntPtr pool);
--		[DllImport(svnclientlib)] static extern void svn_config_get_config (ref IntPtr cfg_hash, string config_dir, IntPtr pool);
--		[DllImport(svnclientlib)] static extern void svn_auth_open (out IntPtr auth_baton, IntPtr providers, IntPtr pool);
--		[DllImport(svnclientlib)] static extern void svn_auth_set_parameter (IntPtr auth_baton, string name, IntPtr value);
--		[DllImport(svnclientlib)] static extern IntPtr svn_auth_get_parameter (IntPtr auth_baton, string name);
-+		[DllImport(svnsubrlib)] static extern void svn_config_ensure (string config_dir, IntPtr pool);
-+		[DllImport(svnsubrlib)] static extern void svn_config_get_config (ref IntPtr cfg_hash, string config_dir, IntPtr pool);
-+		[DllImport(svnsubrlib)] static extern void svn_auth_open (out IntPtr auth_baton, IntPtr providers, IntPtr pool);
-+		[DllImport(svnsubrlib)] static extern void svn_auth_set_parameter (IntPtr auth_baton, string name, IntPtr value);
-+		[DllImport(svnsubrlib)] static extern IntPtr svn_auth_get_parameter (IntPtr auth_baton, string name);
- 		[DllImport(svnclientlib)] static extern void svn_client_get_simple_provider (IntPtr item, IntPtr pool);
- 		[DllImport(svnclientlib)] static extern void svn_client_get_simple_prompt_provider (IntPtr item, svn_auth_simple_prompt_func_t prompt_func, IntPtr prompt_batton, [MarshalAs (UnmanagedType.SysInt)] int retry_limit, IntPtr pool);
- 		[DllImport(svnclientlib)] static extern void svn_client_get_username_provider (IntPtr item, IntPtr pool);
-@@ -880,7 +881,7 @@
- 		                                                               IntPtr receiver_baton,
- 		                                                               IntPtr ctx, IntPtr pool);
- 		
--		[DllImport(svnclientlib)] static extern IntPtr svn_time_from_cstring (out long aprtime, string time, IntPtr pool);
-+		[DllImport(svnsubrlib)] static extern IntPtr svn_time_from_cstring (out long aprtime, string time, IntPtr pool);
- 		
- 		[DllImport(svnclientlib)] static extern IntPtr svn_client_url_from_path (ref IntPtr url, string path_or_url, IntPtr pool);
- 		
-@@ -889,11 +890,11 @@
- 		                                                                ref Rev revision,
- 		                                                                IntPtr ctx, IntPtr pool);
- 		
--		[DllImport(svnclientlib)] static extern IntPtr svn_stream_create (IntPtr baton, IntPtr pool);
-+		[DllImport(svnsubrlib)] static extern IntPtr svn_stream_create (IntPtr baton, IntPtr pool);
- 		
- 		//[DllImport(svnclientlib)] static extern IntPtr svn_stream_set_read (IntPtr stream, svn_readwrite_fn_t reader);
- 		
--		[DllImport(svnclientlib)] static extern IntPtr svn_stream_set_write (IntPtr stream, svn_readwrite_fn_t writer);
-+		[DllImport(svnsubrlib)] static extern IntPtr svn_stream_set_write (IntPtr stream, svn_readwrite_fn_t writer);
- 		
- 		[DllImport(svnclientlib)] static extern IntPtr svn_client_update (IntPtr result_rev, string path, ref Rev revision,
- 		                                                                  int recurse, IntPtr ctx, IntPtr pool);
diff --git a/devel/monodevelop/files/patch-src_addins_CBinding_Navigation_ProjectNodeBuilderExtension.cs b/devel/monodevelop/files/patch-src_addins_CBinding_Navigation_ProjectNodeBuilderExtension.cs
deleted file mode 100644
index dfdc58dc48ce..000000000000
--- a/devel/monodevelop/files/patch-src_addins_CBinding_Navigation_ProjectNodeBuilderExtension.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/addins/CBinding/Navigation/ProjectNodeBuilderExtension.cs.orig
-+++ src/addins/CBinding/Navigation/ProjectNodeBuilderExtension.cs
-@@ -97,7 +97,7 @@
- 			check_ctags = true;
- 			
- 			try {
--				ProcessWrapper p = Runtime.ProcessService.StartProcess ("ctags", "--version", null, null);
-+				ProcessWrapper p = Runtime.ProcessService.StartProcess ("exctags", "--version", null, null);
- 				p.WaitForOutput ();
- 				have_ctags = true;
- 			} catch {
diff --git a/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs b/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs
deleted file mode 100644
index dde4869a4626..000000000000
--- a/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- src/addins/CBinding/Parser/TagDatabaseManager.cs.orig
-+++ src/addins/CBinding/Parser/TagDatabaseManager.cs
-@@ -86,7 +86,7 @@
- 						return false;
- 					}
- 					try {
--						Runtime.ProcessService.StartProcess ("ctags", "--version", null, null).WaitForOutput ();
-+						Runtime.ProcessService.StartProcess ("exctags", "--version", null, null).WaitForOutput ();
- 					} catch {
- 						LoggingService.LogWarning ("Cannot update C/C++ tags database because exuberant ctags is not installed.");
- 						return false;
-@@ -276,7 +276,7 @@
- 				try {
- 					output = new System.IO.StringWriter ();
- 					
--					p = Runtime.ProcessService.StartProcess ("ctags", ctags_options, null, null, output, null);
-+					p = Runtime.ProcessService.StartProcess ("exctags", ctags_options, null, null, output, null);
- 					p.WaitForOutput (10000);
- 					if (p.ExitCode != 0 || !File.Exists (tagFullFileName)) {
- 						LoggingService.LogError ("Ctags did not successfully populate the tags database '{0}' within ten seconds.\nOutput: {1}", tagFullFileName, output.ToString ());
-@@ -383,7 +383,7 @@
- 				output = new System.IO.StringWriter ();
- 				error = new System.IO.StringWriter ();
- 				
--				p = Runtime.ProcessService.StartProcess ("ctags", ctags_kinds.ToString (), project.BaseDirectory, output, error, null);
-+				p = Runtime.ProcessService.StartProcess ("exctags", ctags_kinds.ToString (), project.BaseDirectory, output, error, null);
- 				p.WaitForOutput (10000);
- 				if (p.ExitCode != 0) {
- 					LoggingService.LogError ("Ctags did not successfully populate the tags database from '{0}' within ten seconds.\nError output: {1}", filename, error.ToString ());
diff --git a/devel/monodevelop/pkg-plist b/devel/monodevelop/pkg-plist
index 31f0a8ea127d..ec248aafe7f4 100644
--- a/devel/monodevelop/pkg-plist
+++ b/devel/monodevelop/pkg-plist
@@ -102,6 +102,7 @@ lib/monodevelop/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.Moonlight/Templates/Silverlight.js
 lib/monodevelop/AddIns/MonoDevelop.Moonlight/Templates/framework_SL_2_0.xml
 lib/monodevelop/AddIns/MonoDevelop.Moonlight/Templates/framework_SL_3_0.xml
+lib/monodevelop/AddIns/MonoDevelop.Moonlight/Templates/framework_SL_4_0.xml
 lib/monodevelop/AddIns/MonoDevelop.MsVisualStudio/MonoDevelop.MsVisualStudio.dll
 lib/monodevelop/AddIns/MonoDevelop.MsVisualStudio/MonoDevelop.MsVisualStudio.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll
@@ -114,6 +115,7 @@ lib/monodevelop/AddIns/MonoDevelop.TextTemplating/Mono.TextTemplating.dll
 lib/monodevelop/AddIns/MonoDevelop.TextTemplating/Mono.TextTemplating.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.dll
 lib/monodevelop/AddIns/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.dll.mdb
+lib/monodevelop/AddIns/MonoDevelop.TextTemplating/Templates/T4PreprocessedTemplateCSharp.xft.xml
 lib/monodevelop/AddIns/MonoDevelop.TextTemplating/Templates/T4TemplateCSharp.xft.xml
 lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe
 lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe.mdb
@@ -141,11 +143,18 @@ lib/monodevelop/AddIns/NUnit/nunit.core.dll
 lib/monodevelop/AddIns/NUnit/nunit.core.interfaces.dll
 lib/monodevelop/AddIns/NUnit/nunit.framework.dll
 lib/monodevelop/AddIns/NUnit/nunit.util.dll
+%%GIT%%lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.Git.dll
+%%GIT%%lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.Git.dll.mdb
+%%SVN%%lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.Subversion.Unix.dll
+%%SVN%%lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.Subversion.Unix.dll.config
+%%SVN%%lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.Subversion.Unix.dll.mdb
 %%SVN%%lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.Subversion.dll
-%%SVN%%lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.Subversion.dll.config
 %%SVN%%lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.Subversion.dll.mdb
 lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.dll
 lib/monodevelop/AddIns/VersionControl/MonoDevelop.VersionControl.dll.mdb
+%%GIT%%lib/monodevelop/AddIns/VersionControl/NGit.dll
+%%GIT%%lib/monodevelop/AddIns/VersionControl/NSch.dll
+%%GIT%%lib/monodevelop/AddIns/VersionControl/Sharpen.dll
 lib/monodevelop/AddIns/VersionControl/comment.png
 lib/monodevelop/AddIns/VersionControl/menu_add.png
 lib/monodevelop/AddIns/VersionControl/menu_commit.png
@@ -175,6 +184,7 @@ lib/monodevelop/bin/MonoDevelop.Core.dll
 lib/monodevelop/bin/MonoDevelop.Core.dll.config
 lib/monodevelop/bin/MonoDevelop.Core.dll.mdb
 lib/monodevelop/bin/MonoDevelop.Ide.dll
+lib/monodevelop/bin/MonoDevelop.Ide.dll.config
 lib/monodevelop/bin/MonoDevelop.Ide.dll.mdb
 lib/monodevelop/bin/MonoDevelop.Projects.Formats.MSBuild.exe
 lib/monodevelop/bin/MonoDevelop.Projects.Formats.MSBuild.exe.config
@@ -190,9 +200,9 @@ lib/monodevelop/bin/mdhost.exe
 lib/monodevelop/bin/mdhost.exe.mdb
 lib/monodevelop/bin/mdmonitor.exe
 lib/monodevelop/bin/mdmonitor.exe.mdb
-lib/monodevelop/bin/mdrun.exe
-lib/monodevelop/bin/mdrun.exe.config
-lib/monodevelop/bin/mdrun.exe.mdb
+lib/monodevelop/bin/mdtool.exe
+lib/monodevelop/bin/mdtool.exe.config
+lib/monodevelop/bin/mdtool.exe.mdb
 lib/monodevelop/data/options/DefaultEditingLayout.xml
 lib/monodevelop/data/options/MonoDevelop-templates.xml
 lib/monodevelop/data/options/MonoDevelop-tools.xml