CVS commit: pkgsrc/textproc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Tue, 13 Aug 2019 01:48:50 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Aug 13 01:48:50 UTC 2019

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

Log Message:
Update to 3.53. From the changelog:

- fixed out-of-range exception with repeated `AddKeyword` calls
- added `KeywordFormatHints`, `Priority` and `Constraints` elements to
  syntax definitions
- added Lua function `AddPersistentState`
  (https://gitlab.com/saalen/highlight/issues/112)
- renamed md.lang to markdown.lang
- added Fish syntax definition (thanks to James Lee)
- makefile: added _FILE_OFFSET_BITS=64 flag
- CLI: added optional fallback syntax to `--force`
  (https://gitlab.com/saalen/highlight/issues/126)
- CLI: added option `--max-size`
  (https://gitlab.com/saalen/highlight/issues/127)
- GUI: added multibyte path trace window
- GUI: fixed superflouos creation of the same stylesheet file


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/libhighlight/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/libhighlight/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/textproc/libhighlight/patches/patch-src_makefile
cvs rdiff -u -r1.13 -r1.14 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/libhighlight/Makefile.common
diff -u pkgsrc/textproc/libhighlight/Makefile.common:1.10 pkgsrc/textproc/libhighlight/Makefile.common:1.11
--- pkgsrc/textproc/libhighlight/Makefile.common:1.10   Thu Jun 20 03:08:12 2019
+++ pkgsrc/textproc/libhighlight/Makefile.common        Tue Aug 13 01:48:49 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.10 2019/06/20 03:08:12 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.11 2019/08/13 01:48:49 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               3.52
+VERSION=               3.53
 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.9 pkgsrc/textproc/libhighlight/PLIST:1.10
--- pkgsrc/textproc/libhighlight/PLIST:1.9      Thu Jun 20 03:08:12 2019
+++ pkgsrc/textproc/libhighlight/PLIST  Tue Aug 13 01:48:49 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/06/20 03:08:12 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/08/13 01:48:49 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
@@ -136,6 +136,7 @@ share/highlight/langDefs/express.lang
 share/highlight/langDefs/fame.lang
 share/highlight/langDefs/fasm.lang
 share/highlight/langDefs/felix.lang
+share/highlight/langDefs/fish.lang
 share/highlight/langDefs/fortran77.lang
 share/highlight/langDefs/fortran90.lang
 share/highlight/langDefs/frink.lang
@@ -185,9 +186,9 @@ share/highlight/langDefs/lua.lang
 share/highlight/langDefs/luban.lang
 share/highlight/langDefs/make.lang
 share/highlight/langDefs/maple.lang
+share/highlight/langDefs/markdown.lang
 share/highlight/langDefs/matlab.lang
 share/highlight/langDefs/maya.lang
-share/highlight/langDefs/md.lang
 share/highlight/langDefs/mercury.lang
 share/highlight/langDefs/meson.lang
 share/highlight/langDefs/miranda.lang

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.11 pkgsrc/textproc/libhighlight/distinfo:1.12
--- pkgsrc/textproc/libhighlight/distinfo:1.11  Thu Jun 20 03:08:12 2019
+++ pkgsrc/textproc/libhighlight/distinfo       Tue Aug 13 01:48:49 2019
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2019/06/20 03:08:12 schmonz Exp $
+$NetBSD: distinfo,v 1.12 2019/08/13 01:48:49 schmonz Exp $
 
-SHA1 (highlight-3.52.tar.bz2) = 18bbd1c0e01fb1a5d099701e0df3042cee257f30
-RMD160 (highlight-3.52.tar.bz2) = bc7f8da98076c4d44fff9ae895f00d4bd281880a
-SHA512 (highlight-3.52.tar.bz2) = 4a44f6c4d29836c6f1af9db02c4e989c7ce155bcb387ca294170c361ae6c41b7441b03810ee27e7b7cdbd3ec73907fb5746ab545b7a44dfc482cc242a86681fe
-Size (highlight-3.52.tar.bz2) = 1400941 bytes
+SHA1 (highlight-3.53.tar.bz2) = bef7dac08125cfaa0b1f201b68163e90c261d433
+RMD160 (highlight-3.53.tar.bz2) = 7eeb4e122be2a1f808936cfb1f32cb1b65cd2418
+SHA512 (highlight-3.53.tar.bz2) = b25340aa881e5188fb9862d4858fab17627a80329835723a75de95bbf523f2453f42fa4e6ed842345b5e2842d66a40f16b03c19fbbbea4a226e247a93130a5e3
+Size (highlight-3.53.tar.bz2) = 1408173 bytes
 SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
 SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063
 SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = 977c34f85929bcd2a008d91dac812e44e63afb62
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_makefile) = cccbf5c845bd6fefa11b0591feab39ff634b70c0
+SHA1 (patch-src_makefile) = e7c4d0e8e79101ef0bb94556619b6e2a3283005b

Index: pkgsrc/textproc/libhighlight/patches/patch-src_makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.6 pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.7
--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.6 Thu Jun 20 03:08:12 2019
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile     Tue Aug 13 01:48:49 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_makefile,v 1.6 2019/06/20 03:08:12 schmonz Exp $
+$NetBSD: patch-src_makefile,v 1.7 2019/08/13 01:48:49 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- src/makefile.orig  2019-05-28 18:47:06.000000000 +0000
+--- src/makefile.orig  2019-07-31 21:48:56.000000000 +0000
 +++ src/makefile
 @@ -8,18 +8,18 @@
  # See ../makefile for the definition of ${data_dir}
@@ -21,12 +21,12 @@ Use pkgsrc-specified compiler and flags.
  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 -O0 ${CFLAGS} -std=c++11
+-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
++#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
  
- CFLAGS_DILU=-fno-strict-aliasing
-@@ -54,27 +54,30 @@ REGEX_DIR=${CORE_DIR}re/
+ #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
+ 
+@@ -57,27 +57,30 @@ REGEX_DIR=${CORE_DIR}re/
  DILU_DIR=${CORE_DIR}Diluculum/
  
  ifndef HL_CONFIG_DIR
@@ -62,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}\"
-@@ -102,18 +105,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
+@@ -105,18 +108,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
        ${GUI_QT_DIR}showtextfile.cpp
  
  
@@ -85,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)
-@@ -122,7 +125,7 @@ $(OBJECTFILES) : makefile
+@@ -125,7 +128,7 @@ $(OBJECTFILES) : makefile
  
  
  datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h
@@ -94,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
-@@ -203,7 +206,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
+@@ -206,7 +209,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

Index: pkgsrc/textproc/p5-highlight/Makefile
diff -u pkgsrc/textproc/p5-highlight/Makefile:1.13 pkgsrc/textproc/p5-highlight/Makefile:1.14
--- pkgsrc/textproc/p5-highlight/Makefile:1.13  Sun Aug 11 13:23:59 2019
+++ pkgsrc/textproc/p5-highlight/Makefile       Tue Aug 13 01:48:49 2019
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:23:59 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/08/13 01:48:49 schmonz Exp $
 
-PKGREVISION= 1
 .include "../../textproc/libhighlight/Makefile.common"
 
 PKGNAME=               p5-highlight-${VERSION}

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

Home | Main Index | Thread Index | Old Index