Wed Jul 13 00:52:31 2022 UTC ()
Update to 4.2. From the changelog:

- added support for Critic markup
  (https://gitlab.com/saalen/highlight/-/issues/197)
- added support for jam/ham
  (https://gitlab.com/saalen/highlight/-/issues/196)
- added support for PureScript
  (https://gitlab.com/saalen/highlight/-/merge_requests/132/)
- added support for Nix
  (https://gitlab.com/saalen/highlight/-/issues/200)
- added ino file mapping / Arduino C
  (https://gitlab.com/saalen/highlight/-/issues/201)
- fixed RTF page color attributes
  (https://gitlab.com/saalen/highlight/-/issues/195)
- fixed identifier parsing in yaml.lang
  (https://gitlab.com/saalen/highlight/-/issues/190)
- fixed symbol parsing in lisp.lang
  https://gitlab.com/saalen/highlight/-/issues/198
- fixed string parsing in csharp.lang
  (https://gitlab.com/saalen/highlight/-/issues/199)
- fixed string parsing in conf.lang
  (https://gitlab.com/saalen/highlight/-/issues/203)
- added make target `install-lib-shared` to install shared lib
  (https://gitlab.com/saalen/highlight/-/issues/202)
- CLI W32: prevented automatic file pattern expansion
  (https://gitlab.com/saalen/highlight/-/issues/186)
- GUI: added Japanese translation (thanks to FunFun)
- GUI: disabled floating panel (state restore fails)


(schmonz)
diff -r1.19 -r1.20 pkgsrc/textproc/libhighlight/Makefile.common
diff -r1.17 -r1.18 pkgsrc/textproc/libhighlight/PLIST
diff -r1.4 -r1.5 pkgsrc/textproc/libhighlight/buildlink3.mk
diff -r1.23 -r1.24 pkgsrc/textproc/libhighlight/distinfo
diff -r1.6 -r1.7 pkgsrc/textproc/libhighlight/patches/patch-makefile
diff -r1.1 -r1.2 pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro
cvs diff -r1.19 -r1.20 pkgsrc/textproc/libhighlight/Makefile.common (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/Makefile.common 2021/05/13 14:06:09 1.19
+++ pkgsrc/textproc/libhighlight/Makefile.common 2022/07/13 00:52:30 1.20
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.19 2021/05/13 14:06:09 schmonz Exp $ 1# $NetBSD: Makefile.common,v 1.20 2022/07/13 00:52:30 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.1 7VERSION= 4.2
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.17 -r1.18 pkgsrc/textproc/libhighlight/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/PLIST 2021/05/13 14:06:09 1.17
+++ pkgsrc/textproc/libhighlight/PLIST 2022/07/13 00:52:30 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.17 2021/05/13 14:06:09 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.18 2022/07/13 00:52:30 schmonz Exp $
2lib/libhighlight.la 2lib/libhighlight.la
3share/doc/highlight/AUTHORS 3share/doc/highlight/AUTHORS
4share/doc/highlight/COPYING 4share/doc/highlight/COPYING
5share/doc/highlight/ChangeLog.adoc 5share/doc/highlight/ChangeLog.adoc
6share/doc/highlight/INSTALL 6share/doc/highlight/INSTALL
7share/doc/highlight/README.adoc 7share/doc/highlight/README.adoc
8share/doc/highlight/README_DE.adoc 8share/doc/highlight/README_DE.adoc
9share/doc/highlight/README_LANGLIST.adoc 9share/doc/highlight/README_LANGLIST.adoc
10share/doc/highlight/README_LSP_CLIENT.adoc 10share/doc/highlight/README_LSP_CLIENT.adoc
11share/doc/highlight/README_PLUGINS.adoc 11share/doc/highlight/README_PLUGINS.adoc
12share/doc/highlight/README_REGEX.adoc 12share/doc/highlight/README_REGEX.adoc
13share/doc/highlight/README_RELEASE.adoc 13share/doc/highlight/README_RELEASE.adoc
14share/doc/highlight/README_TESTCASES.adoc 14share/doc/highlight/README_TESTCASES.adoc
@@ -99,26 +99,27 @@ share/highlight/langDefs/ceylon.lang @@ -99,26 +99,27 @@ share/highlight/langDefs/ceylon.lang
99share/highlight/langDefs/charmm.lang 99share/highlight/langDefs/charmm.lang
100share/highlight/langDefs/chill.lang 100share/highlight/langDefs/chill.lang
101share/highlight/langDefs/chpl.lang 101share/highlight/langDefs/chpl.lang
102share/highlight/langDefs/clean.lang 102share/highlight/langDefs/clean.lang
103share/highlight/langDefs/clearbasic.lang 103share/highlight/langDefs/clearbasic.lang
104share/highlight/langDefs/clipper.lang 104share/highlight/langDefs/clipper.lang
105share/highlight/langDefs/clojure.lang 105share/highlight/langDefs/clojure.lang
106share/highlight/langDefs/clp.lang 106share/highlight/langDefs/clp.lang
107share/highlight/langDefs/cmake.lang 107share/highlight/langDefs/cmake.lang
108share/highlight/langDefs/cobol.lang 108share/highlight/langDefs/cobol.lang
109share/highlight/langDefs/coffeescript.lang 109share/highlight/langDefs/coffeescript.lang
110share/highlight/langDefs/coldfusion.lang 110share/highlight/langDefs/coldfusion.lang
111share/highlight/langDefs/conf.lang 111share/highlight/langDefs/conf.lang
 112share/highlight/langDefs/critic.lang
112share/highlight/langDefs/crk.lang 113share/highlight/langDefs/crk.lang
113share/highlight/langDefs/crystal.lang 114share/highlight/langDefs/crystal.lang
114share/highlight/langDefs/cs_block_regex.lang 115share/highlight/langDefs/cs_block_regex.lang
115share/highlight/langDefs/csharp.lang 116share/highlight/langDefs/csharp.lang
116share/highlight/langDefs/css.lang 117share/highlight/langDefs/css.lang
117share/highlight/langDefs/d.lang 118share/highlight/langDefs/d.lang
118share/highlight/langDefs/dart.lang 119share/highlight/langDefs/dart.lang
119share/highlight/langDefs/delphi.lang 120share/highlight/langDefs/delphi.lang
120share/highlight/langDefs/diff.lang 121share/highlight/langDefs/diff.lang
121share/highlight/langDefs/dockerfile.lang 122share/highlight/langDefs/dockerfile.lang
122share/highlight/langDefs/dts.lang 123share/highlight/langDefs/dts.lang
123share/highlight/langDefs/dylan.lang 124share/highlight/langDefs/dylan.lang
124share/highlight/langDefs/ebnf.lang 125share/highlight/langDefs/ebnf.lang
@@ -153,26 +154,27 @@ share/highlight/langDefs/haxe.lang @@ -153,26 +154,27 @@ share/highlight/langDefs/haxe.lang
153share/highlight/langDefs/hcl.lang 154share/highlight/langDefs/hcl.lang
154share/highlight/langDefs/html.lang 155share/highlight/langDefs/html.lang
155share/highlight/langDefs/httpd.lang 156share/highlight/langDefs/httpd.lang
156share/highlight/langDefs/hugo.lang 157share/highlight/langDefs/hugo.lang
157share/highlight/langDefs/icon.lang 158share/highlight/langDefs/icon.lang
158share/highlight/langDefs/idl.lang 159share/highlight/langDefs/idl.lang
159share/highlight/langDefs/idlang.lang 160share/highlight/langDefs/idlang.lang
160share/highlight/langDefs/inc_luatex.lang 161share/highlight/langDefs/inc_luatex.lang
161share/highlight/langDefs/informix.lang 162share/highlight/langDefs/informix.lang
162share/highlight/langDefs/ini.lang 163share/highlight/langDefs/ini.lang
163share/highlight/langDefs/innosetup.lang 164share/highlight/langDefs/innosetup.lang
164share/highlight/langDefs/interlis.lang 165share/highlight/langDefs/interlis.lang
165share/highlight/langDefs/io.lang 166share/highlight/langDefs/io.lang
 167share/highlight/langDefs/jam.lang
166share/highlight/langDefs/jasmin.lang 168share/highlight/langDefs/jasmin.lang
167share/highlight/langDefs/java.lang 169share/highlight/langDefs/java.lang
168share/highlight/langDefs/javascript.lang 170share/highlight/langDefs/javascript.lang
169share/highlight/langDefs/js_regex.lang 171share/highlight/langDefs/js_regex.lang
170share/highlight/langDefs/json.lang 172share/highlight/langDefs/json.lang
171share/highlight/langDefs/jsp.lang 173share/highlight/langDefs/jsp.lang
172share/highlight/langDefs/jsx.lang 174share/highlight/langDefs/jsx.lang
173share/highlight/langDefs/julia.lang 175share/highlight/langDefs/julia.lang
174share/highlight/langDefs/kotlin.lang 176share/highlight/langDefs/kotlin.lang
175share/highlight/langDefs/ldif.lang 177share/highlight/langDefs/ldif.lang
176share/highlight/langDefs/less.lang 178share/highlight/langDefs/less.lang
177share/highlight/langDefs/lhs.lang 179share/highlight/langDefs/lhs.lang
178share/highlight/langDefs/lilypond.lang 180share/highlight/langDefs/lilypond.lang
@@ -198,26 +200,27 @@ share/highlight/langDefs/modelica.lang @@ -198,26 +200,27 @@ share/highlight/langDefs/modelica.lang
198share/highlight/langDefs/moon.lang 200share/highlight/langDefs/moon.lang
199share/highlight/langDefs/ms.lang 201share/highlight/langDefs/ms.lang
200share/highlight/langDefs/msl.lang 202share/highlight/langDefs/msl.lang
201share/highlight/langDefs/mssql.lang 203share/highlight/langDefs/mssql.lang
202share/highlight/langDefs/mxml.lang 204share/highlight/langDefs/mxml.lang
203share/highlight/langDefs/n3.lang 205share/highlight/langDefs/n3.lang
204share/highlight/langDefs/nasal.lang 206share/highlight/langDefs/nasal.lang
205share/highlight/langDefs/nbc.lang 207share/highlight/langDefs/nbc.lang
206share/highlight/langDefs/nemerle.lang 208share/highlight/langDefs/nemerle.lang
207share/highlight/langDefs/netrexx.lang 209share/highlight/langDefs/netrexx.lang
208share/highlight/langDefs/nginx.lang 210share/highlight/langDefs/nginx.lang
209share/highlight/langDefs/nice.lang 211share/highlight/langDefs/nice.lang
210share/highlight/langDefs/nim.lang 212share/highlight/langDefs/nim.lang
 213share/highlight/langDefs/nix.lang
211share/highlight/langDefs/nsis.lang 214share/highlight/langDefs/nsis.lang
212share/highlight/langDefs/nxc.lang 215share/highlight/langDefs/nxc.lang
213share/highlight/langDefs/oberon.lang 216share/highlight/langDefs/oberon.lang
214share/highlight/langDefs/objc.lang 217share/highlight/langDefs/objc.lang
215share/highlight/langDefs/ocaml.lang 218share/highlight/langDefs/ocaml.lang
216share/highlight/langDefs/octave.lang 219share/highlight/langDefs/octave.lang
217share/highlight/langDefs/oorexx.lang 220share/highlight/langDefs/oorexx.lang
218share/highlight/langDefs/org.lang 221share/highlight/langDefs/org.lang
219share/highlight/langDefs/os.lang 222share/highlight/langDefs/os.lang
220share/highlight/langDefs/oz.lang 223share/highlight/langDefs/oz.lang
221share/highlight/langDefs/paradox.lang 224share/highlight/langDefs/paradox.lang
222share/highlight/langDefs/pas.lang 225share/highlight/langDefs/pas.lang
223share/highlight/langDefs/pdf.lang 226share/highlight/langDefs/pdf.lang
@@ -229,26 +232,27 @@ share/highlight/langDefs/plperl.lang @@ -229,26 +232,27 @@ share/highlight/langDefs/plperl.lang
229share/highlight/langDefs/plpython.lang 232share/highlight/langDefs/plpython.lang
230share/highlight/langDefs/pltcl.lang 233share/highlight/langDefs/pltcl.lang
231share/highlight/langDefs/po.lang 234share/highlight/langDefs/po.lang
232share/highlight/langDefs/polygen.lang 235share/highlight/langDefs/polygen.lang
233share/highlight/langDefs/pony.lang 236share/highlight/langDefs/pony.lang
234share/highlight/langDefs/pov.lang 237share/highlight/langDefs/pov.lang
235share/highlight/langDefs/powershell.lang 238share/highlight/langDefs/powershell.lang
236share/highlight/langDefs/pro.lang 239share/highlight/langDefs/pro.lang
237share/highlight/langDefs/progress.lang 240share/highlight/langDefs/progress.lang
238share/highlight/langDefs/ps.lang 241share/highlight/langDefs/ps.lang
239share/highlight/langDefs/psl.lang 242share/highlight/langDefs/psl.lang
240share/highlight/langDefs/pure.lang 243share/highlight/langDefs/pure.lang
241share/highlight/langDefs/purebasic.lang 244share/highlight/langDefs/purebasic.lang
 245share/highlight/langDefs/purescript.lang
242share/highlight/langDefs/pyrex.lang 246share/highlight/langDefs/pyrex.lang
243share/highlight/langDefs/python.lang 247share/highlight/langDefs/python.lang
244share/highlight/langDefs/q.lang 248share/highlight/langDefs/q.lang
245share/highlight/langDefs/qmake.lang 249share/highlight/langDefs/qmake.lang
246share/highlight/langDefs/qml.lang 250share/highlight/langDefs/qml.lang
247share/highlight/langDefs/qu.lang 251share/highlight/langDefs/qu.lang
248share/highlight/langDefs/r.lang 252share/highlight/langDefs/r.lang
249share/highlight/langDefs/rebol.lang 253share/highlight/langDefs/rebol.lang
250share/highlight/langDefs/rego.lang 254share/highlight/langDefs/rego.lang
251share/highlight/langDefs/rexx.lang 255share/highlight/langDefs/rexx.lang
252share/highlight/langDefs/rnc.lang 256share/highlight/langDefs/rnc.lang
253share/highlight/langDefs/rpg.lang 257share/highlight/langDefs/rpg.lang
254share/highlight/langDefs/rpl.lang 258share/highlight/langDefs/rpl.lang
cvs diff -r1.4 -r1.5 pkgsrc/textproc/libhighlight/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/buildlink3.mk 2021/11/01 20:39:18 1.4
+++ pkgsrc/textproc/libhighlight/buildlink3.mk 2022/07/13 00:52:30 1.5
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: buildlink3.mk,v 1.4 2021/11/01 20:39:18 schmonz Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2022/07/13 00:52:30 schmonz Exp $
2 2
3BUILDLINK_TREE+= libhighlight 3BUILDLINK_TREE+= libhighlight
4 4
5.if !defined(LIBHIGHLIGHT_BUILDLINK3_MK) 5.if !defined(LIBHIGHLIGHT_BUILDLINK3_MK)
6LIBHIGHLIGHT_BUILDLINK3_MK:= 6LIBHIGHLIGHT_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libhighlight+= libhighlight>=4.1 8BUILDLINK_API_DEPENDS.libhighlight+= libhighlight>=4.2
9BUILDLINK_PKGSRCDIR.libhighlight?= ../../textproc/libhighlight 9BUILDLINK_PKGSRCDIR.libhighlight?= ../../textproc/libhighlight
10.endif # LIBHIGHLIGHT_BUILDLINK3_MK 10.endif # LIBHIGHLIGHT_BUILDLINK3_MK
11 11
12BUILDLINK_TREE+= -libhighlight 12BUILDLINK_TREE+= -libhighlight
cvs diff -r1.23 -r1.24 pkgsrc/textproc/libhighlight/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/distinfo 2021/10/26 11:22:15 1.23
+++ pkgsrc/textproc/libhighlight/distinfo 2022/07/13 00:52:30 1.24
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.23 2021/10/26 11:22:15 nia Exp $ 1$NetBSD: distinfo,v 1.24 2022/07/13 00:52:30 schmonz Exp $
2 2
3BLAKE2s (highlight-4.1.tar.bz2) = ab465a3b46e72e956e414f3a67b5dd3b52e9bae66bf60a4804722520d7d96ce7 3BLAKE2s (highlight-4.2.tar.bz2) = d1cdd84c7a1cd3c6bf10103cccc12e05dbff650357f6161feacc0870fe4c8ae5
4SHA512 (highlight-4.1.tar.bz2) = 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731 4SHA512 (highlight-4.2.tar.bz2) = 6b9a193975c108bca4228188b8f3ddb395eb1cedd689b44fb18bfa7d4cb878cf6148b2275ef2881973fbd7e08b9038e866aad7c406e975fa3d1a59470b6a3867
5Size (highlight-4.1.tar.bz2) = 1469115 bytes 5Size (highlight-4.2.tar.bz2) = 1479166 bytes
6SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e 6SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
7SHA1 (patch-makefile) = 916b0ff8cebb34039ea869681f78a2bfd46bb837 7SHA1 (patch-makefile) = c1b34c7b16900a16a2c218e6b440036f9b48d53b
8SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3 8SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3
9SHA1 (patch-src_gui-qt_highlight.pro) = 3706eeb89207dd7c444ad5cf7db0b02a939dcb2f 9SHA1 (patch-src_gui-qt_highlight.pro) = 3976f5eba8c3e818c45453377644e003dc3d0744
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) = 9d5d4db4c6bf7d1e13544011c569486e68d8de24
cvs diff -r1.6 -r1.7 pkgsrc/textproc/libhighlight/patches/patch-makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/patches/patch-makefile 2021/05/13 14:06:10 1.6
+++ pkgsrc/textproc/libhighlight/patches/patch-makefile 2022/07/13 00:52:31 1.7
@@ -1,84 +1,84 @@ @@ -1,84 +1,84 @@
1$NetBSD: patch-makefile,v 1.6 2021/05/13 14:06:10 schmonz Exp $ 1$NetBSD: patch-makefile,v 1.7 2022/07/13 00:52:31 schmonz Exp $
2 2
3Use pkgsrc-provided paths and tools. 3Use pkgsrc-provided paths and tools.
4 4
5--- makefile.orig 2021-05-10 17:47:34.000000000 +0000 5--- makefile.orig 2022-03-22 20:58:01.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 # Location of the highlight data files:
15 data_dir = ${PREFIX}/share/highlight/ 15 data_dir = ${PREFIX}/share/highlight/
16@@ -16,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/ 16@@ -19,7 +19,7 @@ bin_dir = ${PREFIX}/bin/
17 bin_dir = ${PREFIX}/bin/ 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 = ${PREFIX}/share/man/
21+man_dir = ${PREFIX}/${PKGMANDIR}/ 21+man_dir = ${PREFIX}/${PKGMANDIR}/
22  22
23 # Location of the highlight documentation: 23 # Location of the highlight documentation:
24 doc_dir = ${PREFIX}/share/doc/highlight/ 24 doc_dir = ${PREFIX}/share/doc/highlight/
25@@ -25,8 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/ 25@@ -28,8 +28,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
26 examples_dir = ${doc_dir}extras/ 26 examples_dir = ${doc_dir}extras/
27  27
28 # Location of the highlight config files: 28 # Location of the highlight config files:
29-conf_dir = /etc/highlight/ 29-conf_dir = /etc/highlight/
30-#conf_dir = ${PREFIX}/etc/highlight/ 30-#conf_dir = ${PREFIX}/etc/highlight/
31+#conf_dir = /etc/highlight/ 31+#conf_dir = /etc/highlight/
32+conf_dir = ${PREFIX}/share/examples/highlight/ 32+conf_dir = ${PREFIX}/share/examples/highlight/
33  33
34 # Location of additional gui files 34 # Location of additional gui files
35 desktop_apps = ${PREFIX}/share/applications/ 35 desktop_apps = ${PREFIX}/share/applications/
36@@ -34,10 +34,10 @@ desktop_icons = ${PREFIX}/share/icons/hi 36@@ -37,10 +37,10 @@ desktop_icons = ${PREFIX}/share/icons/hi
37  37
38 # Commands: 38 # Commands:
39 GZIP=gzip -9f 39 GZIP=gzip -9f
40-INSTALL_DATA=install -m644 40-INSTALL_DATA=install -m644
41-INSTALL_PROGRAM=install -m755 41-INSTALL_PROGRAM=install -m755
42-MKDIR=mkdir -p -m 755 42-MKDIR=mkdir -p -m 755
43-RMDIR=rm -r -f 43-RMDIR=rm -r -f
44+INSTALL_DATA=${BSD_INSTALL_DATA} 44+INSTALL_DATA=${BSD_INSTALL_DATA}
45+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} 45+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
46+MKDIR=${BSD_INSTALL_DATA_DIR} 46+MKDIR=${BSD_INSTALL_DATA_DIR}
47+RMDIR=${RM} -r -f 47+RMDIR=${RM} -r -f
48  48
49 all cli: 49 all cli:
50 ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} 50 ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
51@@ -82,19 +82,12 @@ install: 51@@ -85,19 +85,12 @@ install:
52 ${DESTDIR}${data_dir}themes/base16 \ 52 ${DESTDIR}${data_dir}themes/base16 \
53 ${DESTDIR}${data_dir}langDefs \ 53 ${DESTDIR}${data_dir}langDefs \
54 ${DESTDIR}${data_dir}plugins 54 ${DESTDIR}${data_dir}plugins
55- ${MKDIR} ${DESTDIR}${man_dir}man1/ 55- ${MKDIR} ${DESTDIR}${man_dir}man1/
56- ${MKDIR} ${DESTDIR}${man_dir}man5/ 56- ${MKDIR} ${DESTDIR}${man_dir}man5/
57- ${MKDIR} ${DESTDIR}${bin_dir} 57- ${MKDIR} ${DESTDIR}${bin_dir}
58  58
59 ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/ 59 ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
60 ${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir} 60 ${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir}
61 ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/ 61 ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/
62 ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${data_dir}themes/base16/ 62 ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${data_dir}themes/base16/
63 ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/ 63 ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/
64- ${INSTALL_DATA} ./man/highlight.1 ${DESTDIR}${man_dir}man1/ 64- ${INSTALL_DATA} ./man/highlight.1 ${DESTDIR}${man_dir}man1/
65- ${GZIP} ${DESTDIR}${man_dir}man1/highlight.1 65- ${GZIP} ${DESTDIR}${man_dir}man1/highlight.1
66- ${INSTALL_DATA} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/ 66- ${INSTALL_DATA} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
67- ${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5 67- ${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5
68  68
69 ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} 69 ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
70 ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir} 70 ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir}
71@@ -111,15 +104,27 @@ install: 71@@ -114,15 +107,27 @@ install:
72 ${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes 72 ${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes
73 ${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir} 73 ${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir}
74 ${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir} 74 ${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir}
75- ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} 75- ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
76  76
77 @echo 77 @echo
78 @echo "Done." 78 @echo "Done."
79- @echo "Type highlight --help or man highlight for instructions." 79- @echo "Type highlight --help or man highlight for instructions."
80 @echo "Take a look at ${DESTDIR}${examples_dir} for scripts, SWIG and TCL bindings." 80 @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')." 81+ @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')." 82 @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." 83 @echo "Do not hesitate to report problems. Unknown bugs are hard to fix."
84  84
@@ -88,24 +88,24 @@ Use pkgsrc-provided paths and tools. @@ -88,24 +88,24 @@ Use pkgsrc-provided paths and tools.
88+ ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} 88+ ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
89+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man1 89+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man1
90+ ${BSD_INSTALL_MAN} ./man/highlight.1 ${DESTDIR}${man_dir}/man1/ 90+ ${BSD_INSTALL_MAN} ./man/highlight.1 ${DESTDIR}${man_dir}/man1/
91+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man5 91+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man5
92+ ${BSD_INSTALL_MAN} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/ 92+ ${BSD_INSTALL_MAN} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
93+ 93+
94+ @echo 94+ @echo
95+ @echo "Done." 95+ @echo "Done."
96+ @echo "Type highlight --help or man highlight for instructions." 96+ @echo "Type highlight --help or man highlight for instructions."
97+ 97+
98 install-gui: 98 install-gui:
99 @echo "Installing files for the GUI..." 99 @echo "Installing files for the GUI..."
100 ${MKDIR} ${DESTDIR}${data_dir} \ 100 ${MKDIR} ${DESTDIR}${data_dir} \
101@@ -141,8 +146,8 @@ uninstall: 101@@ -147,8 +152,8 @@ uninstall:
102 ${RMDIR} ${DESTDIR}${doc_dir} 102 ${RMDIR} ${DESTDIR}${doc_dir}
103 ${RMDIR} ${DESTDIR}${conf_dir} 103 ${RMDIR} ${DESTDIR}${conf_dir}
104 ${RMDIR} ${DESTDIR}${examples_dir} 104 ${RMDIR} ${DESTDIR}${examples_dir}
105- rm -rf ${DESTDIR}${man_dir}man1/highlight.1.gz 105- rm -rf ${DESTDIR}${man_dir}man1/highlight.1.gz
106- rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5.gz 106- rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5.gz
107+ rm -rf ${DESTDIR}${man_dir}man1/highlight.1* 107+ rm -rf ${DESTDIR}${man_dir}man1/highlight.1*
108+ rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5* 108+ rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5*
109  109
110 rm -rf ${DESTDIR}${bin_dir}highlight 110 rm -rf ${DESTDIR}${bin_dir}highlight
111 rm -rf ${DESTDIR}${bin_dir}highlight-gui 111 rm -rf ${DESTDIR}${bin_dir}highlight-gui
cvs diff -r1.1 -r1.2 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 2021/01/01 19:41:37 1.1
+++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro 2022/07/13 00:52:31 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-src_gui-qt_highlight.pro,v 1.1 2021/01/01 19:41:37 schmonz Exp $ 1$NetBSD: patch-src_gui-qt_highlight.pro,v 1.2 2022/07/13 00:52:31 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 2020-12-21 10:56:19.000000000 +0000 5--- src/gui-qt/highlight.pro.orig 2022-03-22 20:58:01.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.73.0/include 9 INCLUDEPATH+=/usr/local/Cellar/boost/1.76.0/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