CVS commit: pkgsrc/textproc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Thu, 3 May 2018 13:13:51 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu May  3 13:13:51 UTC 2018

Modified Files:
        pkgsrc/textproc/highlight: Makefile options.mk
        pkgsrc/textproc/libhighlight: Makefile PLIST buildlink3.mk
        pkgsrc/textproc/p5-highlight: Makefile
Added Files:
        pkgsrc/textproc/libhighlight: DESCR Makefile.common distinfo
        pkgsrc/textproc/libhighlight/patches: patch-extras_swig_makefile
            patch-makefile patch-src_core_platform__fs.cpp patch-src_makefile
Removed Files:
        pkgsrc/textproc/highlight: DESCR Makefile.common distinfo
        pkgsrc/textproc/highlight/patches: patch-examples_swig_makefile
            patch-makefile patch-src_core_platform__fs.cpp patch-src_makefile

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/textproc/highlight/DESCR
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/highlight/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/textproc/highlight/Makefile.common
cvs rdiff -u -r1.12 -r0 pkgsrc/textproc/highlight/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/highlight/options.mk
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/textproc/highlight/patches/patch-examples_swig_makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/textproc/highlight/patches/patch-makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/textproc/highlight/patches/patch-src_core_platform__fs.cpp
cvs rdiff -u -r1.3 -r0 pkgsrc/textproc/highlight/patches/patch-src_makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libhighlight/DESCR \
    pkgsrc/textproc/libhighlight/Makefile.common \
    pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/libhighlight/Makefile \
    pkgsrc/textproc/libhighlight/PLIST \
    pkgsrc/textproc/libhighlight/buildlink3.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile \
    pkgsrc/textproc/libhighlight/patches/patch-makefile \
    pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp \
    pkgsrc/textproc/libhighlight/patches/patch-src_makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/p5-highlight/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/highlight/Makefile
diff -u pkgsrc/textproc/highlight/Makefile:1.11 pkgsrc/textproc/highlight/Makefile:1.12
--- pkgsrc/textproc/highlight/Makefile:1.11     Mon Apr  9 20:17:46 2018
+++ pkgsrc/textproc/highlight/Makefile  Thu May  3 13:13:50 2018
@@ -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
 

Index: pkgsrc/textproc/highlight/options.mk
diff -u pkgsrc/textproc/highlight/options.mk:1.1 pkgsrc/textproc/highlight/options.mk:1.2
--- pkgsrc/textproc/highlight/options.mk:1.1    Mon Apr  9 20:17:46 2018
+++ pkgsrc/textproc/highlight/options.mk        Thu May  3 13:13:50 2018
@@ -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

Index: pkgsrc/textproc/libhighlight/Makefile
diff -u pkgsrc/textproc/libhighlight/Makefile:1.1 pkgsrc/textproc/libhighlight/Makefile:1.2
--- pkgsrc/textproc/libhighlight/Makefile:1.1   Sun Apr  8 19:40:29 2018
+++ pkgsrc/textproc/libhighlight/Makefile       Thu May  3 13:13:51 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2018/04/08 19:40:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/03 13:13:51 schmonz Exp $
 
-.include "../../textproc/highlight/Makefile.common"
+.include "../../textproc/libhighlight/Makefile.common"
 
 PKGNAME=               libhighlight-${VERSION}
 COMMENT+=               (shared library)
@@ -15,6 +15,9 @@ CONF_FILES=           ${EGDIR}/filetypes.conf                 \
 
 INSTALLATION_DIRS=     lib
 
+pre-install:
+       rm -f ${WRKSRC}/extras/swig/*.orig
+
 post-install:
        ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/src/libhighlight.la \
                ${DESTDIR}${PREFIX}/lib/
Index: pkgsrc/textproc/libhighlight/PLIST
diff -u pkgsrc/textproc/libhighlight/PLIST:1.1 pkgsrc/textproc/libhighlight/PLIST:1.2
--- pkgsrc/textproc/libhighlight/PLIST:1.1      Sun Apr  8 19:40:29 2018
+++ pkgsrc/textproc/libhighlight/PLIST  Thu May  3 13:13:51 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/04/08 19:40:29 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/05/03 13:13:51 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
@@ -7,20 +7,41 @@ share/doc/highlight/INSTALL
 share/doc/highlight/README
 share/doc/highlight/README_DE
 share/doc/highlight/README_LANGLIST
+share/doc/highlight/README_PLUGINS
 share/doc/highlight/README_REGEX
-share/doc/highlight/README_SWIG
-share/doc/highlight/examples/highlight_pipe.php
-share/doc/highlight/examples/highlight_pipe.pm
-share/doc/highlight/examples/highlight_pipe.py
-share/doc/highlight/examples/swig/highlight.i
-share/doc/highlight/examples/swig/makefile
-share/doc/highlight/examples/swig/testmod.pl
-share/doc/highlight/examples/swig/testmod.py
-share/doc/highlight/examples/web_plugins/dokuwiki/syntax.php
-share/doc/highlight/examples/web_plugins/movabletype/README
-share/doc/highlight/examples/web_plugins/movabletype/highlight.pl
-share/doc/highlight/examples/web_plugins/wordpress/README
-share/doc/highlight/examples/web_plugins/wordpress/highlight.php
+share/doc/highlight/extras/css-themes/README.html
+share/doc/highlight/extras/css-themes/UNLICENCE
+share/doc/highlight/extras/css-themes/example.html
+share/doc/highlight/extras/css-themes/hl-theme-boilerplate.css
+share/doc/highlight/extras/css-themes/hl-theme-boilerplate.scss
+share/doc/highlight/extras/highlight_pipe.php
+share/doc/highlight/extras/highlight_pipe.pm
+share/doc/highlight/extras/highlight_pipe.py
+share/doc/highlight/extras/json/theme2json.lua
+share/doc/highlight/extras/langDefs-resources/cleanslate.lang
+share/doc/highlight/extras/langDefs-resources/template.lang
+share/doc/highlight/extras/pandoc/Highlight.pp
+share/doc/highlight/extras/pandoc/LICENSE
+share/doc/highlight/extras/pandoc/README.html
+share/doc/highlight/extras/pandoc/build-example.bat
+share/doc/highlight/extras/pandoc/build-example.sh
+share/doc/highlight/extras/pandoc/example-preprocessed.md
+share/doc/highlight/extras/pandoc/example.css
+share/doc/highlight/extras/pandoc/example.html
+share/doc/highlight/extras/pandoc/example.md
+share/doc/highlight/extras/pandoc/example.pb
+share/doc/highlight/extras/pywal/pywal.theme
+share/doc/highlight/extras/swig/README_SWIG
+share/doc/highlight/extras/swig/highlight.i
+share/doc/highlight/extras/swig/makefile
+share/doc/highlight/extras/swig/testmod.php
+share/doc/highlight/extras/swig/testmod.pl
+share/doc/highlight/extras/swig/testmod.py
+share/doc/highlight/extras/web_plugins/dokuwiki/syntax.php
+share/doc/highlight/extras/web_plugins/movabletype/README
+share/doc/highlight/extras/web_plugins/movabletype/highlight.pl
+share/doc/highlight/extras/web_plugins/wordpress/README
+share/doc/highlight/extras/web_plugins/wordpress/highlight.php
 share/examples/highlight/filetypes.conf
 share/highlight/langDefs/abap4.lang
 share/highlight/langDefs/abc.lang
@@ -58,34 +79,48 @@ share/highlight/langDefs/c.lang
 share/highlight/langDefs/ceylon.lang
 share/highlight/langDefs/charmm.lang
 share/highlight/langDefs/chill.lang
+share/highlight/langDefs/chpl.lang
 share/highlight/langDefs/clean.lang
 share/highlight/langDefs/clearbasic.lang
 share/highlight/langDefs/clipper.lang
 share/highlight/langDefs/clojure.lang
 share/highlight/langDefs/clp.lang
+share/highlight/langDefs/cmake.lang
 share/highlight/langDefs/cobol.lang
+share/highlight/langDefs/coffee.lang
 share/highlight/langDefs/coldfusion.lang
+share/highlight/langDefs/conf.lang
 share/highlight/langDefs/crk.lang
+share/highlight/langDefs/cs_block_regex.lang
 share/highlight/langDefs/csharp.lang
 share/highlight/langDefs/css.lang
 share/highlight/langDefs/d.lang
 share/highlight/langDefs/dart.lang
 share/highlight/langDefs/diff.lang
+share/highlight/langDefs/docker.lang
+share/highlight/langDefs/dts.lang
 share/highlight/langDefs/dylan.lang
 share/highlight/langDefs/ebnf.lang
+share/highlight/langDefs/ebnf2.lang
 share/highlight/langDefs/eiffel.lang
+share/highlight/langDefs/elixir.lang
+share/highlight/langDefs/email.lang
 share/highlight/langDefs/erlang.lang
 share/highlight/langDefs/euphoria.lang
+share/highlight/langDefs/excel.lang
 share/highlight/langDefs/express.lang
 share/highlight/langDefs/fame.lang
+share/highlight/langDefs/fasm.lang
 share/highlight/langDefs/felix.lang
 share/highlight/langDefs/fortran77.lang
 share/highlight/langDefs/fortran90.lang
 share/highlight/langDefs/frink.lang
 share/highlight/langDefs/fsharp.lang
+share/highlight/langDefs/fstab.lang
 share/highlight/langDefs/fx.lang
 share/highlight/langDefs/gambas.lang
 share/highlight/langDefs/gdb.lang
+share/highlight/langDefs/gdscript.lang
 share/highlight/langDefs/go.lang
 share/highlight/langDefs/graphviz.lang
 share/highlight/langDefs/haskell.lang
@@ -105,8 +140,14 @@ share/highlight/langDefs/io.lang
 share/highlight/langDefs/jasmin.lang
 share/highlight/langDefs/java.lang
 share/highlight/langDefs/js.lang
+share/highlight/langDefs/js_regex.lang
+share/highlight/langDefs/json.lang
 share/highlight/langDefs/jsp.lang
+share/highlight/langDefs/jsx.lang
+share/highlight/langDefs/julia.lang
+share/highlight/langDefs/kotlin.lang
 share/highlight/langDefs/ldif.lang
+share/highlight/langDefs/less.lang
 share/highlight/langDefs/lhs.lang
 share/highlight/langDefs/lilypond.lang
 share/highlight/langDefs/limbo.lang
@@ -121,6 +162,7 @@ share/highlight/langDefs/make.lang
 share/highlight/langDefs/maple.lang
 share/highlight/langDefs/matlab.lang
 share/highlight/langDefs/maya.lang
+share/highlight/langDefs/md.lang
 share/highlight/langDefs/mercury.lang
 share/highlight/langDefs/miranda.lang
 share/highlight/langDefs/mod2.lang
@@ -128,6 +170,7 @@ share/highlight/langDefs/mod3.lang
 share/highlight/langDefs/modelica.lang
 share/highlight/langDefs/moon.lang
 share/highlight/langDefs/ms.lang
+share/highlight/langDefs/msl.lang
 share/highlight/langDefs/mssql.lang
 share/highlight/langDefs/mxml.lang
 share/highlight/langDefs/n3.lang
@@ -135,7 +178,9 @@ share/highlight/langDefs/nasal.lang
 share/highlight/langDefs/nbc.lang
 share/highlight/langDefs/nemerle.lang
 share/highlight/langDefs/netrexx.lang
+share/highlight/langDefs/nginx.lang
 share/highlight/langDefs/nice.lang
+share/highlight/langDefs/nim.lang
 share/highlight/langDefs/nsis.lang
 share/highlight/langDefs/nxc.lang
 share/highlight/langDefs/oberon.lang
@@ -155,6 +200,9 @@ share/highlight/langDefs/pl1.lang
 share/highlight/langDefs/plperl.lang
 share/highlight/langDefs/plpython.lang
 share/highlight/langDefs/pltcl.lang
+share/highlight/langDefs/po.lang
+share/highlight/langDefs/polygen.lang
+share/highlight/langDefs/pony.lang
 share/highlight/langDefs/pov.lang
 share/highlight/langDefs/pro.lang
 share/highlight/langDefs/progress.lang
@@ -162,10 +210,12 @@ share/highlight/langDefs/ps.lang
 share/highlight/langDefs/ps1.lang
 share/highlight/langDefs/psl.lang
 share/highlight/langDefs/pure.lang
+share/highlight/langDefs/purebasic.lang
 share/highlight/langDefs/pyrex.lang
 share/highlight/langDefs/python.lang
 share/highlight/langDefs/q.lang
 share/highlight/langDefs/qmake.lang
+share/highlight/langDefs/qml.lang
 share/highlight/langDefs/qu.lang
 share/highlight/langDefs/r.lang
 share/highlight/langDefs/rebol.lang
@@ -173,11 +223,13 @@ share/highlight/langDefs/rexx.lang
 share/highlight/langDefs/rnc.lang
 share/highlight/langDefs/rpg.lang
 share/highlight/langDefs/rpl.lang
+share/highlight/langDefs/rs.lang
 share/highlight/langDefs/ruby.lang
 share/highlight/langDefs/s.lang
 share/highlight/langDefs/sas.lang
 share/highlight/langDefs/scala.lang
 share/highlight/langDefs/scilab.lang
+share/highlight/langDefs/scss.lang
 share/highlight/langDefs/sh.lang
 share/highlight/langDefs/small.lang
 share/highlight/langDefs/smalltalk.lang
@@ -188,6 +240,9 @@ share/highlight/langDefs/spec.lang
 share/highlight/langDefs/spn.lang
 share/highlight/langDefs/sql.lang
 share/highlight/langDefs/squirrel.lang
+share/highlight/langDefs/styl.lang
+share/highlight/langDefs/svg.lang
+share/highlight/langDefs/swift.lang
 share/highlight/langDefs/sybase.lang
 share/highlight/langDefs/tcl.lang
 share/highlight/langDefs/tcsh.lang
@@ -201,14 +256,18 @@ share/highlight/langDefs/vala.lang
 share/highlight/langDefs/vb.lang
 share/highlight/langDefs/verilog.lang
 share/highlight/langDefs/vhd.lang
+share/highlight/langDefs/vimscript.lang
+share/highlight/langDefs/whiley.lang
 share/highlight/langDefs/xml.lang
 share/highlight/langDefs/xpp.lang
 share/highlight/langDefs/yaiff.lang
+share/highlight/langDefs/yaml.lang
 share/highlight/langDefs/yang.lang
 share/highlight/langDefs/znn.lang
 share/highlight/plugins/asciidoc_html_add_links.lua
 share/highlight/plugins/bash_functions.lua
-share/highlight/plugins/bash_ref_linuxmanpages_com.lua
+share/highlight/plugins/bash_ref_man7_org.lua
+share/highlight/plugins/comment_links.lua
 share/highlight/plugins/cpp_qt.lua
 share/highlight/plugins/cpp_ref_cplusplus_com.lua
 share/highlight/plugins/cpp_ref_gtk_gnome_org.lua
@@ -222,11 +281,22 @@ share/highlight/plugins/java_library.lua
 share/highlight/plugins/keywords_capitalize.lua
 share/highlight/plugins/keywords_lowercase.lua
 share/highlight/plugins/keywords_uppercase.lua
+share/highlight/plugins/mark_lines.lua
+share/highlight/plugins/outhtml_add_background_stripes.lua
+share/highlight/plugins/outhtml_add_background_svg.lua
+share/highlight/plugins/outhtml_add_figure.lua
+share/highlight/plugins/outhtml_add_line.lua
+share/highlight/plugins/outhtml_add_shadow.lua
+share/highlight/plugins/outhtml_codefold.lua
 share/highlight/plugins/outhtml_curly_brackets_matcher.lua
+share/highlight/plugins/outhtml_ie7_webctrl.lua
 share/highlight/plugins/outhtml_keyword_matcher.lua
+share/highlight/plugins/outhtml_modern_fonts.lua
 share/highlight/plugins/outhtml_parantheses_matcher.lua
+share/highlight/plugins/outhtml_tooltips.lua
 share/highlight/plugins/perl_ref_perl_org.lua
 share/highlight/plugins/python_ref_python_org.lua
+share/highlight/plugins/reduce_filesize.lua
 share/highlight/plugins/scala_ref_scala_lang_org.lua
 share/highlight/plugins/theme_invert.lua
 share/highlight/plugins/token_add_state_ids.lua
@@ -257,15 +327,19 @@ share/highlight/themes/dusk.theme
 share/highlight/themes/earendel.theme
 share/highlight/themes/easter.theme
 share/highlight/themes/edit-anjuta.theme
+share/highlight/themes/edit-bbedit.theme
 share/highlight/themes/edit-eclipse.theme
 share/highlight/themes/edit-emacs.theme
+share/highlight/themes/edit-fasm.theme
 share/highlight/themes/edit-flashdevelop.theme
 share/highlight/themes/edit-gedit.theme
+share/highlight/themes/edit-godot.theme
 share/highlight/themes/edit-jedit.theme
 share/highlight/themes/edit-kwrite.theme
 share/highlight/themes/edit-matlab.theme
 share/highlight/themes/edit-msvs2008.theme
 share/highlight/themes/edit-nedit.theme
+share/highlight/themes/edit-purebasic.theme
 share/highlight/themes/edit-vim-dark.theme
 share/highlight/themes/edit-vim.theme
 share/highlight/themes/edit-xcode.theme
@@ -273,6 +347,7 @@ share/highlight/themes/ekvoli.theme
 share/highlight/themes/fine_blue.theme
 share/highlight/themes/freya.theme
 share/highlight/themes/fruit.theme
+share/highlight/themes/github.theme
 share/highlight/themes/golden.theme
 share/highlight/themes/greenlcd.theme
 share/highlight/themes/kellys.theme
@@ -303,6 +378,7 @@ share/highlight/themes/rootwater.theme
 share/highlight/themes/seashell.theme
 share/highlight/themes/solarized-dark.theme
 share/highlight/themes/solarized-light.theme
+share/highlight/themes/sourceforge.theme
 share/highlight/themes/tabula.theme
 share/highlight/themes/tcsoft.theme
 share/highlight/themes/the.theme
Index: pkgsrc/textproc/libhighlight/buildlink3.mk
diff -u pkgsrc/textproc/libhighlight/buildlink3.mk:1.1 pkgsrc/textproc/libhighlight/buildlink3.mk:1.2
--- pkgsrc/textproc/libhighlight/buildlink3.mk:1.1      Sun Apr  8 19:40:29 2018
+++ pkgsrc/textproc/libhighlight/buildlink3.mk  Thu May  3 13:13:51 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/04/08 19:40:29 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/05/03 13:13:51 schmonz Exp $
 
 BUILDLINK_TREE+=       libhighlight
 
 .if !defined(LIBHIGHLIGHT_BUILDLINK3_MK)
 LIBHIGHLIGHT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libhighlight+=   libhighlight>=3.18
+BUILDLINK_API_DEPENDS.libhighlight+=   libhighlight>=3.42
 BUILDLINK_PKGSRCDIR.libhighlight?=     ../../textproc/libhighlight
 .endif # LIBHIGHLIGHT_BUILDLINK3_MK
 

Index: pkgsrc/textproc/p5-highlight/Makefile
diff -u pkgsrc/textproc/p5-highlight/Makefile:1.7 pkgsrc/textproc/p5-highlight/Makefile:1.8
--- pkgsrc/textproc/p5-highlight/Makefile:1.7   Sun Apr  8 19:40:29 2018
+++ pkgsrc/textproc/p5-highlight/Makefile       Thu May  3 13:13:51 2018
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2018/04/08 19:40:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/03 13:13:51 schmonz Exp $
 
-PKGREVISION=           5
-.include "../../textproc/highlight/Makefile.common"
+.include "../../textproc/libhighlight/Makefile.common"
 
 PKGNAME=               p5-highlight-${VERSION}
 COMMENT+=               (Perl bindings)
 
 BUILD_DEPENDS+=                swig-[0-9]*:../../devel/swig
 
-BUILD_DIRS=            examples/swig
+BUILD_DIRS=            extras/swig
 BUILD_TARGET=          perl
 
 USE_TOOLS+=            perl:run
@@ -22,7 +21,7 @@ INSTALLATION_DIRS=    ${PERL5_SUB_INSTALLVE
 PERL_DLEXT=            bundle
 SUBST_CLASSES+=                load
 SUBST_STAGE.load=      pre-configure
-SUBST_FILES.load=      examples/swig/makefile
+SUBST_FILES.load=      extras/swig/makefile
 SUBST_SED.load=                -e 's|-shared -s highlight_wrap\.o|-bundle -s highlight_wrap.o|g'
 .else
 PERL_DLEXT=            so
@@ -30,7 +29,7 @@ PERL_DLEXT=           so
 PLIST_SUBST+=          PERL_DLEXT=${PERL_DLEXT}
 
 do-install:
-       cd ${WRKSRC}/examples/swig && \
+       cd ${WRKSRC}/extras/swig && \
        ${INSTALL_DATA} highlight.pm ${DESTDIR}${PREFIX}/${PERL5_SUB_INSTALLVENDORARCH}/ && \
        ${INSTALL_LIB} highlight.so ${DESTDIR}${PREFIX}/${PERL5_SUB_INSTALLVENDORARCH}/auto/highlight/highlight.${PERL_DLEXT}
 

Added files:

Index: pkgsrc/textproc/libhighlight/DESCR
diff -u /dev/null pkgsrc/textproc/libhighlight/DESCR:1.1
--- /dev/null   Thu May  3 13:13:51 2018
+++ pkgsrc/textproc/libhighlight/DESCR  Thu May  3 13:13:51 2018
@@ -0,0 +1,3 @@
+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.
Index: pkgsrc/textproc/libhighlight/Makefile.common
diff -u /dev/null pkgsrc/textproc/libhighlight/Makefile.common:1.1
--- /dev/null   Thu May  3 13:13:51 2018
+++ pkgsrc/textproc/libhighlight/Makefile.common        Thu May  3 13:13:51 2018
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile.common,v 1.1 2018/05/03 13:13:51 schmonz Exp $
+# used by textproc/highlight/Makefile
+# used by textproc/libhighlight/Makefile
+# used by textproc/p5-highlight/Makefile
+
+DISTNAME=              highlight-${VERSION}
+VERSION=               3.43
+CATEGORIES=            textproc
+MASTER_SITES=          http://www.andre-simon.de/zip/
+EXTRACT_SUFX=          .tar.bz2
+
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+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++11
+MAKE_FILE=             makefile
+
+PATCHDIR=              ${.CURDIR}/../../textproc/libhighlight/patches
+DISTINFO_FILE=         ${.CURDIR}/../../textproc/libhighlight/distinfo
+DESCR_SRC=             ${.CURDIR}/../../textproc/libhighlight/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"
Index: pkgsrc/textproc/libhighlight/distinfo
diff -u /dev/null pkgsrc/textproc/libhighlight/distinfo:1.1
--- /dev/null   Thu May  3 13:13:51 2018
+++ pkgsrc/textproc/libhighlight/distinfo       Thu May  3 13:13:51 2018
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1 2018/05/03 13:13:51 schmonz Exp $
+
+SHA1 (highlight-3.43.tar.bz2) = 471976f309339f9b6a17ee9501b9d3b0a47872da
+RMD160 (highlight-3.43.tar.bz2) = 73d53b819e16a9796af44fe346f464d7743c3ee9
+SHA512 (highlight-3.43.tar.bz2) = 77ad159963de64ef3c4732ad70c63ceafe7002c43d8b045e61361f52e56467933790c70e88570e0c866503a621496de2c80934c7f8141721545ff43c807968d1
+Size (highlight-3.43.tar.bz2) = 1311318 bytes
+SHA1 (patch-extras_swig_makefile) = 53e0793dab41fecafd3360564a951ddd4187e894
+SHA1 (patch-makefile) = 693fe29c416e4e5ee63e279f4abb27799ce0d6e0
+SHA1 (patch-src_core_platform__fs.cpp) = 65b7f4b665b820eec4b835474bd308e49080526e
+SHA1 (patch-src_makefile) = 040bbcddb6e83e4d2c4f9039f55d543c8f7a2ea4

Index: pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile
diff -u /dev/null pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile:1.1
--- /dev/null   Thu May  3 13:13:51 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-extras_swig_makefile     Thu May  3 13:13:51 2018
@@ -0,0 +1,48 @@
+$NetBSD: patch-extras_swig_makefile,v 1.1 2018/05/03 13:13:51 schmonz Exp $
+
+Use pkgsrc-specified compiler and flags.
+
+--- extras/swig/makefile.orig  2013-09-24 20:24:04.000000000 +0000
++++ extras/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
Index: pkgsrc/textproc/libhighlight/patches/patch-makefile
diff -u /dev/null pkgsrc/textproc/libhighlight/patches/patch-makefile:1.1
--- /dev/null   Thu May  3 13:13:51 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-makefile Thu May  3 13:13:51 2018
@@ -0,0 +1,101 @@
+$NetBSD: patch-makefile,v 1.1 2018/05/03 13:13:51 schmonz Exp $
+
+Use pkgsrc-provided paths and tools.
+
+--- makefile.orig      2018-01-20 20:42:17.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}extras/
+ 
+ # 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}
+@@ -81,14 +82,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}
+@@ -110,15 +108,25 @@ install:
+ 
+       ${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 web plugins, 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."
+ 
++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} \
+@@ -140,7 +148,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
Index: pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp
diff -u /dev/null pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.1
--- /dev/null   Thu May  3 13:13:51 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp        Thu May  3 13:13:51 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_core_platform__fs.cpp,v 1.1 2018/05/03 13:13:51 schmonz Exp $
+
+Fix build on (at least) SmartOS.
+
+--- src/core/platform_fs.cpp.orig      2018-01-20 20:42:17.000000000 +0000
++++ src/core/platform_fs.cpp
+@@ -72,13 +72,13 @@ std::string getHomePath()
+ #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);
Index: pkgsrc/textproc/libhighlight/patches/patch-src_makefile
diff -u /dev/null pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.1
--- /dev/null   Thu May  3 13:13:51 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile     Thu May  3 13:13:51 2018
@@ -0,0 +1,89 @@
+$NetBSD: patch-src_makefile,v 1.1 2018/05/03 13:13:51 schmonz Exp $
+
+Use pkgsrc-specified compiler and flags.
+
+--- src/makefile.orig  2018-04-30 12:17:04.000000000 +0000
++++ src/makefile
+@@ -13,19 +13,20 @@
+ # See src/gui-qt/highlight.pro for the Qt GUI compilation options
+ 
+ #CXX=clang++
+-CXX=g++
++#CXX=g++
+ 
+ # was: qmake-qt5
+ QMAKE=qmake
+ 
+ # Added -std=c++11 because of auto_ptr to unique_ptr transition
+-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
++#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
+ #CFLAGS:=-ggdb ${CFLAGS} -std=c++11
+ 
+ CFLAGS_DILU=-fno-strict-aliasing
+ 
+ SO_VERSION=3.43
+ 
++LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
+ 
+ # Source paths
+ CORE_DIR=./core/
+@@ -66,14 +67,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}\"
+@@ -101,18 +104,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}
+-      ${CXX} -shared -Wl,-soname,libhighlight.so.${SO_VERSION} -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)
+@@ -121,7 +124,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
+@@ -202,7 +205,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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index