pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/libhighlight Update to 3.46. From the changelog:

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbc32cd639ef
branches:  trunk
changeset: 324119:fbc32cd639ef
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Oct 08 13:51:28 2018 +0000

description:
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)

diffstat:

 textproc/libhighlight/Makefile.common            |   4 +-
 textproc/libhighlight/PLIST                      |  19 +++++++---
 textproc/libhighlight/distinfo                   |  14 ++++----
 textproc/libhighlight/patches/patch-makefile     |  40 +++++++++++++----------
 textproc/libhighlight/patches/patch-src_makefile |   6 +-
 5 files changed, 48 insertions(+), 35 deletions(-)

diffs (219 lines):

diff -r 4db15fdc6333 -r fbc32cd639ef textproc/libhighlight/Makefile.common
--- a/textproc/libhighlight/Makefile.common     Mon Oct 08 13:50:04 2018 +0000
+++ b/textproc/libhighlight/Makefile.common     Mon Oct 08 13:51:28 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2018/07/23 05:16:43 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.3 2018/10/08 13:51:28 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               3.44
+VERSION=               3.46
 CATEGORIES=            textproc
 MASTER_SITES=          http://www.andre-simon.de/zip/
 EXTRACT_SUFX=          .tar.bz2
diff -r 4db15fdc6333 -r fbc32cd639ef textproc/libhighlight/PLIST
--- a/textproc/libhighlight/PLIST       Mon Oct 08 13:50:04 2018 +0000
+++ b/textproc/libhighlight/PLIST       Mon Oct 08 13:51:28 2018 +0000
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2018/07/23 05:16:43 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/10/08 13:51:28 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
 share/doc/highlight/ChangeLog
 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.adoc
+share/doc/highlight/README_DE.adoc
+share/doc/highlight/README_LANGLIST.adoc
+share/doc/highlight/README_PLUGINS.adoc
+share/doc/highlight/README_REGEX.adoc
+share/doc/highlight/README_RELEASE.adoc
+share/doc/highlight/README_TESTCASES.adoc
 share/doc/highlight/extras/highlight_pipe.php
 share/doc/highlight/extras/highlight_pipe.pm
 share/doc/highlight/extras/highlight_pipe.py
@@ -266,6 +268,7 @@
 share/highlight/langDefs/tex.lang
 share/highlight/langDefs/ts.lang
 share/highlight/langDefs/tsql.lang
+share/highlight/langDefs/tsx.lang
 share/highlight/langDefs/ttcn3.lang
 share/highlight/langDefs/txt.lang
 share/highlight/langDefs/upc.lang
@@ -274,6 +277,7 @@
 share/highlight/langDefs/verilog.lang
 share/highlight/langDefs/vhd.lang
 share/highlight/langDefs/vimscript.lang
+share/highlight/langDefs/vue.lang
 share/highlight/langDefs/whiley.lang
 share/highlight/langDefs/xml.lang
 share/highlight/langDefs/xpp.lang
@@ -298,6 +302,7 @@
 share/highlight/plugins/keywords_capitalize.lua
 share/highlight/plugins/keywords_lowercase.lua
 share/highlight/plugins/keywords_uppercase.lua
+share/highlight/plugins/latex_single_outfile.lua
 share/highlight/plugins/mark_lines.lua
 share/highlight/plugins/outhtml_add_background_stripes.lua
 share/highlight/plugins/outhtml_add_background_svg.lua
@@ -308,6 +313,7 @@
 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_ligature_fonts.lua
 share/highlight/plugins/outhtml_modern_fonts.lua
 share/highlight/plugins/outhtml_parantheses_matcher.lua
 share/highlight/plugins/outhtml_tooltips.lua
@@ -315,6 +321,7 @@
 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/terminal_add_info.lua
 share/highlight/plugins/theme_invert.lua
 share/highlight/plugins/token_add_state_ids.lua
 share/highlight/themes/acid.theme
diff -r 4db15fdc6333 -r fbc32cd639ef textproc/libhighlight/distinfo
--- a/textproc/libhighlight/distinfo    Mon Oct 08 13:50:04 2018 +0000
+++ b/textproc/libhighlight/distinfo    Mon Oct 08 13:51:28 2018 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2018/07/27 07:39:12 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2018/10/08 13:51:28 schmonz Exp $
 
-SHA1 (highlight-3.44.tar.bz2) = c01ea650bc9462df833afa59e566be32cd47e3f0
-RMD160 (highlight-3.44.tar.bz2) = d7997c545d98c21c2fd09f68989e3cb8cf3713da
-SHA512 (highlight-3.44.tar.bz2) = a0b9a147cadec72b80b97d92e6fac9312f134ef71a4a67121cab3646668424379c14a9189b5bdd0d892790cc99edc955090967caf6816239151d0e8a19bcfbd7
-Size (highlight-3.44.tar.bz2) = 1335764 bytes
+SHA1 (highlight-3.46.tar.bz2) = db29dc697641cb154c97cee9c448ea3168a135d2
+RMD160 (highlight-3.46.tar.bz2) = 7f334d85ec0897ae44f471d36496d48f003412ed
+SHA512 (highlight-3.46.tar.bz2) = 1359a428fcd624ae85e939a5a8a991c2f10114c106ddac359e68e7eefadcacad92fbc98866f37ec9654268852a4cfcf595a0ae7f99acd5d75902b5dea235936a
+Size (highlight-3.46.tar.bz2) = 1341849 bytes
 SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
-SHA1 (patch-makefile) = c3ba1882befaf0293ad4ff69b2b6067d42bb3e57
+SHA1 (patch-makefile) = e2a251415fffd38c2ebf73f1e7b57698a6f3f11e
 SHA1 (patch-src_core_platform__fs.cpp) = 65b7f4b665b820eec4b835474bd308e49080526e
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = d073a80a1d853f9cc2bbedf7a402125ec7a994d2
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_makefile) = 6d9343af73f1d9cc1cd62958c654089865f1a2bc
+SHA1 (patch-src_makefile) = 41fd190b19a02b019e50eb8e1e49d90188cff0f1
diff -r 4db15fdc6333 -r fbc32cd639ef textproc/libhighlight/patches/patch-makefile
--- a/textproc/libhighlight/patches/patch-makefile      Mon Oct 08 13:50:04 2018 +0000
+++ b/textproc/libhighlight/patches/patch-makefile      Mon Oct 08 13:51:28 2018 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-makefile,v 1.2 2018/07/23 05:16:43 schmonz Exp $
+$NetBSD: patch-makefile,v 1.3 2018/10/08 13:51:28 schmonz Exp $
 
 Use pkgsrc-provided paths and tools.
 
---- makefile.orig      2018-07-19 17:57:22.000000000 +0000
+--- makefile.orig      2018-10-07 09:31:45.000000000 +0000
 +++ makefile
 @@ -7,7 +7,7 @@
  DESTDIR =
@@ -16,9 +16,9 @@
 @@ -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 man pages:
+-man_dir = ${PREFIX}/share/man/
++man_dir = ${PREFIX}/${PKGMANDIR}/
  
  # Location of the highlight documentation:
  doc_dir = ${PREFIX}/share/doc/highlight/
@@ -47,11 +47,12 @@
  
  all cli:
        ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
-@@ -85,15 +85,12 @@ install:
+@@ -85,17 +85,12 @@ install:
                ${DESTDIR}${data_dir}themes/base16 \
                ${DESTDIR}${data_dir}langDefs \
                ${DESTDIR}${data_dir}plugins
--      ${MKDIR} ${DESTDIR}${man_dir}
+-      ${MKDIR} ${DESTDIR}${man_dir}man1/
+-      ${MKDIR} ${DESTDIR}${man_dir}man5/
 -      ${MKDIR} ${DESTDIR}${bin_dir}
  
        ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
@@ -59,11 +60,12 @@
        ${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/
--      ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
+-      ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}man1/
+-      ${INSTALL_DATA} ./man/filetypes.conf.5.gz ${DESTDIR}${man_dir}man5/
+ 
        ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
-       ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
-       ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
-@@ -116,15 +113,25 @@ install:
+       ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir}
+@@ -115,15 +110,27 @@ 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}
@@ -81,8 +83,10 @@
 +      @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}
++      ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man1
++      ${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir}/man1/
++      ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}man5
++      ${BSD_INSTALL_MAN} ./man/filetypes.conf.5.gz ${DESTDIR}${man_dir}man5/
 +
 +      @echo
 +      @echo "Done."
@@ -91,12 +95,14 @@
  install-gui:
        @echo "Installing files for the GUI..."
        ${MKDIR} ${DESTDIR}${data_dir} \
-@@ -146,7 +153,7 @@ uninstall:
+@@ -145,8 +152,8 @@ 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}${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}${bin_dir}highlight
        rm -rf ${DESTDIR}${bin_dir}highlight-gui
-       rm -rf ${DESTDIR}${desktop_apps}highlight.desktop
diff -r 4db15fdc6333 -r fbc32cd639ef textproc/libhighlight/patches/patch-src_makefile
--- a/textproc/libhighlight/patches/patch-src_makefile  Mon Oct 08 13:50:04 2018 +0000
+++ b/textproc/libhighlight/patches/patch-src_makefile  Mon Oct 08 13:51:28 2018 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_makefile,v 1.2 2018/07/23 05:16:43 schmonz Exp $
+$NetBSD: patch-src_makefile,v 1.3 2018/10/08 13:51:28 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- src/makefile.orig  2018-07-19 17:57:22.000000000 +0000
+--- src/makefile.orig  2018-10-07 09:31:45.000000000 +0000
 +++ src/makefile
 @@ -13,19 +13,20 @@
  # See src/gui-qt/highlight.pro for the Qt GUI compilation options
@@ -21,7 +21,7 @@
  
  CFLAGS_DILU=-fno-strict-aliasing
  
- SO_VERSION=3.44
+ SO_VERSION=3.45
  
 +LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
Home | Main Index | Thread Index | Old Index