Update to 3.54 (during the freeze, for the bugfixes). From the changelog:

- fixed default colour output in BBCode
  (https://gitlab.com/saalen/highlight/issues/134)
- fixed corner case in sh.lang
- fixed syntax tests with UTF-8 input
  (https://gitlab.com/saalen/highlight/issues/123)
- added support for Bash in outhtml_codefold.lua plug-in
- added ballerina.lang
- added block strings to java.lang
- added author hints in themes and language definitions
- added C++20 reserved words in c.lang
- added editorconfig file and validated all files accordingly (thanks to
  Tristano Ajmone)
- CLI: fixed `--list-scripts` with `-d` or HIGHLIGHT_DATADIR env variable
  (https://gitlab.com/saalen/highlight/issues/139)
- GUI W32: replaced multibyte path trace window by startup hint if
  NtfsDisable8dot3NameCreation is set
- GUI: removed AsciiDoc instruction lines from the README popup window

6 files changed, 30 insertions, 28 deletions

diff --git a/textproc/libhighlight/Makefile b/textproc/libhighlight/Makefile
index 2563af8dd88..f324c576854 100644
--- a/textproc/libhighlight/Makefile
+++ b/textproc/libhighlight/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/11/04 21:43:38 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2019/12/18 01:34:33 schmonz Exp $
 
 .include "../../textproc/libhighlight/Makefile.common"
 
@@ -8,7 +8,7 @@ COMMENT+=	(shared library)
 BUILD_TARGET=		lib-shared
 
 EGDIR=			${PREFIX}/share/examples/highlight
-CONF_FILES=		${EGDIR}/filetypes.conf			\
+CONF_FILES=		${EGDIR}/filetypes.conf \
 			${PKG_SYSCONFDIR}/filetypes.conf
 
 INSTALLATION_DIRS=	lib
diff --git a/textproc/libhighlight/Makefile.common b/textproc/libhighlight/Makefile.common
index a87ed05d844..b36fd61a5f7 100644
--- a/textproc/libhighlight/Makefile.common
+++ b/textproc/libhighlight/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.11 2019/08/13 01:48:49 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.12 2019/12/18 01:34:33 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=		highlight-${VERSION}
-VERSION=		3.53
+VERSION=		3.54
 CATEGORIES=		textproc
 MASTER_SITES=		http://www.andre-simon.de/zip/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/textproc/libhighlight/PLIST b/textproc/libhighlight/PLIST
index 1091776230c..8639c9521a0 100644
--- a/textproc/libhighlight/PLIST
+++ b/textproc/libhighlight/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2019/08/13 01:48:49 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.11 2019/12/18 01:34:33 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
@@ -85,6 +85,7 @@ share/highlight/langDefs/autohotkey.lang
 share/highlight/langDefs/autoit.lang
 share/highlight/langDefs/avenue.lang
 share/highlight/langDefs/awk.lang
+share/highlight/langDefs/ballerina.lang
 share/highlight/langDefs/bat.lang
 share/highlight/langDefs/bbcode.lang
 share/highlight/langDefs/bcpl.lang
@@ -322,6 +323,7 @@ share/highlight/plugins/outhtml_add_background_svg.lua
 share/highlight/plugins/outhtml_add_figure.lua
 share/highlight/plugins/outhtml_add_line.lua
 share/highlight/plugins/outhtml_add_shadow.lua
+share/highlight/plugins/outhtml_ansi_esc.lua
 share/highlight/plugins/outhtml_codefold.lua
 share/highlight/plugins/outhtml_curly_brackets_matcher.lua
 share/highlight/plugins/outhtml_ie7_webctrl.lua
diff --git a/textproc/libhighlight/distinfo b/textproc/libhighlight/distinfo
index fa91ce9a73b..d8a3a9c5353 100644
--- a/textproc/libhighlight/distinfo
+++ b/textproc/libhighlight/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.13 2019/08/28 14:38:42 schmonz Exp $
+$NetBSD: distinfo,v 1.14 2019/12/18 01:34:33 schmonz Exp $
 
-SHA1 (highlight-3.53.tar.bz2) = bef7dac08125cfaa0b1f201b68163e90c261d433
-RMD160 (highlight-3.53.tar.bz2) = 7eeb4e122be2a1f808936cfb1f32cb1b65cd2418
-SHA512 (highlight-3.53.tar.bz2) = b25340aa881e5188fb9862d4858fab17627a80329835723a75de95bbf523f2453f42fa4e6ed842345b5e2842d66a40f16b03c19fbbbea4a226e247a93130a5e3
-Size (highlight-3.53.tar.bz2) = 1408173 bytes
-SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
+SHA1 (highlight-3.54.tar.bz2) = 1f061baf166ca1f3b9019b173f008956b49f69b8
+RMD160 (highlight-3.54.tar.bz2) = 74bd87ef8e4898dc1cc9f9a37e068d323f22b2ec
+SHA512 (highlight-3.54.tar.bz2) = c5a0982e9cd5c48d1ffa3ce2286020c1285eacf32928b08e3718582f4d131b05726920156c4357e595403474d4c389fc70e2aff789e17962963b9d8d23ac6488
+Size (highlight-3.54.tar.bz2) = 1407167 bytes
+SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
 SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063
 SHA1 (patch-src_core_platform__fs.cpp) = 94e4b2aef89e48e104be57acf6dd9ce4b5917e21
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = 977c34f85929bcd2a008d91dac812e44e63afb62
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_makefile) = e7c4d0e8e79101ef0bb94556619b6e2a3283005b
+SHA1 (patch-src_makefile) = 6cf3dd2dfed3a150f78b61a992be6f036837cae8
diff --git a/textproc/libhighlight/patches/patch-extras_swig_makefile b/textproc/libhighlight/patches/patch-extras_swig_makefile
index 8f28f537824..6e0602e6d48 100644
--- a/textproc/libhighlight/patches/patch-extras_swig_makefile
+++ b/textproc/libhighlight/patches/patch-extras_swig_makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-extras_swig_makefile,v 1.2 2018/05/27 11:50:26 schmonz Exp $
+$NetBSD: patch-extras_swig_makefile,v 1.3 2019/12/18 01:34:34 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- extras/swig/makefile.orig	2018-04-30 12:17:04.000000000 +0000
+--- extras/swig/makefile.orig	2019-11-11 16:57:10.000000000 +0000
 +++ extras/swig/makefile
 @@ -1,6 +1,6 @@
  
@@ -17,26 +17,26 @@ Use pkgsrc-specified compiler and flags.
  PHP_INC=$(shell php-config --includes)
  
  lib-stamp:
--	make -C ${HL_SRC} -f ./makefile clean
--	PIC=1 make -C ${HL_SRC} -f ./makefile CFLAGS="${CFLAGS}" libhighlight.a
-+	#make -C ${HL_SRC} -f ./makefile clean
-+	#PIC=1 make -C ${HL_SRC} -f ./makefile CFLAGS="${CFLAGS}" libhighlight.a
+-	make -C ../.. -f ./makefile clean-obj
+-	PIC=1 make -C ../.. -f ./makefile CFLAGS="${CFLAGS}" lib-static
++	#make -C ../.. -f ./makefile clean-obj
++	#PIC=1 make -C ../.. -f ./makefile CFLAGS="${CFLAGS}" lib-static
  	touch $@
  
  python: lib-stamp
 -	swig -c++ -python -o highlight_wrap.cpp  highlight.i
--	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC} 
+-	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC}
 -	${CXX} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
 +	swig3.0 -c++ -python -o highlight_wrap.cpp  highlight.i
-+	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC} 
++	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC}
 +	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
  
  perl: lib-stamp
 -	swig -c++ -perl -o highlight_wrap.cpp  highlight.i
--	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC} 
+-	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}
 -	${CXX} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
 +	swig3.0 -c++ -perl -o highlight_wrap.cpp  highlight.i
-+	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC} 
++	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}
 +	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lperl -o highlight.so
  
  php: lib-stamp
@@ -45,7 +45,7 @@ Use pkgsrc-specified compiler and flags.
 -	${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
 +	swig3.0 -c++ -php -o highlight_wrap.cpp highlight.i
 +	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC}
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
++	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lphp -o highlight.so
  
  clean: python-clean perl-clean php-clean
  	rm -f *-stamp
diff --git a/textproc/libhighlight/patches/patch-src_makefile b/textproc/libhighlight/patches/patch-src_makefile
index c0b61c0207e..01b769e058f 100644
--- a/textproc/libhighlight/patches/patch-src_makefile
+++ b/textproc/libhighlight/patches/patch-src_makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_makefile,v 1.7 2019/08/13 01:48:49 schmonz Exp $
+$NetBSD: patch-src_makefile,v 1.8 2019/12/18 01:34:34 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- src/makefile.orig	2019-07-31 21:48:56.000000000 +0000
+--- src/makefile.orig	2019-11-11 16:57:10.000000000 +0000
 +++ src/makefile
 @@ -8,18 +8,18 @@
  # See ../makefile for the definition of ${data_dir}
@@ -95,9 +95,9 @@ Use pkgsrc-specified compiler and flags.
  platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h
  	${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp
 @@ -206,7 +209,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
-   ${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \
-   ${INCLUDE_DIR}stylecolour.h  ${INCLUDE_DIR}preformatter.h \
-   ${CLI_DIR}help.h ${INCLUDE_DIR}version.h
+ 	${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \
+ 	${INCLUDE_DIR}stylecolour.h  ${INCLUDE_DIR}preformatter.h \
+ 	${CLI_DIR}help.h ${INCLUDE_DIR}version.h
 -	${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR}
 +	${CXX_COMPILE} ${CLI_DIR}main.cpp