From 38af44b3dd70f0d233dbe19231e5a07e3eabd9e7 Mon Sep 17 00:00:00 2001 From: pho Date: Mon, 30 Oct 2023 18:29:39 +0000 Subject: [PATCH] textproc/hs-skylighting: Update to 0.14 0.14 * Add rWeakDeliminators field to Rule. [API change] * Make WordDetect sensitive to weakDeliminator. This fixes parsing of floats beginning with '0.' in C (#174). * Add debiancontrol syntax (#173). 0.13.4.1 * Update syntax definitions: ada, bash, cmake, css, html, isocpp, java, javascript, kotlin, latex, makefile, markdown, php, python, qml, r, sass, scss, typescript, zsh. * Don't require word boundary at end of Int, Float, HlCHex, HlCOct (#170). KDE does not. This fixes things like 7L in R. 0.13.4 * Add dosbat syntax (MS DOS batch file) (#169). * Derive Bounded Instance for TokenType (#168, Pavan Pikhi). Add Bounded to the derived instances for the TokenType type. This allows consumers to use [minBound .. maxBound] to generate a list of all token types when writing a Style. * Require xml-conduit >= 1.9.1.3. This fixes a bug that prevents parsing certain DOCTYPE declarations, e.g. in agda.xml. * Updated cmake syntax definition. 0.13.3 * Add gap language (#167). * Update syntax definitions. * Add patches for agda.xml and dtd.xml, to wor around a bug in xml-conduit: https://github.com/snoyberg/xml/pull/187 * Store compiled regexes in RE (#166, Jonathan Coates). This changes the RE type to (lazily) compile the regex when constructed, rather than in the tokenizer. This allows us to avoid re-compiling regexes for each separate tokenize call, instead sharing them globally. We try to hide the internals of this, exposing the previous interface (RE { reString, reCaseSensitive }) with pattern synonyms. * ConTeXt: fix handling of spaces in non-normal tokens (Albert Krewinkel). This ensures that multiple spaces won't be collapsed into a single space. 0.13.2.1 * Update tango style for new token types (#164). The original tango style didn't have colors defined for many token types that have been added since it was added. This commit updates the style to support them. Thanks to @danbraswell for providing the values needed. --- textproc/hs-skylighting/Makefile | 7 +++---- textproc/hs-skylighting/PLIST | 15 +++++++++++++-- textproc/hs-skylighting/buildlink3.mk | 6 +++--- textproc/hs-skylighting/distinfo | 8 ++++---- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/textproc/hs-skylighting/Makefile b/textproc/hs-skylighting/Makefile index a25d4d52e2b8..78d1afdc085a 100644 --- a/textproc/hs-skylighting/Makefile +++ b/textproc/hs-skylighting/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.13 2023/10/09 04:54:54 pho Exp $ +# $NetBSD: Makefile,v 1.14 2023/10/30 18:29:39 pho Exp $ -DISTNAME= skylighting-0.13.2 -PKGREVISION= 2 +DISTNAME= skylighting-0.14 CATEGORIES= textproc MAINTAINER= pho@cielonegro.org COMMENT= Syntax highlighting library LICENSE= gnu-gpl-v2 -CONFIGURE_ARGS+= -fexecutable +CONFIGURE_ARGS+= -f executable # lib:skylighting .include "../../textproc/hs-skylighting-core/buildlink3.mk" diff --git a/textproc/hs-skylighting/PLIST b/textproc/hs-skylighting/PLIST index 70039c4597c5..7b9e12e3b4d2 100644 --- a/textproc/hs-skylighting/PLIST +++ b/textproc/hs-skylighting/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2023/01/27 15:06:06 pho Exp $ +@comment $NetBSD: PLIST,v 1.5 2023/10/30 18:29:39 pho Exp $ bin/skylighting lib/skylighting-${PKGVERSION}/${HS_VERSION}/package-description lib/skylighting-${PKGVERSION}/${HS_VERSION}/package-id @@ -90,6 +90,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/D.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dart.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dart.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dart.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Debiancontrol.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Debiancontrol.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Debiancontrol.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Default.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Default.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Default.p_hi @@ -102,6 +105,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Djangotemplate.p_ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dockerfile.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dockerfile.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dockerfile.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dosbat.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dosbat.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dosbat.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dot.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dot.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Dot.p_hi @@ -141,6 +147,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/FortranFree.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Fsharp.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Fsharp.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Fsharp.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Gap.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Gap.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Gap.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Gcc.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Gcc.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Gcc.p_hi @@ -464,7 +473,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Zsh.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Skylighting/Syntax/Zsh.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a -${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/LICENSE +share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/LICENSE ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/README.md ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/Skylighting-Syntax.html ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/Skylighting.html @@ -491,10 +500,12 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/doc-index-V. ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/doc-index-W.html ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/doc-index-Z.html ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/doc-index.json ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/haddock-bundle.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/index.html ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/linuwial.css ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/meta.json ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/quick-jump.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/skylighting.haddock ${PLIST.doc}share/doc/${HS_PLATFORM}/skylighting-${PKGVERSION}/html/synopsis.png diff --git a/textproc/hs-skylighting/buildlink3.mk b/textproc/hs-skylighting/buildlink3.mk index 1f9fec5a85e7..49d6c931a4cd 100644 --- a/textproc/hs-skylighting/buildlink3.mk +++ b/textproc/hs-skylighting/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.13 2023/10/09 04:54:54 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2023/10/30 18:29:39 pho Exp $ BUILDLINK_TREE+= hs-skylighting .if !defined(HS_SKYLIGHTING_BUILDLINK3_MK) HS_SKYLIGHTING_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-skylighting+= hs-skylighting>=0.13.2 -BUILDLINK_ABI_DEPENDS.hs-skylighting+= hs-skylighting>=0.13.2nb2 +BUILDLINK_API_DEPENDS.hs-skylighting+= hs-skylighting>=0.14 +BUILDLINK_ABI_DEPENDS.hs-skylighting+= hs-skylighting>=0.14 BUILDLINK_PKGSRCDIR.hs-skylighting?= ../../textproc/hs-skylighting .include "../../textproc/hs-skylighting-core/buildlink3.mk" diff --git a/textproc/hs-skylighting/distinfo b/textproc/hs-skylighting/distinfo index e2d90c1a50bb..796644a35b99 100644 --- a/textproc/hs-skylighting/distinfo +++ b/textproc/hs-skylighting/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2023/01/27 15:06:06 pho Exp $ +$NetBSD: distinfo,v 1.7 2023/10/30 18:29:39 pho Exp $ -BLAKE2s (skylighting-0.13.2.tar.gz) = 223c447275f05fe9f06c49d4d087f817db9241fee27260ab5bd5c5799e900823 -SHA512 (skylighting-0.13.2.tar.gz) = d9fdb5944b088e340d11947a5c1beaaa30b71764df86229aa670590fe4977adb9721e59c1d2b296691a6382a97151183a806dc59f4bd38aa54a75f9710ea6353 -Size (skylighting-0.13.2.tar.gz) = 1249526 bytes +BLAKE2s (skylighting-0.14.tar.gz) = 7dc7f310330fb553a760b44e8bb128e7a7169e8486f245fa4dcdc50168944959 +SHA512 (skylighting-0.14.tar.gz) = 33d36f7181c0a6b94d3319707d6ea68199239a7699c18c6392e8ae49d97d7249f57f4d42a9fb09fa9df643268aa57b8e42e2204a6a002f8222ef00284dfd25d4 +Size (skylighting-0.14.tar.gz) = 1393626 bytes