CVS commit: pkgsrc/www/bluefish

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov  3 23:11:58 UTC 2023

Modified Files:
        pkgsrc/www/bluefish: Makefile PLIST distinfo

Log Message:
bluefish: update to 2.2.14.

* 2.2.14 *

Bluefish 2.2.14 fixes three bugs that in certain situations could lead to a
segfault. One bug when deleting backup files on close. The second bug when
closing some of the dialogs in a flatpak distributed version of bluefish.
The third bug when the CSS language file was loaded on a 32bit system.
It furthermore fixes zencoding functionality with python3. It also
adds an option to store the scope of the search dialog to the session or
project (this was removed in 2.2.12 because of a bug-report). It furthermore
improves the speed of the bookmarks code. The build infrastructure was also
slightly modernised, intltool is no longer used.

* 2.2.13 *

Bluefish 2.2.13 is a very minor maintenance release. The biggest update is in
the CSS syntax support. Next to that it improves a few user interface parts,
and fixes some very minor bugs. It also has some minor improvements for the
syntax highlighting in a few other languages, most notably python.

* 2.2.12 *

Bluefish 2.2.12 is a minor maintenance release with some minor new features.
Most important is a fix for a crash in simple search. Python 3 compatibility has
been further improved. Encoding detection in python files has been improved.
Triple click now selects the line. On Mac OSX Bluefish deals better with the new
permission features. Also using the correct language in the Bluefish user
interface is fixed for certain languages on OSX. Several programming languages
have improved syntax highlighting. Bluefish now works fine with Enchant2 for
spell checking.

 * 2.2.11 *

Bluefish 2.2.11 is a minor maintenance release and minor feature release. The
only exception to that is the python 3 compatibility which is a major change.
If you compile Bluefish with python 3, you might experience new bugs. There  are
various minor changes as well. Double click selection has been improved  (for
example selecting a function name that has underscores), and is now
configurable per language. Bluefish now has a feature to fill a line with
spaces up to a mouse click, so you can start typing in any position on the
screen (with a fixed width font). A crash when running very large replace
actions on disk on many files has been fixed. Search and replace now ignore
backup files by default. Cursor highlighting and line highlighting have been
fixed for a rare bug. A small new feature has been added, to insert output from
an external command in the current cursor position. Many language files have
seen  updates, most notably CSS, Python and HTML. A data loss bug - when an
unknown  encoding was selected - was fixed, the fallback is now to save as
UTF-8. A bug  when saving with unknown characters in the filename has also been
fixed. Printing  has been improved such as printing in landscape. Some small
tweaks to the UI have  been implemented. For example you can now search in files
in the filebrowser (right  click a directory). Search results can now be shown
in the output pane. The current  identifier can be selected using
<shift><control><i>. There various fixes when  Bluefish is run on top of
Wayland.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 pkgsrc/www/bluefish/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/bluefish/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/bluefish/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/bluefish/Makefile
diff -u pkgsrc/www/bluefish/Makefile:1.163 pkgsrc/www/bluefish/Makefile:1.164
--- pkgsrc/www/bluefish/Makefile:1.163  Sat Oct 21 17:11:38 2023
+++ pkgsrc/www/bluefish/Makefile        Fri Nov  3 23:11:58 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.163 2023/10/21 17:11:38 gdt Exp $
+# $NetBSD: Makefile,v 1.164 2023/11/03 23:11:58 wiz Exp $
 
-DISTNAME=      bluefish-2.2.10
-PKGREVISION=   22
+DISTNAME=      bluefish-2.2.14
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bluefish/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=  .tar.bz2
@@ -13,8 +12,10 @@ LICENSE=     gnu-gpl-v3
 
 DEPENDS+=              weblint-[0-9]*:../../www/weblint
 
-USE_TOOLS+=            find gmake grep msgfmt pkg-config perl intltool
+USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
+USE_TOOLS+=            find gmake grep msgfmt pkg-config perl
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-icon-path=${PREFIX:Q}/share/pixmaps
 CONFIGURE_ARGS+=       --with-freedesktop_org-menu=${PREFIX:Q}/share/applications
@@ -22,31 +23,26 @@ CONFIGURE_ARGS+=    --with-freedesktop_org-
 CONFIGURE_ENV+=                EXTERNAL_GREP=${TOOLS_GREP:Q}
 CONFIGURE_ENV+=                EXTERNAL_FIND=${TOOLS_FIND:Q}
 
-CHECK_WRKREF_SKIP+=            lib/bluefish/about.so
+CHECK_WRKREF_SKIP+=            lib/bluefish/about.*
 REPLACE_PYTHON+=               data/lorem-ipsum-generator data/jsbeautify
 REPLACE_PYTHON+=               data/cssmin.py data/jsmin.py
 REPLACE_PYTHON+=               data/css_decompressor
 CHECK_INTERPRETER_SKIP+=       share/bluefish/plugins/*/*.py
 CHECK_INTERPRETER_SKIP+=       share/bluefish/plugins/*/*/*.py
 
-PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 2.2.4
-
-# 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"
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/application.mk"
-#CONFIGURE_ARGS+=      --disable-python
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../fonts/gucharmap/buildlink3.mk"
+# too new
+#.include "../../fonts/gucharmap/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/enchant2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/bluefish/PLIST
diff -u pkgsrc/www/bluefish/PLIST:1.28 pkgsrc/www/bluefish/PLIST:1.29
--- pkgsrc/www/bluefish/PLIST:1.28      Sun Dec  2 19:35:26 2018
+++ pkgsrc/www/bluefish/PLIST   Fri Nov  3 23:11:58 2023
@@ -1,14 +1,11 @@
-@comment $NetBSD: PLIST,v 1.28 2018/12/02 19:35:26 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.29 2023/11/03 23:11:58 wiz 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
-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
@@ -100,40 +97,8 @@ share/bluefish/jsbeautifier/unpackers/pa
 share/bluefish/jsbeautifier/unpackers/urlencode.py
 share/bluefish/jsbeautify
 share/bluefish/jsmin.py
-share/bluefish/lipsum/__init__.py
-share/bluefish/lipsum/data/dictionary.txt
-share/bluefish/lipsum/data/lipsum.xml
-share/bluefish/lipsum/data/sample.txt
 share/bluefish/lorem-ipsum-generator
 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
@@ -440,6 +405,7 @@ share/locale/zh_TW/LC_MESSAGES/bluefish_
 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/metainfo/bluefish.appdata.xml
 share/mime/packages/bluefish.xml
 share/pixmaps/application-x-bluefish-project.png
 share/pixmaps/bluefish.png

Index: pkgsrc/www/bluefish/distinfo
diff -u pkgsrc/www/bluefish/distinfo:1.29 pkgsrc/www/bluefish/distinfo:1.30
--- pkgsrc/www/bluefish/distinfo:1.29   Tue Oct 26 11:29:21 2021
+++ pkgsrc/www/bluefish/distinfo        Fri Nov  3 23:11:58 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/10/26 11:29:21 nia Exp $
+$NetBSD: distinfo,v 1.30 2023/11/03 23:11:58 wiz Exp $
 
-BLAKE2s (bluefish-2.2.10.tar.bz2) = 0080d6f32c2dd26199c5af927f69db8247542dc563a4cfbfdcc2d71cf5cb7b47
-SHA512 (bluefish-2.2.10.tar.bz2) = ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
-Size (bluefish-2.2.10.tar.bz2) = 4159964 bytes
+BLAKE2s (bluefish-2.2.14.tar.bz2) = d9a77d56cc1a590380acafb73a8419f7fd5b968e9ec39d9f099f258867384101
+SHA512 (bluefish-2.2.14.tar.bz2) = 4f82693e9d16bbc3ecdbb3e9ace22c433eae1779fbccc14aac53d05e449fad9e72b0e42dc1b60863b44130778741b3a683040a7311ec7f2958ec394bc7897dde
+Size (bluefish-2.2.14.tar.bz2) = 4752484 bytes
 SHA1 (patch-ac) = f4e0a9f861108465ee96a78da327b6aef2de4984