6 files changed, 77 insertions, 37 deletions

diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 9053c0ecad54..9ba496f481e0 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	monodevelop
-PORTVERSION=	2.0
-PORTREVISION=	5
+PORTVERSION=	2.2.2
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
@@ -31,16 +30,37 @@ MAN1=		mdtool.1 monodevelop.1
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 
-OPTIONS=	SVN "Enable subversion support" on
+OPTIONS=	MONOEXT "Enable extensions for Mono development" on \
+		VCS "Enable version control support" on \
+		SVN "Enable subversion support" on
+
+# Restrict to stable (even) versions, indicated by the second component.
+PORTSCOUT=	limitw:1,even
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_MONOEXT)
+CONFIGURE_ARGS+=--enable-monoextensions
+PLIST_SUB+=	MONOEXT=""
+.else
+CONFIGURE_ARGS+=--disable-monoextensions
+PLIST_SUB+=	MONOEXT="@comment "
+.endif
+
+.if defined(WITH_VCS) && !defined(WITHOUT_VCS)
+CONFIGURE_ARGS+=--enable-versioncontrol
+PLIST_SUB+=	VCS=""
+.else
+CONFIGURE_ARGS+=--disable-versioncontrol
+PLIST_SUB+=	VCS="@comment "
+.endif
+
 .if !defined(WITHOUT_SVN)
 RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-CONFIGURE_ARGS+=	--enable-subversion
+CONFIGURE_ARGS+=--enable-subversion
 PLIST_SUB+=	SVN=""
 .else
-CONFIGURE_ARGS+=	--disable-subversion
+CONFIGURE_ARGS+=--disable-subversion
 PLIST_SUB+=	SVN="@comment "
 .endif
 
diff --git a/devel/monodevelop/distinfo b/devel/monodevelop/distinfo
index 6463c11f2b7c..73897b94cf64 100644
--- a/devel/monodevelop/distinfo
+++ b/devel/monodevelop/distinfo
@@ -1,3 +1,3 @@
-MD5 (monodevelop-2.0.tar.bz2) = 0f527204ffd4785284d9556a75524c3e
-SHA256 (monodevelop-2.0.tar.bz2) = 573fd6dda40f6b46866bb8b40b92d2ed279be504d2e943ab5ae65e38c136d984
-SIZE (monodevelop-2.0.tar.bz2) = 5010211
+MD5 (monodevelop-2.2.2.tar.bz2) = 7f01933ede642dbf394147224d0d751e
+SHA256 (monodevelop-2.2.2.tar.bz2) = 6bb377a0b8f0a742e005220f9bb2be540a486415a04cb3f2e526a048ecebc0a1
+SIZE (monodevelop-2.2.2.tar.bz2) = 5892854
diff --git a/devel/monodevelop/files/patch-SystemAssemblyService.cs b/devel/monodevelop/files/patch-SystemAssemblyService.cs
deleted file mode 100644
index b12aef4be1c1..000000000000
--- a/devel/monodevelop/files/patch-SystemAssemblyService.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/core/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs.orig
-+++ src/core/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs
-@@ -412,6 +412,7 @@
- 			
- 			string[] suffixes = new string [] {
- 				Path.Combine ("lib", "pkgconfig"),
-+				Path.Combine ("libdata", "pkgconfig"),
- 				Path.Combine ("lib64", "pkgconfig"),
- 				Path.Combine ("share", "pkgconfig"),
- 			};
diff --git a/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs b/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs
index c56278107f7a..dde4869a4626 100644
--- a/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs
+++ b/devel/monodevelop/files/patch-src_addins_CBinding_Parser_TagDatabaseManager.cs
@@ -12,7 +12,7 @@ $FreeBSD$
  					} catch {
  						LoggingService.LogWarning ("Cannot update C/C++ tags database because exuberant ctags is not installed.");
  						return false;
-@@ -273,7 +273,7 @@
+@@ -276,7 +276,7 @@
  				try {
  					output = new System.IO.StringWriter ();
  					
@@ -21,12 +21,12 @@ $FreeBSD$
  					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 ());
-@@ -377,7 +377,7 @@
+@@ -383,7 +383,7 @@
  				output = new System.IO.StringWriter ();
  				error = new System.IO.StringWriter ();
  				
--				p = Runtime.ProcessService.StartProcess ("ctags", ctags_options, project.BaseDirectory, output, error, null);
-+				p = Runtime.ProcessService.StartProcess ("exctags", ctags_options, project.BaseDirectory, output, error, null);
+-				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/files/patch-src_core_MonoDevelop.Projects_MonoDevelop.Projects.dll.config b/devel/monodevelop/files/patch-src_core_MonoDevelop.Projects_MonoDevelop.Projects.dll.config
deleted file mode 100644
index ae1ddc2c72c9..000000000000
--- a/devel/monodevelop/files/patch-src_core_MonoDevelop.Projects_MonoDevelop.Projects.dll.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$FreeBSD$
-
---- src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config.orig
-+++ src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config
-@@ -1,4 +1,4 @@
- <configuration>
--  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="linux" />
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="!osx,windows" />
-   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.dylib" os="osx" />
- </configuration>
diff --git a/devel/monodevelop/pkg-plist b/devel/monodevelop/pkg-plist
index e67e38104043..0a3dd332dd10 100644
--- a/devel/monodevelop/pkg-plist
+++ b/devel/monodevelop/pkg-plist
@@ -15,6 +15,19 @@ lib/monodevelop/AddIns/ChangeLogAddIn/ChangeLogAddIn.dll.mdb
 lib/monodevelop/AddIns/GnomePlatform/GnomePlatform.dll
 lib/monodevelop/AddIns/GnomePlatform/GnomePlatform.dll.config
 lib/monodevelop/AddIns/GnomePlatform/GnomePlatform.dll.mdb
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/CodeTemplates/AddView/Empty.tt
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.dll
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.dll.mdb
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/Controller.xft.xml
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/EmptyProject.xpt.xml
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/GlobalAsax.xft.xml
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/Project.xpt.xml
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/UserControl.xft.xml
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/ViewContentPage.xft.xml
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/ViewMasterPage.xft.xml
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/ViewPage.xft.xml
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/WebConfigApp.xft.xml
+lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates/WebConfigViews.xft.xml
 lib/monodevelop/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll
 lib/monodevelop/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.AspNet/Schemas/W3C-License.html
@@ -52,6 +65,14 @@ lib/monodevelop/AddIns/MonoDevelop.Autotools/templates/package.pc.template
 lib/monodevelop/AddIns/MonoDevelop.Autotools/templates/rules.make
 lib/monodevelop/AddIns/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.dll
 lib/monodevelop/AddIns/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.dll.mdb
+lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
+lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll.mdb
+lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet.dll
+lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet.dll.mdb
+lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight.dll
+lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight.dll.mdb
+lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll
+lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll
 lib/monodevelop/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll
@@ -70,12 +91,23 @@ lib/monodevelop/AddIns/MonoDevelop.GtkCore/libstetic.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.GtkCore/libsteticui.dll
 lib/monodevelop/AddIns/MonoDevelop.GtkCore/libsteticui.dll.config
 lib/monodevelop/AddIns/MonoDevelop.GtkCore/libsteticui.dll.mdb
+lib/monodevelop/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll
+lib/monodevelop/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll.mdb
+lib/monodevelop/AddIns/MonoDevelop.Moonlight/Templates/Silverlight.js
 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
+lib/monodevelop/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.dll
 lib/monodevelop/AddIns/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.SourceEditor2.dll
 lib/monodevelop/AddIns/MonoDevelop.SourceEditor2.dll.mdb
+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/TextTransform.exe
+lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe.mdb
 lib/monodevelop/AddIns/MonoDevelop.WebReferences/MonoDevelop.WebReferences.dll
 lib/monodevelop/AddIns/MonoDevelop.WebReferences/MonoDevelop.WebReferences.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll
@@ -133,6 +165,8 @@ lib/monodevelop/bin/MonoDevelop.Dock.dll
 lib/monodevelop/bin/MonoDevelop.Dock.dll.mdb
 lib/monodevelop/bin/MonoDevelop.Ide.dll
 lib/monodevelop/bin/MonoDevelop.Ide.dll.mdb
+lib/monodevelop/bin/MonoDevelop.Projects.Formats.MSBuild.exe
+lib/monodevelop/bin/MonoDevelop.Projects.Formats.MSBuild.exe.mdb
 lib/monodevelop/bin/MonoDevelop.Projects.Gui.dll
 lib/monodevelop/bin/MonoDevelop.Projects.Gui.dll.mdb
 lib/monodevelop/bin/MonoDevelop.Projects.dll
@@ -144,6 +178,7 @@ lib/monodevelop/bin/MonoDevelop.exe.config
 lib/monodevelop/bin/MonoDevelop.exe.mdb
 lib/monodevelop/bin/NRefactory.dll
 lib/monodevelop/bin/NRefactory.dll.mdb
+lib/monodevelop/bin/buildinfo
 lib/monodevelop/bin/mdhost.exe
 lib/monodevelop/bin/mdhost.exe.mdb
 lib/monodevelop/bin/mdrun.exe
@@ -224,11 +259,11 @@ share/mime/text/x-nemerle.xml
 share/mime/text/x-vb.xml
 share/mime/treemagic
 share/mime/types
-@dirrmtry share/applications
 @dirrmtry share/locale/sv/LC_MESSAGES
 @dirrmtry share/locale/sv
 @dirrmtry share/locale/ja/LC_MESSAGES
 @dirrmtry share/locale/ja
+@dirrmtry share/applications
 @dirrm lib/monodevelop/data/options
 @dirrm lib/monodevelop/data
 @dirrm lib/monodevelop/bin
@@ -239,17 +274,26 @@ share/mime/types
 @dirrm lib/monodevelop/AddIns/MonoDevelop.XmlEditor/schemas
 @dirrm lib/monodevelop/AddIns/MonoDevelop.XmlEditor
 @dirrm lib/monodevelop/AddIns/MonoDevelop.WebReferences
+@dirrm lib/monodevelop/AddIns/MonoDevelop.TextTemplating
 @dirrm lib/monodevelop/AddIns/MonoDevelop.RegexToolkit
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Refactoring
 @dirrm lib/monodevelop/AddIns/MonoDevelop.MsVisualStudio
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Moonlight/Templates
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Moonlight
 @dirrm lib/monodevelop/AddIns/MonoDevelop.GtkCore
 @dirrm lib/monodevelop/AddIns/MonoDevelop.Gettext
 @dirrm lib/monodevelop/AddIns/MonoDevelop.DesignerSupport
 @dirrm lib/monodevelop/AddIns/MonoDevelop.Deployment
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft
 @dirrm lib/monodevelop/AddIns/MonoDevelop.Debugger
 @dirrm lib/monodevelop/AddIns/MonoDevelop.CodeMetrics
 @dirrm lib/monodevelop/AddIns/MonoDevelop.Autotools/templates
 @dirrm lib/monodevelop/AddIns/MonoDevelop.Autotools
 @dirrm lib/monodevelop/AddIns/MonoDevelop.AspNet/Schemas
+@dirrm lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/Templates
+@dirrm lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/CodeTemplates/AddView
+@dirrm lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc/CodeTemplates
+@dirrm lib/monodevelop/AddIns/MonoDevelop.AspNet.Mvc
 @dirrm lib/monodevelop/AddIns/MonoDevelop.AspNet
 @dirrm lib/monodevelop/AddIns/GnomePlatform
 @dirrm lib/monodevelop/AddIns/ChangeLogAddIn