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)

9 files changed, 4 insertions, 315 deletions

diff --git a/textproc/highlight/DESCR b/textproc/highlight/DESCR
deleted file mode 100644
index 127ca170df2..00000000000
--- a/textproc/highlight/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Highlight converts source code to formatted text with syntax highlighting.
-Supports 100+ programming languages and coloured output in HTML, XHTML, RTF,
-TeX, LaTeX, XSL-FO and XML formats.
diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
index ed1cdf23e32..b3397621c99 100644
--- a/textproc/highlight/Makefile
+++ b/textproc/highlight/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2018/04/09 20:17:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2018/05/03 13:13:50 schmonz Exp $
 
-PKGREVISION=		2
-.include "../../textproc/highlight/Makefile.common"
+.include "../../textproc/libhighlight/Makefile.common"
 
 MANCOMPRESSED=		yes
 
diff --git a/textproc/highlight/Makefile.common b/textproc/highlight/Makefile.common
deleted file mode 100644
index 12fc73ebd8e..00000000000
--- a/textproc/highlight/Makefile.common
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2018/04/08 19:40:29 schmonz Exp $
-# used by textproc/highlight/Makefile
-# used by textproc/libhighlight/Makefile
-# used by textproc/p5-highlight/Makefile
-
-DISTNAME=		highlight-${VERSION}
-VERSION=		3.18
-CATEGORIES=		textproc
-MASTER_SITES=		http://www.andre-simon.de/zip/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.andre-simon.de/
-COMMENT=		Converts source code to formatted text with syntax highlighting
-LICENSE=		gnu-gpl-v3
-
-USE_TOOLS+=		gmake pkg-config
-USE_LANGUAGES=		c c++
-MAKE_FILE=		makefile
-
-PATCHDIR=		${.CURDIR}/../../textproc/highlight/patches
-DISTINFO_FILE=		${.CURDIR}/../../textproc/highlight/distinfo
-DESCR_SRC=		${.CURDIR}/../../textproc/highlight/DESCR
-
-PKG_SYSCONFSUBDIR=	highlight
-
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	do-configure
-SUBST_FILES.paths=	src/core/datadir.cpp src/makefile
-SUBST_SED.paths=	-e 's,/etc/highlight,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,/usr/share,${PREFIX}/share,g'
-
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo
deleted file mode 100644
index 3cfafd07948..00000000000
--- a/textproc/highlight/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.12 2018/04/09 20:17:46 schmonz Exp $
-
-SHA1 (highlight-3.18.tar.bz2) = 985d0a3c707e3251fe50ffff66e11a8563777202
-RMD160 (highlight-3.18.tar.bz2) = 960b2a9ed6071b0f48ef45da2d006f5f00d9b578
-SHA512 (highlight-3.18.tar.bz2) = 1f939e117209e96d021216addc281ca7f265822f053f577ed7cb11b8ac9a1762bf84f8e1f9f5e67277004573b98e4b8732f48549aa674fe6801bfc1c0627b930
-Size (highlight-3.18.tar.bz2) = 619669 bytes
-SHA1 (patch-examples_swig_makefile) = 5b53c835e51ecbd6b0fb4865fa33b7702d47bdb1
-SHA1 (patch-makefile) = edfe212807ceba6d10873b9d75fff9570280a447
-SHA1 (patch-src_core_platform__fs.cpp) = ae4f901da24307b2b7699809ea959976fd95f16f
-SHA1 (patch-src_makefile) = c81216c8e00d382a7d91a6ed62e5e61be055951f
diff --git a/textproc/highlight/options.mk b/textproc/highlight/options.mk
index 5dc5fa70ed4..69afb6f28da 100644
--- a/textproc/highlight/options.mk
+++ b/textproc/highlight/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/04/09 20:17:46 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2018/05/03 13:13:50 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.highlight
 PKG_SUPPORTED_OPTIONS=	x11
@@ -7,8 +7,7 @@ PKG_SUPPORTED_OPTIONS=	x11
 
 PLIST_VARS+=		x11
 .if !empty(PKG_OPTIONS:Mx11)
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
 BUILD_TARGET+=		gui
 INSTALL_TARGET+=	install-gui
 PLIST.x11=		yes
diff --git a/textproc/highlight/patches/patch-examples_swig_makefile b/textproc/highlight/patches/patch-examples_swig_makefile
deleted file mode 100644
index 3339f83b5b7..00000000000
--- a/textproc/highlight/patches/patch-examples_swig_makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-examples_swig_makefile,v 1.4 2018/04/08 19:40:29 schmonz Exp $
-
-Use pkgsrc-specified compiler and flags.
-
---- examples/swig/makefile.orig	2013-09-24 20:24:04.000000000 +0000
-+++ examples/swig/makefile
-@@ -1,6 +1,6 @@
- 
--CXX=g++
--CFLAGS=-g -O2 -fPIC
-+#CXX=g++
-+#CFLAGS=-g -O2 -fPIC
- 
- HL_INC=../../src/include/
- HL_SRC=../../src/
-@@ -12,24 +12,24 @@ PERL_INC=$(shell perl -MExtUtils::Embed 
- PHP_INC=$(shell php-config --includes)
- 
- lib-stamp:
--	make -C ${HL_SRC} -f ./makefile clean
--	PIC=1 make -C ${HL_SRC} -f ./makefile CFLAGS="${CFLAGS}" libhighlight.a
-+	#make -C ${HL_SRC} -f ./makefile clean
-+	#PIC=1 make -C ${HL_SRC} -f ./makefile CFLAGS="${CFLAGS}" libhighlight.a
- 	touch $@
- 
- python: lib-stamp
- 	swig -c++ -python -o highlight_wrap.cpp  highlight.i
--	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC} 
--	${CXX} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
-+	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PYTHON_CFLAGS} -I${HL_INC} 
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lpython2.7 -o _highlight.so
- 
- perl: lib-stamp
- 	swig -c++ -perl -o highlight_wrap.cpp  highlight.i
--	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC} 
--	${CXX} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
-+	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PERL_INC} -I${HL_INC} 
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o  -L${HL_SRC} -lhighlight ${LUA_LIBS} -lperl -o highlight.so
- 
- php: lib-stamp
- 	swig -c++ -php -o highlight_wrap.cpp highlight.i
--	${CXX} ${CFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC}
--	${CXX} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
-+	${CXX} ${CFLAGS} ${LDFLAGS} -c highlight_wrap.cpp ${LUA_CFLAGS} ${PHP_INC} -I${HL_INC}
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -s highlight_wrap.o -L${HL_SRC} -lhighlight ${LUA_LIBS} -o highlight.so
- 
- clean: python-clean perl-clean php-clean
- 	rm -f *-stamp
diff --git a/textproc/highlight/patches/patch-makefile b/textproc/highlight/patches/patch-makefile
deleted file mode 100644
index 9be026f9a1e..00000000000
--- a/textproc/highlight/patches/patch-makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-makefile,v 1.2 2018/04/08 19:40:29 schmonz Exp $
-
-Use pkgsrc-provided paths and tools.
-
---- makefile.orig	2013-06-27 20:36:48.000000000 +0000
-+++ makefile
-@@ -7,7 +7,7 @@
- DESTDIR =
- 
- # Root directory for final installation
--PREFIX = /usr
-+#PREFIX = /usr
- 
- # Location of the highlight data files:
- data_dir = ${PREFIX}/share/highlight/
-@@ -16,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/
- bin_dir = ${PREFIX}/bin/
- 
- # Location of the highlight man page:
--man_dir = ${PREFIX}/share/man/man1/
-+man_dir = ${PREFIX}/${PKGMANDIR}/man1/
- 
- # Location of the highlight documentation:
- doc_dir = ${PREFIX}/share/doc/highlight/
-@@ -25,7 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
- examples_dir = ${doc_dir}examples/
- 
- # Location of the highlight config files:
--conf_dir = /etc/highlight/
-+#conf_dir = /etc/highlight/
-+conf_dir = ${PREFIX}/share/examples/highlight/
- #conf_dir = ${PREFIX}/etc/highlight/
- 
- # Location of additional gui files
-@@ -33,10 +34,10 @@ desktop_apps = ${PREFIX}/share/applicati
- desktop_pixmaps = ${PREFIX}/share/pixmaps/
- 
- # Commands:
--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=${data_dir} HL_CONFIG_DIR=${conf_dir}
-@@ -75,14 +76,11 @@ install:
- 		${DESTDIR}${data_dir}themes \
- 		${DESTDIR}${data_dir}langDefs \
- 		${DESTDIR}${data_dir}plugins
--	${MKDIR} ${DESTDIR}${man_dir}
--	${MKDIR} ${DESTDIR}${bin_dir}
- 
- 	${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
- 	${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir}
- 	${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/
- 	${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/
--	${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
- 	${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
- 	${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
- 	${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
-@@ -99,15 +97,25 @@ install:
- 	${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir}
- 	${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir}
- 	${INSTALL_DATA} ./examples/*.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 plugins and SWIG language 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."
- 
-+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}
-+	${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir}
-+
-+	@echo
-+	@echo "Done."
-+	@echo "Type highlight --help or man highlight for instructions."
-+
- install-gui:
- 	@echo "Installing files for the GUI..."
- 	${MKDIR} ${DESTDIR}${data_dir} \
-@@ -129,7 +137,7 @@ uninstall:
- 	${RMDIR} ${DESTDIR}${doc_dir}
- 	${RMDIR} ${DESTDIR}${conf_dir}
- 	${RMDIR} ${DESTDIR}${examples_dir}
--	rm -rf ${DESTDIR}${man_dir}highlight.1.gz
-+	rm -rf ${DESTDIR}${man_dir}highlight.1*
- 	rm -rf ${DESTDIR}${bin_dir}highlight
- 	rm -rf ${DESTDIR}${bin_dir}highlight-gui
- 	rm -rf ${DESTDIR}${desktop_apps}highlight.desktop
diff --git a/textproc/highlight/patches/patch-src_core_platform__fs.cpp b/textproc/highlight/patches/patch-src_core_platform__fs.cpp
deleted file mode 100644
index bb490a5309b..00000000000
--- a/textproc/highlight/patches/patch-src_core_platform__fs.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_core_platform__fs.cpp,v 1.1 2018/04/08 19:40:29 schmonz Exp $
-
-Fix build on (at least) SmartOS.
-
---- src/core/platform_fs.cpp.orig	2013-09-24 20:24:04.000000000 +0000
-+++ src/core/platform_fs.cpp
-@@ -71,13 +71,13 @@ namespace Platform
- #include <pwd.h>
- 	const char pathSeparator = '/';
- 
--	std::string getAppPath()
-+	::std::string getAppPath()
- 	{
- 		return "";
- 	}
- 	
- 	
--	std::string getHomePath()
-+	::std::string getHomePath()
- 	{
- 	  struct passwd *pw = getpwuid(getuid());
- 	  return string(pw->pw_dir);
diff --git a/textproc/highlight/patches/patch-src_makefile b/textproc/highlight/patches/patch-src_makefile
deleted file mode 100644
index b8d85dfef2b..00000000000
--- a/textproc/highlight/patches/patch-src_makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-src_makefile,v 1.3 2018/04/09 20:17:46 schmonz Exp $
-
-Use pkgsrc-specified compiler and flags.
-
---- src/makefile.orig	2014-04-04 17:26:25.000000000 +0000
-+++ src/makefile
-@@ -12,18 +12,18 @@
- 
- # See src/gui-qt/highlight.pro for the Qt GUI compilation options
- 
--CXX=c++
-+#CXX=c++
- 
- # Added -qt4 because of Arch Linux Qt5 migration
--QMAKE=qmake-qt4
-+#QMAKE=qmake-qt4
- 
--CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
-+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
- #CFLAGS:=-ggdb ${CFLAGS}
- 
- CFLAGS_DILU=-fno-strict-aliasing
- 
- SO_VERSION=3.17
--
-+LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
- 
- # Source paths
- CORE_DIR=./core/
-@@ -61,14 +61,16 @@ ifdef PIC
- 	CFLAGS+=-fPIC
- endif
- 
--LDFLAGS = -ldl
-+#LDFLAGS = -ldl
- # Do not strip by default (Mac OS X lazy pointer issues)
- # Add -static to avoid linking with shared libs (can cause trouble when highlight
- # is run as service)
- #LDFLAGS = ${LDFLAGS} -s
- #LDFLAGS= -Wl,--as-needed
- 
--CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
-+LIBTOOL=libtool --tag=CXX
-+
-+CXX_COMPILE=${LIBTOOL} --mode=compile ${CXX} ${CFLAGS} ${CXX_DIR} -I ${INCLUDE_DIR} ${LUA_CFLAGS} -c
- 
- # Data directories (data dir, configuration file dir)
- CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
-@@ -96,18 +98,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
- 	${GUI_QT_DIR}showtextfile.cpp
- 
- 
--cli: libhighlight.a ${CLI_OBJECTS}
--	${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS}
-+cli: ${CLI_OBJECTS}
-+	${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -lhighlight ${LUA_LIBS}
- 
- lib-static libhighlight.a: ${CORE_OBJECTS}
- 	${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS}
- 
- lib-shared libhighlight.so.1.0: ${CORE_OBJECTS}
--	ld -shared -soname libhighlight.so.1 -o libhighlight.so.${SO_VERSION} -lc ${CORE_OBJECTS}
-+	${LIBTOOL} --mode=link ${CXX} ${LDFLAGS} -o libhighlight.la ${CORE_OBJECTS:%.o=%.lo} ${DILU_OBJECTS:%.o=%.lo} -version-info ${LSO_VERSION} -rpath ${PREFIX}/lib
- 
- gui-qt: highlight-gui
- 
--highlight-gui: libhighlight.a ${GUI_OBJECTS}
-+highlight-gui: ${GUI_OBJECTS}
- 	cd gui-qt && \
- 	${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
- 	$(MAKE)
-@@ -116,7 +118,7 @@ $(OBJECTFILES) : makefile
- 
- 
- datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h
--	${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR}
-+	${CXX_COMPILE} ${CORE_DIR}datadir.cpp
- 
- platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h
- 	${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp
-@@ -197,7 +199,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
-   ${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \
-   ${INCLUDE_DIR}stylecolour.h  ${INCLUDE_DIR}preformatter.h \
-   ${CLI_DIR}help.h ${INCLUDE_DIR}version.h
--	${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR}
-+	${CXX_COMPILE} ${CLI_DIR}main.cpp
- 
- 
- #3rd party libs