16 files changed, 197 insertions, 149 deletions

diff --git a/devel/monodevelop-boo/Makefile b/devel/monodevelop-boo/Makefile
index 30316c1bd853..2b7bfc31f5d5 100644
--- a/devel/monodevelop-boo/Makefile
+++ b/devel/monodevelop-boo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	monodevelop-boo
-PORTVERSION=	2.2
+PORTVERSION=	2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
@@ -15,7 +15,6 @@ COMMENT=	MonoDevelop Boo language support
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		${LOCALBASE}/libdata/pkgconfig/monodevelop.pc:${PORTSDIR}/devel/monodevelop \
-		${LOCALBASE}/libdata/pkgconfig/gtksourceview-sharp-2.0.pc:${PORTSDIR}/x11-toolkits/gtksourceview-sharp \
 		booc:${PORTSDIR}/lang/boo
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/devel/monodevelop-boo/distinfo b/devel/monodevelop-boo/distinfo
index b787c22ad55d..1dd16dd0f787 100644
--- a/devel/monodevelop-boo/distinfo
+++ b/devel/monodevelop-boo/distinfo
@@ -1,3 +1,3 @@
-MD5 (monodevelop-boo-2.2.tar.bz2) = 25abd742dc4a0ffcf17c537dea6d791f
-SHA256 (monodevelop-boo-2.2.tar.bz2) = 2507a9b3f8d42f496ca871730b17f68fb40ce98cbd7692ee287ee67c39fd71f8
-SIZE (monodevelop-boo-2.2.tar.bz2) = 59659
+MD5 (monodevelop-boo-2.4.tar.bz2) = aca5bd7ee104bc8dfd84df285fa2a3c7
+SHA256 (monodevelop-boo-2.4.tar.bz2) = 2446eefdbeb5706d1a8eadc191d135137aa4b0ebcb340bb5321923ddb5a717e0
+SIZE (monodevelop-boo-2.4.tar.bz2) = 61615
diff --git a/devel/monodevelop-boo/files/patch-BooBinding.make b/devel/monodevelop-boo/files/patch-BooBinding.make
index eab40d192bf6..bfd7bad4b5f5 100644
--- a/devel/monodevelop-boo/files/patch-BooBinding.make
+++ b/devel/monodevelop-boo/files/patch-BooBinding.make
@@ -1,6 +1,9 @@
---- BooBinding.make.orig	2008-03-02 14:31:26.000000000 +0100
-+++ BooBinding.make	2008-03-02 14:31:45.000000000 +0100
-@@ -128,25 +128,25 @@
+
+$FreeBSD$
+
+--- BooBinding.make.orig
++++ BooBinding.make
+@@ -128,12 +128,12 @@
  LOCAL_PKGCONFIG=PKG_CONFIG_PATH=../../local-config:$$PKG_CONFIG_PATH
  
  $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list)
@@ -15,8 +18,12 @@
 +	$(MAKE) $(CONFIG)_AfterBuild
 +	$(MAKE) post-all-local-hook prefix=$(prefix)
  
+ $(DATA_FILE_BUILD): $(srcdir)$(subst $(BUILD_DIR),, $@)
+ 	mkdir -p $(dir $@)
+@@ -144,17 +144,17 @@
+ 	cp $(srcdir)/$(subst $(INSTALL_DIR),,$@) $@
  
- install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(BOOBINDING_PC)
+ install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(BOOBINDING_PC) $(DATA_FILE_INSTALL)
 -	make pre-install-local-hook prefix=$(prefix)
 +	$(MAKE) pre-install-local-hook prefix=$(prefix)
  	mkdir -p $(INSTALL_DIR)
@@ -30,6 +37,7 @@
 -	make pre-uninstall-local-hook prefix=$(prefix)
 +	$(MAKE) pre-uninstall-local-hook prefix=$(prefix)
  	rm -f $(INSTALL_DIR)/$(notdir $(ASSEMBLY))
+ 	rm -f $(DATA_FILE_INSTALL)
  	test -z '$(ASSEMBLY_MDB)' || rm -f $(INSTALL_DIR)/$(notdir $(ASSEMBLY_MDB))
  	test -z '$(BOOBINDING_PC)' || rm -f $(INSTALL_DIR)/$(notdir $(BOOBINDING_PC))
 -	make post-uninstall-local-hook prefix=$(prefix)
diff --git a/devel/monodevelop-boo/files/patch-Makefile b/devel/monodevelop-boo/files/patch-Makefile
index 96b1c00825ed..7972f5ef6849 100644
--- a/devel/monodevelop-boo/files/patch-Makefile
+++ b/devel/monodevelop-boo/files/patch-Makefile
@@ -1,17 +1,20 @@
---- Makefile.orig	2008-03-02 14:28:23.000000000 +0100
-+++ Makefile	2008-03-02 14:28:43.000000000 +0100
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
 @@ -26,14 +26,14 @@
  	@set . $$MAKEFLAGS; final_exit=:; \
  	case $$2 in --unix) shift ;; esac; \
  	case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
 -	make pre-$*-hook prefix=$(prefix) ; \
 +	$(MAKE) pre-$*-hook prefix=$(prefix) ; \
- 	for dir in $(SUBDIRS); do \
- 		case $$dir in \
+ 	for dir in $(call quote_each,$(SUBDIRS)); do \
+ 		case "$$dir" in \
 -		.) make $*-local || { final_exit="exit 1"; $$dk; };;\
--		*) (cd $$dir && make $*) || { final_exit="exit 1"; $$dk; };;\
+-		*) (cd "$$dir" && make $*) || { final_exit="exit 1"; $$dk; };;\
 +		.) $(MAKE) $*-local || { final_exit="exit 1"; $$dk; };;\
-+		*) (cd $$dir && $(MAKE) $*) || { final_exit="exit 1"; $$dk; };;\
++		*) (cd "$$dir" && $(MAKE) $*) || { final_exit="exit 1"; $$dk; };;\
  		esac \
  	done; \
 -	make post-$*-hook prefix=$(prefix) ; \
@@ -25,22 +28,22 @@
  	mkdir $(PACKAGE)-$(VERSION)
 -	make pre-dist-hook distdir=$$distdir
 +	$(MAKE) pre-dist-hook distdir=$$distdir
- 	for dir in $(SUBDIRS); do \
+ 	for dir in $(call quote_each,$(SUBDIRS)); do \
  		pkgdir=`pwd`/$(PACKAGE)-$(VERSION); \
- 		mkdir $$pkgdir/$$dir || true; \
+ 		mkdir "$$pkgdir/$$dir" || true; \
  		case $$dir in \
--		.) make dist-local distdir=$$pkgdir || exit 1;; \
--		*) (cd $$dir; make dist-local distdir=$$pkgdir/$$dir) || exit 1;; \
-+		.) $(MAKE) dist-local distdir=$$pkgdir || exit 1;; \
-+		*) (cd $$dir; $(MAKE) dist-local distdir=$$pkgdir/$$dir) || exit 1;; \
+-		.) make dist-local "distdir=$$pkgdir" || exit 1;; \
+-		*) (cd "$$dir"; make dist-local "distdir=$$pkgdir/$$dir") || exit 1;; \
++		.) $(MAKE) dist-local "distdir=$$pkgdir" || exit 1;; \
++		*) (cd "$$dir"; $(MAKE) dist-local "distdir=$$pkgdir/$$dir") || exit 1;; \
  		esac \
  	done
 -	(make dist-local distdir=$(PACKAGE)-$(VERSION))
 -	make
--	make post-dist-hook distsir=$$distdir
+-	make post-dist-hook "distsir=$$distdir"
 +	($(MAKE) dist-local distdir=$(PACKAGE)-$(VERSION))
 +	$(MAKE)
-+	$(MAKE) post-dist-hook distsir=$$distdir
++	$(MAKE) post-dist-hook "distsir=$$distdir"
  	tar czvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
  	rm -rf $(PACKAGE)-$(VERSION)
  	@echo "=========================================="
diff --git a/devel/monodevelop-boo/pkg-plist b/devel/monodevelop-boo/pkg-plist
index 8601a9632e4c..5998a26cf290 100644
--- a/devel/monodevelop-boo/pkg-plist
+++ b/devel/monodevelop-boo/pkg-plist
@@ -3,6 +3,8 @@ lib/monodevelop/AddIns/BooBinding/BooShell.dll.mdb
 lib/monodevelop/AddIns/BooBinding/BooShell.dll
 lib/monodevelop/AddIns/BooBinding/BooBinding.dll.mdb
 lib/monodevelop/AddIns/BooBinding/BooBinding.dll
+lib/monodevelop/AddIns/BooBinding/icons/Boo.FileIcon
+lib/monodevelop/AddIns/BooBinding/icons/BooBinding.Base
 lib/monodevelop/AddIns/BooBinding/locale/ca/LC_MESSAGES/monodevelop-boo.mo
 lib/monodevelop/AddIns/BooBinding/locale/cs/LC_MESSAGES/monodevelop-boo.mo
 lib/monodevelop/AddIns/BooBinding/locale/da/LC_MESSAGES/monodevelop-boo.mo
@@ -25,47 +27,48 @@ lib/monodevelop/AddIns/BooBinding/locale/tr/LC_MESSAGES/monodevelop-boo.mo
 lib/monodevelop/AddIns/BooBinding/locale/zh_CN/LC_MESSAGES/monodevelop-boo.mo
 lib/monodevelop/AddIns/BooBinding/locale/zh_TW/LC_MESSAGES/monodevelop-boo.mo
 libdata/pkgconfig/monodevelop-boo.pc
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/zh_TW/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/zh_TW
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/zh_CN/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/zh_CN
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/tr/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/tr
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/sv/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/sv
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/sl_SI/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/sl_SI
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/ru/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/ru
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/pt_BR/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/pt_BR
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/pt/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/pt
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/pl/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/pl
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/nl/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/nl
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/ja/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/ja
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/it/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/it
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/id/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/id
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/hu/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/hu
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/gl/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/gl
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/fr/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/fr
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/es/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/es
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/de/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/de
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/da/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/da
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/cs/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/cs
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/ca/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale/ca
-@dirrmtry lib/monodevelop/AddIns/BooBinding/locale
-@dirrmtry lib/monodevelop/AddIns/BooBinding
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/zh_TW/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/zh_TW
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/zh_CN/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/zh_CN
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/tr/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/tr
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/sv/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/sv
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/sl_SI/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/sl_SI
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/ru/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/icons
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/ru
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/pt_BR/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/pt_BR
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/pt/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/pt
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/pl/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/pl
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/nl/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/nl
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/ja/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/ja
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/it/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/it
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/id/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/id
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/hu/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/hu
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/gl/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/gl
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/fr/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/fr
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/es/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/es
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/de/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/de
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/da/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/da
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/cs/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/cs
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/ca/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/BooBinding/locale/ca
+@dirrm lib/monodevelop/AddIns/BooBinding/locale
+@dirrm lib/monodevelop/AddIns/BooBinding
diff --git a/devel/monodevelop-database/Makefile b/devel/monodevelop-database/Makefile
index 7c3ac34fbd1d..56c203961d2f 100644
--- a/devel/monodevelop-database/Makefile
+++ b/devel/monodevelop-database/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	monodevelop-database
-PORTVERSION=	2.2
+PORTVERSION=	2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
diff --git a/devel/monodevelop-database/distinfo b/devel/monodevelop-database/distinfo
index 45c55c459c55..901c2e9f842b 100644
--- a/devel/monodevelop-database/distinfo
+++ b/devel/monodevelop-database/distinfo
@@ -1,3 +1,3 @@
-MD5 (monodevelop-database-2.2.tar.bz2) = 430571024f88c87d5104121739c6ab7e
-SHA256 (monodevelop-database-2.2.tar.bz2) = bc43781a360f90f9e69819d1192d1fd882981a807c058141fffb756ed3fe5c2b
-SIZE (monodevelop-database-2.2.tar.bz2) = 384079
+MD5 (monodevelop-database-2.4.tar.bz2) = f3606cb2193fc0229a167a53147fbecf
+SHA256 (monodevelop-database-2.4.tar.bz2) = 091daf30bc44f0d361418e709d800f1fe4c3a0e63657f139e209f9886bc78c5e
+SIZE (monodevelop-database-2.4.tar.bz2) = 416904
diff --git a/devel/monodevelop-database/pkg-plist b/devel/monodevelop-database/pkg-plist
index 1b380523711a..82c1d11633c5 100644
--- a/devel/monodevelop-database/pkg-plist
+++ b/devel/monodevelop-database/pkg-plist
@@ -20,6 +20,31 @@ lib/monodevelop/AddIns/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite.dll.
 lib/monodevelop/AddIns/MonoDevelop.Database/MonoDevelop.Database.Sql.dll
 lib/monodevelop/AddIns/MonoDevelop.Database/MonoDevelop.Database.Sql.dll.mdb
 lib/monodevelop/AddIns/MonoDevelop.Database/MySql.Data.dll
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Column.Key.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Column.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Connection.Error.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Connection.Remove.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Connection.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Constraints.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Database.Error.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Database.Ok.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Database.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Execute.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Function.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Parameter.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Procedure.Error.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Procedure.Source.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Procedure.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Relations.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Table.Error.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Table.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Tables.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.User.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Users.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.View.Error.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.View.Source.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.View.png
+lib/monodevelop/AddIns/MonoDevelop.Database/icons/Icons.16x16.Database.Views.png
 lib/monodevelop/AddIns/MonoDevelop.Database/locale/ca/LC_MESSAGES/monodevelop-database.mo
 lib/monodevelop/AddIns/MonoDevelop.Database/locale/cs/LC_MESSAGES/monodevelop-database.mo
 lib/monodevelop/AddIns/MonoDevelop.Database/locale/da/LC_MESSAGES/monodevelop-database.mo
@@ -42,47 +67,48 @@ lib/monodevelop/AddIns/MonoDevelop.Database/locale/tr/LC_MESSAGES/monodevelop-da
 lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_CN/LC_MESSAGES/monodevelop-database.mo
 lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_TW/LC_MESSAGES/monodevelop-database.mo
 libdata/pkgconfig/monodevelop-database.pc
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_TW/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_TW
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_CN/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_CN
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/tr/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/tr
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/sv/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/sv
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/sl_SI/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/sl_SI
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/ru/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/ru
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/pt_BR/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/pt_BR
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/pt/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/pt
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/pl/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/pl
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/nl/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/nl
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/ja/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/ja
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/it/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/it
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/id/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/id
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/hu/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/hu
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/gl/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/gl
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/fr/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/fr
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/es/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/es
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/de/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/de
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/da/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/da
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/cs/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/cs
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/ca/LC_MESSAGES
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale/ca
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database/locale
-@dirrmtry lib/monodevelop/AddIns/MonoDevelop.Database
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_TW/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_TW
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_CN/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/zh_CN
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/tr/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/tr
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/sv/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/sv
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/sl_SI/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/sl_SI
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/ru/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/ru
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/pt_BR/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/pt_BR
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/pt/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/pt
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/pl/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/pl
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/nl/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/nl
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/ja/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/ja
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/it/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/it
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/id/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/id
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/hu/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/hu
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/gl/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/gl
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/fr/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/fr
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/es/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/es
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/de/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/de
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/da/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/da
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/cs/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/cs
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/ca/LC_MESSAGES
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale/ca
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/locale
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database/icons
+@dirrm lib/monodevelop/AddIns/MonoDevelop.Database
diff --git a/devel/monodevelop-java/Makefile b/devel/monodevelop-java/Makefile
index 75b099781c15..82a65b2f472c 100644
--- a/devel/monodevelop-java/Makefile
+++ b/devel/monodevelop-java/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	monodevelop-java
-PORTVERSION=	2.2
+PORTVERSION=	2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
diff --git a/devel/monodevelop-java/distinfo b/devel/monodevelop-java/distinfo
index 21e3f05cb382..f26772c7253f 100644
--- a/devel/monodevelop-java/distinfo
+++ b/devel/monodevelop-java/distinfo
@@ -1,3 +1,3 @@
-MD5 (monodevelop-java-2.2.tar.bz2) = 4bf3d929fa7f2733c48cf4d44e0489fb
-SHA256 (monodevelop-java-2.2.tar.bz2) = 9125abce3f23b5aa7aa7ea66927517afd8ce84a06baecdd0c59b4ff3e0471140
-SIZE (monodevelop-java-2.2.tar.bz2) = 44536
+MD5 (monodevelop-java-2.4.tar.bz2) = 0303cef924a7904ce5ffbffaecb25912
+SHA256 (monodevelop-java-2.4.tar.bz2) = 9ce77fffb1381470af878157c1dd8f17bd15296e595554c03c8a820c2245946d
+SIZE (monodevelop-java-2.4.tar.bz2) = 44399
diff --git a/devel/monodevelop-vala/Makefile b/devel/monodevelop-vala/Makefile
index 6c9052f13dee..65f3fc6c79b3 100644
--- a/devel/monodevelop-vala/Makefile
+++ b/devel/monodevelop-vala/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	monodevelop-vala
-PORTVERSION=	2.2
+PORTVERSION=	2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
diff --git a/devel/monodevelop-vala/distinfo b/devel/monodevelop-vala/distinfo
index b37084d1e7d7..9e4ecf6da3ea 100644
--- a/devel/monodevelop-vala/distinfo
+++ b/devel/monodevelop-vala/distinfo
@@ -1,3 +1,3 @@
-MD5 (monodevelop-vala-2.2.tar.bz2) = 579f44a1bffaaa0f779f7fc6d25a30ff
-SHA256 (monodevelop-vala-2.2.tar.bz2) = a7dc194179046c1db35ccbf28163545a105c7c6ad2570283d5f77ecc95586c9c
-SIZE (monodevelop-vala-2.2.tar.bz2) = 103691
+MD5 (monodevelop-vala-2.4.tar.bz2) = 9e202c7e4271f0ff2f01b9aba51fd41b
+SHA256 (monodevelop-vala-2.4.tar.bz2) = 03d3d5a999c64f133f878bdb286c52bb2b1e7ab50693db00ad0a8f68a20e5321
+SIZE (monodevelop-vala-2.4.tar.bz2) = 114036
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