Wed Sep 6 18:06:23 2023 UTC ()
Update to 4.8. From the changelog:

- updated astyle lib to version 3.4.6
- moved old yaml.lang to yaml-ansible.lang and added a new yaml
  definition (#235)
- omit size property in BBCode output if `--fragment` is set (#234)
- allowed font size unit with `--font-size` for HTML and ODT
  output (#145)
- GUI: updated JP translation (#144)


(schmonz)
diff -r1.26 -r1.27 pkgsrc/textproc/libhighlight/Makefile.common
diff -r1.22 -r1.23 pkgsrc/textproc/libhighlight/PLIST
diff -r1.29 -r1.30 pkgsrc/textproc/libhighlight/distinfo
diff -r1.5 -r1.6 pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro
cvs diff -r1.26 -r1.27 pkgsrc/textproc/libhighlight/Makefile.common (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/Makefile.common 2023/07/18 12:19:41 1.26
+++ pkgsrc/textproc/libhighlight/Makefile.common 2023/09/06 18:06:23 1.27
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.26 2023/07/18 12:19:41 schmonz Exp $ 1# $NetBSD: Makefile.common,v 1.27 2023/09/06 18:06:23 schmonz Exp $
2# used by textproc/highlight/Makefile 2# used by textproc/highlight/Makefile
3# used by textproc/libhighlight/Makefile 3# used by textproc/libhighlight/Makefile
4# used by textproc/p5-highlight/Makefile 4# used by textproc/p5-highlight/Makefile
5 5
6DISTNAME= highlight-${VERSION} 6DISTNAME= highlight-${VERSION}
7VERSION= 4.7 7VERSION= 4.8
8CATEGORIES= textproc 8CATEGORIES= textproc
9MASTER_SITES= http://www.andre-simon.de/zip/ 9MASTER_SITES= http://www.andre-simon.de/zip/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= schmonz@NetBSD.org 12MAINTAINER= schmonz@NetBSD.org
13HOMEPAGE= http://www.andre-simon.de/ 13HOMEPAGE= http://www.andre-simon.de/
14COMMENT= Converts source code to formatted text with syntax highlighting 14COMMENT= Converts source code to formatted text with syntax highlighting
15LICENSE= gnu-gpl-v3 15LICENSE= gnu-gpl-v3
16 16
17USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
18USE_LANGUAGES= c c++11 18USE_LANGUAGES= c c++11
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20MAKE_FILE= makefile 20MAKE_FILE= makefile
cvs diff -r1.22 -r1.23 pkgsrc/textproc/libhighlight/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/PLIST 2023/05/24 15:53:35 1.22
+++ pkgsrc/textproc/libhighlight/PLIST 2023/09/06 18:06:23 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.22 2023/05/24 15:53:35 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.23 2023/09/06 18:06:23 schmonz Exp $
2lib/libhighlight.la 2lib/libhighlight.la
3share/bash-completion/completions/highlight 3share/bash-completion/completions/highlight
4share/doc/highlight/AUTHORS 4share/doc/highlight/AUTHORS
5share/doc/highlight/COPYING 5share/doc/highlight/COPYING
6share/doc/highlight/ChangeLog.adoc 6share/doc/highlight/ChangeLog.adoc
7share/doc/highlight/INSTALL 7share/doc/highlight/INSTALL
8share/doc/highlight/README.adoc 8share/doc/highlight/README.adoc
9share/doc/highlight/README_DE.adoc 9share/doc/highlight/README_DE.adoc
10share/doc/highlight/README_LANGLIST.adoc 10share/doc/highlight/README_LANGLIST.adoc
11share/doc/highlight/README_LSP_CLIENT.adoc 11share/doc/highlight/README_LSP_CLIENT.adoc
12share/doc/highlight/README_PLUGINS.adoc 12share/doc/highlight/README_PLUGINS.adoc
13share/doc/highlight/README_REGEX.adoc 13share/doc/highlight/README_REGEX.adoc
14share/doc/highlight/README_RELEASE.adoc 14share/doc/highlight/README_RELEASE.adoc
@@ -301,26 +301,27 @@ share/highlight/langDefs/upc.lang @@ -301,26 +301,27 @@ share/highlight/langDefs/upc.lang
301share/highlight/langDefs/vala.lang 301share/highlight/langDefs/vala.lang
302share/highlight/langDefs/vb.lang 302share/highlight/langDefs/vb.lang
303share/highlight/langDefs/verilog.lang 303share/highlight/langDefs/verilog.lang
304share/highlight/langDefs/vhd.lang 304share/highlight/langDefs/vhd.lang
305share/highlight/langDefs/vimscript.lang 305share/highlight/langDefs/vimscript.lang
306share/highlight/langDefs/vue.lang 306share/highlight/langDefs/vue.lang
307share/highlight/langDefs/wat.lang 307share/highlight/langDefs/wat.lang
308share/highlight/langDefs/whiley.lang 308share/highlight/langDefs/whiley.lang
309share/highlight/langDefs/wren.lang 309share/highlight/langDefs/wren.lang
310share/highlight/langDefs/xml.lang 310share/highlight/langDefs/xml.lang
311share/highlight/langDefs/xpp.lang 311share/highlight/langDefs/xpp.lang
312share/highlight/langDefs/yaiff.lang 312share/highlight/langDefs/yaiff.lang
313share/highlight/langDefs/yaml.lang 313share/highlight/langDefs/yaml.lang
 314share/highlight/langDefs/yaml_ansible.lang
314share/highlight/langDefs/yang.lang 315share/highlight/langDefs/yang.lang
315share/highlight/langDefs/zig.lang 316share/highlight/langDefs/zig.lang
316share/highlight/langDefs/znn.lang 317share/highlight/langDefs/znn.lang
317share/highlight/plugins/asciidoc_html_add_links.lua 318share/highlight/plugins/asciidoc_html_add_links.lua
318share/highlight/plugins/bash_functions.lua 319share/highlight/plugins/bash_functions.lua
319share/highlight/plugins/bash_ref_man7_org.lua 320share/highlight/plugins/bash_ref_man7_org.lua
320share/highlight/plugins/comment_links.lua 321share/highlight/plugins/comment_links.lua
321share/highlight/plugins/cpp_qt.lua 322share/highlight/plugins/cpp_qt.lua
322share/highlight/plugins/cpp_ref_cplusplus_com.lua 323share/highlight/plugins/cpp_ref_cplusplus_com.lua
323share/highlight/plugins/cpp_ref_gtk_gnome_org.lua 324share/highlight/plugins/cpp_ref_gtk_gnome_org.lua
324share/highlight/plugins/cpp_ref_local_includes.lua 325share/highlight/plugins/cpp_ref_local_includes.lua
325share/highlight/plugins/cpp_ref_qtproject_org.lua 326share/highlight/plugins/cpp_ref_qtproject_org.lua
326share/highlight/plugins/cpp_ref_wxwidgets_org.lua 327share/highlight/plugins/cpp_ref_wxwidgets_org.lua
cvs diff -r1.29 -r1.30 pkgsrc/textproc/libhighlight/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/distinfo 2023/07/18 12:19:41 1.29
+++ pkgsrc/textproc/libhighlight/distinfo 2023/09/06 18:06:23 1.30
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.29 2023/07/18 12:19:41 schmonz Exp $ 1$NetBSD: distinfo,v 1.30 2023/09/06 18:06:23 schmonz Exp $
2 2
3BLAKE2s (highlight-4.7.tar.bz2) = 10fca9db612f05390080521be4ca2990416b6b498d358cf3a57daf708f977dbf 3BLAKE2s (highlight-4.8.tar.bz2) = e13bbbabb789062aed31205339c178713a82f3327158e0e86f3fc8ea5b06584d
4SHA512 (highlight-4.7.tar.bz2) = b75106687fcfbc8629f36698dd690cd2935777be384583197a34dadadffd3eb6e9fc66f2bdb7599e9dcff18e70ddb84834b469f6e6c4d1efc11ea7a4fb696e04 4SHA512 (highlight-4.8.tar.bz2) = c04e94b2fdb1ebda37937a8bdcdb1bb5afe171a74ca58ddf40b1972bc62a07dc02d628bc962b1db654805a446f32da8d7af41a0c162476cf47a3535128ca6ace
5Size (highlight-4.7.tar.bz2) = 1489235 bytes 5Size (highlight-4.8.tar.bz2) = 1492966 bytes
6SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e 6SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
7SHA1 (patch-makefile) = 92f6514c39f6aa437f9beaafc10a1f6275e241b3 7SHA1 (patch-makefile) = 92f6514c39f6aa437f9beaafc10a1f6275e241b3
8SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3 8SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3
9SHA1 (patch-src_gui-qt_highlight.pro) = f24da8f3a136a9ae5066401a4d46ee802a789c8a 9SHA1 (patch-src_gui-qt_highlight.pro) = 48200cbff5c0004ecae5ed013de6eef65ab260fa
10SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8589c68e032385801bc969abe805f1be3dc2630f 10SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8589c68e032385801bc969abe805f1be3dc2630f
11SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8 11SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
12SHA1 (patch-src_makefile) = a66c61de0ed3eff5fa9ac2da9d434fcd6c553b51 12SHA1 (patch-src_makefile) = a66c61de0ed3eff5fa9ac2da9d434fcd6c553b51
cvs diff -r1.5 -r1.6 pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro 2023/05/24 15:53:35 1.5
+++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro 2023/09/06 18:06:23 1.6
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-src_gui-qt_highlight.pro,v 1.5 2023/05/24 15:53:35 schmonz Exp $ 1$NetBSD: patch-src_gui-qt_highlight.pro,v 1.6 2023/09/06 18:06:23 schmonz Exp $
2 2
3Restore non-.app macOS build settings from 3.59. 3Restore non-.app macOS build settings from 3.59.
4 4
5--- src/gui-qt/highlight.pro.orig 2023-05-19 11:27:59.000000000 +0000 5--- src/gui-qt/highlight.pro.orig 2023-08-28 20:06:54.000000000 +0000
6+++ src/gui-qt/highlight.pro 6+++ src/gui-qt/highlight.pro
7@@ -82,8 +82,11 @@ macx-clang|macx-clang-arm64 { 7@@ -89,8 +89,11 @@ macx-clang|macx-clang-arm64 {
8 INCLUDEPATH += ../../include 8 INCLUDEPATH += ../../include
9 INCLUDEPATH+=/usr/local/Cellar/boost/1.81.0_1/include 9 INCLUDEPATH+=/usr/local/Cellar/boost/1.82.0_1/include
10  10
11- QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0 11- QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0
12- CONFIG += app_bundle 12- CONFIG += app_bundle
13+ ###QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0 13+ ###QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0
14+ ###CONFIG += app_bundle 14+ ###CONFIG += app_bundle
15+ QT_CONFIG -= no-pkg-config 15+ QT_CONFIG -= no-pkg-config
16+ CONFIG += link_pkgconfig 16+ CONFIG += link_pkgconfig
17+ PKGCONFIG += lua 17+ PKGCONFIG += lua
18 LIBS += -L.. -lhighlight 18 LIBS += -L.. -lhighlight
19 LIBS += -L/Users/andresimon/MyProjects/lua-5.4.1/src -llua 19 LIBS += -L/Users/andresimon/MyProjects/lua-5.4.1/src -llua
20  20