- Update to 2.4.

Feature safe:	yes

4 files changed, 35 insertions, 26 deletions

diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 9ba496f481e0..9a9111019aa1 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	monodevelop
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
diff --git a/devel/monodevelop/distinfo b/devel/monodevelop/distinfo
index 73897b94cf64..3d6368d54bf5 100644
--- a/devel/monodevelop/distinfo
+++ b/devel/monodevelop/distinfo
@@ -1,3 +1,3 @@
-MD5 (monodevelop-2.2.2.tar.bz2) = 7f01933ede642dbf394147224d0d751e
-SHA256 (monodevelop-2.2.2.tar.bz2) = 6bb377a0b8f0a742e005220f9bb2be540a486415a04cb3f2e526a048ecebc0a1
-SIZE (monodevelop-2.2.2.tar.bz2) = 5892854
+MD5 (monodevelop-2.4.tar.bz2) = 14deccd526d640cd38482f7ce7c0cb41
+SHA256 (monodevelop-2.4.tar.bz2) = d91220c382237b5ca33a6b38355b7d6ad4ba0fc289fec8347f2bdd5ab0df7899
+SIZE (monodevelop-2.4.tar.bz2) = 6152312
diff --git a/devel/monodevelop/files/patch-LibApr.cs b/devel/monodevelop/files/patch-LibApr.cs
index 0efe88d44193..8b34bc2d3ff5 100644
--- a/devel/monodevelop/files/patch-LibApr.cs
+++ b/devel/monodevelop/files/patch-LibApr.cs
@@ -5,7 +5,7 @@
  	public class LibApr0: LibApr
  	{
 -		private const string aprlib = "libapr-0.so.0";
-+		private const string aprlib = "libapr-1.so.3";
++		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/pkg-plist b/devel/monodevelop/pkg-plist
index 0a3dd332dd10..8a17a935945f 100644
--- a/devel/monodevelop/pkg-plist
+++ b/devel/monodevelop/pkg-plist
@@ -4,6 +4,8 @@ lib/monodevelop/AddIns/BackendBindings/ILAsmBinding.dll
 lib/monodevelop/AddIns/BackendBindings/ILAsmBinding.dll.mdb
 lib/monodevelop/AddIns/BackendBindings/MonoDevelop.CBinding.dll
 lib/monodevelop/AddIns/BackendBindings/MonoDevelop.CBinding.dll.mdb
+lib/monodevelop/AddIns/BackendBindings/MonoDevelop.CSharpBinding.AspNet.dll
+lib/monodevelop/AddIns/BackendBindings/MonoDevelop.CSharpBinding.AspNet.dll.mdb
 lib/monodevelop/AddIns/BackendBindings/MonoDevelop.CSharpBinding.Autotools.dll
 lib/monodevelop/AddIns/BackendBindings/MonoDevelop.CSharpBinding.Autotools.dll.mdb
 lib/monodevelop/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll
@@ -67,6 +69,8 @@ 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/Mono.Debugging.Soft.dll
+lib/monodevelop/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.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
@@ -91,9 +95,13 @@ 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.HexEditor.dll
+lib/monodevelop/AddIns/MonoDevelop.HexEditor.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.Moonlight/Templates/framework_SL_2_0.xml
+lib/monodevelop/AddIns/MonoDevelop.Moonlight/Templates/framework_SL_3_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
@@ -106,6 +114,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/T4TemplateCSharp.xft.xml
 lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe
 lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe.mdb
 lib/monodevelop/AddIns/MonoDevelop.WebReferences/MonoDevelop.WebReferences.dll
@@ -132,21 +141,27 @@ 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
-lib/monodevelop/AddIns/VersionControl/Diff.dll
-lib/monodevelop/AddIns/VersionControl/Diff.dll.mdb
-lib/monodevelop/AddIns/VersionControl/DiffWidget.dll
-lib/monodevelop/AddIns/VersionControl/DiffWidget.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
-lib/monodevelop/AddIns/WelcomePage/WelcomePage.css
+lib/monodevelop/AddIns/VersionControl/comment.png
+lib/monodevelop/AddIns/VersionControl/menu_add.png
+lib/monodevelop/AddIns/VersionControl/menu_commit.png
+lib/monodevelop/AddIns/VersionControl/menu_diff.png
+lib/monodevelop/AddIns/VersionControl/menu_log.png
+lib/monodevelop/AddIns/VersionControl/menu_remote_status.png
+lib/monodevelop/AddIns/VersionControl/menu_remove.png
+lib/monodevelop/AddIns/VersionControl/menu_resolve.png
+lib/monodevelop/AddIns/VersionControl/menu_revert.png
+lib/monodevelop/AddIns/VersionControl/menu_status.png
+lib/monodevelop/AddIns/VersionControl/menu_update.png
 lib/monodevelop/AddIns/WelcomePage/WelcomePage.dll
 lib/monodevelop/AddIns/WelcomePage/WelcomePage.dll.mdb
-lib/monodevelop/AddIns/WelcomePage/mono-bg.png
-lib/monodevelop/AddIns/WelcomePage/mono-decoration.png
-lib/monodevelop/AddIns/WelcomePage/mono-logo.png
+lib/monodevelop/AddIns/WelcomePage/md-bg.png
+lib/monodevelop/AddIns/WelcomePage/md-logo.png
+lib/monodevelop/bin/Cecil.Decompiler.dll
 lib/monodevelop/bin/Mono.Cecil.Mdb.dll
 lib/monodevelop/bin/Mono.Cecil.Mdb.dll.mdb
 lib/monodevelop/bin/Mono.Cecil.dll
@@ -154,24 +169,15 @@ lib/monodevelop/bin/Mono.Cecil.dll.mdb
 lib/monodevelop/bin/Mono.Debugging.dll
 lib/monodevelop/bin/Mono.Debugging.dll.mdb
 lib/monodevelop/bin/Mono.TextEditor.dll
+lib/monodevelop/bin/Mono.TextEditor.dll.config
 lib/monodevelop/bin/Mono.TextEditor.dll.mdb
-lib/monodevelop/bin/MonoDevelop.Components.dll
-lib/monodevelop/bin/MonoDevelop.Components.dll.mdb
-lib/monodevelop/bin/MonoDevelop.Core.Gui.dll
-lib/monodevelop/bin/MonoDevelop.Core.Gui.dll.mdb
 lib/monodevelop/bin/MonoDevelop.Core.dll
+lib/monodevelop/bin/MonoDevelop.Core.dll.config
 lib/monodevelop/bin/MonoDevelop.Core.dll.mdb
-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
-lib/monodevelop/bin/MonoDevelop.Projects.dll.config
-lib/monodevelop/bin/MonoDevelop.Projects.dll.mdb
 lib/monodevelop/bin/MonoDevelop.exe
 lib/monodevelop/bin/MonoDevelop.exe.addins
 lib/monodevelop/bin/MonoDevelop.exe.config
@@ -181,6 +187,8 @@ lib/monodevelop/bin/NRefactory.dll.mdb
 lib/monodevelop/bin/buildinfo
 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
@@ -274,6 +282,7 @@ 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/Templates
 @dirrm lib/monodevelop/AddIns/MonoDevelop.TextTemplating
 @dirrm lib/monodevelop/AddIns/MonoDevelop.RegexToolkit
 @dirrm lib/monodevelop/AddIns/MonoDevelop.Refactoring
@@ -298,8 +307,8 @@ share/mime/types
 @dirrm lib/monodevelop/AddIns/GnomePlatform
 @dirrm lib/monodevelop/AddIns/ChangeLogAddIn
 @dirrm lib/monodevelop/AddIns/BackendBindings
-@dirrm lib/monodevelop/AddIns
-@dirrm lib/monodevelop
+@dirrmtry lib/monodevelop/AddIns
+@dirrmtry lib/monodevelop
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true