Thu Apr 4 14:14:29 2019 UTC ()
Update to 3.50. From the changelog:

- added lineno, column parameters to OnStateChange hook
- added support for Crystal (thanks to C R Jaensch)
- added support for Slim (https://gitlab.com/saalen/highlight/merge_requests/85)
- fixed several typos in documentaion and manpages
- CLI: added `--syntax-by-name` option (suggested by Chris Mayo)
- CLI: removed deprecated `--list-langs` and`--list-themes` options
- GUI: added terminal sequence output options (https://gitlab.com/saalen/highlight/issues/110)


(schmonz)
diff -r1.6 -r1.7 pkgsrc/textproc/libhighlight/Makefile.common
diff -r1.6 -r1.7 pkgsrc/textproc/libhighlight/PLIST
diff -r1.8 -r1.9 pkgsrc/textproc/libhighlight/distinfo
diff -r1.3 -r1.4 pkgsrc/textproc/libhighlight/patches/patch-makefile
diff -r1.4 -r1.5 pkgsrc/textproc/libhighlight/patches/patch-src_makefile
cvs diff -r1.6 -r1.7 pkgsrc/textproc/libhighlight/Makefile.common (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/Makefile.common 2019/02/12 19:46:12 1.6
+++ pkgsrc/textproc/libhighlight/Makefile.common 2019/04/04 14:14:28 1.7
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.6 2019/02/12 19:46:12 schmonz Exp $ 1# $NetBSD: Makefile.common,v 1.7 2019/04/04 14:14:28 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= 3.49 7VERSION= 3.50
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
19MAKE_FILE= makefile 19MAKE_FILE= makefile
20 20
cvs diff -r1.6 -r1.7 pkgsrc/textproc/libhighlight/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/PLIST 2019/02/12 19:46:12 1.6
+++ pkgsrc/textproc/libhighlight/PLIST 2019/04/04 14:14:28 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2019/02/12 19:46:12 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.7 2019/04/04 14:14:28 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_PLUGINS.adoc 10share/doc/highlight/README_PLUGINS.adoc
11share/doc/highlight/README_REGEX.adoc 11share/doc/highlight/README_REGEX.adoc
12share/doc/highlight/README_RELEASE.adoc 12share/doc/highlight/README_RELEASE.adoc
13share/doc/highlight/README_TESTCASES.adoc 13share/doc/highlight/README_TESTCASES.adoc
14share/doc/highlight/extras/highlight_pipe.php 14share/doc/highlight/extras/highlight_pipe.php
@@ -100,26 +100,27 @@ share/highlight/langDefs/charmm.lang @@ -100,26 +100,27 @@ share/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/coffee.lang 109share/highlight/langDefs/coffee.lang
110share/highlight/langDefs/coldfusion.lang 110share/highlight/langDefs/coldfusion.lang
111share/highlight/langDefs/conf.lang 111share/highlight/langDefs/conf.lang
112share/highlight/langDefs/crk.lang 112share/highlight/langDefs/crk.lang
 113share/highlight/langDefs/crystal.lang
113share/highlight/langDefs/cs_block_regex.lang 114share/highlight/langDefs/cs_block_regex.lang
114share/highlight/langDefs/csharp.lang 115share/highlight/langDefs/csharp.lang
115share/highlight/langDefs/css.lang 116share/highlight/langDefs/css.lang
116share/highlight/langDefs/d.lang 117share/highlight/langDefs/d.lang
117share/highlight/langDefs/dart.lang 118share/highlight/langDefs/dart.lang
118share/highlight/langDefs/delphi.lang 119share/highlight/langDefs/delphi.lang
119share/highlight/langDefs/diff.lang 120share/highlight/langDefs/diff.lang
120share/highlight/langDefs/docker.lang 121share/highlight/langDefs/docker.lang
121share/highlight/langDefs/dts.lang 122share/highlight/langDefs/dts.lang
122share/highlight/langDefs/dylan.lang 123share/highlight/langDefs/dylan.lang
123share/highlight/langDefs/ebnf.lang 124share/highlight/langDefs/ebnf.lang
124share/highlight/langDefs/ebnf2.lang 125share/highlight/langDefs/ebnf2.lang
125share/highlight/langDefs/eiffel.lang 126share/highlight/langDefs/eiffel.lang
@@ -239,30 +240,32 @@ share/highlight/langDefs/q.lang @@ -239,30 +240,32 @@ share/highlight/langDefs/q.lang
239share/highlight/langDefs/qmake.lang 240share/highlight/langDefs/qmake.lang
240share/highlight/langDefs/qml.lang 241share/highlight/langDefs/qml.lang
241share/highlight/langDefs/qu.lang 242share/highlight/langDefs/qu.lang
242share/highlight/langDefs/r.lang 243share/highlight/langDefs/r.lang
243share/highlight/langDefs/rebol.lang 244share/highlight/langDefs/rebol.lang
244share/highlight/langDefs/rexx.lang 245share/highlight/langDefs/rexx.lang
245share/highlight/langDefs/rnc.lang 246share/highlight/langDefs/rnc.lang
246share/highlight/langDefs/rpg.lang 247share/highlight/langDefs/rpg.lang
247share/highlight/langDefs/rpl.lang 248share/highlight/langDefs/rpl.lang
248share/highlight/langDefs/rs.lang 249share/highlight/langDefs/rs.lang
249share/highlight/langDefs/ruby.lang 250share/highlight/langDefs/ruby.lang
250share/highlight/langDefs/s.lang 251share/highlight/langDefs/s.lang
251share/highlight/langDefs/sas.lang 252share/highlight/langDefs/sas.lang
 253share/highlight/langDefs/scad.lang
252share/highlight/langDefs/scala.lang 254share/highlight/langDefs/scala.lang
253share/highlight/langDefs/scilab.lang 255share/highlight/langDefs/scilab.lang
254share/highlight/langDefs/scss.lang 256share/highlight/langDefs/scss.lang
255share/highlight/langDefs/sh.lang 257share/highlight/langDefs/sh.lang
 258share/highlight/langDefs/slim.lang
256share/highlight/langDefs/small.lang 259share/highlight/langDefs/small.lang
257share/highlight/langDefs/smalltalk.lang 260share/highlight/langDefs/smalltalk.lang
258share/highlight/langDefs/sml.lang 261share/highlight/langDefs/sml.lang
259share/highlight/langDefs/snmp.lang 262share/highlight/langDefs/snmp.lang
260share/highlight/langDefs/snobol.lang 263share/highlight/langDefs/snobol.lang
261share/highlight/langDefs/solidity.lang 264share/highlight/langDefs/solidity.lang
262share/highlight/langDefs/spec.lang 265share/highlight/langDefs/spec.lang
263share/highlight/langDefs/spn.lang 266share/highlight/langDefs/spn.lang
264share/highlight/langDefs/sql.lang 267share/highlight/langDefs/sql.lang
265share/highlight/langDefs/squirrel.lang 268share/highlight/langDefs/squirrel.lang
266share/highlight/langDefs/styl.lang 269share/highlight/langDefs/styl.lang
267share/highlight/langDefs/svg.lang 270share/highlight/langDefs/svg.lang
268share/highlight/langDefs/swift.lang 271share/highlight/langDefs/swift.lang
cvs diff -r1.8 -r1.9 pkgsrc/textproc/libhighlight/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/distinfo 2019/02/12 19:46:12 1.8
+++ pkgsrc/textproc/libhighlight/distinfo 2019/04/04 14:14:28 1.9
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.8 2019/02/12 19:46:12 schmonz Exp $ 1$NetBSD: distinfo,v 1.9 2019/04/04 14:14:28 schmonz Exp $
2 2
3SHA1 (highlight-3.49.tar.bz2) = de80b3aa0421ae0d6a5e00a2a81ce08f0dcdcb5a 3SHA1 (highlight-3.50.tar.bz2) = 8499963717f9d1e639b2689f6775ffd5f0aacbb4
4RMD160 (highlight-3.49.tar.bz2) = 515716e9d1155fe9df28e445985329dfbf277a05 4RMD160 (highlight-3.50.tar.bz2) = 8c273ee95c1778fcdb51e17472bc4fbb0d0ff188
5SHA512 (highlight-3.49.tar.bz2) = 81223c11b7b518b5b289622afadb0f2660898f74342b96f3e03f8bd3ac88d2f9b816efe0dffcc58323417d8a47b112053c16bd5f83475e6908ab228ee3cf81b0 5SHA512 (highlight-3.50.tar.bz2) = 1911a29fea6a157ff237276673acf0ae2b5a931ad7beeacf26a67970fc5ec66abf6dc64ff1694bf0cf68414c29f597625700943da772823a025f7a139d606c3d
6Size (highlight-3.49.tar.bz2) = 1364886 bytes 6Size (highlight-3.50.tar.bz2) = 1386968 bytes
7SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f 7SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
8SHA1 (patch-makefile) = e2a251415fffd38c2ebf73f1e7b57698a6f3f11e 8SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063
9SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0 9SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0
10SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8688f68e4dd64ccab2df577262baa2579040505a 10SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8688f68e4dd64ccab2df577262baa2579040505a
11SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8 11SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
12SHA1 (patch-src_makefile) = 9aea185beddf4fce63100892d63053f8bd98a26e 12SHA1 (patch-src_makefile) = d07c197a731f5a6197b55f4c8f12bd01ad11d544
cvs diff -r1.3 -r1.4 pkgsrc/textproc/libhighlight/patches/patch-makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/patches/patch-makefile 2018/10/08 13:51:28 1.3
+++ pkgsrc/textproc/libhighlight/patches/patch-makefile 2019/04/04 14:14:28 1.4
@@ -1,108 +1,111 @@ @@ -1,108 +1,111 @@
1$NetBSD: patch-makefile,v 1.3 2018/10/08 13:51:28 schmonz Exp $ 1$NetBSD: patch-makefile,v 1.4 2019/04/04 14:14:28 schmonz Exp $
2 2
3Use pkgsrc-provided paths and tools. 3Use pkgsrc-provided paths and tools.
4 4
5--- makefile.orig 2018-10-07 09:31:45.000000000 +0000 5--- makefile.orig 2019-03-26 19:58:45.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@@ -16,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/
17 bin_dir = ${PREFIX}/bin/ 17 bin_dir = ${PREFIX}/bin/
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,18 +25,18 @@ doc_dir = ${PREFIX}/share/doc/highlight/ 25@@ -25,8 +25,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 desktop_pixmaps = ${PREFIX}/share/pixmaps/ 36@@ -34,10 +34,10 @@ desktop_pixmaps = ${PREFIX}/share/pixmap
37  37
38 # Commands: 38 # Commands:
 39 GZIP=gzip -9f
39-INSTALL_DATA=install -m644 40-INSTALL_DATA=install -m644
40-INSTALL_PROGRAM=install -m755 41-INSTALL_PROGRAM=install -m755
41-MKDIR=mkdir -p -m 755 42-MKDIR=mkdir -p -m 755
42-RMDIR=rm -r -f 43-RMDIR=rm -r -f
43+INSTALL_DATA=${BSD_INSTALL_DATA} 44+INSTALL_DATA=${BSD_INSTALL_DATA}
44+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} 45+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
45+MKDIR=${BSD_INSTALL_DATA_DIR} 46+MKDIR=${BSD_INSTALL_DATA_DIR}
46+RMDIR=${RM} -r -f 47+RMDIR=${RM} -r -f
47  48
48 all cli: 49 all cli:
49 ${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}
50@@ -85,17 +85,12 @@ install: 51@@ -86,19 +86,12 @@ install:
51 ${DESTDIR}${data_dir}themes/base16 \ 52 ${DESTDIR}${data_dir}themes/base16 \
52 ${DESTDIR}${data_dir}langDefs \ 53 ${DESTDIR}${data_dir}langDefs \
53 ${DESTDIR}${data_dir}plugins 54 ${DESTDIR}${data_dir}plugins
54- ${MKDIR} ${DESTDIR}${man_dir}man1/ 55- ${MKDIR} ${DESTDIR}${man_dir}man1/
55- ${MKDIR} ${DESTDIR}${man_dir}man5/ 56- ${MKDIR} ${DESTDIR}${man_dir}man5/
56- ${MKDIR} ${DESTDIR}${bin_dir} 57- ${MKDIR} ${DESTDIR}${bin_dir}
57  58
58 ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/ 59 ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
59 ${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir} 60 ${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir}
60 ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/ 61 ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/
61 ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${data_dir}themes/base16/ 62 ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${data_dir}themes/base16/
62 ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/ 63 ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/
63- ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}man1/ 64- ${INSTALL_DATA} ./man/highlight.1 ${DESTDIR}${man_dir}man1/
64- ${INSTALL_DATA} ./man/filetypes.conf.5.gz ${DESTDIR}${man_dir}man5/ 65- -${GZIP} ${DESTDIR}${man_dir}man1/highlight.1
 66- ${INSTALL_DATA} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
 67- -${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5
65  68
66 ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} 69 ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
67 ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir} 70 ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir}
68@@ -115,15 +110,27 @@ install: 71@@ -118,15 +111,27 @@ install:
69 ${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
70 ${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir} 73 ${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir}
71 ${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir} 74 ${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir}
72- ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} 75- ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
73  76
74 @echo 77 @echo
75 @echo "Done." 78 @echo "Done."
76- @echo "Type highlight --help or man highlight for instructions." 79- @echo "Type highlight --help or man highlight for instructions."
77 @echo "Take a look at ${DESTDIR}${examples_dir} for web plugins, SWIG and TCL bindings." 80 @echo "Take a look at ${DESTDIR}${examples_dir} for web plugins, SWIG and TCL bindings."
78+ @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')."
79 @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')."
80 @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."
81  84
82+install-cli: 85+install-cli:
83+ @echo "Installing files for the CLI..." 86+ @echo "Installing files for the CLI..."
84+ ${MKDIR} ${DESTDIR}${bin_dir} 87+ ${MKDIR} ${DESTDIR}${bin_dir}
85+ ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} 88+ ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
86+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man1 89+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man1
87+ ${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir}/man1/ 90+ ${BSD_INSTALL_MAN} ./man/highlight.1 ${DESTDIR}${man_dir}/man1/
88+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man5 91+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man5
89+ ${BSD_INSTALL_MAN} ./man/filetypes.conf.5.gz ${DESTDIR}${man_dir}man5/ 92+ ${BSD_INSTALL_MAN} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
90+ 93+
91+ @echo 94+ @echo
92+ @echo "Done." 95+ @echo "Done."
93+ @echo "Type highlight --help or man highlight for instructions." 96+ @echo "Type highlight --help or man highlight for instructions."
94+ 97+
95 install-gui: 98 install-gui:
96 @echo "Installing files for the GUI..." 99 @echo "Installing files for the GUI..."
97 ${MKDIR} ${DESTDIR}${data_dir} \ 100 ${MKDIR} ${DESTDIR}${data_dir} \
98@@ -145,8 +152,8 @@ uninstall: 101@@ -148,8 +153,8 @@ uninstall:
99 ${RMDIR} ${DESTDIR}${doc_dir} 102 ${RMDIR} ${DESTDIR}${doc_dir}
100 ${RMDIR} ${DESTDIR}${conf_dir} 103 ${RMDIR} ${DESTDIR}${conf_dir}
101 ${RMDIR} ${DESTDIR}${examples_dir} 104 ${RMDIR} ${DESTDIR}${examples_dir}
102- rm -rf ${DESTDIR}${man_dir}man1/highlight.1.gz 105- rm -rf ${DESTDIR}${man_dir}man1/highlight.1.gz
103- rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5.gz 106- rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5.gz
104+ rm -rf ${DESTDIR}${man_dir}man1/highlight.1* 107+ rm -rf ${DESTDIR}${man_dir}man1/highlight.1*
105+ rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5* 108+ rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5*
106  109
107 rm -rf ${DESTDIR}${bin_dir}highlight 110 rm -rf ${DESTDIR}${bin_dir}highlight
108 rm -rf ${DESTDIR}${bin_dir}highlight-gui 111 rm -rf ${DESTDIR}${bin_dir}highlight-gui
cvs diff -r1.4 -r1.5 pkgsrc/textproc/libhighlight/patches/patch-src_makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile 2018/10/14 12:17:50 1.4
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile 2019/04/04 14:14:28 1.5
@@ -1,83 +1,105 @@ @@ -1,83 +1,105 @@
1$NetBSD: patch-src_makefile,v 1.4 2018/10/14 12:17:50 schmonz Exp $ 1$NetBSD: patch-src_makefile,v 1.5 2019/04/04 14:14:28 schmonz Exp $
2 2
3Use pkgsrc-specified compiler and flags. 3Use pkgsrc-specified compiler and flags.
4 4
5--- src/makefile.orig 2018-10-13 19:26:45.000000000 +0000 5--- src/makefile.orig 2019-03-26 19:58:45.000000000 +0000
6+++ src/makefile 6+++ src/makefile
7@@ -13,13 +13,13 @@ 7@@ -8,18 +8,18 @@
 8 # See ../makefile for the definition of ${data_dir}
 9
 10 # Add -DHL_CONFIG_DIR=\"/your/path/\" to define the configuration directory
 11-# (default: /etc/highlight)
 12+# (default: /etc/pkg/highlight)
 13
8 # See src/gui-qt/highlight.pro for the Qt GUI compilation options 14 # See src/gui-qt/highlight.pro for the Qt GUI compilation options
9  15
10 #CXX=clang++ 16 #CXX=clang++
11-CXX=g++ 17-CXX=g++
12+#CXX=g++ 18+#CXX=g++
13  19
14 # was: qmake-qt5 20 # was: qmake-qt5
15 QMAKE=qmake 21 QMAKE=qmake
16  22
17 # Added -std=c++11 because of auto_ptr to unique_ptr transition 23 # Added -std=c++11 because of auto_ptr to unique_ptr transition
18-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 24-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
19+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 25+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
20 #CFLAGS:=-ggdb ${CFLAGS} -std=c++11 26 #CFLAGS:=-ggdb ${CFLAGS} -std=c++11
21  27
22 CFLAGS_DILU=-fno-strict-aliasing 28 CFLAGS_DILU=-fno-strict-aliasing
23@@ -66,14 +66,17 @@ ifdef PIC 29@@ -54,27 +54,30 @@ REGEX_DIR=${CORE_DIR}re/
 30 DILU_DIR=${CORE_DIR}Diluculum/
 31
 32 ifndef HL_CONFIG_DIR
 33- HL_CONFIG_DIR = /etc/highlight/
 34+ HL_CONFIG_DIR = /etc/pkg/highlight/
 35 endif
 36 ifndef HL_DATA_DIR
 37- HL_DATA_DIR = /usr/share/highlight/
 38+ HL_DATA_DIR = /opt/.pkg-20151023/share/highlight/
 39 endif
 40 ifndef HL_DOC_DIR
 41- HL_DOC_DIR = /usr/share/doc/highlight/
 42+ HL_DOC_DIR = /opt/.pkg-20151023/share/doc/highlight/
 43 endif
 44
 45 ifdef PIC
24 CFLAGS+=-fPIC 46 CFLAGS+=-fPIC
25 endif 47 endif
26  48
27-LDFLAGS = -ldl 49-LDFLAGS = -ldl
28+#LDFLAGS = -ldl 50+#LDFLAGS = -ldl
29 # Do not strip by default (Mac OS X lazy pointer issues) 51 # Do not strip by default (Mac OS X lazy pointer issues)
30 # Add -static to avoid linking with shared libs (can cause trouble when highlight 52 # Add -static to avoid linking with shared libs (can cause trouble when highlight
31 # is run as service) 53 # is run as service)
32 #LDFLAGS = ${LDFLAGS} -s 54 #LDFLAGS = ${LDFLAGS} -s
33 #LDFLAGS= -Wl,--as-needed 55 #LDFLAGS= -Wl,--as-needed
34  56
35-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS} 57-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
36+LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }') 58+LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
37+LIBTOOL=libtool --tag=CXX 59+LIBTOOL=libtool --tag=CXX
38+ 60+
39+CXX_COMPILE=${LIBTOOL} --mode=compile ${CXX} ${CFLAGS} ${CXX_DIR} -I ${INCLUDE_DIR} ${LUA_CFLAGS} -c 61+CXX_COMPILE=${LIBTOOL} --mode=compile ${CXX} ${CFLAGS} ${CXX_DIR} -I ${INCLUDE_DIR} ${LUA_CFLAGS} -c
40  62
41 # Data directories (data dir, configuration file dir) 63 # Data directories (data dir, configuration file dir)
42 CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\" 64 CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
43@@ -101,18 +104,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI 65@@ -102,18 +105,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
44 ${GUI_QT_DIR}showtextfile.cpp 66 ${GUI_QT_DIR}showtextfile.cpp
45  67
46  68
47-cli: libhighlight.a ${CLI_OBJECTS} 69-cli: libhighlight.a ${CLI_OBJECTS}
48- ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS} 70- ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS}
49+cli: ${CLI_OBJECTS} 71+cli: ${CLI_OBJECTS}
50+ ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -lhighlight ${LUA_LIBS} 72+ ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -lhighlight ${LUA_LIBS}
51  73
52 lib-static libhighlight.a: ${CORE_OBJECTS} 74 lib-static libhighlight.a: ${CORE_OBJECTS}
53 ${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS} 75 ${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS}
54  76
55 lib-shared libhighlight.so.1.0: ${CORE_OBJECTS} 77 lib-shared libhighlight.so.1.0: ${CORE_OBJECTS}
56- ${CXX} -shared -Wl,-soname,libhighlight.so.${SO_VERSION} -o libhighlight.so.${SO_VERSION} -lc ${CORE_OBJECTS} 78- ${CXX} -shared -Wl,-soname,libhighlight.so.${SO_VERSION} -o libhighlight.so.${SO_VERSION} -lc ${CORE_OBJECTS}
57+ ${LIBTOOL} --mode=link ${CXX} ${LDFLAGS} -o libhighlight.la ${CORE_OBJECTS:%.o=%.lo} ${DILU_OBJECTS:%.o=%.lo} -version-info ${LSO_VERSION} -rpath ${PREFIX}/lib 79+ ${LIBTOOL} --mode=link ${CXX} ${LDFLAGS} -o libhighlight.la ${CORE_OBJECTS:%.o=%.lo} ${DILU_OBJECTS:%.o=%.lo} -version-info ${LSO_VERSION} -rpath ${PREFIX}/lib
58  80
59 gui-qt: highlight-gui 81 gui-qt: highlight-gui
60  82
61-highlight-gui: libhighlight.a ${GUI_OBJECTS} 83-highlight-gui: libhighlight.a ${GUI_OBJECTS}
62+highlight-gui: ${GUI_OBJECTS} 84+highlight-gui: ${GUI_OBJECTS}
63 cd gui-qt && \ 85 cd gui-qt && \
64 ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \ 86 ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
65 $(MAKE) 87 $(MAKE)
66@@ -121,7 +124,7 @@ $(OBJECTFILES) : makefile 88@@ -122,7 +125,7 @@ $(OBJECTFILES) : makefile
67  89
68  90
69 datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h 91 datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h
70- ${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR} 92- ${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR}
71+ ${CXX_COMPILE} ${CORE_DIR}datadir.cpp 93+ ${CXX_COMPILE} ${CORE_DIR}datadir.cpp
72  94
73 platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h 95 platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h
74 ${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp 96 ${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp
75@@ -202,7 +205,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai 97@@ -203,7 +206,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
76 ${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \ 98 ${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \
77 ${INCLUDE_DIR}stylecolour.h ${INCLUDE_DIR}preformatter.h \ 99 ${INCLUDE_DIR}stylecolour.h ${INCLUDE_DIR}preformatter.h \
78 ${CLI_DIR}help.h ${INCLUDE_DIR}version.h 100 ${CLI_DIR}help.h ${INCLUDE_DIR}version.h
79- ${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR} 101- ${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR}
80+ ${CXX_COMPILE} ${CLI_DIR}main.cpp 102+ ${CXX_COMPILE} ${CLI_DIR}main.cpp
81  103
82  104
83 #3rd party libs 105 #3rd party libs