Mon Mar 18 18:56:40 2024 UTC (70d)
libhighlight: update to 4.11. Changes:

- updated astyle lib to version 3.4.13
- updated java definition
- updated solidity definition
- fix backslash symbol in man page
- src/makefile: added -std=c++17 to enable modern C++ features


(schmonz)
diff -r1.29 -r1.30 pkgsrc/textproc/libhighlight/Makefile.common
diff -r1.24 -r1.25 pkgsrc/textproc/libhighlight/PLIST
diff -r1.32 -r1.33 pkgsrc/textproc/libhighlight/distinfo
diff -r1.6 -r1.7 pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro
diff -r1.12 -r1.13 pkgsrc/textproc/libhighlight/patches/patch-src_makefile
cvs diff -r1.29 -r1.30 pkgsrc/textproc/libhighlight/Makefile.common (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/Makefile.common 2023/11/08 11:11:35 1.29
+++ pkgsrc/textproc/libhighlight/Makefile.common 2024/03/18 18:56:40 1.30
@@ -1,31 +1,33 @@ @@ -1,31 +1,33 @@
1# $NetBSD: Makefile.common,v 1.29 2023/11/08 11:11:35 schmonz Exp $ 1# $NetBSD: Makefile.common,v 1.30 2024/03/18 18:56:40 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.10 7VERSION= 4.11
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++
 19FORCE_CXX_STD= c++17
 20USE_CXX_FEATURES= c++17
19USE_LIBTOOL= yes 21USE_LIBTOOL= yes
20MAKE_FILE= makefile 22MAKE_FILE= makefile
21 23
22PATCHDIR= ${.CURDIR}/../../textproc/libhighlight/patches 24PATCHDIR= ${.CURDIR}/../../textproc/libhighlight/patches
23DISTINFO_FILE= ${.CURDIR}/../../textproc/libhighlight/distinfo 25DISTINFO_FILE= ${.CURDIR}/../../textproc/libhighlight/distinfo
24DESCR_SRC= ${.CURDIR}/../../textproc/libhighlight/DESCR 26DESCR_SRC= ${.CURDIR}/../../textproc/libhighlight/DESCR
25 27
26PKG_SYSCONFSUBDIR= highlight 28PKG_SYSCONFSUBDIR= highlight
27 29
28SUBST_CLASSES+= paths 30SUBST_CLASSES+= paths
29SUBST_MESSAGE.paths= Fixing hardcoded paths. 31SUBST_MESSAGE.paths= Fixing hardcoded paths.
30SUBST_STAGE.paths= do-configure 32SUBST_STAGE.paths= do-configure
31SUBST_FILES.paths= src/core/datadir.cpp src/makefile 33SUBST_FILES.paths= src/core/datadir.cpp src/makefile
cvs diff -r1.24 -r1.25 pkgsrc/textproc/libhighlight/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/PLIST 2023/10/20 15:58:49 1.24
+++ pkgsrc/textproc/libhighlight/PLIST 2024/03/18 18:56:40 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.24 2023/10/20 15:58:49 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.25 2024/03/18 18:56:40 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
@@ -195,26 +195,27 @@ share/highlight/langDefs/lotus.lang @@ -195,26 +195,27 @@ share/highlight/langDefs/lotus.lang
195share/highlight/langDefs/lua.lang 195share/highlight/langDefs/lua.lang
196share/highlight/langDefs/luban.lang 196share/highlight/langDefs/luban.lang
197share/highlight/langDefs/makefile.lang 197share/highlight/langDefs/makefile.lang
198share/highlight/langDefs/maple.lang 198share/highlight/langDefs/maple.lang
199share/highlight/langDefs/markdown.lang 199share/highlight/langDefs/markdown.lang
200share/highlight/langDefs/matlab.lang 200share/highlight/langDefs/matlab.lang
201share/highlight/langDefs/maya.lang 201share/highlight/langDefs/maya.lang
202share/highlight/langDefs/mercury.lang 202share/highlight/langDefs/mercury.lang
203share/highlight/langDefs/meson.lang 203share/highlight/langDefs/meson.lang
204share/highlight/langDefs/miranda.lang 204share/highlight/langDefs/miranda.lang
205share/highlight/langDefs/mod2.lang 205share/highlight/langDefs/mod2.lang
206share/highlight/langDefs/mod3.lang 206share/highlight/langDefs/mod3.lang
207share/highlight/langDefs/modelica.lang 207share/highlight/langDefs/modelica.lang
 208share/highlight/langDefs/mojo.lang
208share/highlight/langDefs/moon.lang 209share/highlight/langDefs/moon.lang
209share/highlight/langDefs/ms.lang 210share/highlight/langDefs/ms.lang
210share/highlight/langDefs/msl.lang 211share/highlight/langDefs/msl.lang
211share/highlight/langDefs/mssql.lang 212share/highlight/langDefs/mssql.lang
212share/highlight/langDefs/mxml.lang 213share/highlight/langDefs/mxml.lang
213share/highlight/langDefs/n3.lang 214share/highlight/langDefs/n3.lang
214share/highlight/langDefs/nasal.lang 215share/highlight/langDefs/nasal.lang
215share/highlight/langDefs/nbc.lang 216share/highlight/langDefs/nbc.lang
216share/highlight/langDefs/nemerle.lang 217share/highlight/langDefs/nemerle.lang
217share/highlight/langDefs/netrexx.lang 218share/highlight/langDefs/netrexx.lang
218share/highlight/langDefs/nginx.lang 219share/highlight/langDefs/nginx.lang
219share/highlight/langDefs/nice.lang 220share/highlight/langDefs/nice.lang
220share/highlight/langDefs/nim.lang 221share/highlight/langDefs/nim.lang
cvs diff -r1.32 -r1.33 pkgsrc/textproc/libhighlight/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/distinfo 2023/11/08 11:11:35 1.32
+++ pkgsrc/textproc/libhighlight/distinfo 2024/03/18 18:56:40 1.33
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.32 2023/11/08 11:11:35 schmonz Exp $ 1$NetBSD: distinfo,v 1.33 2024/03/18 18:56:40 schmonz Exp $
2 2
3BLAKE2s (highlight-4.10.tar.bz2) = 9e703a8553ebee5a6202e196d192dab16fe30c57d6ac5b4fbf4d4373d926673d 3BLAKE2s (highlight-4.11.tar.bz2) = 83a554aac0cc3afafe956fa330f31e8926529c6629eda1551aa3aedc4f35f4dd
4SHA512 (highlight-4.10.tar.bz2) = 30e3590ea8673e9a6b6c8fc3c2b03fce6a708fa44dfb265a0495002ef4c0f87ccd22d107e64301644e3abfd023c5f695d3d524501eb6b3a0f99225a8b23f315f 4SHA512 (highlight-4.11.tar.bz2) = eb0c92e5dc3ecf280bf6e5a4e68ffb0289a09b3b92fb37756495a5c4e1936800b74385ea0eec2650cae2c690715cc37fd7eeff13e36615410af4c2edd9f2c868
5Size (highlight-4.10.tar.bz2) = 1498745 bytes 5Size (highlight-4.11.tar.bz2) = 1502154 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) = 48200cbff5c0004ecae5ed013de6eef65ab260fa 9SHA1 (patch-src_gui-qt_highlight.pro) = 34c41b702899ef916caa7fdb94c00103e0152959
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) = 4052e2e44ae1681bede016929ad11d2095fbf89f
cvs diff -r1.6 -r1.7 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/09/06 18:06:23 1.6
+++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro 2024/03/18 18:56:40 1.7
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-src_gui-qt_highlight.pro,v 1.6 2023/09/06 18:06:23 schmonz Exp $ 1$NetBSD: patch-src_gui-qt_highlight.pro,v 1.7 2024/03/18 18:56:40 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-08-28 20:06:54.000000000 +0000 5--- src/gui-qt/highlight.pro.orig 2024-03-15 14:46:32.000000000 +0000
6+++ src/gui-qt/highlight.pro 6+++ src/gui-qt/highlight.pro
7@@ -89,8 +89,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.82.0_1/include 9 INCLUDEPATH+=/usr/local/Cellar/boost/1.84.0_1/include
10  10
11- QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0 11- QMAKE_MACOSX_DEPLOYMENT_TARGET=14.0
12- CONFIG += app_bundle 12- CONFIG += app_bundle
13+ ###QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0 13+ ###QMAKE_MACOSX_DEPLOYMENT_TARGET=14.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
cvs diff -r1.12 -r1.13 pkgsrc/textproc/libhighlight/patches/patch-src_makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile 2022/10/03 18:09:12 1.12
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile 2024/03/18 18:56:40 1.13
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-src_makefile,v 1.12 2022/10/03 18:09:12 schmonz Exp $ 1$NetBSD: patch-src_makefile,v 1.13 2024/03/18 18:56:40 schmonz Exp $
2 2
3Use pkgsrc-specified compiler and flags. 3Use pkgsrc-specified compiler and flags.
4 4
5--- src/makefile.orig 2022-09-28 17:52:30.000000000 +0000 5--- src/makefile.orig 2024-03-15 14:46:32.000000000 +0000
6+++ src/makefile 6+++ src/makefile
7@@ -13,11 +13,11 @@ 7@@ -13,11 +13,11 @@
8 # See src/gui-qt/highlight.pro for the Qt GUI compilation options 8 # See src/gui-qt/highlight.pro for the Qt GUI compilation options
9  9
10 #CXX ?= clang++ 10 #CXX ?= clang++
11-CXX ?= g++ 11-CXX ?= g++
12+#CXX ?= g++ 12+#CXX ?= g++
13  13
14 QMAKE ?= qmake 14 QMAKE ?= qmake
15  15
16-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64 16-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++17 -D_FILE_OFFSET_BITS=64
17+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64 17+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++17 -D_FILE_OFFSET_BITS=64
18  18
19 #CFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection 19 #CFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
20  20
21@@ -68,16 +68,20 @@ ifdef PIC 21@@ -68,16 +68,20 @@ ifdef PIC
22 CFLAGS+=-fPIC 22 CFLAGS+=-fPIC
23 endif 23 endif
24  24
25-ifneq ($(OS), Windows_NT) 25-ifneq ($(OS), Windows_NT)
26-LDFLAGS = -ldl 26-LDFLAGS = -ldl
27-endif 27-endif
28+#ifneq ($(OS), Windows_NT) 28+#ifneq ($(OS), Windows_NT)
29+#LDFLAGS = -ldl 29+#LDFLAGS = -ldl
30+#endif 30+#endif