Mon Oct 3 18:09:12 2022 UTC ()
Update to 4.3. From the changelog:

- added support for Carbon
- added support for Fortran77 star comments comments (#208)
- added support for PowerShell block comments (#210)
- fixed Python formatted string pattern (#212)
- added new shell completion generation script (#137)
- W32: fixed Windows compilation headers (#138)


(schmonz)
diff -r1.20 -r1.21 pkgsrc/textproc/libhighlight/Makefile.common
diff -r1.18 -r1.19 pkgsrc/textproc/libhighlight/PLIST
diff -r1.24 -r1.25 pkgsrc/textproc/libhighlight/distinfo
diff -r1.7 -r1.8 pkgsrc/textproc/libhighlight/patches/patch-makefile
diff -r1.2 -r1.3 pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro
diff -r1.11 -r1.12 pkgsrc/textproc/libhighlight/patches/patch-src_makefile
cvs diff -r1.20 -r1.21 pkgsrc/textproc/libhighlight/Makefile.common (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/Makefile.common 2022/07/13 00:52:30 1.20
+++ pkgsrc/textproc/libhighlight/Makefile.common 2022/10/03 18:09:12 1.21
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.20 2022/07/13 00:52:30 schmonz Exp $ 1# $NetBSD: Makefile.common,v 1.21 2022/10/03 18:09:12 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.2 7VERSION= 4.3
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= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@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.18 -r1.19 pkgsrc/textproc/libhighlight/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/PLIST 2022/07/13 00:52:30 1.18
+++ pkgsrc/textproc/libhighlight/PLIST 2022/10/03 18:09:12 1.19
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1@comment $NetBSD: PLIST,v 1.18 2022/07/13 00:52:30 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.19 2022/10/03 18:09:12 schmonz Exp $
2lib/libhighlight.la 2lib/libhighlight.la
 3share/bash-completion/completions/highlight
3share/doc/highlight/AUTHORS 4share/doc/highlight/AUTHORS
4share/doc/highlight/COPYING 5share/doc/highlight/COPYING
5share/doc/highlight/ChangeLog.adoc 6share/doc/highlight/ChangeLog.adoc
6share/doc/highlight/INSTALL 7share/doc/highlight/INSTALL
7share/doc/highlight/README.adoc 8share/doc/highlight/README.adoc
8share/doc/highlight/README_DE.adoc 9share/doc/highlight/README_DE.adoc
9share/doc/highlight/README_LANGLIST.adoc 10share/doc/highlight/README_LANGLIST.adoc
10share/doc/highlight/README_LSP_CLIENT.adoc 11share/doc/highlight/README_LSP_CLIENT.adoc
11share/doc/highlight/README_PLUGINS.adoc 12share/doc/highlight/README_PLUGINS.adoc
12share/doc/highlight/README_REGEX.adoc 13share/doc/highlight/README_REGEX.adoc
13share/doc/highlight/README_RELEASE.adoc 14share/doc/highlight/README_RELEASE.adoc
14share/doc/highlight/README_TESTCASES.adoc 15share/doc/highlight/README_TESTCASES.adoc
15share/doc/highlight/README_V4_MIGRATION.adoc 16share/doc/highlight/README_V4_MIGRATION.adoc
@@ -49,26 +50,27 @@ share/doc/highlight/extras/themes-resour @@ -49,26 +50,27 @@ share/doc/highlight/extras/themes-resour
49share/doc/highlight/extras/themes-resources/base16/example-light.html 50share/doc/highlight/extras/themes-resources/base16/example-light.html
50share/doc/highlight/extras/themes-resources/base16/example.bat 51share/doc/highlight/extras/themes-resources/base16/example.bat
51share/doc/highlight/extras/themes-resources/base16/example.pb 52share/doc/highlight/extras/themes-resources/base16/example.pb
52share/doc/highlight/extras/themes-resources/base16/example.theme 53share/doc/highlight/extras/themes-resources/base16/example.theme
53share/doc/highlight/extras/themes-resources/base16/example.yaml 54share/doc/highlight/extras/themes-resources/base16/example.yaml
54share/doc/highlight/extras/themes-resources/base16/example_light.theme 55share/doc/highlight/extras/themes-resources/base16/example_light.theme
55share/doc/highlight/extras/themes-resources/css-themes/README.html 56share/doc/highlight/extras/themes-resources/css-themes/README.html
56share/doc/highlight/extras/themes-resources/css-themes/UNLICENCE 57share/doc/highlight/extras/themes-resources/css-themes/UNLICENCE
57share/doc/highlight/extras/themes-resources/css-themes/example.html 58share/doc/highlight/extras/themes-resources/css-themes/example.html
58share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.css 59share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.css
59share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.scss 60share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.scss
60share/examples/highlight/filetypes.conf 61share/examples/highlight/filetypes.conf
61share/examples/highlight/lsp.conf 62share/examples/highlight/lsp.conf
 63share/fish/vendor_completions.d/highlight.fish
62share/highlight/langDefs/abap.lang 64share/highlight/langDefs/abap.lang
63share/highlight/langDefs/abc.lang 65share/highlight/langDefs/abc.lang
64share/highlight/langDefs/abnf.lang 66share/highlight/langDefs/abnf.lang
65share/highlight/langDefs/actionscript.lang 67share/highlight/langDefs/actionscript.lang
66share/highlight/langDefs/ada.lang 68share/highlight/langDefs/ada.lang
67share/highlight/langDefs/agda.lang 69share/highlight/langDefs/agda.lang
68share/highlight/langDefs/alan.lang 70share/highlight/langDefs/alan.lang
69share/highlight/langDefs/algol.lang 71share/highlight/langDefs/algol.lang
70share/highlight/langDefs/ampl.lang 72share/highlight/langDefs/ampl.lang
71share/highlight/langDefs/amtrix.lang 73share/highlight/langDefs/amtrix.lang
72share/highlight/langDefs/applescript.lang 74share/highlight/langDefs/applescript.lang
73share/highlight/langDefs/arc.lang 75share/highlight/langDefs/arc.lang
74share/highlight/langDefs/arm.lang 76share/highlight/langDefs/arm.lang
@@ -85,26 +87,27 @@ share/highlight/langDefs/avenue.lang @@ -85,26 +87,27 @@ share/highlight/langDefs/avenue.lang
85share/highlight/langDefs/awk.lang 87share/highlight/langDefs/awk.lang
86share/highlight/langDefs/ballerina.lang 88share/highlight/langDefs/ballerina.lang
87share/highlight/langDefs/bat.lang 89share/highlight/langDefs/bat.lang
88share/highlight/langDefs/bbcode.lang 90share/highlight/langDefs/bbcode.lang
89share/highlight/langDefs/bcpl.lang 91share/highlight/langDefs/bcpl.lang
90share/highlight/langDefs/bibtex.lang 92share/highlight/langDefs/bibtex.lang
91share/highlight/langDefs/biferno.lang 93share/highlight/langDefs/biferno.lang
92share/highlight/langDefs/bison.lang 94share/highlight/langDefs/bison.lang
93share/highlight/langDefs/blitzbasic.lang 95share/highlight/langDefs/blitzbasic.lang
94share/highlight/langDefs/bms.lang 96share/highlight/langDefs/bms.lang
95share/highlight/langDefs/bnf.lang 97share/highlight/langDefs/bnf.lang
96share/highlight/langDefs/boo.lang 98share/highlight/langDefs/boo.lang
97share/highlight/langDefs/c.lang 99share/highlight/langDefs/c.lang
 100share/highlight/langDefs/carbon.lang
98share/highlight/langDefs/ceylon.lang 101share/highlight/langDefs/ceylon.lang
99share/highlight/langDefs/charmm.lang 102share/highlight/langDefs/charmm.lang
100share/highlight/langDefs/chill.lang 103share/highlight/langDefs/chill.lang
101share/highlight/langDefs/chpl.lang 104share/highlight/langDefs/chpl.lang
102share/highlight/langDefs/clean.lang 105share/highlight/langDefs/clean.lang
103share/highlight/langDefs/clearbasic.lang 106share/highlight/langDefs/clearbasic.lang
104share/highlight/langDefs/clipper.lang 107share/highlight/langDefs/clipper.lang
105share/highlight/langDefs/clojure.lang 108share/highlight/langDefs/clojure.lang
106share/highlight/langDefs/clp.lang 109share/highlight/langDefs/clp.lang
107share/highlight/langDefs/cmake.lang 110share/highlight/langDefs/cmake.lang
108share/highlight/langDefs/cobol.lang 111share/highlight/langDefs/cobol.lang
109share/highlight/langDefs/coffeescript.lang 112share/highlight/langDefs/coffeescript.lang
110share/highlight/langDefs/coldfusion.lang 113share/highlight/langDefs/coldfusion.lang
@@ -540,13 +543,14 @@ share/highlight/themes/rootwater.theme @@ -540,13 +543,14 @@ share/highlight/themes/rootwater.theme
540share/highlight/themes/seashell.theme 543share/highlight/themes/seashell.theme
541share/highlight/themes/solarized-dark.theme 544share/highlight/themes/solarized-dark.theme
542share/highlight/themes/solarized-light.theme 545share/highlight/themes/solarized-light.theme
543share/highlight/themes/sourceforge.theme 546share/highlight/themes/sourceforge.theme
544share/highlight/themes/tabula.theme 547share/highlight/themes/tabula.theme
545share/highlight/themes/tcsoft.theme 548share/highlight/themes/tcsoft.theme
546share/highlight/themes/the.theme 549share/highlight/themes/the.theme
547share/highlight/themes/vampire.theme 550share/highlight/themes/vampire.theme
548share/highlight/themes/whitengrey.theme 551share/highlight/themes/whitengrey.theme
549share/highlight/themes/xoria256.theme 552share/highlight/themes/xoria256.theme
550share/highlight/themes/zellner.theme 553share/highlight/themes/zellner.theme
551share/highlight/themes/zenburn.theme 554share/highlight/themes/zenburn.theme
552share/highlight/themes/zmrok.theme 555share/highlight/themes/zmrok.theme
 556share/zsh/site-functions/_highlight
cvs diff -r1.24 -r1.25 pkgsrc/textproc/libhighlight/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/distinfo 2022/07/13 00:52:30 1.24
+++ pkgsrc/textproc/libhighlight/distinfo 2022/10/03 18:09:12 1.25
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.24 2022/07/13 00:52:30 schmonz Exp $ 1$NetBSD: distinfo,v 1.25 2022/10/03 18:09:12 schmonz Exp $
2 2
3BLAKE2s (highlight-4.2.tar.bz2) = d1cdd84c7a1cd3c6bf10103cccc12e05dbff650357f6161feacc0870fe4c8ae5 3BLAKE2s (highlight-4.3.tar.bz2) = 892ca1db58a55cd7b38f7887d28a018024a4db9fc289440eb6ad2683d4173d23
4SHA512 (highlight-4.2.tar.bz2) = 6b9a193975c108bca4228188b8f3ddb395eb1cedd689b44fb18bfa7d4cb878cf6148b2275ef2881973fbd7e08b9038e866aad7c406e975fa3d1a59470b6a3867 4SHA512 (highlight-4.3.tar.bz2) = c0c83b8e17d7bf042d858da9e5cbca611ef5de63da278d052be6f4c6be9818055f2868739e1d02d5734008eb3a25d879580ae7d418196f5bfbfd5e4ff0a693c2
5Size (highlight-4.2.tar.bz2) = 1479166 bytes 5Size (highlight-4.3.tar.bz2) = 1482114 bytes
6SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e 6SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
7SHA1 (patch-makefile) = c1b34c7b16900a16a2c218e6b440036f9b48d53b 7SHA1 (patch-makefile) = f2fb560b6fb7f49882f0c83e5aed47ca69bdf74b
8SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3 8SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3
9SHA1 (patch-src_gui-qt_highlight.pro) = 3976f5eba8c3e818c45453377644e003dc3d0744 9SHA1 (patch-src_gui-qt_highlight.pro) = 8aaf8a937cf3579479b2d87415fb6b50766f2599
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) = 9d5d4db4c6bf7d1e13544011c569486e68d8de24 12SHA1 (patch-src_makefile) = a66c61de0ed3eff5fa9ac2da9d434fcd6c553b51
cvs diff -r1.7 -r1.8 pkgsrc/textproc/libhighlight/patches/patch-makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/patches/patch-makefile 2022/07/13 00:52:31 1.7
+++ pkgsrc/textproc/libhighlight/patches/patch-makefile 2022/10/03 18:09:12 1.8
@@ -1,111 +1,125 @@ @@ -1,111 +1,125 @@
1$NetBSD: patch-makefile,v 1.7 2022/07/13 00:52:31 schmonz Exp $ 1$NetBSD: patch-makefile,v 1.8 2022/10/03 18:09:12 schmonz Exp $
2 2
3Use pkgsrc-provided paths and tools. 3Use pkgsrc-provided paths and tools.
4 4
5--- makefile.orig 2022-03-22 20:58:01.000000000 +0000 5--- makefile.orig 2022-09-28 17:52:30.000000000 +0000
6+++ makefile 6+++ makefile
7@@ -7,7 +7,7 @@ 7@@ -7,7 +7,7 @@
8 DESTDIR = 8 DESTDIR =
9  9
10 # Root directory for final installation 10 # Root directory for final installation
11-PREFIX = /usr 11-PREFIX = /usr
12+#PREFIX = /usr 12+#PREFIX = /usr
13  13
14 # Location of the highlight data files: 14 # Data file directory
15 data_dir = ${PREFIX}/share/highlight/ 15 data_dir = ${PREFIX}/share/
16@@ -19,7 +19,7 @@ bin_dir = ${PREFIX}/bin/ 16@@ -22,7 +22,7 @@ bin_dir = ${PREFIX}/bin/
17 lib_dir = ${PREFIX}/lib/ 17 lib_dir = ${PREFIX}/lib/
18  18
19 # Location of the highlight man pages: 19 # Location of the highlight man pages:
20-man_dir = ${PREFIX}/share/man/ 20-man_dir = ${data_dir}man/
21+man_dir = ${PREFIX}/${PKGMANDIR}/ 21+man_dir = ${PREFIX}/${PKGMANDIR}/
22  22
23 # Location of the highlight documentation: 23 # Documentation directory
24 doc_dir = ${PREFIX}/share/doc/highlight/ 24 doc_dir = ${data_dir}doc/
25@@ -28,8 +28,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/ 25@@ -34,11 +34,12 @@ hl_doc_dir = ${doc_dir}highlight/
26 examples_dir = ${doc_dir}extras/ 26 examples_dir = ${hl_doc_dir}extras/
 27
 28 # Location of system-wide config files:
 29-ifeq (${PREFIX},/usr)
 30- conf_dir = /etc/
 31-else
 32- conf_dir = ${PREFIX}/etc/
 33-endif
 34+#ifeq (${PREFIX},/usr)
 35+# conf_dir = /etc/
 36+#else
 37+# conf_dir = ${PREFIX}/etc/
 38+#endif
 39+conf_dir = ${PREFIX}/share/examples/
27  40
28 # Location of the highlight config files: 41 # Location of the highlight config files:
29-conf_dir = /etc/highlight/ 42 hl_conf_dir = ${conf_dir}highlight/
30-#conf_dir = ${PREFIX}/etc/highlight/ 43@@ -58,10 +59,10 @@ desktop_icons = ${data_dir}icons/hicolor
31+#conf_dir = /etc/highlight/ 
32+conf_dir = ${PREFIX}/share/examples/highlight/ 
33  
34 # Location of additional gui files 
35 desktop_apps = ${PREFIX}/share/applications/ 
36@@ -37,10 +37,10 @@ desktop_icons = ${PREFIX}/share/icons/hi 
37  44
38 # Commands: 45 # Commands:
39 GZIP=gzip -9f 46 GZIP=gzip -9f
40-INSTALL_DATA=install -m644 47-INSTALL_DATA=install -m644
41-INSTALL_PROGRAM=install -m755 48-INSTALL_PROGRAM=install -m755
42-MKDIR=mkdir -p -m 755 49-MKDIR=mkdir -p -m 755
43-RMDIR=rm -r -f 50-RMDIR=rm -r -f
44+INSTALL_DATA=${BSD_INSTALL_DATA} 51+INSTALL_DATA=${BSD_INSTALL_DATA}
45+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} 52+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
46+MKDIR=${BSD_INSTALL_DATA_DIR} 53+MKDIR=${BSD_INSTALL_DATA_DIR}
47+RMDIR=${RM} -r -f 54+RMDIR=${RM} -r -f
48  55
49 all cli: 56 all cli:
50 ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} 57 ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${hl_data_dir} HL_CONFIG_DIR=${hl_conf_dir}
51@@ -85,19 +85,12 @@ install: 58@@ -109,22 +110,15 @@ install:
52 ${DESTDIR}${data_dir}themes/base16 \ 59 ${DESTDIR}${hl_data_dir}themes/base16 \
53 ${DESTDIR}${data_dir}langDefs \ 60 ${DESTDIR}${hl_data_dir}langDefs \
54 ${DESTDIR}${data_dir}plugins 61 ${DESTDIR}${hl_data_dir}plugins
55- ${MKDIR} ${DESTDIR}${man_dir}man1/ 62- ${MKDIR} ${DESTDIR}${man_dir}man1/
56- ${MKDIR} ${DESTDIR}${man_dir}man5/ 63- ${MKDIR} ${DESTDIR}${man_dir}man5/
 64 ${MKDIR} ${DESTDIR}${bash_comp_dir}
 65 ${MKDIR} ${DESTDIR}${fish_comp_dir}
 66 ${MKDIR} ${DESTDIR}${zsh_comp_dir}
57- ${MKDIR} ${DESTDIR}${bin_dir} 67- ${MKDIR} ${DESTDIR}${bin_dir}
58  68
59 ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/ 69 ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${hl_data_dir}langDefs/
60 ${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir} 70 ${INSTALL_DATA} ./*.conf ${DESTDIR}${hl_conf_dir}
61 ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/ 71 ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${hl_data_dir}themes/
62 ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${data_dir}themes/base16/ 72 ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${hl_data_dir}themes/base16/
63 ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/ 73 ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${hl_data_dir}plugins/
64- ${INSTALL_DATA} ./man/highlight.1 ${DESTDIR}${man_dir}man1/ 74- ${INSTALL_DATA} ./man/highlight.1 ${DESTDIR}${man_dir}man1/
65- ${GZIP} ${DESTDIR}${man_dir}man1/highlight.1 75- ${GZIP} ${DESTDIR}${man_dir}man1/highlight.1
66- ${INSTALL_DATA} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/ 76- ${INSTALL_DATA} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
67- ${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5 77- ${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5
68  78
69 ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} 79 ${INSTALL_DATA} ./sh-completion/highlight.bash ${DESTDIR}${bash_comp_dir}highlight
70 ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir} 80 ${INSTALL_DATA} ./sh-completion/highlight.fish ${DESTDIR}${fish_comp_dir}
71@@ -114,15 +107,27 @@ install: 81@@ -145,12 +139,11 @@ install:
72 ${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes 82 ${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes
73 ${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir} 83 ${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir}
74 ${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir} 84 ${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir}
75- ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} 85- ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
76  86
77 @echo 87 @echo
78 @echo "Done." 88 @echo "Done."
79- @echo "Type highlight --help or man highlight for instructions." 89- @echo "Type highlight --help or man highlight for instructions."
80 @echo "Take a look at ${DESTDIR}${examples_dir} for scripts, SWIG and TCL bindings." 90 @echo "Take a look at ${DESTDIR}${examples_dir} for scripts, SWIG and TCL bindings."
81+ @echo "Execute 'make install-cli' to install the highlight CLI ('make cli')." 91+ @echo "Execute 'make install-cli' to install the highlight CLI ('make cli')."
82 @echo "Execute 'make install-gui' to install the highlight GUI ('make gui')." 92 @echo "Execute 'make install-gui' to install the highlight GUI ('make gui')."
83 @echo "Do not hesitate to report problems. Unknown bugs are hard to fix." 93 @echo "Do not hesitate to report problems. Unknown bugs are hard to fix."
84  94
 95@@ -169,6 +162,19 @@ install-gui:
 96 ${INSTALL_DATA} ./src/gui-qt/highlight.png ${DESTDIR}${desktop_icons}
 97 ${INSTALL_PROGRAM} ./src/highlight-gui ${DESTDIR}${bin_dir}
 98
85+install-cli: 99+install-cli:
86+ @echo "Installing files for the CLI..." 100+ @echo "Installing files for the CLI..."
87+ ${MKDIR} ${DESTDIR}${bin_dir} 101+ ${MKDIR} ${DESTDIR}${bin_dir}
88+ ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} 102+ ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
89+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man1 103+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man1
90+ ${BSD_INSTALL_MAN} ./man/highlight.1 ${DESTDIR}${man_dir}/man1/ 104+ ${BSD_INSTALL_MAN} ./man/highlight.1 ${DESTDIR}${man_dir}/man1/
91+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man5 105+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man5
92+ ${BSD_INSTALL_MAN} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/ 106+ ${BSD_INSTALL_MAN} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
93+ 107+
94+ @echo 108+ @echo
95+ @echo "Done." 109+ @echo "Done."
96+ @echo "Type highlight --help or man highlight for instructions." 110+ @echo "Type highlight --help or man highlight for instructions."
97+ 111+
98 install-gui: 112 install-lib-shared:
99 @echo "Installing files for the GUI..." 113 ${INSTALL_DATA} ./src/libhighlight.so.4.0 ${DESTDIR}${lib_dir}
100 ${MKDIR} ${DESTDIR}${data_dir} \ 114
101@@ -147,8 +152,8 @@ uninstall: 115@@ -178,8 +184,8 @@ uninstall:
102 ${RMDIR} ${DESTDIR}${doc_dir} 116 ${RMDIR} ${DESTDIR}${hl_doc_dir}
103 ${RMDIR} ${DESTDIR}${conf_dir} 117 ${RMDIR} ${DESTDIR}${hl_conf_dir}
104 ${RMDIR} ${DESTDIR}${examples_dir} 118 ${RMDIR} ${DESTDIR}${examples_dir}
105- rm -rf ${DESTDIR}${man_dir}man1/highlight.1.gz 119- rm -rf ${DESTDIR}${man_dir}man1/highlight.1.gz
106- rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5.gz 120- rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5.gz
107+ rm -rf ${DESTDIR}${man_dir}man1/highlight.1* 121+ rm -rf ${DESTDIR}${man_dir}man1/highlight.1*
108+ rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5* 122+ rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5*
 123 rm -rf ${DESTDIR}${bash_comp_dir}highlight.bash
 124 rm -rf ${DESTDIR}${fish_comp_dir}highlight.fish
109  125
110 rm -rf ${DESTDIR}${bin_dir}highlight 
111 rm -rf ${DESTDIR}${bin_dir}highlight-gui 
cvs diff -r1.2 -r1.3 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 2022/07/13 00:52:31 1.2
+++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro 2022/10/03 18:09:12 1.3
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-src_gui-qt_highlight.pro,v 1.2 2022/07/13 00:52:31 schmonz Exp $ 1$NetBSD: patch-src_gui-qt_highlight.pro,v 1.3 2022/10/03 18:09:12 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 2022-03-22 20:58:01.000000000 +0000 5--- src/gui-qt/highlight.pro.orig 2022-09-28 17:52:30.000000000 +0000
6+++ src/gui-qt/highlight.pro 6+++ src/gui-qt/highlight.pro
7@@ -80,8 +80,11 @@ macx-clang { 7@@ -80,8 +80,11 @@ macx-clang {
8 INCLUDEPATH += ../../include 8 INCLUDEPATH += ../../include
9 INCLUDEPATH+=/usr/local/Cellar/boost/1.76.0/include 9 INCLUDEPATH+=/usr/local/Cellar/boost/1.78.0_1/include
10  10
11- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13 11- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13
12- CONFIG += app_bundle 12- CONFIG += app_bundle
13+ ###QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13 13+ ###QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13
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.11 -r1.12 pkgsrc/textproc/libhighlight/patches/patch-src_makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile 2020/12/18 18:45:08 1.11
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile 2022/10/03 18:09:12 1.12
@@ -1,81 +1,86 @@ @@ -1,81 +1,86 @@
1$NetBSD: patch-src_makefile,v 1.11 2020/12/18 18:45:08 schmonz Exp $ 1$NetBSD: patch-src_makefile,v 1.12 2022/10/03 18:09:12 schmonz Exp $
2 2
3Use pkgsrc-specified compiler and flags. 3Use pkgsrc-specified compiler and flags.
4 4
5--- src/makefile.orig 2020-11-13 20:00:38.000000000 +0000 5--- src/makefile.orig 2022-09-28 17:52:30.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++11 -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++11 -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,14 +68,17 @@ 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-LDFLAGS = -ldl 26-LDFLAGS = -ldl
 27-endif
 28+#ifneq ($(OS), Windows_NT)
26+#LDFLAGS = -ldl 29+#LDFLAGS = -ldl
 30+#endif
27 # Do not strip by default (Mac OS X lazy pointer issues) 31 # Do not strip by default (Mac OS X lazy pointer issues)
28 # Add -static to avoid linking with shared libs (can cause trouble when highlight 32 # Add -static to avoid linking with shared libs (can cause trouble when highlight
29 # is run as service) 33 # is run as service)
30 #LDFLAGS = ${LDFLAGS} -s 34 #LDFLAGS = ${LDFLAGS} -s
31 #LDFLAGS= -Wl,--as-needed 35 #LDFLAGS= -Wl,--as-needed
32  36
33-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS} 37-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
 38+
34+LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }') 39+LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
35+LIBTOOL=libtool --tag=CXX 40+LIBTOOL=libtool --tag=CXX
36+ 41+
37+CXX_COMPILE=${LIBTOOL} --mode=compile ${CXX} ${CFLAGS} ${CXX_DIR} -I ${INCLUDE_DIR} ${LUA_CFLAGS} -c 42+CXX_COMPILE=${LIBTOOL} --mode=compile ${CXX} ${CFLAGS} ${CXX_DIR} -I ${INCLUDE_DIR} ${LUA_CFLAGS} -c
38  43
39 # Data directories (data dir, configuration file dir) 44 # Data directories (data dir, configuration file dir)
40 CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\" 45 CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
41@@ -103,18 +106,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI 46@@ -105,18 +109,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
42 ${GUI_QT_DIR}showtextfile.cpp 47 ${GUI_QT_DIR}showtextfile.cpp
43  48
44  49
45-cli: libhighlight.a ${CLI_OBJECTS} 50-cli: libhighlight.a ${CLI_OBJECTS}
46- ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS} 51- ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS}
47+cli: ${CLI_OBJECTS} 52+cli: ${CLI_OBJECTS}
48+ ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -lhighlight ${LUA_LIBS} 53+ ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -lhighlight ${LUA_LIBS}
49  54
50 lib-static libhighlight.a: ${CORE_OBJECTS} 55 lib-static libhighlight.a: ${CORE_OBJECTS}
51 ${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS} 56 ${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS}
52  57
53 lib-shared libhighlight.so.1.0: ${CORE_OBJECTS} 58 lib-shared libhighlight.so.1.0: ${CORE_OBJECTS}
54- ${CXX} -shared -Wl,-soname,libhighlight.so.${SO_VERSION} -o libhighlight.so.${SO_VERSION} -lc ${CORE_OBJECTS} 59- ${CXX} -shared -Wl,-soname,libhighlight.so.${SO_VERSION} -o libhighlight.so.${SO_VERSION} -lc ${CORE_OBJECTS}
55+ ${LIBTOOL} --mode=link ${CXX} ${LDFLAGS} -o libhighlight.la ${CORE_OBJECTS:%.o=%.lo} ${DILU_OBJECTS:%.o=%.lo} -version-info ${LSO_VERSION} -rpath ${PREFIX}/lib 60+ ${LIBTOOL} --mode=link ${CXX} ${LDFLAGS} -o libhighlight.la ${CORE_OBJECTS:%.o=%.lo} ${DILU_OBJECTS:%.o=%.lo} -version-info ${LSO_VERSION} -rpath ${PREFIX}/lib
56  61
57 gui-qt: highlight-gui 62 gui-qt: highlight-gui
58  63
59-highlight-gui: libhighlight.a ${GUI_OBJECTS} 64-highlight-gui: libhighlight.a ${GUI_OBJECTS}
60+highlight-gui: ${GUI_OBJECTS} 65+highlight-gui: ${GUI_OBJECTS}
61 cd gui-qt && \ 66 cd gui-qt && \
62 ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \ 67 ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
63 $(MAKE) 68 $(MAKE)
64@@ -123,7 +126,7 @@ $(OBJECTFILES) : makefile 69@@ -125,7 +129,7 @@ $(OBJECTFILES) : makefile
65  70
66  71
67 datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h 72 datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h
68- ${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR} 73- ${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR}
69+ ${CXX_COMPILE} ${CORE_DIR}datadir.cpp 74+ ${CXX_COMPILE} ${CORE_DIR}datadir.cpp
70  75
71 platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h 76 platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h
72 ${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp 77 ${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp
73@@ -207,7 +210,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai 78@@ -212,7 +216,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
74 ${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \ 79 ${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \
75 ${INCLUDE_DIR}stylecolour.h ${INCLUDE_DIR}preformatter.h \ 80 ${INCLUDE_DIR}stylecolour.h ${INCLUDE_DIR}preformatter.h \
76 ${CLI_DIR}help.h ${INCLUDE_DIR}version.h 81 ${CLI_DIR}help.h ${INCLUDE_DIR}version.h
77- ${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR} 82- ${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR}
78+ ${CXX_COMPILE} ${CLI_DIR}main.cpp 83+ ${CXX_COMPILE} ${CLI_DIR}main.cpp
79  84
80  85
81 #3rd party libs 86 #3rd party libs