head 1.10; access; symbols pkgsrc-2026Q1:1.10.0.8 pkgsrc-2026Q1-base:1.10 pkgsrc-2025Q4:1.10.0.6 pkgsrc-2025Q4-base:1.10 pkgsrc-2025Q3:1.10.0.4 pkgsrc-2025Q3-base:1.10 pkgsrc-2025Q2:1.10.0.2 pkgsrc-2025Q2-base:1.10 pkgsrc-2025Q1:1.9.0.14 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.12 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.10 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.8 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.6 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.4 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.2 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.8.0.6 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.4 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.2 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.7.0.2 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.6.0.10 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.8 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.6 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.4 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.2 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.5.0.2 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.4.0.14 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.12 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.10 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.6 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.8 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.4 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.2 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.3.0.4 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.2 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.2.0.2 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.1.0.2 pkgsrc-2018Q2-base:1.1; locks; strict; comment @# @; 1.10 date 2025.05.21.18.41.35; author schmonz; state Exp; branches; next 1.9; commitid cwbHtNrzmqAoYNVF; 1.9 date 2023.07.18.12.19.41; author schmonz; state Exp; branches; next 1.8; commitid DqG7Ja1NUSrBuhxE; 1.8 date 2022.10.03.18.09.12; author schmonz; state Exp; branches; next 1.7; commitid hFf14OzMTO1tGiWD; 1.7 date 2022.07.13.00.52.31; author schmonz; state Exp; branches; next 1.6; commitid U7nAccu9kSPeAFLD; 1.6 date 2021.05.13.14.06.10; author schmonz; state Exp; branches; next 1.5; commitid qtV6FXb8BPNtFZSC; 1.5 date 2021.01.01.19.41.37; author schmonz; state Exp; branches; next 1.4; commitid uwa4TmG893OCL3CC; 1.4 date 2019.04.04.14.14.28; author schmonz; state Exp; branches; next 1.3; commitid uRtDoXQBJyQRs2iB; 1.3 date 2018.10.08.13.51.28; author schmonz; state Exp; branches; next 1.2; commitid X0lV0T8ojzvI3aVA; 1.2 date 2018.07.23.05.16.43; author schmonz; state Exp; branches; next 1.1; commitid pW5VDfk2tkzxGdLA; 1.1 date 2018.05.03.13.13.51; author schmonz; state Exp; branches; next ; commitid 8ebyE1g9RmpGVQAA; desc @@ 1.10 log @libhighlight: update to 4.16. Changes: - updated astyle lib to version 3.6.9 - fix shell script parenthesis recognition - updated AWK, C, Go and Python language definitions - added README_FR.adoc - added shell script and git config file extensions - GUI: adjusted cmake build script to improve Qt build target handling - GUI: updated Qt UI translations @ text @$NetBSD: patch-makefile,v 1.9 2023/07/18 12:19:41 schmonz Exp $ Use pkgsrc-provided paths and tools. --- makefile.orig 2025-05-08 18:55:05.000000000 +0000 +++ makefile @@@@ -7,7 +7,7 @@@@ DESTDIR = # Root directory for final installation -PREFIX = /usr +#PREFIX = /usr # Data file directory data_dir = ${PREFIX}/share/ @@@@ -22,7 +22,7 @@@@ bin_dir = ${PREFIX}/bin/ lib_dir = ${PREFIX}/lib/ # Location of the highlight man pages: -man_dir = ${data_dir}man/ +man_dir = ${PREFIX}/${PKGMANDIR}/ # Documentation directory doc_dir = ${data_dir}doc/ @@@@ -34,11 +34,12 @@@@ hl_doc_dir = ${doc_dir}highlight/ examples_dir = ${hl_doc_dir}extras/ # Location of system-wide config files: -ifeq (${PREFIX},/usr) - conf_dir = /etc/ -else - conf_dir = ${PREFIX}/etc/ -endif +#ifeq (${PREFIX},/usr) +# conf_dir = /etc/ +#else +# conf_dir = ${PREFIX}/etc/ +#endif +conf_dir = ${PREFIX}/share/examples/ # Location of the highlight config files: hl_conf_dir = ${conf_dir}highlight/ @@@@ -58,10 +59,10 @@@@ desktop_icons = ${data_dir}icons/hicolor # Commands: GZIP=gzip -9fn -INSTALL_DATA=install -m644 -INSTALL_PROGRAM=install -m755 -MKDIR=mkdir -p -m 755 -RMDIR=rm -r -f +INSTALL_DATA=${BSD_INSTALL_DATA} +INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} +MKDIR=${BSD_INSTALL_DATA_DIR} +RMDIR=${RM} -r -f all cli: ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${hl_data_dir} HL_CONFIG_DIR=${hl_conf_dir} @@@@ -109,22 +110,15 @@@@ install: ${DESTDIR}${hl_data_dir}themes/base16 \ ${DESTDIR}${hl_data_dir}langDefs \ ${DESTDIR}${hl_data_dir}plugins - ${MKDIR} ${DESTDIR}${man_dir}man1/ - ${MKDIR} ${DESTDIR}${man_dir}man5/ ${MKDIR} ${DESTDIR}${bash_comp_dir} ${MKDIR} ${DESTDIR}${fish_comp_dir} ${MKDIR} ${DESTDIR}${zsh_comp_dir} - ${MKDIR} ${DESTDIR}${bin_dir} ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${hl_data_dir}langDefs/ ${INSTALL_DATA} ./*.conf ${DESTDIR}${hl_conf_dir} ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${hl_data_dir}themes/ ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${hl_data_dir}themes/base16/ ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${hl_data_dir}plugins/ - ${INSTALL_DATA} ./man/highlight.1 ${DESTDIR}${man_dir}man1/ - ${GZIP} ${DESTDIR}${man_dir}man1/highlight.1 - ${INSTALL_DATA} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/ - ${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5 ${INSTALL_DATA} ./sh-completion/highlight.bash ${DESTDIR}${bash_comp_dir}highlight ${INSTALL_DATA} ./sh-completion/highlight.fish ${DESTDIR}${fish_comp_dir} @@@@ -145,12 +139,11 @@@@ install: ${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes ${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir} ${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir} - ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} @@echo @@echo "Done." - @@echo "Type highlight --help or man highlight for instructions." @@echo "Take a look at ${DESTDIR}${examples_dir} for scripts, SWIG and TCL bindings." + @@echo "Execute 'make install-cli' to install the highlight CLI ('make cli')." @@echo "Execute 'make install-gui' to install the highlight GUI ('make gui')." @@echo "Do not hesitate to report problems. Unknown bugs are hard to fix." @@@@ -169,6 +162,19 @@@@ install-gui: ${INSTALL_DATA} ./src/gui-qt/highlight.png ${DESTDIR}${desktop_icons} ${INSTALL_PROGRAM} ./src/highlight-gui ${DESTDIR}${bin_dir} +install-cli: + @@echo "Installing files for the CLI..." + ${MKDIR} ${DESTDIR}${bin_dir} + ${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir} + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man1 + ${BSD_INSTALL_MAN} ./man/highlight.1 ${DESTDIR}${man_dir}/man1/ + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man5 + ${BSD_INSTALL_MAN} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/ + + @@echo + @@echo "Done." + @@echo "Type highlight --help or man highlight for instructions." + install-lib-shared: ${INSTALL_DATA} ./src/libhighlight.so.4.0 ${DESTDIR}${lib_dir} @@@@ -178,8 +184,8 @@@@ uninstall: ${RMDIR} ${DESTDIR}${hl_doc_dir} ${RMDIR} ${DESTDIR}${hl_conf_dir} ${RMDIR} ${DESTDIR}${examples_dir} - rm -rf ${DESTDIR}${man_dir}man1/highlight.1.gz - rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5.gz + rm -rf ${DESTDIR}${man_dir}man1/highlight.1* + rm -rf ${DESTDIR}${man_dir}man5/filetypes.conf.5* rm -rf ${DESTDIR}${bash_comp_dir}highlight rm -rf ${DESTDIR}${fish_comp_dir}highlight.fish rm -rf ${DESTDIR}${zsh_comp_dir}_highlight @ 1.9 log @Update to 4.7. From the changelog: - updated astyle lib to version 3.4.1 - CLI: fixed member variable initialization (#143) @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.8 2022/10/03 18:09:12 schmonz Exp $ d5 1 a5 1 --- makefile.orig 2023-07-17 17:56:37.000000000 +0000 d46 1 a46 1 GZIP=gzip -9f @ 1.8 log @Update to 4.3. From the changelog: - added support for Carbon - added support for Fortran77 star comments comments (#208) - added support for PowerShell block comments (#210) - fixed Python formatted string pattern (#212) - added new shell completion generation script (#137) - W32: fixed Windows compilation headers (#138) @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.7 2022/07/13 00:52:31 schmonz Exp $ d5 1 a5 1 --- makefile.orig 2022-09-28 17:52:30.000000000 +0000 d123 1 a123 1 rm -rf ${DESTDIR}${bash_comp_dir}highlight.bash d125 1 a125 1 @ 1.7 log @Update to 4.2. From the changelog: - added support for Critic markup (https://gitlab.com/saalen/highlight/-/issues/197) - added support for jam/ham (https://gitlab.com/saalen/highlight/-/issues/196) - added support for PureScript (https://gitlab.com/saalen/highlight/-/merge_requests/132/) - added support for Nix (https://gitlab.com/saalen/highlight/-/issues/200) - added ino file mapping / Arduino C (https://gitlab.com/saalen/highlight/-/issues/201) - fixed RTF page color attributes (https://gitlab.com/saalen/highlight/-/issues/195) - fixed identifier parsing in yaml.lang (https://gitlab.com/saalen/highlight/-/issues/190) - fixed symbol parsing in lisp.lang https://gitlab.com/saalen/highlight/-/issues/198 - fixed string parsing in csharp.lang (https://gitlab.com/saalen/highlight/-/issues/199) - fixed string parsing in conf.lang (https://gitlab.com/saalen/highlight/-/issues/203) - added make target `install-lib-shared` to install shared lib (https://gitlab.com/saalen/highlight/-/issues/202) - CLI W32: prevented automatic file pattern expansion (https://gitlab.com/saalen/highlight/-/issues/186) - GUI: added Japanese translation (thanks to FunFun) - GUI: disabled floating panel (state restore fails) @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.6 2021/05/13 14:06:10 schmonz Exp $ d5 1 a5 1 --- makefile.orig 2022-03-22 20:58:01.000000000 +0000 d14 3 a16 3 # Location of the highlight data files: data_dir = ${PREFIX}/share/highlight/ @@@@ -19,7 +19,7 @@@@ bin_dir = ${PREFIX}/bin/ d20 1 a20 1 -man_dir = ${PREFIX}/share/man/ d23 17 a39 4 # Location of the highlight documentation: doc_dir = ${PREFIX}/share/doc/highlight/ @@@@ -28,8 +28,8 @@@@ doc_dir = ${PREFIX}/share/doc/highlight/ examples_dir = ${doc_dir}extras/ d42 2 a43 8 -conf_dir = /etc/highlight/ -#conf_dir = ${PREFIX}/etc/highlight/ +#conf_dir = /etc/highlight/ +conf_dir = ${PREFIX}/share/examples/highlight/ # Location of additional gui files desktop_apps = ${PREFIX}/share/applications/ @@@@ -37,10 +37,10 @@@@ desktop_icons = ${PREFIX}/share/icons/hi d57 5 a61 5 ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} @@@@ -85,19 +85,12 @@@@ install: ${DESTDIR}${data_dir}themes/base16 \ ${DESTDIR}${data_dir}langDefs \ ${DESTDIR}${data_dir}plugins d64 3 d69 5 a73 5 ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/ ${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir} ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/ ${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${data_dir}themes/base16/ ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/ d79 3 a81 3 ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir} @@@@ -114,15 +107,27 @@@@ install: d95 4 d112 6 a117 6 install-gui: @@echo "Installing files for the GUI..." ${MKDIR} ${DESTDIR}${data_dir} \ @@@@ -147,8 +152,8 @@@@ uninstall: ${RMDIR} ${DESTDIR}${doc_dir} ${RMDIR} ${DESTDIR}${conf_dir} d123 2 a125 2 rm -rf ${DESTDIR}${bin_dir}highlight rm -rf ${DESTDIR}${bin_dir}highlight-gui @ 1.6 log @Update to 4.1. From the changelog: - improved handling of Custom theme attributes (#182) - fixed wrong color code in edit-kwrite.theme - added rng file mapping (#129) - improved Lisp highlighting - GUI: fixed highlighting options tab title (thanks to Craig) - renamed `std` style name to `def` - version and README updates - removed `extras/web_plugins` - added user-select default property to HTML line number style - revised color themes - added two more keyword styles for default themes - added Custom theme attributes for Plain TeX, LaTeX, SVG and Pango - enabled syntax message output with `--ls-syntax-error` - GUI: enabled syntax error checkbox - added Custom theme attribute - enabled inline stylesheets with `--ls-hover` - added Error and Hover theme properties - enabled syntax error highlighting with `ls-semantic` - improved LSP message handling - added delay LSP parameter - added LSP semantic token styles to base16 themes - renamed `str` style name to `sng` - CLI: enabled `--ls-semantic` option - GUI: enabled semantic checkbox and a server capability test - added support for the language server protocol - added new configuration file lsp.conf - CLI: added `ls-profile`, `--ls-workspace`,`--ls-hover` - CLI: deprecated `--start-nested`, `--reformat=user`, `--reformat-option`, `--base16`, `--delim-cr`, `--plug-in-read` - GUI: added LSP configuration tab - added `--syntax-supported` option @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.5 2021/01/01 19:41:37 schmonz Exp $ d5 1 a5 1 --- makefile.orig 2021-05-10 17:47:34.000000000 +0000 d16 2 a17 2 @@@@ -16,7 +16,7 @@@@ data_dir = ${PREFIX}/share/highlight/ bin_dir = ${PREFIX}/bin/ d25 1 a25 1 @@@@ -25,8 +25,8 @@@@ doc_dir = ${PREFIX}/share/doc/highlight/ d36 1 a36 1 @@@@ -34,10 +34,10 @@@@ desktop_icons = ${PREFIX}/share/icons/hi d51 1 a51 1 @@@@ -82,19 +82,12 @@@@ install: d71 1 a71 1 @@@@ -111,15 +104,27 @@@@ install: d101 1 a101 1 @@@@ -141,8 +146,8 @@@@ uninstall: @ 1.5 log @Update to 3.60. From the changelog: - improved PHP 8 syntax support - added Emacs Org-Mode support (#174) - fixed single argument and truecolor output of mark_lines.lua plug-in (#164) - added lineno and column parameters to Decorate hook - LIB: moved CodeGenerator::readUserStyleDef and getStyleDefinition to public (#173) @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.4 2019/04/04 14:14:28 schmonz Exp $ d5 1 a5 1 --- makefile.orig 2020-12-21 10:56:19.000000000 +0000 d51 1 a51 1 @@@@ -86,19 +86,12 @@@@ install: d71 1 a71 1 @@@@ -118,15 +111,27 @@@@ install: d80 1 a80 1 @@echo "Take a look at ${DESTDIR}${examples_dir} for web plugins, SWIG and TCL bindings." d101 1 a101 1 @@@@ -148,8 +153,8 @@@@ uninstall: @ 1.4 log @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) @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.3 2018/10/08 13:51:28 schmonz Exp $ d5 1 a5 1 --- makefile.orig 2019-03-26 19:58:45.000000000 +0000 d36 1 a36 1 @@@@ -34,10 +34,10 @@@@ desktop_pixmaps = ${PREFIX}/share/pixmap d65 1 a65 1 - -${GZIP} ${DESTDIR}${man_dir}man1/highlight.1 d67 1 a67 1 - -${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5 @ 1.3 log @Update to 3.46. From the changelog: - fixed xterm256 and truecolor whitespace outpur (https://gitlab.com/saalen/highlight/issues/90) - converted manuals to AsciiDoc (thanks to Tristano Ajmone) - added DocumentHeader and DocumentFooter plug-in hooks - added RemoveKeyword Lua function for syntax definitions - added syntax test indicators (see README_TESTCASES) - added support for ISO and R10 variants of Modula2 (thanks to Benjamin Kowarsch) - fixed R identifiers (https://gitlab.com/saalen/highlight/merge_requests/77) - fixed ALAN IF identifiers (see https://gitlab.com/saalen/highlight/merge_requests/79) - fixed issue with Bash string interpolation - fixed some bugs found by coverity tool (https://gitlab.com/saalen/highlight/issues/82) - added Swift keywords and types - added filetypes.conf.5 man page (https://gitlab.com/saalen/highlight/issues/83) - added Gradle extension mapping (https://gitlab.com/saalen/highlight/merge_requests/80) @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.2 2018/07/23 05:16:43 schmonz Exp $ d5 1 a5 1 --- makefile.orig 2018-10-07 09:31:45.000000000 +0000 d25 1 a25 1 @@@@ -25,18 +25,18 @@@@ doc_dir = ${PREFIX}/share/doc/highlight/ d36 1 a36 1 desktop_pixmaps = ${PREFIX}/share/pixmaps/ d39 1 d51 1 a51 1 @@@@ -85,17 +85,12 @@@@ install: d64 4 a67 2 - ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}man1/ - ${INSTALL_DATA} ./man/filetypes.conf.5.gz ${DESTDIR}${man_dir}man5/ d71 1 a71 1 @@@@ -115,15 +110,27 @@@@ install: d90 1 a90 1 + ${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir}/man1/ d92 1 a92 1 + ${BSD_INSTALL_MAN} ./man/filetypes.conf.5.gz ${DESTDIR}${man_dir}man5/ d101 1 a101 1 @@@@ -145,8 +152,8 @@@@ uninstall: @ 1.2 log @Update to 3.44. From the changelog: - fixed gcc 8 compilation warnings - fixed Ruby string interpolation (https://github.com/andre-simon/highlight/issues/70) - added support for ALAN IF (thanks to Tristano Ajmone) - added 107 Base16 themes [https://github.com/chriskempson/base16] (thanks to Tristano Ajmone) - updated Rust and Java reserved words lists - revised documentation - moved extras/css-themes into extras/themes-resources - added extras/themes-resources/base16 (thanks to Tristano Ajmone) - GUI: added Base16 theme selection checkbox - CLI: added --base16 option to enable the new themes - CLI: accept - as argument to read from stdin (https://github.com/andre-simon/highlight/issues/73) @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.1 2018/05/03 13:13:51 schmonz Exp $ d5 1 a5 1 --- makefile.orig 2018-07-19 17:57:22.000000000 +0000 d19 3 a21 3 # Location of the highlight man page: -man_dir = ${PREFIX}/share/man/man1/ +man_dir = ${PREFIX}/${PKGMANDIR}/man1/ d50 1 a50 1 @@@@ -85,15 +85,12 @@@@ install: d54 2 a55 1 - ${MKDIR} ${DESTDIR}${man_dir} d63 3 a65 1 - ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir} d67 2 a68 3 ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir} @@@@ -116,15 +113,25 @@@@ install: d86 4 a89 2 + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir} + ${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir} d98 1 a98 1 @@@@ -146,7 +153,7 @@@@ uninstall: d102 5 a106 2 - rm -rf ${DESTDIR}${man_dir}highlight.1.gz + rm -rf ${DESTDIR}${man_dir}highlight.1* a108 1 rm -rf ${DESTDIR}${desktop_apps}highlight.desktop @ 1.1 log @Update to 3.43. From the changelog: -updated astyle code to release 3.1 (Rev. 655) -added webkit reformatting style -improved several language definitions -fixed Matlab string recognition (https://github.com/andre-simon/highlight/issues/61) -fixed Autohotkey escape sequence recognition (thanks to Klaus Daube) -added excel.lang (https://github.com/andre-simon/highlight/pull/60) -improved Qt pro file (https://github.com/andre-simon/highlight/pull/59) -CLI: added --reformat-option (https://github.com/andre-simon/highlight/issues/62) -CLI: added --line-range (https://github.com/andre-simon/highlight/issues/64) -GUI: added Bulgarian translation (thanks to Georgi Sotirov) -fixed HL_OUTPUT in Lua state for HL_FORMAT_XHTML and HL_FORMAT_TRUECOLOR values -fixed lib-shared make target -updated astyle code to release 3.1.0 beta -added Polygen and EBNF2 syntax definitions (thanks to Tristano Ajmone) -added pywal terminal colouring template in extras/pywal -added reformatting style ratliff (replaces banner) -added extras/langDefs-resources/cleanslate.lang (thanks to Tristano Ajmone) -improved Perl6 compatibility -improved PHP string interpolation -improved Haskell definition (https://github.com/andre-simon/highlight/pull/52) -CLI: added --canvas option to define background color padding in ANSI output (https://github.com/andre-simon/highlight/issues/40) -GUI: added French translation (thanks to Antoine Belvire) -GUI: added Scripts tab (suggested by Tristano Ajmone) -GUI: minor bugfixes -renamed examples directory to extras -line anchors (-a) are attached as id attribute to the first span or li tag in HTML output (https://github.com/andre-simon/highlight/issues/36) -renamed ID prefix in outhtml_codefold plug-in to be compatible with -a IDs -added fstab.lang and added anacrontab in filetypes.conf -removed references to OutputType::HTML32 -added extras/css-themes and extras/langDefs-resources (thanks to Tristano Ajmone) -CLI: removed deprecated indicator of --data-dir option -CLI: added --no-version-info option -GUI: fixed initial theme selection -GUI: added "Omit version info comment" option -GUI: added "Copy with MIME type" option for HTML output (https://github.com/andre-simon/highlight/issues/32) -fixed Ruby string parsing (thanks to Jens Schleusener) -fixed segfault on sparc64 (patch by James Clarke) -fixed PureBasic definition (https://github.com/andre-simon/highlight/issues/25) -added CMake definition (https://github.com/andre-simon/highlight/issues/20) -added email definition (https://github.com/andre-simon/highlight/issues/21) -linked scm suffix to lisp definition (https://github.com/andre-simon/highlight/issues/22) -W32 CLI: support HIGHLIGHT_DATADIR and --data-dir options (https://github.com/andre-simon/highlight/issues/24) -revised documentation -added syntax for Docker and Elixir -improved HTML, Julia, Kotlin and Smalltalk syntax definitions -GUI: added "Paste, Convert and Copy" button (https://sourceforge.net/p/syntaxhighlight/support-requests/4/) -fixed Bash variable highlighting issue -updated astyle code to release 3.0.1 (https://sourceforge.net/p/astyle/bugs/438) -added bash_ref_man7_org.lua plugin -fixed Perl string highlighting issue -fixed highlighting if a line continues after the nested code delimiter -updated astyle code to release 3.0 -added examples/pandoc (thanks to Tristano Ajmone) -added syntax mapping for markdown (https://github.com/andre-simon/highlight/issues/11) -added syntax mapping for clj (https://github.com/andre-simon/highlight/issues/15) -improved Java definition (https://github.com/andre-simon/highlight/issues/13) -added theme to JSON converter in examples/json (https://github.com/andre-simon/highlight/issues/8) -CLI: added support for environment variable HIGHLIGHT_OPTIONS (https://github.com/andre-simon/highlight/issues/17) -fixed code folding plugin to support more Ruby conditional modifiers (thanks to Jens Schleusener) -fixed Perl quoted string highlighting (thanks to Jens Schleusener) -added new GeneratorOverride syntax definition parameter -added Filenames parameter in filetypes.conf to assign input filenames to syntax types (suggested by Andy) -added FASM definition and edit-fasm theme (thanks to Tristano Ajmone) -added outhtml_ie7_webctrl plug-in (suggested by Tristano Ajmone) -GUI: file extensions can be configured for multiple languages, triggers syntax selection prompt -GUI: added Italian translation (thanks to Tristano Ajmone) -fixed code folding plugin to support Ruby conditional modifiers -fixed JSON definition (thanks to Timothee Cour) -fixed output of unknown syntax warning with applied force switch (thanks to Andy) -added state trace parameter to Decorate plug-in function -added GDScript definition and edit-godot theme (thanks to Tristano Ajmone) -updated SWIG code samples -updated Artistic Style lib (SVN Rev. 553) -revised docs -CLI: fixed creation of hidden files if output filename is prepended by its input path -CLI: added switch --stdout (https://sourceforge.net/p/syntaxhighlight/bugs/14) -fixed segfault with --skip applied on a single file input list (thanks to Jens Schleusener) -added support for Python 3.6 syntax -added Github and Sourceforge themes -fixed highlighting of nested section delimiters -fixed PHP definition (thanks to Christoph Burschka) -fixed font family declaration in SVG -fixed user defined encoding in ODT -fixed unnecessary output of style file with --inline-css (thanks to Jens Schleusener) -added vimscript language definition (thanks to Max Christian Pohle) -added Coffeescript language definition (thanks to Jess Austin) -added PureBasic definition and theme (thanks to Tristano Ajmone) -added JSX language definition (suggested by Max Stoiber) -added PO translation definition -added plug-in outhtml_add_figure.lua -updated js definition -updated Artistic Style lib (SVN Rev. 521) -improved various color themes and syntax definitions -added support for true color escape codes (--out-format truecolor) -fixed xterm256 output for paging with less (thanks to Fylwind) -fixed operator regex in rnc.lang, crk.lang and yaml.lang (thanks to Joe Klauza) -added Pony and Whiley definitions -updated Ceylon, Julia and TypeScript definitions -added Go, AutoHotKey, TypeScript and R to the foldable list in the outhtml_codefold.lua plug-in -removed plugins/bash_ref_linuxmanpages_com.lua -GUI: fixed README, ChangeLog and License file paths on Linux -revised documentation -GUI: fixed minor layout issues -the data directory can be defined with the HIGHLIGHT_DATADIR environment variable -fixed RTF output of UTF-8 input; needs input encoding set to utf-8 (thanks to Kamigishi Rei) -fixed XML comment recognition (thanks to Mani) -data search directories were appended to the result of --list-scripts -revised older syntax definitions -updated base URLs of bash_ref_linuxmanpages and cpp_ref_qtproject plug-ins -GUI: added system copy and paste shortcuts for clipboard functions (suggested by Kamigishi Rei) -added Ansible Yaml definition (thanks to Raphael Droz) -added Chapel definition (thanks to Lydia Duncan) -fixed gcc 6 warnings about deprecated auto_ptr usage -src/makefile: added -std=c++11 because of auto_ptr to unique_ptr transition (thanks to Jens Schleusener) -GUI: fixed style file output if "write to source directory" option is checked (thanks to Jim Pattee) -added support of Pascal, Lua, Ruby and C# regions in outhtml_codefold.lua -improved outhtml_codefold.lua to handle embedded languages -added string delimiters in the Ruby definition -added new AssertEqualLength flag in string section of language definitions -improved heredoc parsing -fixed Lua multiline string recognition -improved SVG whitespace output (patch by Paul de Vrieze) -added Nim and mIRC Scripting definitions -improved outhtml_codefold.lua to ignore brackets on the same line -added RTF output to mark_lines.lua -fixed Powershell and NSIS definitions -added JSON and Github Markdown definitions -CLI: added --keep-injections option to force plugin injection output with -f -GUI: added keep injections checkbox -GUI: fixed crash after removing selected plugins -added HL_REJECT state to be used in a OnStateChange function -added DecorateLineBegin and DecorateLineEnd hooks -added mark_lines.lua, outhtml_codefold.lua, comment_links.lua plug-ins -fixed font face in ODT output -fixed Operators parameter in frink.lang and oorexx.lang -fixed regular expression parsing within strings for JS, Perl and Ruby -CLI: added --page-color option to include a page color in RTF output -GUI: added RTF page color checkbox -added new SVG definition to support embedded scripting -improved js.lang, css.lang, scss.lang, less.lang, tsql.lang -modified HTML ordered list output to work better with new plug-ins -renamed plug-in variable HL_INPUT_FILE to HL_PLUGIN_PARAM -CLI: renamed --plug-in-read option to --plug-in-param -GUI: updated plug-in parameter label and tool-tips -GUI: fixed minor issues -fixed TeX output for cweb documents (patch by Ingo Krabbe) -fixed string interpolation in bat.lang -added reduce_filesize.lua, outhtml_add_shadow.lua, outhtml_add_background_svg.lua, outhtml_add_background_stripes.lua, outhtml_add_line.lua plug-ins -added TCL extension in examples/tcl -added kotlin.lang, nginx.lang and julia.lang -updated php.lang to include version 7 keywords -updated ceylon.lang to include version 1.2 keywords -updated scripts in examples directory -CLI: style-infile option marked as deprecated -GUI: shortened paths in file input lists -added rs.lang -added conf.lang (thanks to Victor Ananjevsky) -added some extensions in filetypes.conf (patch by Victor Ananjevsky) -fixed Matlab definition and style (thanks to Justin Pearson) -CLI: fixed --list-scripts with unknown argument (thanks to Jens Schleusener) -updated astyle code to release 2.05.1 -fixed shebang recognition (thanks to Victor Ananjevsky) -GUI: added option to define line numbering start -added support for LESS, SASS and Stylus CSS processors (suggested by Marcel Bischoff) -added support for Lua 5.3, removed LUA52 makefile option -fixed heredoc matching in perl.lang (thanks to cornucopia) -fixed Haskell lang (thanks to Daan Michiels) -fixed RNC lang (thanks to Daan Michiels) -fixed regex pattern in js.lang -updated astyle code to release 2.05 -added astyle reformatting style vtk -added bold, italic and underline attributes to xterm256 ANSI output (patch by Andrew Fuller) -fixed assembler mapping in filetypes.conf (thanks to Jens Schleusener) -added Swift definition -improved ASP, F#, OCaml and Lisp syntax definitions -added interpolation patterns to several definitions -updated base URLs in cpp_ref_gtk_gnome and cpp_ref_qtproject plug-ins -CLI: added Pango markup output option (patch by Dominik Schmidt) @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.2 2018/04/08 19:40:29 schmonz Exp $ d5 1 a5 1 --- makefile.orig 2018-01-20 20:42:17.000000000 +0000 d25 1 a25 1 @@@@ -25,7 +25,8 @@@@ doc_dir = ${PREFIX}/share/doc/highlight/ d30 1 a32 1 #conf_dir = ${PREFIX}/etc/highlight/ d35 1 a35 1 @@@@ -33,10 +34,10 @@@@ desktop_apps = ${PREFIX}/share/applicati d50 2 a51 2 @@@@ -81,14 +82,11 @@@@ install: ${DESTDIR}${data_dir}themes \ d60 1 d66 2 a67 2 @@@@ -110,15 +108,25 @@@@ install: d94 1 a94 1 @@@@ -140,7 +148,7 @@@@ uninstall: @