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 (expand / 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 (expand / 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,20 +1,20 @@ @@ -1,20 +1,20 @@
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
cvs diff -r1.10 -r1.11 pkgsrc/textproc/libhighlight/PLIST (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -75,26 +75,27 @@ share/highlight/langDefs/applescript.lan @@ -75,26 +75,27 @@ share/highlight/langDefs/applescript.lan
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
@@ -312,26 +313,27 @@ share/highlight/plugins/cpp_syslog.lua @@ -312,26 +313,27 @@ share/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
cvs diff -r1.13 -r1.14 pkgsrc/textproc/libhighlight/distinfo (expand / 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 (expand / 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 (expand / 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,18 +1,18 @@ @@ -1,18 +1,18 @@
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++
@@ -85,21 +85,21 @@ Use pkgsrc-specified compiler and flags. @@ -85,21 +85,21 @@ Use pkgsrc-specified compiler and flags.
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