pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1454bb69a702
branches:  trunk
changeset: 383128:1454bb69a702
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Jul 23 05:16:43 2018 +0000

description:
Update to 3.44. From the changelog:

- fixed gcc 8 compilation warnings
- fixed Ruby string interpolation
  (https://github.com/andre-simon/highlight/issues/70)
- added support for ALAN IF (thanks to Tristano Ajmone)
- added 107 Base16 themes [https://github.com/chriskempson/base16]
  (thanks to Tristano Ajmone)
- updated Rust and Java reserved words lists
- revised documentation
- moved extras/css-themes into extras/themes-resources
- added extras/themes-resources/base16 (thanks to Tristano Ajmone)
- GUI: added Base16 theme selection checkbox
- CLI: added --base16 option to enable the new themes
- CLI: accept - as argument to read from stdin
  (https://github.com/andre-simon/highlight/issues/73)

diffstat:

 textproc/highlight/Makefile                      |    3 +-
 textproc/libhighlight/Makefile.common            |    4 +-
 textproc/libhighlight/PLIST                      |  136 +++++++++++++++++++++-
 textproc/libhighlight/buildlink3.mk              |    4 +-
 textproc/libhighlight/distinfo                   |   14 +-
 textproc/libhighlight/patches/patch-makefile     |   21 +-
 textproc/libhighlight/patches/patch-src_makefile |    6 +-
 textproc/p5-highlight/Makefile                   |    3 +-
 8 files changed, 157 insertions(+), 34 deletions(-)

diffs (truncated from 347 to 300 lines):

diff -r 0e6b0094f736 -r 1454bb69a702 textproc/highlight/Makefile
--- a/textproc/highlight/Makefile       Mon Jul 23 04:56:33 2018 +0000
+++ b/textproc/highlight/Makefile       Mon Jul 23 05:16:43 2018 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.14 2018/07/20 03:34:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2018/07/23 05:16:43 schmonz Exp $
 
-PKGREVISION= 2
 .include "../../textproc/libhighlight/Makefile.common"
 
 MANCOMPRESSED=         yes
diff -r 0e6b0094f736 -r 1454bb69a702 textproc/libhighlight/Makefile.common
--- a/textproc/libhighlight/Makefile.common     Mon Jul 23 04:56:33 2018 +0000
+++ b/textproc/libhighlight/Makefile.common     Mon Jul 23 05:16:43 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.1 2018/05/03 13:13:51 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.2 2018/07/23 05:16:43 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               3.43
+VERSION=               3.44
 CATEGORIES=            textproc
 MASTER_SITES=          http://www.andre-simon.de/zip/
 EXTRACT_SUFX=          .tar.bz2
diff -r 0e6b0094f736 -r 1454bb69a702 textproc/libhighlight/PLIST
--- a/textproc/libhighlight/PLIST       Mon Jul 23 04:56:33 2018 +0000
+++ b/textproc/libhighlight/PLIST       Mon Jul 23 05:16:43 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/05/03 13:13:51 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/07/23 05:16:43 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
@@ -9,15 +9,11 @@
 share/doc/highlight/README_LANGLIST
 share/doc/highlight/README_PLUGINS
 share/doc/highlight/README_REGEX
-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/UNLICENCE
 share/doc/highlight/extras/langDefs-resources/cleanslate.lang
 share/doc/highlight/extras/langDefs-resources/template.lang
 share/doc/highlight/extras/pandoc/Highlight.pp
@@ -37,6 +33,26 @@
 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/tcl/README_TCL
+share/doc/highlight/extras/tcl/makefile
+share/doc/highlight/extras/tcl/pkgIndex.tcl
+share/doc/highlight/extras/tcl/tclhighlight.c
+share/doc/highlight/extras/themes-resources/base16/LICENSE
+share/doc/highlight/extras/themes-resources/base16/README.html
+share/doc/highlight/extras/themes-resources/base16/base16_highlight.mustache
+share/doc/highlight/extras/themes-resources/base16/base16_highlight_light.mustache
+share/doc/highlight/extras/themes-resources/base16/example-dark.html
+share/doc/highlight/extras/themes-resources/base16/example-light.html
+share/doc/highlight/extras/themes-resources/base16/example.bat
+share/doc/highlight/extras/themes-resources/base16/example.pb
+share/doc/highlight/extras/themes-resources/base16/example.theme
+share/doc/highlight/extras/themes-resources/base16/example.yaml
+share/doc/highlight/extras/themes-resources/base16/example_light.theme
+share/doc/highlight/extras/themes-resources/css-themes/README.html
+share/doc/highlight/extras/themes-resources/css-themes/UNLICENCE
+share/doc/highlight/extras/themes-resources/css-themes/example.html
+share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.css
+share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.scss
 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
@@ -49,6 +65,7 @@
 share/highlight/langDefs/actionscript.lang
 share/highlight/langDefs/ada.lang
 share/highlight/langDefs/agda.lang
+share/highlight/langDefs/alan.lang
 share/highlight/langDefs/algol.lang
 share/highlight/langDefs/ampl.lang
 share/highlight/langDefs/amtrix.lang
@@ -305,6 +322,113 @@
 share/highlight/themes/andes.theme
 share/highlight/themes/anotherdark.theme
 share/highlight/themes/autumn.theme
+share/highlight/themes/base16/3024.theme
+share/highlight/themes/base16/apathy.theme
+share/highlight/themes/base16/ashes.theme
+share/highlight/themes/base16/atelier-cave-light.theme
+share/highlight/themes/base16/atelier-cave.theme
+share/highlight/themes/base16/atelier-dune-light.theme
+share/highlight/themes/base16/atelier-dune.theme
+share/highlight/themes/base16/atelier-estuary-light.theme
+share/highlight/themes/base16/atelier-estuary.theme
+share/highlight/themes/base16/atelier-forest-light.theme
+share/highlight/themes/base16/atelier-forest.theme
+share/highlight/themes/base16/atelier-heath-light.theme
+share/highlight/themes/base16/atelier-heath.theme
+share/highlight/themes/base16/atelier-lakeside-light.theme
+share/highlight/themes/base16/atelier-lakeside.theme
+share/highlight/themes/base16/atelier-plateau-light.theme
+share/highlight/themes/base16/atelier-plateau.theme
+share/highlight/themes/base16/atelier-savanna-light.theme
+share/highlight/themes/base16/atelier-savanna.theme
+share/highlight/themes/base16/atelier-seaside-light.theme
+share/highlight/themes/base16/atelier-seaside.theme
+share/highlight/themes/base16/atelier-sulphurpool-light.theme
+share/highlight/themes/base16/atelier-sulphurpool.theme
+share/highlight/themes/base16/bespin.theme
+share/highlight/themes/base16/brewer.theme
+share/highlight/themes/base16/bright.theme
+share/highlight/themes/base16/brushtrees-dark.theme
+share/highlight/themes/base16/brushtrees.theme
+share/highlight/themes/base16/chalk.theme
+share/highlight/themes/base16/circus.theme
+share/highlight/themes/base16/classic-dark.theme
+share/highlight/themes/base16/classic-light.theme
+share/highlight/themes/base16/codeschool.theme
+share/highlight/themes/base16/cupcake.theme
+share/highlight/themes/base16/cupertino.theme
+share/highlight/themes/base16/darktooth.theme
+share/highlight/themes/base16/default-dark.theme
+share/highlight/themes/base16/default-light.theme
+share/highlight/themes/base16/dracula.theme
+share/highlight/themes/base16/eighties.theme
+share/highlight/themes/base16/embers.theme
+share/highlight/themes/base16/flat.theme
+share/highlight/themes/base16/github.theme
+share/highlight/themes/base16/google-dark.theme
+share/highlight/themes/base16/google-light.theme
+share/highlight/themes/base16/grayscale-dark.theme
+share/highlight/themes/base16/grayscale-light.theme
+share/highlight/themes/base16/greenscreen.theme
+share/highlight/themes/base16/gruvbox-dark-hard.theme
+share/highlight/themes/base16/gruvbox-dark-medium.theme
+share/highlight/themes/base16/gruvbox-dark-pale.theme
+share/highlight/themes/base16/gruvbox-dark-soft.theme
+share/highlight/themes/base16/gruvbox-light-hard.theme
+share/highlight/themes/base16/gruvbox-light-medium.theme
+share/highlight/themes/base16/gruvbox-light-soft.theme
+share/highlight/themes/base16/harmonic-dark.theme
+share/highlight/themes/base16/harmonic-light.theme
+share/highlight/themes/base16/hopscotch.theme
+share/highlight/themes/base16/ia-dark.theme
+share/highlight/themes/base16/ia-light.theme
+share/highlight/themes/base16/icy.theme
+share/highlight/themes/base16/irblack.theme
+share/highlight/themes/base16/isotope.theme
+share/highlight/themes/base16/macintosh.theme
+share/highlight/themes/base16/marrakesh.theme
+share/highlight/themes/base16/materia.theme
+share/highlight/themes/base16/material-darker.theme
+share/highlight/themes/base16/material-lighter.theme
+share/highlight/themes/base16/material-palenight.theme
+share/highlight/themes/base16/material-vivid.theme
+share/highlight/themes/base16/material.theme
+share/highlight/themes/base16/mellow-purple.theme
+share/highlight/themes/base16/mexico-light.theme
+share/highlight/themes/base16/mocha.theme
+share/highlight/themes/base16/monokai.theme
+share/highlight/themes/base16/nord.theme
+share/highlight/themes/base16/ocean.theme
+share/highlight/themes/base16/oceanicnext.theme
+share/highlight/themes/base16/one-light.theme
+share/highlight/themes/base16/onedark.theme
+share/highlight/themes/base16/outrun-dark.theme
+share/highlight/themes/base16/paraiso.theme
+share/highlight/themes/base16/phd.theme
+share/highlight/themes/base16/pico.theme
+share/highlight/themes/base16/pop.theme
+share/highlight/themes/base16/porple.theme
+share/highlight/themes/base16/railscasts.theme
+share/highlight/themes/base16/rebecca.theme
+share/highlight/themes/base16/seti.theme
+share/highlight/themes/base16/shapeshifter.theme
+share/highlight/themes/base16/snazzy.theme
+share/highlight/themes/base16/solarflare.theme
+share/highlight/themes/base16/solarized-dark.theme
+share/highlight/themes/base16/solarized-light.theme
+share/highlight/themes/base16/spacemacs.theme
+share/highlight/themes/base16/summerfruit-dark.theme
+share/highlight/themes/base16/summerfruit-light.theme
+share/highlight/themes/base16/tomorrow-night.theme
+share/highlight/themes/base16/tomorrow.theme
+share/highlight/themes/base16/tube.theme
+share/highlight/themes/base16/twilight.theme
+share/highlight/themes/base16/unikitty-dark.theme
+share/highlight/themes/base16/unikitty-light.theme
+share/highlight/themes/base16/unikitty-reversible.theme
+share/highlight/themes/base16/woodland.theme
+share/highlight/themes/base16/xcode-dusk.theme
+share/highlight/themes/base16/zenburn.theme
 share/highlight/themes/baycomb.theme
 share/highlight/themes/bclear.theme
 share/highlight/themes/biogoo.theme
diff -r 0e6b0094f736 -r 1454bb69a702 textproc/libhighlight/buildlink3.mk
--- a/textproc/libhighlight/buildlink3.mk       Mon Jul 23 04:56:33 2018 +0000
+++ b/textproc/libhighlight/buildlink3.mk       Mon Jul 23 05:16:43 2018 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/05/03 13:13:51 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/07/23 05:16:43 schmonz Exp $
 
 BUILDLINK_TREE+=       libhighlight
 
 .if !defined(LIBHIGHLIGHT_BUILDLINK3_MK)
 LIBHIGHLIGHT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libhighlight+=   libhighlight>=3.42
+BUILDLINK_API_DEPENDS.libhighlight+=   libhighlight>=3.44
 BUILDLINK_PKGSRCDIR.libhighlight?=     ../../textproc/libhighlight
 .endif # LIBHIGHLIGHT_BUILDLINK3_MK
 
diff -r 0e6b0094f736 -r 1454bb69a702 textproc/libhighlight/distinfo
--- a/textproc/libhighlight/distinfo    Mon Jul 23 04:56:33 2018 +0000
+++ b/textproc/libhighlight/distinfo    Mon Jul 23 05:16:43 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2018/05/27 11:50:26 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2018/07/23 05:16:43 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 (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 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
-SHA1 (patch-makefile) = 693fe29c416e4e5ee63e279f4abb27799ce0d6e0
+SHA1 (patch-makefile) = c3ba1882befaf0293ad4ff69b2b6067d42bb3e57
 SHA1 (patch-src_core_platform__fs.cpp) = 65b7f4b665b820eec4b835474bd308e49080526e
-SHA1 (patch-src_makefile) = 040bbcddb6e83e4d2c4f9039f55d543c8f7a2ea4
+SHA1 (patch-src_makefile) = 6d9343af73f1d9cc1cd62958c654089865f1a2bc
diff -r 0e6b0094f736 -r 1454bb69a702 textproc/libhighlight/patches/patch-makefile
--- a/textproc/libhighlight/patches/patch-makefile      Mon Jul 23 04:56:33 2018 +0000
+++ b/textproc/libhighlight/patches/patch-makefile      Mon Jul 23 05:16:43 2018 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-makefile,v 1.1 2018/05/03 13:13:51 schmonz Exp $
+$NetBSD: patch-makefile,v 1.2 2018/07/23 05:16:43 schmonz Exp $
 
 Use pkgsrc-provided paths and tools.
 
---- makefile.orig      2018-01-20 20:42:17.000000000 +0000
+--- makefile.orig      2018-07-19 17:57:22.000000000 +0000
 +++ makefile
 @@ -7,7 +7,7 @@
  DESTDIR =
@@ -22,17 +22,17 @@
  
  # Location of the highlight documentation:
  doc_dir = ${PREFIX}/share/doc/highlight/
-@@ -25,7 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
+@@ -25,18 +25,18 @@ doc_dir = ${PREFIX}/share/doc/highlight/
  examples_dir = ${doc_dir}extras/
  
  # Location of the highlight config files:
 -conf_dir = /etc/highlight/
+-#conf_dir = ${PREFIX}/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_apps = ${PREFIX}/share/applications/
  desktop_pixmaps = ${PREFIX}/share/pixmaps/
  
  # Commands:
@@ -47,8 +47,8 @@
  
  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 \
+@@ -85,15 +85,12 @@ install:
+               ${DESTDIR}${data_dir}themes/base16 \
                ${DESTDIR}${data_dir}langDefs \
                ${DESTDIR}${data_dir}plugins
 -      ${MKDIR} ${DESTDIR}${man_dir}
@@ -57,13 +57,14 @@
        ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
        ${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir}
        ${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} ./AUTHORS ${DESTDIR}${doc_dir}
        ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
        ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
-@@ -110,15 +108,25 @@ install:
- 
+@@ -116,15 +113,25 @@ install:
+       ${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes



Home | Main Index | Thread Index | Old Index