CVS commit: pkgsrc/textproc/libhighlight

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/libhighlight
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Thu, 4 Apr 2019 14:14:29 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Apr  4 14:14:29 UTC 2019

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/libhighlight/Makefile.common \
    pkgsrc/textproc/libhighlight/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/libhighlight/patches/patch-makefile
cvs rdiff -u -r1.4 -r1.5 \
    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.6 pkgsrc/textproc/libhighlight/Makefile.common:1.7
--- pkgsrc/textproc/libhighlight/Makefile.common:1.6    Tue Feb 12 19:46:12 2019
+++ pkgsrc/textproc/libhighlight/Makefile.common        Thu Apr  4 14:14:28 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.6 2019/02/12 19:46:12 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.7 2019/04/04 14:14:28 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               3.49
+VERSION=               3.50
 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.6 pkgsrc/textproc/libhighlight/PLIST:1.7
--- pkgsrc/textproc/libhighlight/PLIST:1.6      Tue Feb 12 19:46:12 2019
+++ pkgsrc/textproc/libhighlight/PLIST  Thu Apr  4 14:14:28 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/02/12 19:46:12 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/04/04 14:14:28 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
@@ -110,6 +110,7 @@ share/highlight/langDefs/coffee.lang
 share/highlight/langDefs/coldfusion.lang
 share/highlight/langDefs/conf.lang
 share/highlight/langDefs/crk.lang
+share/highlight/langDefs/crystal.lang
 share/highlight/langDefs/cs_block_regex.lang
 share/highlight/langDefs/csharp.lang
 share/highlight/langDefs/css.lang
@@ -249,10 +250,12 @@ share/highlight/langDefs/rs.lang
 share/highlight/langDefs/ruby.lang
 share/highlight/langDefs/s.lang
 share/highlight/langDefs/sas.lang
+share/highlight/langDefs/scad.lang
 share/highlight/langDefs/scala.lang
 share/highlight/langDefs/scilab.lang
 share/highlight/langDefs/scss.lang
 share/highlight/langDefs/sh.lang
+share/highlight/langDefs/slim.lang
 share/highlight/langDefs/small.lang
 share/highlight/langDefs/smalltalk.lang
 share/highlight/langDefs/sml.lang

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.8 pkgsrc/textproc/libhighlight/distinfo:1.9
--- pkgsrc/textproc/libhighlight/distinfo:1.8   Tue Feb 12 19:46:12 2019
+++ pkgsrc/textproc/libhighlight/distinfo       Thu Apr  4 14:14:28 2019
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2019/02/12 19:46:12 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2019/04/04 14:14:28 schmonz Exp $
 
-SHA1 (highlight-3.49.tar.bz2) = de80b3aa0421ae0d6a5e00a2a81ce08f0dcdcb5a
-RMD160 (highlight-3.49.tar.bz2) = 515716e9d1155fe9df28e445985329dfbf277a05
-SHA512 (highlight-3.49.tar.bz2) = 81223c11b7b518b5b289622afadb0f2660898f74342b96f3e03f8bd3ac88d2f9b816efe0dffcc58323417d8a47b112053c16bd5f83475e6908ab228ee3cf81b0
-Size (highlight-3.49.tar.bz2) = 1364886 bytes
+SHA1 (highlight-3.50.tar.bz2) = 8499963717f9d1e639b2689f6775ffd5f0aacbb4
+RMD160 (highlight-3.50.tar.bz2) = 8c273ee95c1778fcdb51e17472bc4fbb0d0ff188
+SHA512 (highlight-3.50.tar.bz2) = 1911a29fea6a157ff237276673acf0ae2b5a931ad7beeacf26a67970fc5ec66abf6dc64ff1694bf0cf68414c29f597625700943da772823a025f7a139d606c3d
+Size (highlight-3.50.tar.bz2) = 1386968 bytes
 SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
-SHA1 (patch-makefile) = e2a251415fffd38c2ebf73f1e7b57698a6f3f11e
+SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063
 SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8688f68e4dd64ccab2df577262baa2579040505a
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_makefile) = 9aea185beddf4fce63100892d63053f8bd98a26e
+SHA1 (patch-src_makefile) = d07c197a731f5a6197b55f4c8f12bd01ad11d544

Index: pkgsrc/textproc/libhighlight/patches/patch-makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-makefile:1.3 pkgsrc/textproc/libhighlight/patches/patch-makefile:1.4
--- pkgsrc/textproc/libhighlight/patches/patch-makefile:1.3     Mon Oct  8 13:51:28 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-makefile Thu Apr  4 14:14:28 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-makefile,v 1.3 2018/10/08 13:51:28 schmonz Exp $
+$NetBSD: patch-makefile,v 1.4 2019/04/04 14:14:28 schmonz Exp $
 
 Use pkgsrc-provided paths and tools.
 
---- makefile.orig      2018-10-07 09:31:45.000000000 +0000
+--- makefile.orig      2019-03-26 19:58:45.000000000 +0000
 +++ makefile
 @@ -7,7 +7,7 @@
  DESTDIR =
@@ -22,7 +22,7 @@ Use pkgsrc-provided paths and tools.
  
  # Location of the highlight documentation:
  doc_dir = ${PREFIX}/share/doc/highlight/
-@@ -25,18 +25,18 @@ doc_dir = ${PREFIX}/share/doc/highlight/
+@@ -25,8 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
  examples_dir = ${doc_dir}extras/
  
  # Location of the highlight config files:
@@ -33,9 +33,10 @@ Use pkgsrc-provided paths and tools.
  
  # Location of additional gui files
  desktop_apps = ${PREFIX}/share/applications/
- desktop_pixmaps = ${PREFIX}/share/pixmaps/
+@@ -34,10 +34,10 @@ desktop_pixmaps = ${PREFIX}/share/pixmap
  
  # Commands:
+ GZIP=gzip -9f
 -INSTALL_DATA=install -m644
 -INSTALL_PROGRAM=install -m755
 -MKDIR=mkdir -p -m 755
@@ -47,7 +48,7 @@ Use pkgsrc-provided paths and tools.
  
  all cli:
        ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
-@@ -85,17 +85,12 @@ install:
+@@ -86,19 +86,12 @@ install:
                ${DESTDIR}${data_dir}themes/base16 \
                ${DESTDIR}${data_dir}langDefs \
                ${DESTDIR}${data_dir}plugins
@@ -60,12 +61,14 @@ Use pkgsrc-provided paths and tools.
        ${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}man1/
--      ${INSTALL_DATA} ./man/filetypes.conf.5.gz ${DESTDIR}${man_dir}man5/
+-      ${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} ./AUTHORS ${DESTDIR}${doc_dir}
        ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir}
-@@ -115,15 +110,27 @@ install:
+@@ -118,15 +111,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}
@@ -84,9 +87,9 @@ Use pkgsrc-provided paths and tools.
 +      ${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.gz ${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.gz ${DESTDIR}${man_dir}man5/
++      ${BSD_INSTALL_MAN} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
 +
 +      @echo
 +      @echo "Done."
@@ -95,7 +98,7 @@ Use pkgsrc-provided paths and tools.
  install-gui:
        @echo "Installing files for the GUI..."
        ${MKDIR} ${DESTDIR}${data_dir} \
-@@ -145,8 +152,8 @@ uninstall:
+@@ -148,8 +153,8 @@ uninstall:
        ${RMDIR} ${DESTDIR}${doc_dir}
        ${RMDIR} ${DESTDIR}${conf_dir}
        ${RMDIR} ${DESTDIR}${examples_dir}

Index: pkgsrc/textproc/libhighlight/patches/patch-src_makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.4 pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.5
--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.4 Sun Oct 14 12:17:50 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile     Thu Apr  4 14:14:28 2019
@@ -1,10 +1,16 @@
-$NetBSD: patch-src_makefile,v 1.4 2018/10/14 12:17:50 schmonz Exp $
+$NetBSD: patch-src_makefile,v 1.5 2019/04/04 14:14:28 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- src/makefile.orig  2018-10-13 19:26:45.000000000 +0000
+--- src/makefile.orig  2019-03-26 19:58:45.000000000 +0000
 +++ src/makefile
-@@ -13,13 +13,13 @@
+@@ -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)
+ 
  # See src/gui-qt/highlight.pro for the Qt GUI compilation options
  
  #CXX=clang++
@@ -20,7 +26,23 @@ Use pkgsrc-specified compiler and flags.
  #CFLAGS:=-ggdb ${CFLAGS} -std=c++11
  
  CFLAGS_DILU=-fno-strict-aliasing
-@@ -66,14 +66,17 @@ ifdef PIC
+@@ -54,27 +54,30 @@ REGEX_DIR=${CORE_DIR}re/
+ DILU_DIR=${CORE_DIR}Diluculum/
+ 
+ ifndef HL_CONFIG_DIR
+-      HL_CONFIG_DIR = /etc/highlight/
++      HL_CONFIG_DIR = /etc/pkg/highlight/
+ endif
+ ifndef HL_DATA_DIR
+-      HL_DATA_DIR = /usr/share/highlight/
++      HL_DATA_DIR = /opt/.pkg-20151023/share/highlight/
+ endif
+ ifndef HL_DOC_DIR
+-      HL_DOC_DIR = /usr/share/doc/highlight/
++      HL_DOC_DIR = /opt/.pkg-20151023/share/doc/highlight/
+ endif
+ 
+ ifdef PIC
        CFLAGS+=-fPIC
  endif
  
@@ -40,7 +62,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}\"
-@@ -101,18 +104,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
+@@ -102,18 +105,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
        ${GUI_QT_DIR}showtextfile.cpp
  
  
@@ -63,7 +85,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)
-@@ -121,7 +124,7 @@ $(OBJECTFILES) : makefile
+@@ -122,7 +125,7 @@ $(OBJECTFILES) : makefile
  
  
  datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h
@@ -72,7 +94,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
-@@ -202,7 +205,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
+@@ -203,7 +206,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

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