(pkgsrc)

 - Add gnu-gpl-v3 to LICENSE
 - Add comment on patch-ac
 - Add following include, pkglint recommended,
   .include "../../graphics/hicolor-icon-theme/buildlink3.mk"

(upstream) update 2.2.4 to 2.2.6
* 2.2.6 *

Bluefish 2.2.6 is mostly a bug fix release. This release fixes a critical bug
(segfault) in filebrowser that could be triggered if the root directory was set
as basedir. It also has a fix for a specific CSS-in-HTML-tag highlighting issue.
The filter code furthermore caused a segfault if the command did not exist. The
Windows version finally supports open in running process. Next to these bugs
many small issues have been resolved. Development checks are now only enabled if
Bluefish is compiled from svn, not if compiled from tarball. Various language
files have small improvements, most notably C, Javascript and CSS. Several
translations have been updated. A corner case for a new document from a template
that does not exist was fixed. The "open" submenu now opens SVG files from the
filebrowser instead of inserting an image tag. The included cssmin and jsbeatify
have been updated. A syntax scanning issue when replacing large chunks of text
was fixed, he "Report bug" link was broken, a new "conditional" option to the
language file that makes re-using certain blocks of language files easier was
added, and error reporting in outputbox was improved. On OSX filebrowser icons
and the "open file" dialog size have been improved.

* 2.2.5 *

Bluefish 2.2.5 is a minor bug fix release but has also quite some new features.
The syntax scanning engine is faster after small changes to the text. The
filebrowser is also much faster with less memory usage, with various fixes and
new features. Projects now store the active document and active line numbers.
Indenting is improved in auto-completion and the smart indenting. Bookmarks and
paste special also have been improved. On OSX there are many improvements, such
as Mavericks support, Retina display support, working system hotkeys, native
input methods (Japanese, Chinese, etc.), opening files from the finder and
Widget bindings on MacOSX are moved to Cmd+C|V|X|A and working. Furthermore
almost all syntax highlighting has been improved, most notable jquery in
javascript, HTML5, and HTML5 in PHP files. There are also many bug fixes, such
as in wrap text on right margin, in the replace engine, the jsmin licence, the
split lines feature, the auto-recovery and many obscure bugs. Last bluefish now
has an appdata file.

4 files changed, 24 insertions, 10 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 7551d1bb958..280702a7674 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.117 2014/05/29 23:37:56 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2014/11/24 05:03:43 mef Exp $
 
-DISTNAME=	bluefish-2.2.4
-PKGREVISION=	9
+DISTNAME=	bluefish-2.2.6
 CATEGORIES=	www
 MASTER_SITES=	http://bluefish.mrball.net/stable/source/               \
 		http://www.bennewitz.com/bluefish/stable/source/
@@ -10,6 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://bluefish.openoffice.nl/
 COMMENT=	GTK HTML editor for the experienced web designer
+LICENSE=	gnu-gpl-v3
 
 DEPENDS+=		weblint-[0-9]*:../../www/weblint
 
@@ -44,6 +44,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 2.2.4
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../fonts/gucharmap/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/bluefish/PLIST b/www/bluefish/PLIST
index ebacf94d59f..c80c89267e5 100644
--- a/www/bluefish/PLIST
+++ b/www/bluefish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2013/03/15 18:32:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.26 2014/11/24 05:03:43 mef Exp $
 bin/bluefish
 lib/bluefish/about.la
 lib/bluefish/charmap.la
@@ -8,6 +8,7 @@ lib/bluefish/infbrowser.la
 lib/bluefish/snippets.la
 lib/bluefish/zencoding.la
 man/man1/bluefish.1
+share/appdata/bluefish.appdata.xml
 share/applications/bluefish.desktop
 share/bluefish/bflang/JQuery.bfinc
 share/bluefish/bflang/ada.bflang2
@@ -21,6 +22,7 @@ share/bluefish/bflang/asp.bflang2
 share/bluefish/bflang/bflang2.bflang2
 share/bluefish/bflang/c.bflang2
 share/bluefish/bflang/cfml.bflang2
+share/bluefish/bflang/chuck.bflang2
 share/bluefish/bflang/clojure.bflang2
 share/bluefish/bflang/cpp.bflang2
 share/bluefish/bflang/css-rules.bfinc
@@ -81,6 +83,7 @@ share/bluefish/cssmin.py
 share/bluefish/default_accelmap
 share/bluefish/encodings
 share/bluefish/jsbeautifier/__init__.py
+share/bluefish/jsbeautifier/__version__.py
 share/bluefish/jsbeautifier/unpackers/__init__.py
 share/bluefish/jsbeautifier/unpackers/evalbased.py
 share/bluefish/jsbeautifier/unpackers/javascriptobfuscator.py
@@ -153,6 +156,14 @@ 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/ar/LC_MESSAGES/bluefish.mo
+share/locale/ar/LC_MESSAGES/bluefish_plugin_about.mo
+share/locale/ar/LC_MESSAGES/bluefish_plugin_charmap.mo
+share/locale/ar/LC_MESSAGES/bluefish_plugin_entities.mo
+share/locale/ar/LC_MESSAGES/bluefish_plugin_htmlbar.mo
+share/locale/ar/LC_MESSAGES/bluefish_plugin_infbrowser.mo
+share/locale/ar/LC_MESSAGES/bluefish_plugin_snippets.mo
+share/locale/ar/LC_MESSAGES/bluefish_plugin_zencoding.mo
 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
diff --git a/www/bluefish/distinfo b/www/bluefish/distinfo
index a9469f07a3a..6d25492eb1e 100644
--- a/www/bluefish/distinfo
+++ b/www/bluefish/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.22 2013/03/15 18:32:01 drochner Exp $
+$NetBSD: distinfo,v 1.23 2014/11/24 05:03:43 mef Exp $
 
-SHA1 (bluefish-2.2.4.tar.bz2) = b65310617b5fd525a8c57f7681e023f6f4496378
-RMD160 (bluefish-2.2.4.tar.bz2) = 56e8a1478ea6939cef0229fcfd40c44a52c49e83
-Size (bluefish-2.2.4.tar.bz2) = 3689060 bytes
-SHA1 (patch-ac) = 5145b8e2df6919e60621aca5eb62a9526efaff43
+SHA1 (bluefish-2.2.6.tar.bz2) = 7742f732a4259ff927a2160a4d94e0c0a805a196
+RMD160 (bluefish-2.2.6.tar.bz2) = ec3d73fec8d7a82ff2fe2182dc6664113a314421
+Size (bluefish-2.2.6.tar.bz2) = 3793018 bytes
+SHA1 (patch-ac) = f4e0a9f861108465ee96a78da327b6aef2de4984
diff --git a/www/bluefish/patches/patch-ac b/www/bluefish/patches/patch-ac
index 07cda0a5e33..f01c1352f0b 100644
--- a/www/bluefish/patches/patch-ac
+++ b/www/bluefish/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2011/03/11 18:03:21 drochner Exp $
+$NetBSD: patch-ac,v 1.5 2014/11/24 05:03:43 mef Exp $
+
+[check-portability.awk] configure: if test "$prefix" == "NONE"; ...
 
 --- configure.orig	2010-02-15 13:56:55.000000000 +0000
 +++ configure