CVS commit: pkgsrc/textproc/libhighlight

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Sep 17 21:06:20 UTC 2020

Modified Files:
        pkgsrc/textproc/libhighlight: Makefile.common PLIST distinfo
        pkgsrc/textproc/libhighlight/patches: patch-src_makefile

Log Message:
Update to 3.58. From the changelog:

- improved `--force` fallback argument handling
  (https://gitlab.com/saalen/highlight/-/issues/163)
- added C++ attribute syntax support
- added Lua fuction `StoreValue` to set and retrieve information across
  Lua states
- added `extras/eclipse-themes/eclipse_color_themes.py` script to
  retrieve themes from eclipsecolorthemes.org
- added support for Web Assembly Text
- updated mark_lines.lua to output 16m terminal sequences
  (https://gitlab.com/saalen/highlight/-/issues/164)
- fixed issues in bash.lang
  (https://gitlab.com/saalen/highlight/-/issues/161)
- fixed Bash heredoc highlighting in bash_functions.lua
  (https://gitlab.com/saalen/highlight/-/issues/156)
- CLI: `highlight --version -q` only prints the version number
- GUI: added theme contrast indicator


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/libhighlight/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/libhighlight/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/textproc/libhighlight/patches/patch-src_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/libhighlight/Makefile.common
diff -u pkgsrc/textproc/libhighlight/Makefile.common:1.15 pkgsrc/textproc/libhighlight/Makefile.common:1.16
--- pkgsrc/textproc/libhighlight/Makefile.common:1.15   Sun May 17 15:09:41 2020
+++ pkgsrc/textproc/libhighlight/Makefile.common        Thu Sep 17 21:06:20 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.15 2020/05/17 15:09:41 nia Exp $
+# $NetBSD: Makefile.common,v 1.16 2020/09/17 21:06:20 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               3.57
+VERSION=               3.58
 CATEGORIES=            textproc
 MASTER_SITES=          http://www.andre-simon.de/zip/
 EXTRACT_SUFX=          .tar.bz2

Index: pkgsrc/textproc/libhighlight/PLIST
diff -u pkgsrc/textproc/libhighlight/PLIST:1.13 pkgsrc/textproc/libhighlight/PLIST:1.14
--- pkgsrc/textproc/libhighlight/PLIST:1.13     Sun May 17 15:09:41 2020
+++ pkgsrc/textproc/libhighlight/PLIST  Thu Sep 17 21:06:20 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2020/05/17 15:09:41 nia Exp $
+@comment $NetBSD: PLIST,v 1.14 2020/09/17 21:06:20 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
@@ -294,6 +294,7 @@ share/highlight/langDefs/verilog.lang
 share/highlight/langDefs/vhd.lang
 share/highlight/langDefs/vimscript.lang
 share/highlight/langDefs/vue.lang
+share/highlight/langDefs/wat.lang
 share/highlight/langDefs/whiley.lang
 share/highlight/langDefs/wren.lang
 share/highlight/langDefs/xml.lang

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.17 pkgsrc/textproc/libhighlight/distinfo:1.18
--- pkgsrc/textproc/libhighlight/distinfo:1.17  Sun May 17 15:09:41 2020
+++ pkgsrc/textproc/libhighlight/distinfo       Thu Sep 17 21:06:20 2020
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.17 2020/05/17 15:09:41 nia Exp $
+$NetBSD: distinfo,v 1.18 2020/09/17 21:06:20 schmonz Exp $
 
-SHA1 (highlight-3.57.tar.bz2) = 0076a69a6eb6f0bfdd7fbbf4799c0438827fa804
-RMD160 (highlight-3.57.tar.bz2) = aab32330ef947d9e83f229d007cf202c1a0b0e66
-SHA512 (highlight-3.57.tar.bz2) = a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-Size (highlight-3.57.tar.bz2) = 1412857 bytes
+SHA1 (highlight-3.58.tar.bz2) = c7c051593b415725fbff5de42028d41b04b5ea6a
+RMD160 (highlight-3.58.tar.bz2) = 679448f782a93cd44f8d84bea81093d20a166103
+SHA512 (highlight-3.58.tar.bz2) = 89e716ddd9242878cd64b7fd1e3102a620ecc24b339100155bb5c4fc9c79750996920fce290fb7272e2a4afc05e0e92fc52946a19efb8642b2a3bd0d3dab5bc4
+Size (highlight-3.58.tar.bz2) = 1416199 bytes
 SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
 SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063
 SHA1 (patch-src_core_platform__fs.cpp) = 94e4b2aef89e48e104be57acf6dd9ce4b5917e21
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = 977c34f85929bcd2a008d91dac812e44e63afb62
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_makefile) = 5e3207e202e3cb9b7f7b0d1e38e814933b0d5e6d
+SHA1 (patch-src_makefile) = ac3fc3dcfac061f39797a5c08dc191979715804f

Index: pkgsrc/textproc/libhighlight/patches/patch-src_makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.9 pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.10
--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.9 Tue May 12 09:56:44 2020
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile     Thu Sep 17 21:06:20 2020
@@ -1,24 +1,17 @@
-$NetBSD: patch-src_makefile,v 1.9 2020/05/12 09:56:44 schmonz Exp $
+$NetBSD: patch-src_makefile,v 1.10 2020/09/17 21:06:20 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- src/makefile.orig  2020-04-07 18:17:39.000000000 +0000
+--- src/makefile.orig  2020-09-07 20:21:10.000000000 +0000
 +++ src/makefile
-@@ -8,18 +8,18 @@
- # See ../makefile for the definition of ${data_dir}
- 
- # Add -DHL_CONFIG_DIR=\"/your/path/\" to define the configuration directory
--# (default: /etc/highlight)
-+# (default: /etc/pkg/highlight)
- 
+@@ -13,12 +13,12 @@
  # See src/gui-qt/highlight.pro for the Qt GUI compilation options
  
- #CXX=clang++
--CXX=g++
-+#CXX=g++
+ #CXX ?= clang++
+-CXX ?= g++
++#CXX ?= g++
  
- # was: qmake-qt5
- QMAKE=qmake
+ QMAKE ?= qmake
  
  # Added -std=c++11 because of auto_ptr to unique_ptr transition
 -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
@@ -26,7 +19,7 @@ Use pkgsrc-specified compiler and flags.
  
  #CFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables 
-fstack-clash-protection
  
-@@ -70,14 +70,17 @@ ifdef PIC
+@@ -69,14 +69,17 @@ ifdef PIC
        CFLAGS+=-fPIC
  endif
  
@@ -46,7 +39,7 @@ Use pkgsrc-specified compiler and flags.
  
  # Data directories (data dir, configuration file dir)
  CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
-@@ -105,18 +108,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
+@@ -104,18 +107,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
        ${GUI_QT_DIR}showtextfile.cpp
  
  
@@ -69,7 +62,7 @@ Use pkgsrc-specified compiler and flags.
        cd gui-qt && \
        ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
        $(MAKE)
-@@ -125,7 +128,7 @@ $(OBJECTFILES) : makefile
+@@ -124,7 +127,7 @@ $(OBJECTFILES) : makefile
  
  
  datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h
@@ -78,7 +71,7 @@ Use pkgsrc-specified compiler and flags.
  
  platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h
        ${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp
-@@ -206,7 +209,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
+@@ -208,7 +211,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