update to 2.0.3

this is a new major release, too many changes to list here

9 files changed, 407 insertions, 77 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index b6ad104b262..4509d0cda28 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2011/02/28 14:53:06 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2011/03/11 18:03:21 drochner Exp $
 
-DISTNAME=	bluefish-1.0.7
-PKGREVISION=	11
+DISTNAME=	bluefish-2.0.3
 CATEGORIES=	www
 MASTER_SITES=	http://bluefish.mrball.net/stable/source/               \
 		http://www.bennewitz.com/bluefish/stable/source/
@@ -15,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=		weblint-[0-9]*:../../www/weblint
 
-USE_TOOLS+=		find gmake grep msgfmt pkg-config
+USE_TOOLS+=		find gmake grep msgfmt pkg-config perl intltool
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-icon-path=${PREFIX:Q}/share/pixmaps
@@ -26,13 +25,18 @@ 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}
 
+# XXX this doesn't work
+#XML_CATALOGS=	${PREFIX}/share/xml/bluefish/catalog.xml
+#XML_ENTRIES=	delegateURI http://bluefish.openoffice.nl/ns/bflang/2.0/ \
+#		${PREFIX}/share/xml/bluefish/2.0/
+#.include "../../textproc/xmlcatmgr/catalogs.mk"
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.include "../../fonts/gucharmap/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/aspell/buildlink3.mk"
+.include "../../textproc/enchant/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/bluefish/PLIST b/www/bluefish/PLIST
index ba3c6f389f8..e4f41d41f78 100644
--- a/www/bluefish/PLIST
+++ b/www/bluefish/PLIST
@@ -1,57 +1,316 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 22:00:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2011/03/11 18:03:21 drochner Exp $
 bin/bluefish
+lib/bluefish/about.la
+lib/bluefish/charmap.la
+lib/bluefish/entities.la
+lib/bluefish/htmlbar.la
+lib/bluefish/infbrowser.la
+lib/bluefish/snippets.la
 man/man1/bluefish.1
-share/application-registry/bluefish.applications
-share/applications/bluefish-project.desktop
 share/applications/bluefish.desktop
+share/bluefish/bflang/JQuery.bfinc
+share/bluefish/bflang/ada.bflang2
+share/bluefish/bflang/all-html.bfinc
+share/bluefish/bflang/all-javascript.bfinc
+share/bluefish/bflang/all-php.bfinc
+share/bluefish/bflang/all-vbscript.bfinc
+share/bluefish/bflang/asp-vbscript.bflang2
+share/bluefish/bflang/asp.bflang2
+share/bluefish/bflang/bflang2.bflang2
+share/bluefish/bflang/c.bflang2
+share/bluefish/bflang/clojure.bflang2
+share/bluefish/bflang/cpp.bflang2
+share/bluefish/bflang/css-rules.bfinc
+share/bluefish/bflang/css-selectors.bfinc
+share/bluefish/bflang/css.bflang2
+share/bluefish/bflang/d.bflang2
+share/bluefish/bflang/diff.bflang2
+share/bluefish/bflang/highlighter.bflang2
+share/bluefish/bflang/html.bflang2
+share/bluefish/bflang/java.bflang2
+share/bluefish/bflang/javascript.bflang2
+share/bluefish/bflang/jsp.bflang2
+share/bluefish/bflang/mediawiki.bflang2
+share/bluefish/bflang/nsis.bflang2
+share/bluefish/bflang/pascal.bflang2
+share/bluefish/bflang/perl.bflang2
+share/bluefish/bflang/php.bflang2
+share/bluefish/bflang/po.bflang2
+share/bluefish/bflang/processing.bflang2
+share/bluefish/bflang/python.bflang2
+share/bluefish/bflang/r.bflang2
+share/bluefish/bflang/ruby.bflang2
+share/bluefish/bflang/scheme.bflang2
+share/bluefish/bflang/shell.bflang2
+share/bluefish/bflang/smarty.bflang2
+share/bluefish/bflang/sql.bflang2
+share/bluefish/bflang/text.bflang2
+share/bluefish/bflang/vbscript.bflang2
+share/bluefish/bflang/wordpress.bfinc
+share/bluefish/bflang/wordpress.bflang2
+share/bluefish/bflang/xhtml.bflang2
+share/bluefish/bflang/xml.bflang2
+share/bluefish/bflib/bflib_DocBook_4_5.xml.gz
+share/bluefish/bflib/bflib_DocBook_5_0.xml.gz
+share/bluefish/bflib/bflib_SVG_1_0.xml.gz
+share/bluefish/bflib/bflib_SVG_1_1_Basic.xml.gz
+share/bluefish/bflib/bflib_SVG_1_1_Full.xml.gz
+share/bluefish/bflib/bflib_SVG_1_1_Tiny.xml.gz
+share/bluefish/bflib/bflib_XHTML_1_0_Frameset.xml.gz
+share/bluefish/bflib/bflib_XHTML_1_0_Strict.xml.gz
+share/bluefish/bflib/bflib_XHTML_1_0_Transitional.xml.gz
+share/bluefish/bflib/bflib_XHTML_1_0_W3C.xml.gz
+share/bluefish/bflib/bflib_XHTML_1_1.xml.gz
+share/bluefish/bflib/bflib_css2.xml.gz
+share/bluefish/bflib/bflib_dom.xml.gz
+share/bluefish/bflib/bflib_php4.xml.gz
+share/bluefish/bflib/bflib_php5.xml.gz
+share/bluefish/bflib/bflib_php5_with_examples.xml.gz
+share/bluefish/bflib/bflib_python_2.3.xml.gz
+share/bluefish/bflib/bflib_xhtml.xml.gz
 share/bluefish/bluefish_splash.png
-share/bluefish/custom_menu.de.default
-share/bluefish/custom_menu.default
-share/bluefish/custom_menu.fr.default
-share/bluefish/encodings.default
-share/bluefish/filetypes.default
-share/bluefish/funcref_css.xml
-share/bluefish/funcref_html.xml
-share/bluefish/funcref_php.xml
-share/bluefish/funcref_python.xml
-share/bluefish/highlighting.default
-share/bluefish/icon_c.png
-share/bluefish/icon_cfml.png
-share/bluefish/icon_dir.png
-share/bluefish/icon_html.png
-share/bluefish/icon_image.png
-share/bluefish/icon_java.png
-share/bluefish/icon_pascal.png
-share/bluefish/icon_php.png
-share/bluefish/icon_python.png
-share/bluefish/icon_r.png
-share/bluefish/icon_unknown.png
-share/bluefish/icon_xml.png
+share/bluefish/encodings
+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/doc/bluefish/bflang/sample.bflang2
+share/icons/hicolor/128x128/apps/bluefish.png
+share/icons/hicolor/128x128/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/16x16/apps/bluefish.png
+share/icons/hicolor/16x16/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/192x192/apps/bluefish.png
+share/icons/hicolor/192x192/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/22x22/apps/bluefish.png
+share/icons/hicolor/22x22/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/32x32/apps/bluefish.png
+share/icons/hicolor/32x32/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/36x36/apps/bluefish.png
+share/icons/hicolor/36x36/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/48x48/apps/bluefish.png
+share/icons/hicolor/48x48/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/64x64/apps/bluefish.png
+share/icons/hicolor/64x64/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/72x72/apps/bluefish.png
+share/icons/hicolor/72x72/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/96x96/apps/bluefish.png
+share/icons/hicolor/96x96/mimetypes/application-x-bluefish-project.png
+share/icons/hicolor/scalable/apps/bluefish-icon.svg
+share/icons/hicolor/scalable/mimetypes/bluefish-project.svg
 share/locale/bg/LC_MESSAGES/bluefish.mo
+share/locale/bg/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/bg/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/cs/LC_MESSAGES/bluefish.mo
+share/locale/cs/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/cs/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/da/LC_MESSAGES/bluefish.mo
+share/locale/da/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/da/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/de/LC_MESSAGES/bluefish.mo
+share/locale/de/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/de/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/el/LC_MESSAGES/bluefish.mo
+share/locale/el/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/el/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/es/LC_MESSAGES/bluefish.mo
+share/locale/es/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/es/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/eu/LC_MESSAGES/bluefish.mo
+share/locale/eu/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/eu/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/fi/LC_MESSAGES/bluefish.mo
+share/locale/fi/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/fi/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/fr/LC_MESSAGES/bluefish.mo
+share/locale/fr/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/fr/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/gl/LC_MESSAGES/bluefish.mo
+share/locale/gl/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/gl/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/hu/LC_MESSAGES/bluefish.mo
+share/locale/hu/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/hu/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/it/LC_MESSAGES/bluefish.mo
+share/locale/it/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/it/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/ja/LC_MESSAGES/bluefish.mo
-share/locale/no/LC_MESSAGES/bluefish.mo
+share/locale/ja/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/ja/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/nb/LC_MESSAGES/bluefish.mo
+share/locale/nb/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/nb/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/nl/LC_MESSAGES/bluefish.mo
+share/locale/nl/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/nl/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/nn/LC_MESSAGES/bluefish.mo
+share/locale/nn/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/nn/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/pl/LC_MESSAGES/bluefish.mo
+share/locale/pl/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/pl/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/pt/LC_MESSAGES/bluefish.mo
+share/locale/pt/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/pt/LC_MESSAGES/bluefish_plugin_charmap.mo
+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_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
+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/ro/LC_MESSAGES/bluefish.mo
+share/locale/ro/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/ro/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/ru/LC_MESSAGES/bluefish.mo
+share/locale/ru/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/ru/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/sk/LC_MESSAGES/bluefish.mo
+share/locale/sk/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/sk/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/sr/LC_MESSAGES/bluefish.mo
+share/locale/sr/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/sr/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/sv/LC_MESSAGES/bluefish.mo
+share/locale/sv/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/sv/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/ta/LC_MESSAGES/bluefish.mo
+share/locale/ta/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/ta/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/tr/LC_MESSAGES/bluefish.mo
+share/locale/tr/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/tr/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/uk/LC_MESSAGES/bluefish.mo
+share/locale/uk/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/uk/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/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
+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_TW/LC_MESSAGES/bluefish.mo
-share/mime-info/bluefish.keys
-share/mime-info/bluefish.mime
+share/locale/zh_TW/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/zh_TW/LC_MESSAGES/bluefish_plugin_charmap.mo
+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/mime/packages/bluefish.xml
-share/pixmaps/bluefish-icon.png
-share/pixmaps/gnome-mime-application-bluefish-project.png
+share/pixmaps/application-x-bluefish-project.png
+share/pixmaps/bluefish.png
+share/xml/bluefish/2.0/bflang2.rng
+share/xml/bluefish/catalog.xml
diff --git a/www/bluefish/distinfo b/www/bluefish/distinfo
index d3c0beea5b5..2151ccaff8e 100644
--- a/www/bluefish/distinfo
+++ b/www/bluefish/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.17 2007/03/14 15:50:53 rillig Exp $
+$NetBSD: distinfo,v 1.18 2011/03/11 18:03:21 drochner Exp $
 
-SHA1 (bluefish-1.0.7.tar.bz2) = c61d6271c49e9fa8c728724e6aadde33a227bdea
-RMD160 (bluefish-1.0.7.tar.bz2) = 7ce8a7c8873cd0ef84dd6486551976593544a8dc
-Size (bluefish-1.0.7.tar.bz2) = 1495619 bytes
-SHA1 (patch-aa) = bba2581eefa4efa00943b9f158898fe4743b56cc
-SHA1 (patch-ab) = ab0d1d172b0d3097f85588a5f24304501671d048
-SHA1 (patch-ac) = de8871c7d5ab63153f10a787debb1deed4420577
+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 (patch-ac) = 5145b8e2df6919e60621aca5eb62a9526efaff43
+SHA1 (patch-ba) = 5372a42d2cda6348a34a9cb953ef4f57fb92e724
+SHA1 (patch-bb) = c33c55bc47dd66b4d6372b04f29acffb5d1da9b4
+SHA1 (patch-bc) = ca378c991d6f5bc73dc4db8622a9895eca372a04
diff --git a/www/bluefish/patches/patch-aa b/www/bluefish/patches/patch-aa
deleted file mode 100644
index 64de46f6a3e..00000000000
--- a/www/bluefish/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2006/02/05 19:45:10 adam Exp $
-
---- src/document.c.orig	2006-01-29 21:33:52.000000000 +0100
-+++ src/document.c
-@@ -27,6 +27,7 @@
-  */
- #ifdef PLATFORM_SOLARIS
- #define _POSIX_C_SOURCE 200312L
-+#define __EXTENSIONS__ 1
- #endif
- 
- #include <gtk/gtk.h>
diff --git a/www/bluefish/patches/patch-ab b/www/bluefish/patches/patch-ab
deleted file mode 100644
index 843110965e9..00000000000
--- a/www/bluefish/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2006/02/05 19:45:10 adam Exp $
-
---- src/highlight.c.orig	2005-12-10 11:22:41.000000000 +0100
-+++ src/highlight.c
-@@ -218,6 +218,9 @@ static gboolean my_own_iter_forward_to_t
- 	}
- 	return FALSE;
- }
-+#else
-+/* The result of this macro will not be used at all. */
-+#  define get_metaname_from_tag() "(get_metaname_from_tag)"
- #endif /* DEBUG */
- 
- #ifdef HL_PROFILING
diff --git a/www/bluefish/patches/patch-ac b/www/bluefish/patches/patch-ac
index e38653aa7a1..07cda0a5e33 100644
--- a/www/bluefish/patches/patch-ac
+++ b/www/bluefish/patches/patch-ac
@@ -1,13 +1,19 @@
-$NetBSD: patch-ac,v 1.3 2006/10/18 21:40:17 rillig Exp $
+$NetBSD: patch-ac,v 1.4 2011/03/11 18:03:21 drochner Exp $
 
---- configure.orig	2006-10-18 23:28:42.000000000 +0200
-+++ configure	2006-10-18 23:36:32.000000000 +0200
-@@ -4748,7 +4748,7 @@ fi
+--- configure.orig	2010-02-15 13:56:55.000000000 +0000
++++ configure
+@@ -26444,12 +26444,12 @@ LIBS="$LIBS $BLUEFISH_REQUIRED_LIBS"
  
- #####################################################
  
--if test "${prefix}" == "NONE"; then
-+if test "${prefix}" = "NONE"; then
+ 
+-if test "$prefix" == "NONE"; then
++if test "$prefix" = "NONE"; then
  	prefix=${ac_default_prefix}
  
  fi
+ 
+-if test "$exec_prefix" == "NONE"; then
++if test "$exec_prefix" = "NONE"; then
+ 	exec_prefix=${prefix}
+ 
+ fi
diff --git a/www/bluefish/patches/patch-ba b/www/bluefish/patches/patch-ba
new file mode 100644
index 00000000000..45a1ced4165
--- /dev/null
+++ b/www/bluefish/patches/patch-ba
@@ -0,0 +1,50 @@
+$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
new file mode 100644
index 00000000000..82cced19feb
--- /dev/null
+++ b/www/bluefish/patches/patch-bb
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..986bb033506
--- /dev/null
+++ b/www/bluefish/patches/patch-bc
@@ -0,0 +1,14 @@
+$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);