Update to monodevelop 2.2.1, part of mono 2.6

4 files changed, 43 insertions, 19 deletions

diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 0e98ee60199..12f465637a4 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/02/16 18:13:55 kefren Exp $
 
-DISTNAME=	monodevelop-2.0
-PKGREVISION=	5
+DISTNAME=	monodevelop-2.2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/monodevelop/
 EXTRACT_SUFX=	.tar.bz2
@@ -28,7 +27,7 @@ REPLACE_BASH+=	theme-icons/icon-theme-installer
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libgdiplus/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtksourceview-sharp2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
diff --git a/devel/monodevelop/PLIST b/devel/monodevelop/PLIST
index 1326c90a07b..d961cd5b0e0 100644
--- a/devel/monodevelop/PLIST
+++ b/devel/monodevelop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:48:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/02/16 18:13:55 kefren Exp $
 bin/mdtool
 bin/monodevelop
 lib/monodevelop/AddIns/BackendBindings/ILAsmBinding.dll
@@ -16,6 +16,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.Autotools/Makefile.am.project.template
 lib/monodevelop/AddIns/MonoDevelop.Autotools/Makefile.include
 lib/monodevelop/AddIns/MonoDevelop.Autotools/Makefile.noauto.project.template
@@ -53,6 +66,14 @@ lib/monodevelop/AddIns/MonoDevelop.AssemblyBrowser.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll.mdb
 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
@@ -71,12 +92,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
@@ -129,6 +161,8 @@ lib/monodevelop/bin/MonoDevelop.Core.Gui.dll
 lib/monodevelop/bin/MonoDevelop.Core.dll
 lib/monodevelop/bin/MonoDevelop.Dock.dll
 lib/monodevelop/bin/MonoDevelop.Ide.dll
+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.dll
 lib/monodevelop/bin/MonoDevelop.Projects.dll.config
@@ -136,6 +170,7 @@ lib/monodevelop/bin/MonoDevelop.exe
 lib/monodevelop/bin/MonoDevelop.exe.addins
 lib/monodevelop/bin/MonoDevelop.exe.config
 lib/monodevelop/bin/NRefactory.dll
+lib/monodevelop/bin/buildinfo
 lib/monodevelop/bin/mdhost.exe
 lib/monodevelop/bin/mdrun.exe
 lib/monodevelop/bin/mdrun.exe.config
diff --git a/devel/monodevelop/distinfo b/devel/monodevelop/distinfo
index ebc68fe6f51..8831be2d2a6 100644
--- a/devel/monodevelop/distinfo
+++ b/devel/monodevelop/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2009/04/07 12:36:33 kefren Exp $
+$NetBSD: distinfo,v 1.10 2010/02/16 18:13:55 kefren Exp $
 
-SHA1 (monodevelop-2.0.tar.bz2) = f270fc394f680d59a26951cad64f9517772ab351
-RMD160 (monodevelop-2.0.tar.bz2) = 70c312af2345d5d36d4ba35e48e6127b095e6b33
-Size (monodevelop-2.0.tar.bz2) = 5010211 bytes
-SHA1 (patch-aa) = 001db4cabd785e979ef82be4438269cac24d4f51
+SHA1 (monodevelop-2.2.1.tar.bz2) = 7d4fdeda1fcc69b1f5eb6eac7412f7bb84b10564
+RMD160 (monodevelop-2.2.1.tar.bz2) = 807b73d53d8aba099aaa24ebb9e9b363594ae37a
+Size (monodevelop-2.2.1.tar.bz2) = 5880656 bytes
diff --git a/devel/monodevelop/patches/patch-aa b/devel/monodevelop/patches/patch-aa
deleted file mode 100644
index a5d8ab9b6ae..00000000000
--- a/devel/monodevelop/patches/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2009/04/07 12:36:33 kefren Exp $
---- src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config.orig	2009-04-07 15:31:34.000000000 +0300
-+++ src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config	2009-04-07 15:31:56.000000000 +0300
-@@ -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="linux,netbsd" />
-   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.dylib" os="osx" />
- </configuration>