Update to 2.2.6.

4 files changed, 42 insertions, 13 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index cfd9787fe074..2b9b98544e7e 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bluefish
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.2.6
 CATEGORIES=	www editors
 MASTER_SITES=	http://www.bennewitz.com/bluefish/stable/source/ \
 		http://bluefish.mrball.net/stable/source/ \
diff --git a/www/bluefish/distinfo b/www/bluefish/distinfo
index 29bb6f81dd11..23dd30782a9c 100644
--- a/www/bluefish/distinfo
+++ b/www/bluefish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.3.tar.bz2) = be284cd972d82b56a55f9b9588b3c0ff18702318822f45c7598c336de8a4d6ea
-SIZE (bluefish-2.2.3.tar.bz2) = 3635489
+SHA256 (bluefish-2.2.6.tar.bz2) = 54c2892c317eb2287c9fb0a3e29c3f19bef51d9ab0353bfb158e52a1cdae4216
+SIZE (bluefish-2.2.6.tar.bz2) = 3793018
diff --git a/www/bluefish/files/patch-data_bflang-Makefile.in b/www/bluefish/files/patch-data_bflang-Makefile.in
index 6a4cf403b43d..a3bd3ab60fb7 100644
--- a/www/bluefish/files/patch-data_bflang-Makefile.in
+++ b/www/bluefish/files/patch-data_bflang-Makefile.in
@@ -1,9 +1,9 @@
---- ./data/bflang/Makefile.in.orig	2010-09-16 08:20:07.000000000 -0400
-+++ ./data/bflang/Makefile.in	2011-01-31 14:05:03.000000000 -0500
-@@ -374,26 +374,6 @@
- 	test -n "$$files" || exit 0; \
- 	echo " ( cd '$(DESTDIR)$(bflangrngdir)' && rm -f" $$files ")"; \
- 	cd "$(DESTDIR)$(bflangrngdir)" && rm -f $$files
+--- data/bflang/Makefile.in.orig	2014-09-02 16:47:12 UTC
++++ data/bflang/Makefile.in
+@@ -405,24 +405,6 @@
+ 	@list='$(bflangrng_DATA)'; test -n "$(bflangrngdir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ 	dir='$(DESTDIR)$(bflangrngdir)'; $(am__uninstall_files_from_dir)
 -install-bflangsampleDATA: $(bflangsample_DATA)
 -	@$(NORMAL_INSTALL)
 -	test -z "$(bflangsampledir)" || $(MKDIR_P) "$(DESTDIR)$(bflangsampledir)"
@@ -21,9 +21,7 @@
 -	@$(NORMAL_UNINSTALL)
 -	@list='$(bflangsample_DATA)'; test -n "$(bflangsampledir)" || list=; \
 -	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(bflangsampledir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(bflangsampledir)" && rm -f $$files
+-	dir='$(DESTDIR)$(bflangsampledir)'; $(am__uninstall_files_from_dir)
  install-bflangxmlDATA: $(bflangxml_DATA)
  	@$(NORMAL_INSTALL)
  	test -z "$(bflangxmldir)" || $(MKDIR_P) "$(DESTDIR)$(bflangxmldir)"
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index e0d55c276a70..7c579f051da9 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -7,6 +7,7 @@ lib/bluefish/infbrowser.so
 lib/bluefish/snippets.so
 lib/bluefish/zencoding.so
 man/man1/bluefish.1.gz
+share/appdata/bluefish.appdata.xml
 share/applications/bluefish.desktop
 %%DATADIR%%/bflang/JQuery.bfinc
 %%DATADIR%%/bflang/ada.bflang2
@@ -20,6 +21,7 @@ share/applications/bluefish.desktop
 %%DATADIR%%/bflang/bflang2.bflang2
 %%DATADIR%%/bflang/c.bflang2
 %%DATADIR%%/bflang/cfml.bflang2
+%%DATADIR%%/bflang/chuck.bflang2
 %%DATADIR%%/bflang/clojure.bflang2
 %%DATADIR%%/bflang/cpp.bflang2
 %%DATADIR%%/bflang/css-rules.bfinc
@@ -76,8 +78,19 @@ share/applications/bluefish.desktop
 %%DATADIR%%/bflib/bflib_python_2.3.xml.gz
 %%DATADIR%%/bflib/bflib_xhtml.xml.gz
 %%DATADIR%%/bluefish_splash.png
+%%DATADIR%%/cssmin.py
 %%DATADIR%%/default_accelmap
 %%DATADIR%%/encodings
+%%DATADIR%%/jsbeautifier/__init__.py
+%%DATADIR%%/jsbeautifier/__version__.py
+%%DATADIR%%/jsbeautifier/unpackers/__init__.py
+%%DATADIR%%/jsbeautifier/unpackers/evalbased.py
+%%DATADIR%%/jsbeautifier/unpackers/javascriptobfuscator.py
+%%DATADIR%%/jsbeautifier/unpackers/myobfuscate.py
+%%DATADIR%%/jsbeautifier/unpackers/packer.py
+%%DATADIR%%/jsbeautifier/unpackers/urlencode.py
+%%DATADIR%%/jsbeautify
+%%DATADIR%%/jsmin.py
 %%DATADIR%%/lipsum/__init__.py
 %%DATADIR%%/lipsum/data/dictionary.txt
 %%DATADIR%%/lipsum/data/lipsum.xml
@@ -142,6 +155,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
+%%NLS%%share/locale/ar/LC_MESSAGES/bluefish.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/bluefish_plugin_about.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/bluefish_plugin_charmap.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/bluefish_plugin_entities.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/bluefish_plugin_htmlbar.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/bluefish_plugin_infbrowser.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/bluefish_plugin_snippets.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/bluefish_plugin_zencoding.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/bluefish.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/bluefish_plugin_about.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -190,6 +211,14 @@ share/icons/hicolor/scalable/mimetypes/bluefish-project.svg
 %%NLS%%share/locale/el/LC_MESSAGES/bluefish_plugin_infbrowser.mo
 %%NLS%%share/locale/el/LC_MESSAGES/bluefish_plugin_snippets.mo
 %%NLS%%share/locale/el/LC_MESSAGES/bluefish_plugin_zencoding.mo
+%%NLS%%share/locale/en/LC_MESSAGES/bluefish.mo
+%%NLS%%share/locale/en/LC_MESSAGES/bluefish_plugin_about.mo
+%%NLS%%share/locale/en/LC_MESSAGES/bluefish_plugin_charmap.mo
+%%NLS%%share/locale/en/LC_MESSAGES/bluefish_plugin_entities.mo
+%%NLS%%share/locale/en/LC_MESSAGES/bluefish_plugin_htmlbar.mo
+%%NLS%%share/locale/en/LC_MESSAGES/bluefish_plugin_infbrowser.mo
+%%NLS%%share/locale/en/LC_MESSAGES/bluefish_plugin_snippets.mo
+%%NLS%%share/locale/en/LC_MESSAGES/bluefish_plugin_zencoding.mo
 %%NLS%%share/locale/es/LC_MESSAGES/bluefish.mo
 %%NLS%%share/locale/es/LC_MESSAGES/bluefish_plugin_about.mo
 %%NLS%%share/locale/es/LC_MESSAGES/bluefish_plugin_charmap.mo
@@ -400,6 +429,8 @@ share/xml/bluefish/catalog.xml
 @dirrm lib/bluefish
 @dirrm %%DATADIR%%/bflang
 @dirrm %%DATADIR%%/bflib
+@dirrm %%DATADIR%%/jsbeautifier
+@dirrm %%DATADIR%%/jsbeautifier/unpackers
 @dirrm %%DATADIR%%/lipsum/data
 @dirrm %%DATADIR%%/lipsum
 @dirrm %%DATADIR%%/plugins/htmlbar/ui
@@ -415,6 +446,7 @@ share/xml/bluefish/catalog.xml
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/bflang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/appdata
 @dirrmtry share/mime/application
 @dirrm share/xml/bluefish/2.0
 @dirrm share/xml/bluefish