Wed Dec 18 01:34:34 2019 UTC ()
Update to 3.54 (during the freeze, for the bugfixes). From the changelog:

- fixed default colour output in BBCode
  (https://gitlab.com/saalen/highlight/issues/134)
- fixed corner case in sh.lang
- fixed syntax tests with UTF-8 input
  (https://gitlab.com/saalen/highlight/issues/123)
- added support for Bash in outhtml_codefold.lua plug-in
- added ballerina.lang
- added block strings to java.lang
- added author hints in themes and language definitions
- added C++20 reserved words in c.lang
- added editorconfig file and validated all files accordingly (thanks to
  Tristano Ajmone)
- CLI: fixed `--list-scripts` with `-d` or HIGHLIGHT_DATADIR env variable
  (https://gitlab.com/saalen/highlight/issues/139)
- GUI W32: replaced multibyte path trace window by startup hint if
  NtfsDisable8dot3NameCreation is set
- GUI: removed AsciiDoc instruction lines from the README popup window


(schmonz)
diff -r1.4 -r1.5 pkgsrc/textproc/libhighlight/Makefile
diff -r1.11 -r1.12 pkgsrc/textproc/libhighlight/Makefile.common
diff -r1.10 -r1.11 pkgsrc/textproc/libhighlight/PLIST
diff -r1.13 -r1.14 pkgsrc/textproc/libhighlight/distinfo
diff -r1.2 -r1.3 pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile
diff -r1.7 -r1.8 pkgsrc/textproc/libhighlight/patches/patch-src_makefile

cvs diff -r1.4 -r1.5 pkgsrc/textproc/libhighlight/Makefile (switch to unified diff)

--- pkgsrc/textproc/libhighlight/Makefile 2019/11/04 21:43:38 1.4
+++ pkgsrc/textproc/libhighlight/Makefile 2019/12/18 01:34:33 1.5
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.4 2019/11/04 21:43:38 rillig Exp $ 1# $NetBSD: Makefile,v 1.5 2019/12/18 01:34:33 schmonz Exp $
2 2
3.include "../../textproc/libhighlight/Makefile.common" 3.include "../../textproc/libhighlight/Makefile.common"
4 4
5PKGNAME= libhighlight-${VERSION} 5PKGNAME= libhighlight-${VERSION}
6COMMENT+= (shared library) 6COMMENT+= (shared library)
7 7
8BUILD_TARGET= lib-shared 8BUILD_TARGET= lib-shared
9 9
10EGDIR= ${PREFIX}/share/examples/highlight 10EGDIR= ${PREFIX}/share/examples/highlight
11CONF_FILES= ${EGDIR}/filetypes.conf \ 11CONF_FILES= ${EGDIR}/filetypes.conf \
12 ${PKG_SYSCONFDIR}/filetypes.conf 12 ${PKG_SYSCONFDIR}/filetypes.conf
13 13
14INSTALLATION_DIRS= lib 14INSTALLATION_DIRS= lib
15 15
16pre-install: 16pre-install:
17 rm -f ${WRKSRC}/extras/swig/*.orig 17 rm -f ${WRKSRC}/extras/swig/*.orig
18 18
19post-install: 19post-install:
20 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/src/libhighlight.la \ 20 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/src/libhighlight.la \
21 ${DESTDIR}${PREFIX}/lib/ 21 ${DESTDIR}${PREFIX}/lib/
22 22
23.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"

cvs diff -r1.11 -r1.12 pkgsrc/textproc/libhighlight/Makefile.common (switch to unified diff)

--- pkgsrc/textproc/libhighlight/Makefile.common 2019/08/13 01:48:49 1.11
+++ pkgsrc/textproc/libhighlight/Makefile.common 2019/12/18 01:34:33 1.12
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile.common,v 1.11 2019/08/13 01:48:49 schmonz Exp $ 1# $NetBSD: Makefile.common,v 1.12 2019/12/18 01:34:33 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.53 7VERSION= 3.54
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
21 21
22PATCHDIR= ${.CURDIR}/../../textproc/libhighlight/patches 22PATCHDIR= ${.CURDIR}/../../textproc/libhighlight/patches
23DISTINFO_FILE= ${.CURDIR}/../../textproc/libhighlight/distinfo 23DISTINFO_FILE= ${.CURDIR}/../../textproc/libhighlight/distinfo
24DESCR_SRC= ${.CURDIR}/../../textproc/libhighlight/DESCR 24DESCR_SRC= ${.CURDIR}/../../textproc/libhighlight/DESCR
25 25
26PKG_SYSCONFSUBDIR= highlight 26PKG_SYSCONFSUBDIR= highlight
27 27
28SUBST_CLASSES+= paths 28SUBST_CLASSES+= paths
29SUBST_MESSAGE.paths= Fixing hardcoded paths. 29SUBST_MESSAGE.paths= Fixing hardcoded paths.
30SUBST_STAGE.paths= do-configure 30SUBST_STAGE.paths= do-configure
31SUBST_FILES.paths= src/core/datadir.cpp src/makefile 31SUBST_FILES.paths= src/core/datadir.cpp src/makefile
32SUBST_SED.paths= -e 's,/etc/highlight,${PKG_SYSCONFDIR},g' 32SUBST_SED.paths= -e 's,/etc/highlight,${PKG_SYSCONFDIR},g'
33SUBST_SED.paths+= -e 's,/usr/share,${PREFIX}/share,g' 33SUBST_SED.paths+= -e 's,/usr/share,${PREFIX}/share,g'
34 34
35.include "../../devel/boost-headers/buildlink3.mk" 35.include "../../devel/boost-headers/buildlink3.mk"
36.include "../../lang/lua/buildlink3.mk" 36.include "../../lang/lua/buildlink3.mk"
37.include "../../mk/dlopen.buildlink3.mk" 37.include "../../mk/dlopen.buildlink3.mk"

cvs diff -r1.10 -r1.11 pkgsrc/textproc/libhighlight/PLIST (switch to unified diff)

--- pkgsrc/textproc/libhighlight/PLIST 2019/08/13 01:48:49 1.10
+++ pkgsrc/textproc/libhighlight/PLIST 2019/12/18 01:34:33 1.11
@@ -1,540 +1,542 @@ @@ -1,540 +1,542 @@
1@comment $NetBSD: PLIST,v 1.10 2019/08/13 01:48:49 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.11 2019/12/18 01:34:33 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
15share/doc/highlight/extras/highlight_pipe.pm 15share/doc/highlight/extras/highlight_pipe.pm
16share/doc/highlight/extras/highlight_pipe.py 16share/doc/highlight/extras/highlight_pipe.py
17share/doc/highlight/extras/json/theme2json.lua 17share/doc/highlight/extras/json/theme2json.lua
18share/doc/highlight/extras/langDefs-resources/UNLICENCE 18share/doc/highlight/extras/langDefs-resources/UNLICENCE
19share/doc/highlight/extras/langDefs-resources/cleanslate.lang 19share/doc/highlight/extras/langDefs-resources/cleanslate.lang
20share/doc/highlight/extras/langDefs-resources/template.lang 20share/doc/highlight/extras/langDefs-resources/template.lang
21share/doc/highlight/extras/pandoc/Highlight.pp 21share/doc/highlight/extras/pandoc/Highlight.pp
22share/doc/highlight/extras/pandoc/LICENSE 22share/doc/highlight/extras/pandoc/LICENSE
23share/doc/highlight/extras/pandoc/README.html 23share/doc/highlight/extras/pandoc/README.html
24share/doc/highlight/extras/pandoc/build-example.bat 24share/doc/highlight/extras/pandoc/build-example.bat
25share/doc/highlight/extras/pandoc/build-example.sh 25share/doc/highlight/extras/pandoc/build-example.sh
26share/doc/highlight/extras/pandoc/example-preprocessed.md 26share/doc/highlight/extras/pandoc/example-preprocessed.md
27share/doc/highlight/extras/pandoc/example.css 27share/doc/highlight/extras/pandoc/example.css
28share/doc/highlight/extras/pandoc/example.html 28share/doc/highlight/extras/pandoc/example.html
29share/doc/highlight/extras/pandoc/example.md 29share/doc/highlight/extras/pandoc/example.md
30share/doc/highlight/extras/pandoc/example.pb 30share/doc/highlight/extras/pandoc/example.pb
31share/doc/highlight/extras/pywal/pywal.theme 31share/doc/highlight/extras/pywal/pywal.theme
32share/doc/highlight/extras/swig/README_SWIG 32share/doc/highlight/extras/swig/README_SWIG
33share/doc/highlight/extras/swig/highlight.i 33share/doc/highlight/extras/swig/highlight.i
34share/doc/highlight/extras/swig/makefile 34share/doc/highlight/extras/swig/makefile
35share/doc/highlight/extras/swig/testmod.php 35share/doc/highlight/extras/swig/testmod.php
36share/doc/highlight/extras/swig/testmod.pl 36share/doc/highlight/extras/swig/testmod.pl
37share/doc/highlight/extras/swig/testmod.py 37share/doc/highlight/extras/swig/testmod.py
38share/doc/highlight/extras/tcl/README_TCL 38share/doc/highlight/extras/tcl/README_TCL
39share/doc/highlight/extras/tcl/makefile 39share/doc/highlight/extras/tcl/makefile
40share/doc/highlight/extras/tcl/pkgIndex.tcl 40share/doc/highlight/extras/tcl/pkgIndex.tcl
41share/doc/highlight/extras/tcl/tclhighlight.c 41share/doc/highlight/extras/tcl/tclhighlight.c
42share/doc/highlight/extras/themes-resources/base16/LICENSE 42share/doc/highlight/extras/themes-resources/base16/LICENSE
43share/doc/highlight/extras/themes-resources/base16/README.html 43share/doc/highlight/extras/themes-resources/base16/README.html
44share/doc/highlight/extras/themes-resources/base16/base16_highlight.mustache 44share/doc/highlight/extras/themes-resources/base16/base16_highlight.mustache
45share/doc/highlight/extras/themes-resources/base16/base16_highlight_light.mustache 45share/doc/highlight/extras/themes-resources/base16/base16_highlight_light.mustache
46share/doc/highlight/extras/themes-resources/base16/example-dark.html 46share/doc/highlight/extras/themes-resources/base16/example-dark.html
47share/doc/highlight/extras/themes-resources/base16/example-light.html 47share/doc/highlight/extras/themes-resources/base16/example-light.html
48share/doc/highlight/extras/themes-resources/base16/example.bat 48share/doc/highlight/extras/themes-resources/base16/example.bat
49share/doc/highlight/extras/themes-resources/base16/example.pb 49share/doc/highlight/extras/themes-resources/base16/example.pb
50share/doc/highlight/extras/themes-resources/base16/example.theme 50share/doc/highlight/extras/themes-resources/base16/example.theme
51share/doc/highlight/extras/themes-resources/base16/example.yaml 51share/doc/highlight/extras/themes-resources/base16/example.yaml
52share/doc/highlight/extras/themes-resources/base16/example_light.theme 52share/doc/highlight/extras/themes-resources/base16/example_light.theme
53share/doc/highlight/extras/themes-resources/css-themes/README.html 53share/doc/highlight/extras/themes-resources/css-themes/README.html
54share/doc/highlight/extras/themes-resources/css-themes/UNLICENCE 54share/doc/highlight/extras/themes-resources/css-themes/UNLICENCE
55share/doc/highlight/extras/themes-resources/css-themes/example.html 55share/doc/highlight/extras/themes-resources/css-themes/example.html
56share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.css 56share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.css
57share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.scss 57share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.scss
58share/doc/highlight/extras/web_plugins/dokuwiki/syntax.php 58share/doc/highlight/extras/web_plugins/dokuwiki/syntax.php
59share/doc/highlight/extras/web_plugins/movabletype/README 59share/doc/highlight/extras/web_plugins/movabletype/README
60share/doc/highlight/extras/web_plugins/movabletype/highlight.pl 60share/doc/highlight/extras/web_plugins/movabletype/highlight.pl
61share/doc/highlight/extras/web_plugins/wordpress/README 61share/doc/highlight/extras/web_plugins/wordpress/README
62share/doc/highlight/extras/web_plugins/wordpress/highlight.php 62share/doc/highlight/extras/web_plugins/wordpress/highlight.php
63share/examples/highlight/filetypes.conf 63share/examples/highlight/filetypes.conf
64share/highlight/langDefs/abap4.lang 64share/highlight/langDefs/abap4.lang
65share/highlight/langDefs/abc.lang 65share/highlight/langDefs/abc.lang
66share/highlight/langDefs/abnf.lang 66share/highlight/langDefs/abnf.lang
67share/highlight/langDefs/actionscript.lang 67share/highlight/langDefs/actionscript.lang
68share/highlight/langDefs/ada.lang 68share/highlight/langDefs/ada.lang
69share/highlight/langDefs/agda.lang 69share/highlight/langDefs/agda.lang
70share/highlight/langDefs/alan.lang 70share/highlight/langDefs/alan.lang
71share/highlight/langDefs/algol.lang 71share/highlight/langDefs/algol.lang
72share/highlight/langDefs/ampl.lang 72share/highlight/langDefs/ampl.lang
73share/highlight/langDefs/amtrix.lang 73share/highlight/langDefs/amtrix.lang
74share/highlight/langDefs/applescript.lang 74share/highlight/langDefs/applescript.lang
75share/highlight/langDefs/arc.lang 75share/highlight/langDefs/arc.lang
76share/highlight/langDefs/arm.lang 76share/highlight/langDefs/arm.lang
77share/highlight/langDefs/as400cl.lang 77share/highlight/langDefs/as400cl.lang
78share/highlight/langDefs/ascend.lang 78share/highlight/langDefs/ascend.lang
79share/highlight/langDefs/asciidoc.lang 79share/highlight/langDefs/asciidoc.lang
80share/highlight/langDefs/asp.lang 80share/highlight/langDefs/asp.lang
81share/highlight/langDefs/aspect.lang 81share/highlight/langDefs/aspect.lang
82share/highlight/langDefs/assembler.lang 82share/highlight/langDefs/assembler.lang
83share/highlight/langDefs/ats.lang 83share/highlight/langDefs/ats.lang
84share/highlight/langDefs/autohotkey.lang 84share/highlight/langDefs/autohotkey.lang
85share/highlight/langDefs/autoit.lang 85share/highlight/langDefs/autoit.lang
86share/highlight/langDefs/avenue.lang 86share/highlight/langDefs/avenue.lang
87share/highlight/langDefs/awk.lang 87share/highlight/langDefs/awk.lang
 88share/highlight/langDefs/ballerina.lang
88share/highlight/langDefs/bat.lang 89share/highlight/langDefs/bat.lang
89share/highlight/langDefs/bbcode.lang 90share/highlight/langDefs/bbcode.lang
90share/highlight/langDefs/bcpl.lang 91share/highlight/langDefs/bcpl.lang
91share/highlight/langDefs/bibtex.lang 92share/highlight/langDefs/bibtex.lang
92share/highlight/langDefs/biferno.lang 93share/highlight/langDefs/biferno.lang
93share/highlight/langDefs/bison.lang 94share/highlight/langDefs/bison.lang
94share/highlight/langDefs/blitzbasic.lang 95share/highlight/langDefs/blitzbasic.lang
95share/highlight/langDefs/bms.lang 96share/highlight/langDefs/bms.lang
96share/highlight/langDefs/bnf.lang 97share/highlight/langDefs/bnf.lang
97share/highlight/langDefs/boo.lang 98share/highlight/langDefs/boo.lang
98share/highlight/langDefs/c.lang 99share/highlight/langDefs/c.lang
99share/highlight/langDefs/ceylon.lang 100share/highlight/langDefs/ceylon.lang
100share/highlight/langDefs/charmm.lang 101share/highlight/langDefs/charmm.lang
101share/highlight/langDefs/chill.lang 102share/highlight/langDefs/chill.lang
102share/highlight/langDefs/chpl.lang 103share/highlight/langDefs/chpl.lang
103share/highlight/langDefs/clean.lang 104share/highlight/langDefs/clean.lang
104share/highlight/langDefs/clearbasic.lang 105share/highlight/langDefs/clearbasic.lang
105share/highlight/langDefs/clipper.lang 106share/highlight/langDefs/clipper.lang
106share/highlight/langDefs/clojure.lang 107share/highlight/langDefs/clojure.lang
107share/highlight/langDefs/clp.lang 108share/highlight/langDefs/clp.lang
108share/highlight/langDefs/cmake.lang 109share/highlight/langDefs/cmake.lang
109share/highlight/langDefs/cobol.lang 110share/highlight/langDefs/cobol.lang
110share/highlight/langDefs/coffee.lang 111share/highlight/langDefs/coffee.lang
111share/highlight/langDefs/coldfusion.lang 112share/highlight/langDefs/coldfusion.lang
112share/highlight/langDefs/conf.lang 113share/highlight/langDefs/conf.lang
113share/highlight/langDefs/crk.lang 114share/highlight/langDefs/crk.lang
114share/highlight/langDefs/crystal.lang 115share/highlight/langDefs/crystal.lang
115share/highlight/langDefs/cs_block_regex.lang 116share/highlight/langDefs/cs_block_regex.lang
116share/highlight/langDefs/csharp.lang 117share/highlight/langDefs/csharp.lang
117share/highlight/langDefs/css.lang 118share/highlight/langDefs/css.lang
118share/highlight/langDefs/d.lang 119share/highlight/langDefs/d.lang
119share/highlight/langDefs/dart.lang 120share/highlight/langDefs/dart.lang
120share/highlight/langDefs/delphi.lang 121share/highlight/langDefs/delphi.lang
121share/highlight/langDefs/diff.lang 122share/highlight/langDefs/diff.lang
122share/highlight/langDefs/docker.lang 123share/highlight/langDefs/docker.lang
123share/highlight/langDefs/dts.lang 124share/highlight/langDefs/dts.lang
124share/highlight/langDefs/dylan.lang 125share/highlight/langDefs/dylan.lang
125share/highlight/langDefs/ebnf.lang 126share/highlight/langDefs/ebnf.lang
126share/highlight/langDefs/ebnf2.lang 127share/highlight/langDefs/ebnf2.lang
127share/highlight/langDefs/eiffel.lang 128share/highlight/langDefs/eiffel.lang
128share/highlight/langDefs/elixir.lang 129share/highlight/langDefs/elixir.lang
129share/highlight/langDefs/email.lang 130share/highlight/langDefs/email.lang
130share/highlight/langDefs/erb.lang 131share/highlight/langDefs/erb.lang
131share/highlight/langDefs/erlang.lang 132share/highlight/langDefs/erlang.lang
132share/highlight/langDefs/euphoria.lang 133share/highlight/langDefs/euphoria.lang
133share/highlight/langDefs/exapunks.lang 134share/highlight/langDefs/exapunks.lang
134share/highlight/langDefs/excel.lang 135share/highlight/langDefs/excel.lang
135share/highlight/langDefs/express.lang 136share/highlight/langDefs/express.lang
136share/highlight/langDefs/fame.lang 137share/highlight/langDefs/fame.lang
137share/highlight/langDefs/fasm.lang 138share/highlight/langDefs/fasm.lang
138share/highlight/langDefs/felix.lang 139share/highlight/langDefs/felix.lang
139share/highlight/langDefs/fish.lang 140share/highlight/langDefs/fish.lang
140share/highlight/langDefs/fortran77.lang 141share/highlight/langDefs/fortran77.lang
141share/highlight/langDefs/fortran90.lang 142share/highlight/langDefs/fortran90.lang
142share/highlight/langDefs/frink.lang 143share/highlight/langDefs/frink.lang
143share/highlight/langDefs/fsharp.lang 144share/highlight/langDefs/fsharp.lang
144share/highlight/langDefs/fstab.lang 145share/highlight/langDefs/fstab.lang
145share/highlight/langDefs/fx.lang 146share/highlight/langDefs/fx.lang
146share/highlight/langDefs/gambas.lang 147share/highlight/langDefs/gambas.lang
147share/highlight/langDefs/gdb.lang 148share/highlight/langDefs/gdb.lang
148share/highlight/langDefs/gdscript.lang 149share/highlight/langDefs/gdscript.lang
149share/highlight/langDefs/go.lang 150share/highlight/langDefs/go.lang
150share/highlight/langDefs/graphviz.lang 151share/highlight/langDefs/graphviz.lang
151share/highlight/langDefs/haskell.lang 152share/highlight/langDefs/haskell.lang
152share/highlight/langDefs/haxe.lang 153share/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
166share/highlight/langDefs/jasmin.lang 167share/highlight/langDefs/jasmin.lang
167share/highlight/langDefs/java.lang 168share/highlight/langDefs/java.lang
168share/highlight/langDefs/js.lang 169share/highlight/langDefs/js.lang
169share/highlight/langDefs/js_regex.lang 170share/highlight/langDefs/js_regex.lang
170share/highlight/langDefs/json.lang 171share/highlight/langDefs/json.lang
171share/highlight/langDefs/jsp.lang 172share/highlight/langDefs/jsp.lang
172share/highlight/langDefs/jsx.lang 173share/highlight/langDefs/jsx.lang
173share/highlight/langDefs/julia.lang 174share/highlight/langDefs/julia.lang
174share/highlight/langDefs/kotlin.lang 175share/highlight/langDefs/kotlin.lang
175share/highlight/langDefs/ldif.lang 176share/highlight/langDefs/ldif.lang
176share/highlight/langDefs/less.lang 177share/highlight/langDefs/less.lang
177share/highlight/langDefs/lhs.lang 178share/highlight/langDefs/lhs.lang
178share/highlight/langDefs/lilypond.lang 179share/highlight/langDefs/lilypond.lang
179share/highlight/langDefs/limbo.lang 180share/highlight/langDefs/limbo.lang
180share/highlight/langDefs/lindenscript.lang 181share/highlight/langDefs/lindenscript.lang
181share/highlight/langDefs/lisp.lang 182share/highlight/langDefs/lisp.lang
182share/highlight/langDefs/logtalk.lang 183share/highlight/langDefs/logtalk.lang
183share/highlight/langDefs/lotos.lang 184share/highlight/langDefs/lotos.lang
184share/highlight/langDefs/lotus.lang 185share/highlight/langDefs/lotus.lang
185share/highlight/langDefs/lua.lang 186share/highlight/langDefs/lua.lang
186share/highlight/langDefs/luban.lang 187share/highlight/langDefs/luban.lang
187share/highlight/langDefs/make.lang 188share/highlight/langDefs/make.lang
188share/highlight/langDefs/maple.lang 189share/highlight/langDefs/maple.lang
189share/highlight/langDefs/markdown.lang 190share/highlight/langDefs/markdown.lang
190share/highlight/langDefs/matlab.lang 191share/highlight/langDefs/matlab.lang
191share/highlight/langDefs/maya.lang 192share/highlight/langDefs/maya.lang
192share/highlight/langDefs/mercury.lang 193share/highlight/langDefs/mercury.lang
193share/highlight/langDefs/meson.lang 194share/highlight/langDefs/meson.lang
194share/highlight/langDefs/miranda.lang 195share/highlight/langDefs/miranda.lang
195share/highlight/langDefs/mod2.lang 196share/highlight/langDefs/mod2.lang
196share/highlight/langDefs/mod3.lang 197share/highlight/langDefs/mod3.lang
197share/highlight/langDefs/modelica.lang 198share/highlight/langDefs/modelica.lang
198share/highlight/langDefs/moon.lang 199share/highlight/langDefs/moon.lang
199share/highlight/langDefs/ms.lang 200share/highlight/langDefs/ms.lang
200share/highlight/langDefs/msl.lang 201share/highlight/langDefs/msl.lang
201share/highlight/langDefs/mssql.lang 202share/highlight/langDefs/mssql.lang
202share/highlight/langDefs/mxml.lang 203share/highlight/langDefs/mxml.lang
203share/highlight/langDefs/n3.lang 204share/highlight/langDefs/n3.lang
204share/highlight/langDefs/nasal.lang 205share/highlight/langDefs/nasal.lang
205share/highlight/langDefs/nbc.lang 206share/highlight/langDefs/nbc.lang
206share/highlight/langDefs/nemerle.lang 207share/highlight/langDefs/nemerle.lang
207share/highlight/langDefs/netrexx.lang 208share/highlight/langDefs/netrexx.lang
208share/highlight/langDefs/nginx.lang 209share/highlight/langDefs/nginx.lang
209share/highlight/langDefs/nice.lang 210share/highlight/langDefs/nice.lang
210share/highlight/langDefs/nim.lang 211share/highlight/langDefs/nim.lang
211share/highlight/langDefs/nsis.lang 212share/highlight/langDefs/nsis.lang
212share/highlight/langDefs/nxc.lang 213share/highlight/langDefs/nxc.lang
213share/highlight/langDefs/oberon.lang 214share/highlight/langDefs/oberon.lang
214share/highlight/langDefs/objc.lang 215share/highlight/langDefs/objc.lang
215share/highlight/langDefs/ocaml.lang 216share/highlight/langDefs/ocaml.lang
216share/highlight/langDefs/octave.lang 217share/highlight/langDefs/octave.lang
217share/highlight/langDefs/oorexx.lang 218share/highlight/langDefs/oorexx.lang
218share/highlight/langDefs/os.lang 219share/highlight/langDefs/os.lang
219share/highlight/langDefs/oz.lang 220share/highlight/langDefs/oz.lang
220share/highlight/langDefs/paradox.lang 221share/highlight/langDefs/paradox.lang
221share/highlight/langDefs/pas.lang 222share/highlight/langDefs/pas.lang
222share/highlight/langDefs/pdf.lang 223share/highlight/langDefs/pdf.lang
223share/highlight/langDefs/perl.lang 224share/highlight/langDefs/perl.lang
224share/highlight/langDefs/php.lang 225share/highlight/langDefs/php.lang
225share/highlight/langDefs/pike.lang 226share/highlight/langDefs/pike.lang
226share/highlight/langDefs/pl1.lang 227share/highlight/langDefs/pl1.lang
227share/highlight/langDefs/plperl.lang 228share/highlight/langDefs/plperl.lang
228share/highlight/langDefs/plpython.lang 229share/highlight/langDefs/plpython.lang
229share/highlight/langDefs/pltcl.lang 230share/highlight/langDefs/pltcl.lang
230share/highlight/langDefs/po.lang 231share/highlight/langDefs/po.lang
231share/highlight/langDefs/polygen.lang 232share/highlight/langDefs/polygen.lang
232share/highlight/langDefs/pony.lang 233share/highlight/langDefs/pony.lang
233share/highlight/langDefs/pov.lang 234share/highlight/langDefs/pov.lang
234share/highlight/langDefs/pro.lang 235share/highlight/langDefs/pro.lang
235share/highlight/langDefs/progress.lang 236share/highlight/langDefs/progress.lang
236share/highlight/langDefs/ps.lang 237share/highlight/langDefs/ps.lang
237share/highlight/langDefs/ps1.lang 238share/highlight/langDefs/ps1.lang
238share/highlight/langDefs/psl.lang 239share/highlight/langDefs/psl.lang
239share/highlight/langDefs/pure.lang 240share/highlight/langDefs/pure.lang
240share/highlight/langDefs/purebasic.lang 241share/highlight/langDefs/purebasic.lang
241share/highlight/langDefs/pyrex.lang 242share/highlight/langDefs/pyrex.lang
242share/highlight/langDefs/python.lang 243share/highlight/langDefs/python.lang
243share/highlight/langDefs/q.lang 244share/highlight/langDefs/q.lang
244share/highlight/langDefs/qmake.lang 245share/highlight/langDefs/qmake.lang
245share/highlight/langDefs/qml.lang 246share/highlight/langDefs/qml.lang
246share/highlight/langDefs/qu.lang 247share/highlight/langDefs/qu.lang
247share/highlight/langDefs/r.lang 248share/highlight/langDefs/r.lang
248share/highlight/langDefs/rebol.lang 249share/highlight/langDefs/rebol.lang
249share/highlight/langDefs/rexx.lang 250share/highlight/langDefs/rexx.lang
250share/highlight/langDefs/rnc.lang 251share/highlight/langDefs/rnc.lang
251share/highlight/langDefs/rpg.lang 252share/highlight/langDefs/rpg.lang
252share/highlight/langDefs/rpl.lang 253share/highlight/langDefs/rpl.lang
253share/highlight/langDefs/rs.lang 254share/highlight/langDefs/rs.lang
254share/highlight/langDefs/ruby.lang 255share/highlight/langDefs/ruby.lang
255share/highlight/langDefs/s.lang 256share/highlight/langDefs/s.lang
256share/highlight/langDefs/sas.lang 257share/highlight/langDefs/sas.lang
257share/highlight/langDefs/scad.lang 258share/highlight/langDefs/scad.lang
258share/highlight/langDefs/scala.lang 259share/highlight/langDefs/scala.lang
259share/highlight/langDefs/scilab.lang 260share/highlight/langDefs/scilab.lang
260share/highlight/langDefs/scss.lang 261share/highlight/langDefs/scss.lang
261share/highlight/langDefs/sh.lang 262share/highlight/langDefs/sh.lang
262share/highlight/langDefs/slim.lang 263share/highlight/langDefs/slim.lang
263share/highlight/langDefs/small.lang 264share/highlight/langDefs/small.lang
264share/highlight/langDefs/smalltalk.lang 265share/highlight/langDefs/smalltalk.lang
265share/highlight/langDefs/sml.lang 266share/highlight/langDefs/sml.lang
266share/highlight/langDefs/snmp.lang 267share/highlight/langDefs/snmp.lang
267share/highlight/langDefs/snobol.lang 268share/highlight/langDefs/snobol.lang
268share/highlight/langDefs/solidity.lang 269share/highlight/langDefs/solidity.lang
269share/highlight/langDefs/spec.lang 270share/highlight/langDefs/spec.lang
270share/highlight/langDefs/spn.lang 271share/highlight/langDefs/spn.lang
271share/highlight/langDefs/sql.lang 272share/highlight/langDefs/sql.lang
272share/highlight/langDefs/squirrel.lang 273share/highlight/langDefs/squirrel.lang
273share/highlight/langDefs/styl.lang 274share/highlight/langDefs/styl.lang
274share/highlight/langDefs/svg.lang 275share/highlight/langDefs/svg.lang
275share/highlight/langDefs/swift.lang 276share/highlight/langDefs/swift.lang
276share/highlight/langDefs/sybase.lang 277share/highlight/langDefs/sybase.lang
277share/highlight/langDefs/tcl.lang 278share/highlight/langDefs/tcl.lang
278share/highlight/langDefs/tcsh.lang 279share/highlight/langDefs/tcsh.lang
279share/highlight/langDefs/terraform.lang 280share/highlight/langDefs/terraform.lang
280share/highlight/langDefs/tex.lang 281share/highlight/langDefs/tex.lang
281share/highlight/langDefs/toml.lang 282share/highlight/langDefs/toml.lang
282share/highlight/langDefs/ts.lang 283share/highlight/langDefs/ts.lang
283share/highlight/langDefs/tsql.lang 284share/highlight/langDefs/tsql.lang
284share/highlight/langDefs/tsx.lang 285share/highlight/langDefs/tsx.lang
285share/highlight/langDefs/ttcn3.lang 286share/highlight/langDefs/ttcn3.lang
286share/highlight/langDefs/txt.lang 287share/highlight/langDefs/txt.lang
287share/highlight/langDefs/upc.lang 288share/highlight/langDefs/upc.lang
288share/highlight/langDefs/vala.lang 289share/highlight/langDefs/vala.lang
289share/highlight/langDefs/vb.lang 290share/highlight/langDefs/vb.lang
290share/highlight/langDefs/verilog.lang 291share/highlight/langDefs/verilog.lang
291share/highlight/langDefs/vhd.lang 292share/highlight/langDefs/vhd.lang
292share/highlight/langDefs/vimscript.lang 293share/highlight/langDefs/vimscript.lang
293share/highlight/langDefs/vue.lang 294share/highlight/langDefs/vue.lang
294share/highlight/langDefs/whiley.lang 295share/highlight/langDefs/whiley.lang
295share/highlight/langDefs/xml.lang 296share/highlight/langDefs/xml.lang
296share/highlight/langDefs/xpp.lang 297share/highlight/langDefs/xpp.lang
297share/highlight/langDefs/yaiff.lang 298share/highlight/langDefs/yaiff.lang
298share/highlight/langDefs/yaml.lang 299share/highlight/langDefs/yaml.lang
299share/highlight/langDefs/yang.lang 300share/highlight/langDefs/yang.lang
300share/highlight/langDefs/znn.lang 301share/highlight/langDefs/znn.lang
301share/highlight/plugins/asciidoc_html_add_links.lua 302share/highlight/plugins/asciidoc_html_add_links.lua
302share/highlight/plugins/bash_functions.lua 303share/highlight/plugins/bash_functions.lua
303share/highlight/plugins/bash_ref_man7_org.lua 304share/highlight/plugins/bash_ref_man7_org.lua
304share/highlight/plugins/comment_links.lua 305share/highlight/plugins/comment_links.lua
305share/highlight/plugins/cpp_qt.lua 306share/highlight/plugins/cpp_qt.lua
306share/highlight/plugins/cpp_ref_cplusplus_com.lua 307share/highlight/plugins/cpp_ref_cplusplus_com.lua
307share/highlight/plugins/cpp_ref_gtk_gnome_org.lua 308share/highlight/plugins/cpp_ref_gtk_gnome_org.lua
308share/highlight/plugins/cpp_ref_local_includes.lua 309share/highlight/plugins/cpp_ref_local_includes.lua
309share/highlight/plugins/cpp_ref_qtproject_org.lua 310share/highlight/plugins/cpp_ref_qtproject_org.lua
310share/highlight/plugins/cpp_ref_wxwidgets_org.lua 311share/highlight/plugins/cpp_ref_wxwidgets_org.lua
311share/highlight/plugins/cpp_syslog.lua 312share/highlight/plugins/cpp_syslog.lua
312share/highlight/plugins/cpp_wx.lua 313share/highlight/plugins/cpp_wx.lua
313share/highlight/plugins/ctags_html_tooltips.lua 314share/highlight/plugins/ctags_html_tooltips.lua
314share/highlight/plugins/java_library.lua 315share/highlight/plugins/java_library.lua
315share/highlight/plugins/keywords_capitalize.lua 316share/highlight/plugins/keywords_capitalize.lua
316share/highlight/plugins/keywords_lowercase.lua 317share/highlight/plugins/keywords_lowercase.lua
317share/highlight/plugins/keywords_uppercase.lua 318share/highlight/plugins/keywords_uppercase.lua
318share/highlight/plugins/latex_single_outfile.lua 319share/highlight/plugins/latex_single_outfile.lua
319share/highlight/plugins/mark_lines.lua 320share/highlight/plugins/mark_lines.lua
320share/highlight/plugins/outhtml_add_background_stripes.lua 321share/highlight/plugins/outhtml_add_background_stripes.lua
321share/highlight/plugins/outhtml_add_background_svg.lua 322share/highlight/plugins/outhtml_add_background_svg.lua
322share/highlight/plugins/outhtml_add_figure.lua 323share/highlight/plugins/outhtml_add_figure.lua
323share/highlight/plugins/outhtml_add_line.lua 324share/highlight/plugins/outhtml_add_line.lua
324share/highlight/plugins/outhtml_add_shadow.lua 325share/highlight/plugins/outhtml_add_shadow.lua
 326share/highlight/plugins/outhtml_ansi_esc.lua
325share/highlight/plugins/outhtml_codefold.lua 327share/highlight/plugins/outhtml_codefold.lua
326share/highlight/plugins/outhtml_curly_brackets_matcher.lua 328share/highlight/plugins/outhtml_curly_brackets_matcher.lua
327share/highlight/plugins/outhtml_ie7_webctrl.lua 329share/highlight/plugins/outhtml_ie7_webctrl.lua
328share/highlight/plugins/outhtml_keyword_matcher.lua 330share/highlight/plugins/outhtml_keyword_matcher.lua
329share/highlight/plugins/outhtml_ligature_fonts.lua 331share/highlight/plugins/outhtml_ligature_fonts.lua
330share/highlight/plugins/outhtml_modern_fonts.lua 332share/highlight/plugins/outhtml_modern_fonts.lua
331share/highlight/plugins/outhtml_parantheses_matcher.lua 333share/highlight/plugins/outhtml_parantheses_matcher.lua
332share/highlight/plugins/outhtml_tooltips.lua 334share/highlight/plugins/outhtml_tooltips.lua
333share/highlight/plugins/perl_ref_perl_org.lua 335share/highlight/plugins/perl_ref_perl_org.lua
334share/highlight/plugins/python_ref_python_org.lua 336share/highlight/plugins/python_ref_python_org.lua
335share/highlight/plugins/reduce_filesize.lua 337share/highlight/plugins/reduce_filesize.lua
336share/highlight/plugins/scala_ref_scala_lang_org.lua 338share/highlight/plugins/scala_ref_scala_lang_org.lua
337share/highlight/plugins/terminal_add_info.lua 339share/highlight/plugins/terminal_add_info.lua
338share/highlight/plugins/theme_invert.lua 340share/highlight/plugins/theme_invert.lua
339share/highlight/plugins/token_add_state_ids.lua 341share/highlight/plugins/token_add_state_ids.lua
340share/highlight/themes/acid.theme 342share/highlight/themes/acid.theme
341share/highlight/themes/aiseered.theme 343share/highlight/themes/aiseered.theme
342share/highlight/themes/andes.theme 344share/highlight/themes/andes.theme
343share/highlight/themes/anotherdark.theme 345share/highlight/themes/anotherdark.theme
344share/highlight/themes/autumn.theme 346share/highlight/themes/autumn.theme
345share/highlight/themes/base16/3024.theme 347share/highlight/themes/base16/3024.theme
346share/highlight/themes/base16/apathy.theme 348share/highlight/themes/base16/apathy.theme
347share/highlight/themes/base16/ashes.theme 349share/highlight/themes/base16/ashes.theme
348share/highlight/themes/base16/atelier-cave-light.theme 350share/highlight/themes/base16/atelier-cave-light.theme
349share/highlight/themes/base16/atelier-cave.theme 351share/highlight/themes/base16/atelier-cave.theme
350share/highlight/themes/base16/atelier-dune-light.theme 352share/highlight/themes/base16/atelier-dune-light.theme
351share/highlight/themes/base16/atelier-dune.theme 353share/highlight/themes/base16/atelier-dune.theme
352share/highlight/themes/base16/atelier-estuary-light.theme 354share/highlight/themes/base16/atelier-estuary-light.theme
353share/highlight/themes/base16/atelier-estuary.theme 355share/highlight/themes/base16/atelier-estuary.theme
354share/highlight/themes/base16/atelier-forest-light.theme 356share/highlight/themes/base16/atelier-forest-light.theme
355share/highlight/themes/base16/atelier-forest.theme 357share/highlight/themes/base16/atelier-forest.theme
356share/highlight/themes/base16/atelier-heath-light.theme 358share/highlight/themes/base16/atelier-heath-light.theme
357share/highlight/themes/base16/atelier-heath.theme 359share/highlight/themes/base16/atelier-heath.theme
358share/highlight/themes/base16/atelier-lakeside-light.theme 360share/highlight/themes/base16/atelier-lakeside-light.theme
359share/highlight/themes/base16/atelier-lakeside.theme 361share/highlight/themes/base16/atelier-lakeside.theme
360share/highlight/themes/base16/atelier-plateau-light.theme 362share/highlight/themes/base16/atelier-plateau-light.theme
361share/highlight/themes/base16/atelier-plateau.theme 363share/highlight/themes/base16/atelier-plateau.theme
362share/highlight/themes/base16/atelier-savanna-light.theme 364share/highlight/themes/base16/atelier-savanna-light.theme
363share/highlight/themes/base16/atelier-savanna.theme 365share/highlight/themes/base16/atelier-savanna.theme
364share/highlight/themes/base16/atelier-seaside-light.theme 366share/highlight/themes/base16/atelier-seaside-light.theme
365share/highlight/themes/base16/atelier-seaside.theme 367share/highlight/themes/base16/atelier-seaside.theme
366share/highlight/themes/base16/atelier-sulphurpool-light.theme 368share/highlight/themes/base16/atelier-sulphurpool-light.theme
367share/highlight/themes/base16/atelier-sulphurpool.theme 369share/highlight/themes/base16/atelier-sulphurpool.theme
368share/highlight/themes/base16/bespin.theme 370share/highlight/themes/base16/bespin.theme
369share/highlight/themes/base16/brewer.theme 371share/highlight/themes/base16/brewer.theme
370share/highlight/themes/base16/bright.theme 372share/highlight/themes/base16/bright.theme
371share/highlight/themes/base16/brushtrees-dark.theme 373share/highlight/themes/base16/brushtrees-dark.theme
372share/highlight/themes/base16/brushtrees.theme 374share/highlight/themes/base16/brushtrees.theme
373share/highlight/themes/base16/chalk.theme 375share/highlight/themes/base16/chalk.theme
374share/highlight/themes/base16/circus.theme 376share/highlight/themes/base16/circus.theme
375share/highlight/themes/base16/classic-dark.theme 377share/highlight/themes/base16/classic-dark.theme
376share/highlight/themes/base16/classic-light.theme 378share/highlight/themes/base16/classic-light.theme
377share/highlight/themes/base16/codeschool.theme 379share/highlight/themes/base16/codeschool.theme
378share/highlight/themes/base16/cupcake.theme 380share/highlight/themes/base16/cupcake.theme
379share/highlight/themes/base16/cupertino.theme 381share/highlight/themes/base16/cupertino.theme
380share/highlight/themes/base16/darktooth.theme 382share/highlight/themes/base16/darktooth.theme
381share/highlight/themes/base16/default-dark.theme 383share/highlight/themes/base16/default-dark.theme
382share/highlight/themes/base16/default-light.theme 384share/highlight/themes/base16/default-light.theme
383share/highlight/themes/base16/dracula.theme 385share/highlight/themes/base16/dracula.theme
384share/highlight/themes/base16/eighties.theme 386share/highlight/themes/base16/eighties.theme
385share/highlight/themes/base16/embers.theme 387share/highlight/themes/base16/embers.theme
386share/highlight/themes/base16/flat.theme 388share/highlight/themes/base16/flat.theme
387share/highlight/themes/base16/github.theme 389share/highlight/themes/base16/github.theme
388share/highlight/themes/base16/google-dark.theme 390share/highlight/themes/base16/google-dark.theme
389share/highlight/themes/base16/google-light.theme 391share/highlight/themes/base16/google-light.theme
390share/highlight/themes/base16/grayscale-dark.theme 392share/highlight/themes/base16/grayscale-dark.theme
391share/highlight/themes/base16/grayscale-light.theme 393share/highlight/themes/base16/grayscale-light.theme
392share/highlight/themes/base16/greenscreen.theme 394share/highlight/themes/base16/greenscreen.theme
393share/highlight/themes/base16/gruvbox-dark-hard.theme 395share/highlight/themes/base16/gruvbox-dark-hard.theme
394share/highlight/themes/base16/gruvbox-dark-medium.theme 396share/highlight/themes/base16/gruvbox-dark-medium.theme
395share/highlight/themes/base16/gruvbox-dark-pale.theme 397share/highlight/themes/base16/gruvbox-dark-pale.theme
396share/highlight/themes/base16/gruvbox-dark-soft.theme 398share/highlight/themes/base16/gruvbox-dark-soft.theme
397share/highlight/themes/base16/gruvbox-light-hard.theme 399share/highlight/themes/base16/gruvbox-light-hard.theme
398share/highlight/themes/base16/gruvbox-light-medium.theme 400share/highlight/themes/base16/gruvbox-light-medium.theme
399share/highlight/themes/base16/gruvbox-light-soft.theme 401share/highlight/themes/base16/gruvbox-light-soft.theme
400share/highlight/themes/base16/harmonic-dark.theme 402share/highlight/themes/base16/harmonic-dark.theme
401share/highlight/themes/base16/harmonic-light.theme 403share/highlight/themes/base16/harmonic-light.theme
402share/highlight/themes/base16/hopscotch.theme 404share/highlight/themes/base16/hopscotch.theme
403share/highlight/themes/base16/ia-dark.theme 405share/highlight/themes/base16/ia-dark.theme
404share/highlight/themes/base16/ia-light.theme 406share/highlight/themes/base16/ia-light.theme
405share/highlight/themes/base16/icy.theme 407share/highlight/themes/base16/icy.theme
406share/highlight/themes/base16/irblack.theme 408share/highlight/themes/base16/irblack.theme
407share/highlight/themes/base16/isotope.theme 409share/highlight/themes/base16/isotope.theme
408share/highlight/themes/base16/macintosh.theme 410share/highlight/themes/base16/macintosh.theme
409share/highlight/themes/base16/marrakesh.theme 411share/highlight/themes/base16/marrakesh.theme
410share/highlight/themes/base16/materia.theme 412share/highlight/themes/base16/materia.theme
411share/highlight/themes/base16/material-darker.theme 413share/highlight/themes/base16/material-darker.theme
412share/highlight/themes/base16/material-lighter.theme 414share/highlight/themes/base16/material-lighter.theme
413share/highlight/themes/base16/material-palenight.theme 415share/highlight/themes/base16/material-palenight.theme
414share/highlight/themes/base16/material-vivid.theme 416share/highlight/themes/base16/material-vivid.theme
415share/highlight/themes/base16/material.theme 417share/highlight/themes/base16/material.theme
416share/highlight/themes/base16/mellow-purple.theme 418share/highlight/themes/base16/mellow-purple.theme
417share/highlight/themes/base16/mexico-light.theme 419share/highlight/themes/base16/mexico-light.theme
418share/highlight/themes/base16/mocha.theme 420share/highlight/themes/base16/mocha.theme
419share/highlight/themes/base16/monokai.theme 421share/highlight/themes/base16/monokai.theme
420share/highlight/themes/base16/nord.theme 422share/highlight/themes/base16/nord.theme
421share/highlight/themes/base16/ocean.theme 423share/highlight/themes/base16/ocean.theme
422share/highlight/themes/base16/oceanicnext.theme 424share/highlight/themes/base16/oceanicnext.theme
423share/highlight/themes/base16/one-light.theme 425share/highlight/themes/base16/one-light.theme
424share/highlight/themes/base16/onedark.theme 426share/highlight/themes/base16/onedark.theme
425share/highlight/themes/base16/outrun-dark.theme 427share/highlight/themes/base16/outrun-dark.theme
426share/highlight/themes/base16/paraiso.theme 428share/highlight/themes/base16/paraiso.theme
427share/highlight/themes/base16/phd.theme 429share/highlight/themes/base16/phd.theme
428share/highlight/themes/base16/pico.theme 430share/highlight/themes/base16/pico.theme
429share/highlight/themes/base16/pop.theme 431share/highlight/themes/base16/pop.theme
430share/highlight/themes/base16/porple.theme 432share/highlight/themes/base16/porple.theme
431share/highlight/themes/base16/railscasts.theme 433share/highlight/themes/base16/railscasts.theme
432share/highlight/themes/base16/rebecca.theme 434share/highlight/themes/base16/rebecca.theme
433share/highlight/themes/base16/seti.theme 435share/highlight/themes/base16/seti.theme
434share/highlight/themes/base16/shapeshifter.theme 436share/highlight/themes/base16/shapeshifter.theme
435share/highlight/themes/base16/snazzy.theme 437share/highlight/themes/base16/snazzy.theme
436share/highlight/themes/base16/solarflare.theme 438share/highlight/themes/base16/solarflare.theme
437share/highlight/themes/base16/solarized-dark.theme 439share/highlight/themes/base16/solarized-dark.theme
438share/highlight/themes/base16/solarized-light.theme 440share/highlight/themes/base16/solarized-light.theme
439share/highlight/themes/base16/spacemacs.theme 441share/highlight/themes/base16/spacemacs.theme
440share/highlight/themes/base16/summerfruit-dark.theme 442share/highlight/themes/base16/summerfruit-dark.theme
441share/highlight/themes/base16/summerfruit-light.theme 443share/highlight/themes/base16/summerfruit-light.theme
442share/highlight/themes/base16/tomorrow-night.theme 444share/highlight/themes/base16/tomorrow-night.theme
443share/highlight/themes/base16/tomorrow.theme 445share/highlight/themes/base16/tomorrow.theme
444share/highlight/themes/base16/tube.theme 446share/highlight/themes/base16/tube.theme
445share/highlight/themes/base16/twilight.theme 447share/highlight/themes/base16/twilight.theme
446share/highlight/themes/base16/unikitty-dark.theme 448share/highlight/themes/base16/unikitty-dark.theme
447share/highlight/themes/base16/unikitty-light.theme 449share/highlight/themes/base16/unikitty-light.theme
448share/highlight/themes/base16/unikitty-reversible.theme 450share/highlight/themes/base16/unikitty-reversible.theme
449share/highlight/themes/base16/woodland.theme 451share/highlight/themes/base16/woodland.theme
450share/highlight/themes/base16/xcode-dusk.theme 452share/highlight/themes/base16/xcode-dusk.theme
451share/highlight/themes/base16/zenburn.theme 453share/highlight/themes/base16/zenburn.theme
452share/highlight/themes/baycomb.theme 454share/highlight/themes/baycomb.theme
453share/highlight/themes/bclear.theme 455share/highlight/themes/bclear.theme
454share/highlight/themes/biogoo.theme 456share/highlight/themes/biogoo.theme
455share/highlight/themes/bipolar.theme 457share/highlight/themes/bipolar.theme
456share/highlight/themes/blacknblue.theme 458share/highlight/themes/blacknblue.theme
457share/highlight/themes/bluegreen.theme 459share/highlight/themes/bluegreen.theme
458share/highlight/themes/breeze.theme 460share/highlight/themes/breeze.theme
459share/highlight/themes/bright.theme 461share/highlight/themes/bright.theme
460share/highlight/themes/camo.theme 462share/highlight/themes/camo.theme
461share/highlight/themes/candy.theme 463share/highlight/themes/candy.theme
462share/highlight/themes/clarity.theme 464share/highlight/themes/clarity.theme
463share/highlight/themes/dante.theme 465share/highlight/themes/dante.theme
464share/highlight/themes/darkblue.theme 466share/highlight/themes/darkblue.theme
465share/highlight/themes/darkbone.theme 467share/highlight/themes/darkbone.theme
466share/highlight/themes/darkness.theme 468share/highlight/themes/darkness.theme
467share/highlight/themes/darkplus.theme 469share/highlight/themes/darkplus.theme
468share/highlight/themes/darkslategray.theme 470share/highlight/themes/darkslategray.theme
469share/highlight/themes/darkspectrum.theme 471share/highlight/themes/darkspectrum.theme
470share/highlight/themes/denim.theme 472share/highlight/themes/denim.theme
471share/highlight/themes/duotone-dark-earth.theme 473share/highlight/themes/duotone-dark-earth.theme
472share/highlight/themes/duotone-dark-forest.theme 474share/highlight/themes/duotone-dark-forest.theme
473share/highlight/themes/duotone-dark-sea.theme 475share/highlight/themes/duotone-dark-sea.theme
474share/highlight/themes/duotone-dark-sky.theme 476share/highlight/themes/duotone-dark-sky.theme
475share/highlight/themes/duotone-dark-space.theme 477share/highlight/themes/duotone-dark-space.theme
476share/highlight/themes/dusk.theme 478share/highlight/themes/dusk.theme
477share/highlight/themes/earendel.theme 479share/highlight/themes/earendel.theme
478share/highlight/themes/easter.theme 480share/highlight/themes/easter.theme
479share/highlight/themes/edit-anjuta.theme 481share/highlight/themes/edit-anjuta.theme
480share/highlight/themes/edit-bbedit.theme 482share/highlight/themes/edit-bbedit.theme
481share/highlight/themes/edit-eclipse.theme 483share/highlight/themes/edit-eclipse.theme
482share/highlight/themes/edit-emacs.theme 484share/highlight/themes/edit-emacs.theme
483share/highlight/themes/edit-fasm.theme 485share/highlight/themes/edit-fasm.theme
484share/highlight/themes/edit-flashdevelop.theme 486share/highlight/themes/edit-flashdevelop.theme
485share/highlight/themes/edit-gedit.theme 487share/highlight/themes/edit-gedit.theme
486share/highlight/themes/edit-godot.theme 488share/highlight/themes/edit-godot.theme
487share/highlight/themes/edit-jedit.theme 489share/highlight/themes/edit-jedit.theme
488share/highlight/themes/edit-kwrite.theme 490share/highlight/themes/edit-kwrite.theme
489share/highlight/themes/edit-matlab.theme 491share/highlight/themes/edit-matlab.theme
490share/highlight/themes/edit-msvs2008.theme 492share/highlight/themes/edit-msvs2008.theme
491share/highlight/themes/edit-nedit.theme 493share/highlight/themes/edit-nedit.theme
492share/highlight/themes/edit-purebasic.theme 494share/highlight/themes/edit-purebasic.theme
493share/highlight/themes/edit-vim-dark.theme 495share/highlight/themes/edit-vim-dark.theme
494share/highlight/themes/edit-vim.theme 496share/highlight/themes/edit-vim.theme
495share/highlight/themes/edit-xcode.theme 497share/highlight/themes/edit-xcode.theme
496share/highlight/themes/ekvoli.theme 498share/highlight/themes/ekvoli.theme
497share/highlight/themes/fine_blue.theme 499share/highlight/themes/fine_blue.theme
498share/highlight/themes/freya.theme 500share/highlight/themes/freya.theme
499share/highlight/themes/fruit.theme 501share/highlight/themes/fruit.theme
500share/highlight/themes/github.theme 502share/highlight/themes/github.theme
501share/highlight/themes/golden.theme 503share/highlight/themes/golden.theme
502share/highlight/themes/greenlcd.theme 504share/highlight/themes/greenlcd.theme
503share/highlight/themes/kellys.theme 505share/highlight/themes/kellys.theme
504share/highlight/themes/leo.theme 506share/highlight/themes/leo.theme
505share/highlight/themes/lucretia.theme 507share/highlight/themes/lucretia.theme
506share/highlight/themes/manxome.theme 508share/highlight/themes/manxome.theme
507share/highlight/themes/maroloccio.theme 509share/highlight/themes/maroloccio.theme
508share/highlight/themes/matrix.theme 510share/highlight/themes/matrix.theme
509share/highlight/themes/moe.theme 511share/highlight/themes/moe.theme
510share/highlight/themes/molokai.theme 512share/highlight/themes/molokai.theme
511share/highlight/themes/moria.theme 513share/highlight/themes/moria.theme
512share/highlight/themes/navajo-night.theme 514share/highlight/themes/navajo-night.theme
513share/highlight/themes/navy.theme 515share/highlight/themes/navy.theme
514share/highlight/themes/neon.theme 516share/highlight/themes/neon.theme
515share/highlight/themes/night.theme 517share/highlight/themes/night.theme
516share/highlight/themes/nightshimmer.theme 518share/highlight/themes/nightshimmer.theme
517share/highlight/themes/nuvola.theme 519share/highlight/themes/nuvola.theme
518share/highlight/themes/olive.theme 520share/highlight/themes/olive.theme
519share/highlight/themes/orion.theme 521share/highlight/themes/orion.theme
520share/highlight/themes/oxygenated.theme 522share/highlight/themes/oxygenated.theme
521share/highlight/themes/pablo.theme 523share/highlight/themes/pablo.theme
522share/highlight/themes/peaksea.theme 524share/highlight/themes/peaksea.theme
523share/highlight/themes/print.theme 525share/highlight/themes/print.theme
524share/highlight/themes/rand01.theme 526share/highlight/themes/rand01.theme
525share/highlight/themes/rdark.theme 527share/highlight/themes/rdark.theme
526share/highlight/themes/relaxedgreen.theme 528share/highlight/themes/relaxedgreen.theme
527share/highlight/themes/rootwater.theme 529share/highlight/themes/rootwater.theme
528share/highlight/themes/seashell.theme 530share/highlight/themes/seashell.theme
529share/highlight/themes/solarized-dark.theme 531share/highlight/themes/solarized-dark.theme
530share/highlight/themes/solarized-light.theme 532share/highlight/themes/solarized-light.theme
531share/highlight/themes/sourceforge.theme 533share/highlight/themes/sourceforge.theme
532share/highlight/themes/tabula.theme 534share/highlight/themes/tabula.theme
533share/highlight/themes/tcsoft.theme 535share/highlight/themes/tcsoft.theme
534share/highlight/themes/the.theme 536share/highlight/themes/the.theme
535share/highlight/themes/vampire.theme 537share/highlight/themes/vampire.theme
536share/highlight/themes/whitengrey.theme 538share/highlight/themes/whitengrey.theme
537share/highlight/themes/xoria256.theme 539share/highlight/themes/xoria256.theme
538share/highlight/themes/zellner.theme 540share/highlight/themes/zellner.theme
539share/highlight/themes/zenburn.theme 541share/highlight/themes/zenburn.theme
540share/highlight/themes/zmrok.theme 542share/highlight/themes/zmrok.theme

cvs diff -r1.13 -r1.14 pkgsrc/textproc/libhighlight/distinfo (switch to unified diff)

--- pkgsrc/textproc/libhighlight/distinfo 2019/08/28 14:38:42 1.13
+++ pkgsrc/textproc/libhighlight/distinfo 2019/12/18 01:34:33 1.14
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.13 2019/08/28 14:38:42 schmonz Exp $ 1$NetBSD: distinfo,v 1.14 2019/12/18 01:34:33 schmonz Exp $
2 2
3SHA1 (highlight-3.53.tar.bz2) = bef7dac08125cfaa0b1f201b68163e90c261d433 3SHA1 (highlight-3.54.tar.bz2) = 1f061baf166ca1f3b9019b173f008956b49f69b8
4RMD160 (highlight-3.53.tar.bz2) = 7eeb4e122be2a1f808936cfb1f32cb1b65cd2418 4RMD160 (highlight-3.54.tar.bz2) = 74bd87ef8e4898dc1cc9f9a37e068d323f22b2ec
5SHA512 (highlight-3.53.tar.bz2) = b25340aa881e5188fb9862d4858fab17627a80329835723a75de95bbf523f2453f42fa4e6ed842345b5e2842d66a40f16b03c19fbbbea4a226e247a93130a5e3 5SHA512 (highlight-3.54.tar.bz2) = c5a0982e9cd5c48d1ffa3ce2286020c1285eacf32928b08e3718582f4d131b05726920156c4357e595403474d4c389fc70e2aff789e17962963b9d8d23ac6488
6Size (highlight-3.53.tar.bz2) = 1408173 bytes 6Size (highlight-3.54.tar.bz2) = 1407167 bytes
7SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f 7SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
8SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063 8SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063
9SHA1 (patch-src_core_platform__fs.cpp) = 94e4b2aef89e48e104be57acf6dd9ce4b5917e21 9SHA1 (patch-src_core_platform__fs.cpp) = 94e4b2aef89e48e104be57acf6dd9ce4b5917e21
10SHA1 (patch-src_gui-qt_mainwindow.cpp) = 977c34f85929bcd2a008d91dac812e44e63afb62 10SHA1 (patch-src_gui-qt_mainwindow.cpp) = 977c34f85929bcd2a008d91dac812e44e63afb62
11SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8 11SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
12SHA1 (patch-src_makefile) = e7c4d0e8e79101ef0bb94556619b6e2a3283005b 12SHA1 (patch-src_makefile) = 6cf3dd2dfed3a150f78b61a992be6f036837cae8

cvs diff -r1.2 -r1.3 pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile (switch to unified diff)

--- pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile 2018/05/27 11:50:26 1.2
+++ pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile 2019/12/18 01:34:34 1.3
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1$NetBSD: patch-extras_swig_makefile,v 1.2 2018/05/27 11:50:26 schmonz Exp $ 1$NetBSD: patch-extras_swig_makefile,v 1.3 2019/12/18 01:34:34 schmonz Exp $
2 2
3Use pkgsrc-specified compiler and flags. 3Use pkgsrc-specified compiler and flags.
4 4
5--- extras/swig/makefile.orig 2018-04-30 12:17:04.000000000 +0000 5--- extras/swig/makefile.orig 2019-11-11 16:57:10.000000000 +0000
6+++ extras/swig/makefile 6+++ extras/swig/makefile
7@@ -1,6 +1,6 @@ 7@@ -1,6 +1,6 @@
8  8
9-CXX=g++ 9-CXX=g++
10-CFLAGS=-g -O2 -fPIC 10-CFLAGS=-g -O2 -fPIC
11+#CXX=g++ 11+#CXX=g++
12+#CFLAGS=-g -O2 -fPIC 12+#CFLAGS=-g -O2 -fPIC
13  13
14 HL_INC=../../src/include/ 14 HL_INC=../../src/include/
15 HL_SRC=../../src/ 15 HL_SRC=../../src/
16@@ -12,24 +12,24 @@ PERL_INC=$(shell perl -MExtUtils::Embed  16@@ -12,24 +12,24 @@ PERL_INC=$(shell perl -MExtUtils::Embed
17 PHP_INC=$(shell php-config --includes) 17 PHP_INC=$(shell php-config --includes)
18  18
19 lib-stamp: 19 lib-stamp:
20- make -C ${HL_SRC} -f ./makefile clean 20- make -C ../.. -f ./makefile clean-obj
21- PIC=1 make -C ${HL_SRC} -f ./makefile CFLAGS="${CFLAGS}" libhighlight.a 21- PIC=1 make -C ../.. -f ./makefile CFLAGS="${CFLAGS}" lib-static
22+ #make -C ${HL_SRC} -f ./makefile clean 22+ #make -C ../.. -f ./makefile clean-obj
23+ #PIC=1 make -C ${HL_SRC} -f ./makefile CFLAGS="${CFLAGS}" libhighlight.a 23+ #PIC=1 make -C ../.. -f ./makefile CFLAGS="${CFLAGS}" lib-static
24 touch $@ 24 touch $@
25  25
26 python: lib-stamp 26 python: lib-stamp
27- swig -c++ -python -o highlight_wrap.cpp highlight.i 27- swig -c++ -python -o highlight_wrap.cpp highlight.i
28- ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC}  28- ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC}
29- ${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so 29- ${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
30+ swig3.0 -c++ -python -o highlight_wrap.cpp highlight.i 30+ swig3.0 -c++ -python -o highlight_wrap.cpp highlight.i
31+ ${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC}  31+ ${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC}
32+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so 32+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
33  33
34 perl: lib-stamp 34 perl: lib-stamp
35- swig -c++ -perl -o highlight_wrap.cpp highlight.i 35- swig -c++ -perl -o highlight_wrap.cpp highlight.i
36- ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}  36- ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}
37- ${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so 37- ${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
38+ swig3.0 -c++ -perl -o highlight_wrap.cpp highlight.i 38+ swig3.0 -c++ -perl -o highlight_wrap.cpp highlight.i
39+ ${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}  39+ ${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC}
40+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lperl -o highlight.so 40+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lperl -o highlight.so
41  41
42 php: lib-stamp 42 php: lib-stamp
43- swig -c++ -php -o highlight_wrap.cpp highlight.i 43- swig -c++ -php -o highlight_wrap.cpp highlight.i
44- ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC} 44- ${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC}
45- ${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so 45- ${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
46+ swig3.0 -c++ -php -o highlight_wrap.cpp highlight.i 46+ swig3.0 -c++ -php -o highlight_wrap.cpp highlight.i
47+ ${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC} 47+ ${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC}
48+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so 48+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -lphp -o highlight.so
49  49
50 clean: python-clean perl-clean php-clean 50 clean: python-clean perl-clean php-clean
51 rm -f *-stamp 51 rm -f *-stamp

cvs diff -r1.7 -r1.8 pkgsrc/textproc/libhighlight/patches/patch-src_makefile (switch to unified diff)

--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile 2019/08/13 01:48:49 1.7
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile 2019/12/18 01:34:34 1.8
@@ -1,105 +1,105 @@ @@ -1,105 +1,105 @@
1$NetBSD: patch-src_makefile,v 1.7 2019/08/13 01:48:49 schmonz Exp $ 1$NetBSD: patch-src_makefile,v 1.8 2019/12/18 01:34:34 schmonz Exp $
2 2
3Use pkgsrc-specified compiler and flags. 3Use pkgsrc-specified compiler and flags.
4 4
5--- src/makefile.orig 2019-07-31 21:48:56.000000000 +0000 5--- src/makefile.orig 2019-11-11 16:57:10.000000000 +0000
6+++ src/makefile 6+++ src/makefile
7@@ -8,18 +8,18 @@ 7@@ -8,18 +8,18 @@
8 # See ../makefile for the definition of ${data_dir} 8 # See ../makefile for the definition of ${data_dir}
9  9
10 # Add -DHL_CONFIG_DIR=\"/your/path/\" to define the configuration directory 10 # Add -DHL_CONFIG_DIR=\"/your/path/\" to define the configuration directory
11-# (default: /etc/highlight) 11-# (default: /etc/highlight)
12+# (default: /etc/pkg/highlight) 12+# (default: /etc/pkg/highlight)
13  13
14 # 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
15  15
16 #CXX=clang++ 16 #CXX=clang++
17-CXX=g++ 17-CXX=g++
18+#CXX=g++ 18+#CXX=g++
19  19
20 # was: qmake-qt5 20 # was: qmake-qt5
21 QMAKE=qmake 21 QMAKE=qmake
22  22
23 # 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
24-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64 24-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
25+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64 25+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
26  26
27 #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 27 #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
28  28
29@@ -57,27 +57,30 @@ REGEX_DIR=${CORE_DIR}re/ 29@@ -57,27 +57,30 @@ REGEX_DIR=${CORE_DIR}re/
30 DILU_DIR=${CORE_DIR}Diluculum/ 30 DILU_DIR=${CORE_DIR}Diluculum/
31  31
32 ifndef HL_CONFIG_DIR 32 ifndef HL_CONFIG_DIR
33- HL_CONFIG_DIR = /etc/highlight/ 33- HL_CONFIG_DIR = /etc/highlight/
34+ HL_CONFIG_DIR = /etc/pkg/highlight/ 34+ HL_CONFIG_DIR = /etc/pkg/highlight/
35 endif 35 endif
36 ifndef HL_DATA_DIR 36 ifndef HL_DATA_DIR
37- HL_DATA_DIR = /usr/share/highlight/ 37- HL_DATA_DIR = /usr/share/highlight/
38+ HL_DATA_DIR = /opt/.pkg-20151023/share/highlight/ 38+ HL_DATA_DIR = /opt/.pkg-20151023/share/highlight/
39 endif 39 endif
40 ifndef HL_DOC_DIR 40 ifndef HL_DOC_DIR
41- HL_DOC_DIR = /usr/share/doc/highlight/ 41- HL_DOC_DIR = /usr/share/doc/highlight/
42+ HL_DOC_DIR = /opt/.pkg-20151023/share/doc/highlight/ 42+ HL_DOC_DIR = /opt/.pkg-20151023/share/doc/highlight/
43 endif 43 endif
44  44
45 ifdef PIC 45 ifdef PIC
46 CFLAGS+=-fPIC 46 CFLAGS+=-fPIC
47 endif 47 endif
48  48
49-LDFLAGS = -ldl 49-LDFLAGS = -ldl
50+#LDFLAGS = -ldl 50+#LDFLAGS = -ldl
51 # Do not strip by default (Mac OS X lazy pointer issues) 51 # Do not strip by default (Mac OS X lazy pointer issues)
52 # 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
53 # is run as service) 53 # is run as service)
54 #LDFLAGS = ${LDFLAGS} -s 54 #LDFLAGS = ${LDFLAGS} -s
55 #LDFLAGS= -Wl,--as-needed 55 #LDFLAGS= -Wl,--as-needed
56  56
57-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS} 57-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
58+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 }')
59+LIBTOOL=libtool --tag=CXX 59+LIBTOOL=libtool --tag=CXX
60+ 60+
61+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
62  62
63 # Data directories (data dir, configuration file dir) 63 # Data directories (data dir, configuration file dir)
64 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}\"
65@@ -105,18 +108,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI 65@@ -105,18 +108,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
66 ${GUI_QT_DIR}showtextfile.cpp 66 ${GUI_QT_DIR}showtextfile.cpp
67  67
68  68
69-cli: libhighlight.a ${CLI_OBJECTS} 69-cli: libhighlight.a ${CLI_OBJECTS}
70- ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS} 70- ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS}
71+cli: ${CLI_OBJECTS} 71+cli: ${CLI_OBJECTS}
72+ ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -lhighlight ${LUA_LIBS} 72+ ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -lhighlight ${LUA_LIBS}
73  73
74 lib-static libhighlight.a: ${CORE_OBJECTS} 74 lib-static libhighlight.a: ${CORE_OBJECTS}
75 ${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS} 75 ${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS}
76  76
77 lib-shared libhighlight.so.1.0: ${CORE_OBJECTS} 77 lib-shared libhighlight.so.1.0: ${CORE_OBJECTS}
78- ${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}
79+ ${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
80  80
81 gui-qt: highlight-gui 81 gui-qt: highlight-gui
82  82
83-highlight-gui: libhighlight.a ${GUI_OBJECTS} 83-highlight-gui: libhighlight.a ${GUI_OBJECTS}
84+highlight-gui: ${GUI_OBJECTS} 84+highlight-gui: ${GUI_OBJECTS}
85 cd gui-qt && \ 85 cd gui-qt && \
86 ${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}\\\" ' && \
87 $(MAKE) 87 $(MAKE)
88@@ -125,7 +128,7 @@ $(OBJECTFILES) : makefile 88@@ -125,7 +128,7 @@ $(OBJECTFILES) : makefile
89  89
90  90
91 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
92- ${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR} 92- ${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR}
93+ ${CXX_COMPILE} ${CORE_DIR}datadir.cpp 93+ ${CXX_COMPILE} ${CORE_DIR}datadir.cpp
94  94
95 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
96 ${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp 96 ${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp
97@@ -206,7 +209,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai 97@@ -206,7 +209,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
98 ${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 \
99 ${INCLUDE_DIR}stylecolour.h ${INCLUDE_DIR}preformatter.h \ 99 ${INCLUDE_DIR}stylecolour.h ${INCLUDE_DIR}preformatter.h \
100 ${CLI_DIR}help.h ${INCLUDE_DIR}version.h 100 ${CLI_DIR}help.h ${INCLUDE_DIR}version.h
101- ${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR} 101- ${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR}
102+ ${CXX_COMPILE} ${CLI_DIR}main.cpp 102+ ${CXX_COMPILE} ${CLI_DIR}main.cpp
103  103
104  104
105 #3rd party libs 105 #3rd party libs