update to 2.2.1

new major release, many changes, most notably:
-syntax scanner speed improvement
-UI and feature improvements
-new languages: Google Go, Vala and Ada
-zencoding support

6 files changed, 84 insertions, 106 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index c9cd37c6911..b11506a21da 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2011/11/01 06:02:45 sbd Exp $
+# $NetBSD: Makefile,v 1.92 2012/01/12 11:33:23 drochner Exp $
 
-DISTNAME=	bluefish-2.0.3
-PKGREVISION=	2
+DISTNAME=	bluefish-2.2.1
 CATEGORIES=	www
 MASTER_SITES=	http://bluefish.mrball.net/stable/source/               \
 		http://www.bennewitz.com/bluefish/stable/source/
@@ -21,8 +20,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-icon-path=${PREFIX:Q}/share/pixmaps
 CONFIGURE_ARGS+=	--with-freedesktop_org-menu=${PREFIX:Q}/share/applications
 CONFIGURE_ARGS+=	--with-freedesktop_org-mime=${PREFIX:Q}/share/mime
-CONFIGURE_ARGS+=	--with-gnome2_4-mime=${PREFIX:Q}/share/mime-info
-CONFIGURE_ARGS+=	--with-gnome2_4-appreg=${PREFIX:Q}/share/application-registry
 CONFIGURE_ENV+=		EXTERNAL_GREP=${TOOLS_GREP:Q}
 CONFIGURE_ENV+=		EXTERNAL_FIND=${TOOLS_FIND:Q}
 
@@ -34,6 +31,9 @@ CHECK_WRKREF_SKIP+=	lib/bluefish/about.so
 #		${PREFIX}/share/xml/bluefish/2.0/
 #.include "../../textproc/xmlcatmgr/catalogs.mk"
 
+.include "../../lang/python/application.mk"
+#CONFIGURE_ARGS+=	--disable-python
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/www/bluefish/PLIST b/www/bluefish/PLIST
index e4f41d41f78..a2f003d6294 100644
--- a/www/bluefish/PLIST
+++ b/www/bluefish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2011/03/11 18:03:21 drochner Exp $
+@comment $NetBSD: PLIST,v 1.22 2012/01/12 11:33:23 drochner Exp $
 bin/bluefish
 lib/bluefish/about.la
 lib/bluefish/charmap.la
@@ -6,11 +6,13 @@ lib/bluefish/entities.la
 lib/bluefish/htmlbar.la
 lib/bluefish/infbrowser.la
 lib/bluefish/snippets.la
+lib/bluefish/zencoding.la
 man/man1/bluefish.1
 share/applications/bluefish.desktop
 share/bluefish/bflang/JQuery.bfinc
 share/bluefish/bflang/ada.bflang2
 share/bluefish/bflang/all-html.bfinc
+share/bluefish/bflang/all-html5.bfinc
 share/bluefish/bflang/all-javascript.bfinc
 share/bluefish/bflang/all-php.bfinc
 share/bluefish/bflang/all-vbscript.bfinc
@@ -18,6 +20,7 @@ share/bluefish/bflang/asp-vbscript.bflang2
 share/bluefish/bflang/asp.bflang2
 share/bluefish/bflang/bflang2.bflang2
 share/bluefish/bflang/c.bflang2
+share/bluefish/bflang/cfml.bflang2
 share/bluefish/bflang/clojure.bflang2
 share/bluefish/bflang/cpp.bflang2
 share/bluefish/bflang/css-rules.bfinc
@@ -27,9 +30,11 @@ share/bluefish/bflang/d.bflang2
 share/bluefish/bflang/diff.bflang2
 share/bluefish/bflang/highlighter.bflang2
 share/bluefish/bflang/html.bflang2
+share/bluefish/bflang/html5.bflang2
 share/bluefish/bflang/java.bflang2
 share/bluefish/bflang/javascript.bflang2
 share/bluefish/bflang/jsp.bflang2
+share/bluefish/bflang/lua.bflang2
 share/bluefish/bflang/mediawiki.bflang2
 share/bluefish/bflang/nsis.bflang2
 share/bluefish/bflang/pascal.bflang2
@@ -44,7 +49,9 @@ share/bluefish/bflang/scheme.bflang2
 share/bluefish/bflang/shell.bflang2
 share/bluefish/bflang/smarty.bflang2
 share/bluefish/bflang/sql.bflang2
+share/bluefish/bflang/svg.bflang2
 share/bluefish/bflang/text.bflang2
+share/bluefish/bflang/vala.bflang2
 share/bluefish/bflang/vbscript.bflang2
 share/bluefish/bflang/wordpress.bfinc
 share/bluefish/bflang/wordpress.bflang2
@@ -70,12 +77,42 @@ share/bluefish/bflib/bflib_python_2.3.xml.gz
 share/bluefish/bflib/bflib_xhtml.xml.gz
 share/bluefish/bluefish_splash.png
 share/bluefish/encodings
+share/bluefish/plugins/htmlbar/ui/htmlbar_menu_ui.xml
+share/bluefish/plugins/zencoding/__init__.py
+share/bluefish/plugins/zencoding/actions/__init__.py
+share/bluefish/plugins/zencoding/actions/basic.py
+share/bluefish/plugins/zencoding/actions/token.py
+share/bluefish/plugins/zencoding/actions/traverse.py
+share/bluefish/plugins/zencoding/filters/__init__.py
+share/bluefish/plugins/zencoding/filters/comment.py
+share/bluefish/plugins/zencoding/filters/css.py
+share/bluefish/plugins/zencoding/filters/escape.py
+share/bluefish/plugins/zencoding/filters/format-css.py
+share/bluefish/plugins/zencoding/filters/format.py
+share/bluefish/plugins/zencoding/filters/haml.py
+share/bluefish/plugins/zencoding/filters/html.py
+share/bluefish/plugins/zencoding/filters/single-line.py
+share/bluefish/plugins/zencoding/filters/trim.py
+share/bluefish/plugins/zencoding/filters/xsl.py
+share/bluefish/plugins/zencoding/html_matcher.py
+share/bluefish/plugins/zencoding/interface/__init__.py
+share/bluefish/plugins/zencoding/interface/editor.py
+share/bluefish/plugins/zencoding/interface/file.py
+share/bluefish/plugins/zencoding/parser/__init__.py
+share/bluefish/plugins/zencoding/parser/abbreviation.py
+share/bluefish/plugins/zencoding/parser/css.py
+share/bluefish/plugins/zencoding/parser/utils.py
+share/bluefish/plugins/zencoding/parser/xml.py
+share/bluefish/plugins/zencoding/resources.py
+share/bluefish/plugins/zencoding/utils.py
+share/bluefish/plugins/zencoding/zen_settings.py
 share/bluefish/snippets
 share/bluefish/templates/C_header
 share/bluefish/templates/C_header_GPL
 share/bluefish/templates/HTML_5
 share/bluefish/templates/PHP
 share/bluefish/templates/XHTML_1.0
+share/bluefish/ui/bluefish_menu_ui.xml
 share/doc/bluefish/bflang/sample.bflang2
 share/icons/hicolor/128x128/apps/bluefish.png
 share/icons/hicolor/128x128/mimetypes/application-x-bluefish-project.png
@@ -106,6 +143,7 @@ share/locale/bg/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/bg/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/bg/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/bg/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/bg/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/cs/LC_MESSAGES/bluefish.mo
 share/locale/cs/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/cs/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -113,6 +151,7 @@ share/locale/cs/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/cs/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/cs/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/cs/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/cs/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/da/LC_MESSAGES/bluefish.mo
 share/locale/da/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/da/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -120,6 +159,7 @@ share/locale/da/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/da/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/da/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/da/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/da/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/de/LC_MESSAGES/bluefish.mo
 share/locale/de/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/de/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -127,6 +167,7 @@ share/locale/de/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/de/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/de/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/de/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/de/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/el/LC_MESSAGES/bluefish.mo
 share/locale/el/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/el/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -134,6 +175,7 @@ share/locale/el/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/el/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/el/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/el/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/el/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/es/LC_MESSAGES/bluefish.mo
 share/locale/es/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/es/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -141,6 +183,7 @@ share/locale/es/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/es/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/es/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/es/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/es/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/eu/LC_MESSAGES/bluefish.mo
 share/locale/eu/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/eu/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -148,6 +191,7 @@ share/locale/eu/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/eu/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/eu/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/eu/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/eu/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/fi/LC_MESSAGES/bluefish.mo
 share/locale/fi/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/fi/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -155,6 +199,7 @@ share/locale/fi/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/fi/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/fi/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/fi/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/fi/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/fr/LC_MESSAGES/bluefish.mo
 share/locale/fr/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/fr/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -162,6 +207,7 @@ share/locale/fr/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/fr/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/fr/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/fr/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/fr/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/gl/LC_MESSAGES/bluefish.mo
 share/locale/gl/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/gl/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -169,6 +215,7 @@ share/locale/gl/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/gl/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/gl/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/gl/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/gl/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/hu/LC_MESSAGES/bluefish.mo
 share/locale/hu/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/hu/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -176,6 +223,7 @@ share/locale/hu/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/hu/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/hu/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/hu/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/hu/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/it/LC_MESSAGES/bluefish.mo
 share/locale/it/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/it/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -183,6 +231,7 @@ share/locale/it/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/it/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/it/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/it/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/it/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/ja/LC_MESSAGES/bluefish.mo
 share/locale/ja/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/ja/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -190,13 +239,15 @@ share/locale/ja/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/ja/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/ja/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/ja/LC_MESSAGES/bluefish_plugin_snippets.mo
-share/locale/ko_KR/LC_MESSAGES/bluefish.mo
-share/locale/ko_KR/LC_MESSAGES/bluefish_plugin_about.mo
-share/locale/ko_KR/LC_MESSAGES/bluefish_plugin_charmap.mo
-share/locale/ko_KR/LC_MESSAGES/bluefish_plugin_entities.mo
-share/locale/ko_KR/LC_MESSAGES/bluefish_plugin_htmlbar.mo
-share/locale/ko_KR/LC_MESSAGES/bluefish_plugin_infbrowser.mo
-share/locale/ko_KR/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/ja/LC_MESSAGES/bluefish_plugin_zencoding.mo
+share/locale/ko/LC_MESSAGES/bluefish.mo
+share/locale/ko/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/ko/LC_MESSAGES/bluefish_plugin_charmap.mo
+share/locale/ko/LC_MESSAGES/bluefish_plugin_entities.mo
+share/locale/ko/LC_MESSAGES/bluefish_plugin_htmlbar.mo
+share/locale/ko/LC_MESSAGES/bluefish_plugin_infbrowser.mo
+share/locale/ko/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/ko/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/nb/LC_MESSAGES/bluefish.mo
 share/locale/nb/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/nb/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -204,6 +255,7 @@ share/locale/nb/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/nb/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/nb/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/nb/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/nb/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/nl/LC_MESSAGES/bluefish.mo
 share/locale/nl/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/nl/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -211,6 +263,7 @@ share/locale/nl/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/nl/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/nl/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/nl/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/nl/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/nn/LC_MESSAGES/bluefish.mo
 share/locale/nn/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/nn/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -218,6 +271,7 @@ share/locale/nn/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/nn/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/nn/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/nn/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/nn/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/pl/LC_MESSAGES/bluefish.mo
 share/locale/pl/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/pl/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -225,6 +279,7 @@ share/locale/pl/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/pl/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/pl/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/pl/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/pl/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/pt/LC_MESSAGES/bluefish.mo
 share/locale/pt/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/pt/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -232,6 +287,7 @@ share/locale/pt/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/pt/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/pt/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/pt/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/pt/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/pt_BR/LC_MESSAGES/bluefish.mo
 share/locale/pt_BR/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/pt_BR/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -239,6 +295,7 @@ share/locale/pt_BR/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/pt_BR/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/pt_BR/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/pt_BR/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/pt_BR/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/ro/LC_MESSAGES/bluefish.mo
 share/locale/ro/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/ro/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -246,6 +303,7 @@ share/locale/ro/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/ro/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/ro/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/ro/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/ro/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/ru/LC_MESSAGES/bluefish.mo
 share/locale/ru/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/ru/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -253,6 +311,7 @@ share/locale/ru/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/ru/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/ru/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/ru/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/ru/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/sk/LC_MESSAGES/bluefish.mo
 share/locale/sk/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/sk/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -260,6 +319,7 @@ share/locale/sk/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/sk/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/sk/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/sk/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/sk/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/sr/LC_MESSAGES/bluefish.mo
 share/locale/sr/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/sr/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -267,6 +327,7 @@ share/locale/sr/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/sr/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/sr/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/sr/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/sr/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/sv/LC_MESSAGES/bluefish.mo
 share/locale/sv/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/sv/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -274,6 +335,7 @@ share/locale/sv/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/sv/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/sv/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/sv/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/sv/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/ta/LC_MESSAGES/bluefish.mo
 share/locale/ta/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/ta/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -281,6 +343,7 @@ share/locale/ta/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/ta/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/ta/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/ta/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/ta/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/tr/LC_MESSAGES/bluefish.mo
 share/locale/tr/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/tr/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -288,6 +351,7 @@ share/locale/tr/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/tr/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/tr/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/tr/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/tr/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/uk/LC_MESSAGES/bluefish.mo
 share/locale/uk/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/uk/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -295,6 +359,7 @@ share/locale/uk/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/uk/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/uk/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/uk/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/uk/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/zh_CN/LC_MESSAGES/bluefish.mo
 share/locale/zh_CN/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/zh_CN/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -302,6 +367,7 @@ share/locale/zh_CN/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/zh_CN/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/zh_CN/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/zh_CN/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/zh_CN/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/locale/zh_TW/LC_MESSAGES/bluefish.mo
 share/locale/zh_TW/LC_MESSAGES/bluefish_plugin_about.mo
 share/locale/zh_TW/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -309,6 +375,7 @@ share/locale/zh_TW/LC_MESSAGES/bluefish_plugin_entities.mo
 share/locale/zh_TW/LC_MESSAGES/bluefish_plugin_htmlbar.mo
 share/locale/zh_TW/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 share/locale/zh_TW/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/zh_TW/LC_MESSAGES/bluefish_plugin_zencoding.mo
 share/mime/packages/bluefish.xml
 share/pixmaps/application-x-bluefish-project.png
 share/pixmaps/bluefish.png
diff --git a/www/bluefish/distinfo b/www/bluefish/distinfo
index 2151ccaff8e..d14b8d67ea8 100644
--- a/www/bluefish/distinfo
+++ b/www/bluefish/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.18 2011/03/11 18:03:21 drochner Exp $
+$NetBSD: distinfo,v 1.19 2012/01/12 11:33:23 drochner Exp $
 
-SHA1 (bluefish-2.0.3.tar.bz2) = ab6b16d50faca169c25001d5a26ca8b84ddb1019
-RMD160 (bluefish-2.0.3.tar.bz2) = 0a82d8973b201014bcc03fbe09896472bfcdf3c1
-Size (bluefish-2.0.3.tar.bz2) = 3477615 bytes
+SHA1 (bluefish-2.2.1.tar.bz2) = f7b2e9915e196c971c6bcca04d8d6b87efab1ae6
+RMD160 (bluefish-2.2.1.tar.bz2) = 75626423216cdd9bb621f3063baba278ce3bbd76
+Size (bluefish-2.2.1.tar.bz2) = 3501247 bytes
 SHA1 (patch-ac) = 5145b8e2df6919e60621aca5eb62a9526efaff43
-SHA1 (patch-ba) = 5372a42d2cda6348a34a9cb953ef4f57fb92e724
-SHA1 (patch-bb) = c33c55bc47dd66b4d6372b04f29acffb5d1da9b4
-SHA1 (patch-bc) = ca378c991d6f5bc73dc4db8622a9895eca372a04
diff --git a/www/bluefish/patches/patch-ba b/www/bluefish/patches/patch-ba
deleted file mode 100644
index 45a1ced4165..00000000000
--- a/www/bluefish/patches/patch-ba
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2011/03/11 18:03:21 drochner Exp $
-
-SVN revision 6432
-
---- src/bftextview2.c.orig	2010-12-27 02:11:21.000000000 +0000
-+++ src/bftextview2.c
-@@ -1339,10 +1339,11 @@ bluefish_text_view_button_press_event(Gt
- 		}
- 	}
- 	if (event->button == 1) {
--		btv->needs_blockmatch = TRUE;
--		if (!btv->mark_set_idle)
--			btv->mark_set_idle = g_idle_add_full(G_PRIORITY_HIGH_IDLE, mark_set_idle_lcb, btv->master, NULL);
--
-+		if (btv->show_mbhl) {
-+			btv->needs_blockmatch = TRUE;
-+			if (!btv->mark_set_idle)
-+				btv->mark_set_idle = g_idle_add_full(G_PRIORITY_HIGH_IDLE, mark_set_idle_lcb, btv->master, NULL);
-+		}
- 	} else if (event->button == 3) {
- 		GtkTextIter iter;
- 		/* store the location of the right mouse button click for menu items like 'edit tag'
-@@ -1404,10 +1405,10 @@ bluefish_text_view_key_release_event(Gtk
- 	btv->insert_was_auto_indent = FALSE;
- 
- 	DBG_SIGNALS("bluefish_text_view_key_release_event for %p, keyval=%d\n", widget, kevent->keyval);
--
--	if (!btv->mark_set_idle && btv->needs_blockmatch)
--		btv->mark_set_idle = g_idle_add_full(G_PRIORITY_HIGH_IDLE, mark_set_idle_lcb, btv->master, NULL);
--
-+	if (btv->show_mbhl) {
-+		if (!btv->mark_set_idle && btv->needs_blockmatch)
-+			btv->mark_set_idle = g_idle_add_full(G_PRIORITY_HIGH_IDLE, mark_set_idle_lcb, btv->master, NULL);
-+	}
- 	/* sometimes we receive a release event for a key that was not pressed in the textview widget!
- 	   for example if you use the keyboard to navigate the menu, and press enter to activate an item, a 
- 	   key release event is received in the textview widget.... so we have to check that ! */
-@@ -1838,6 +1839,12 @@ bluefish_text_view_set_show_mbhl(Bluefis
- 	}
- 
- 	btv->show_mbhl = show;
-+	if (!show && btv->showing_blockmatch) {
-+		GtkTextIter it1,it2;
-+		gtk_text_buffer_get_bounds(btv->buffer, &it1, &it2);
-+		gtk_text_buffer_remove_tag(btv->buffer, BLUEFISH_TEXT_VIEW(btv)->blockmatch, &it1, &it2);
-+		btv->showing_blockmatch = FALSE;
-+	}
- 	gtk_widget_queue_draw(GTK_WIDGET(btv));
- 	if (btv->slave)
- 		gtk_widget_queue_draw(GTK_WIDGET(btv->slave));
diff --git a/www/bluefish/patches/patch-bb b/www/bluefish/patches/patch-bb
deleted file mode 100644
index 82cced19feb..00000000000
--- a/www/bluefish/patches/patch-bb
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2011/03/11 18:03:21 drochner Exp $
-
-SVN revision 6443
-
---- src/rcfile.c.orig	2011-02-18 21:28:16.000000000 +0000
-+++ src/rcfile.c
-@@ -903,13 +903,13 @@ static GHashTable *return_session_config
- 	init_prop_integer(&configlist, &session->wrap_text_default, "wrap_text_default:", 1, FALSE);
- 	init_prop_integer(&configlist, &session->autoindent, "autoindent:", 1, FALSE);
- 	init_prop_integer(&configlist, &session->editor_tab_width, "editor_tab_width:", 3, FALSE);
--	init_prop_integer(&configlist, &session->editor_indent_wspaces, "editor_indent_wspaces:", 0, TRUE);
-+	init_prop_integer(&configlist, &session->editor_indent_wspaces, "editor_indent_wspaces:", 0, FALSE);
- 	init_prop_integer(&configlist, &session->view_line_numbers, "view_line_numbers:", 1, FALSE);
- 	init_prop_integer(&configlist, &session->view_cline, "view_cline:", 1, FALSE);
- 	init_prop_integer(&configlist, &session->view_blocks, "view_blocks:", 1, FALSE);
- 	init_prop_integer(&configlist, &session->autocomplete, "autocomplete:", 1, FALSE);
- 	init_prop_integer(&configlist, &session->show_mbhl, "show_mbhl:", 1, FALSE);
--	init_prop_integer(&configlist, &session->display_right_margin, "display_right_margin:", 0, TRUE);
-+	init_prop_integer(&configlist, &session->display_right_margin, "display_right_margin:", 0, FALSE);
- #ifdef HAVE_LIBENCHANT
- 	init_prop_integer(&configlist, &session->spell_check_default, "spell_check_default:", 1, FALSE);
- 	init_prop_integer(&configlist, &session->spell_insert_entities, "spell_insert_entities:", 0, FALSE);
diff --git a/www/bluefish/patches/patch-bc b/www/bluefish/patches/patch-bc
deleted file mode 100644
index 986bb033506..00000000000
--- a/www/bluefish/patches/patch-bc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2011/03/11 18:03:21 drochner Exp $
-
-SVN revision 6455
-
---- src/menu.c.orig	2011-02-11 02:11:29.000000000 +0000
-+++ src/menu.c
-@@ -607,6 +607,7 @@ void menu_create_main(Tbfwin *bfwin, Gtk
- 	gtk_accel_map_add_entry("<bluefishmain>/Go/Next Document", GDK_Page_Down, GDK_CONTROL_MASK);
- 	gtk_accel_map_add_entry("<bluefishmain>/Go/First Document", GDK_Page_Up, GDK_SHIFT_MASK | GDK_CONTROL_MASK);
- 	gtk_accel_map_add_entry("<bluefishmain>/Go/Last Document", GDK_Page_Down, GDK_SHIFT_MASK | GDK_CONTROL_MASK);
-+	gtk_widget_show(bfwin->menubar);
- 	setup_toggle_item(item_factory, "/View/Main Toolbar", bfwin->session->view_main_toolbar);
- 	setup_toggle_item(item_factory, "/View/Side Pane", bfwin->session->view_left_panel);
- 	setup_toggle_item(item_factory, "/View/Statusbar", bfwin->session->view_statusbar);