CVS commit: pkgsrc/textproc/hs-ansi-wl-pprint

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Oct 27 13:20:49 UTC 2023

Modified Files:
        pkgsrc/textproc/hs-ansi-wl-pprint: Makefile PLIST buildlink3.mk
            distinfo

Log Message:
textproc/hs-ansi-wl-pprint: Update to 1.0.2

1.0.2

* Change the implementation to the prettyprinter package, using the
  prettyprinter-compat-ansi-wl-pprint compatibility package.

  Migrate to prettyprinter.

  Note: Using show won't preserve formatting anymore, as prettyprinters
  Show Doc instance is annotation invariant. You can convert to String
  using Data.Text.Lazy.unpack . Prettyprinter.Render.Terminal.renderLazy
  . Prettyprinter.layoutPretty Prettyprinter.defaultLayoutOptions, from the
  text, prettyprinter-ansi-terminal, prettyprinter packages respectively.

* The Text.PrettyPrint.ANSI.Leijen.Internal module is gone.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/hs-ansi-wl-pprint/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/hs-ansi-wl-pprint/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/hs-ansi-wl-pprint/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/hs-ansi-wl-pprint/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/hs-ansi-wl-pprint/Makefile
diff -u pkgsrc/textproc/hs-ansi-wl-pprint/Makefile:1.9 pkgsrc/textproc/hs-ansi-wl-pprint/Makefile:1.10
--- pkgsrc/textproc/hs-ansi-wl-pprint/Makefile:1.9      Mon Oct  9 04:54:48 2023
+++ pkgsrc/textproc/hs-ansi-wl-pprint/Makefile  Fri Oct 27 13:20:48 2023
@@ -1,16 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2023/10/09 04:54:48 pho Exp $
+# $NetBSD: Makefile,v 1.10 2023/10/27 13:20:48 pho Exp $
 
-DISTNAME=      ansi-wl-pprint-0.6.9
-PKGREVISION=   7
+DISTNAME=      ansi-wl-pprint-1.0.2
 CATEGORIES=    textproc
 
 MAINTAINER=    pho%cielonegro.org@localhost
 COMMENT=       Wadler/Leijen Pretty Printer for colored ANSI terminal output
 LICENSE=       modified-bsd
 
-HASKELL_UNRESTRICT_DEPENDENCIES+=      \
-       ansi-terminal
-
-.include "../../devel/hs-ansi-terminal/buildlink3.mk"
+.include "../../textproc/hs-prettyprinter-compat-ansi-wl-pprint/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/hs-ansi-wl-pprint/PLIST
diff -u pkgsrc/textproc/hs-ansi-wl-pprint/PLIST:1.3 pkgsrc/textproc/hs-ansi-wl-pprint/PLIST:1.4
--- pkgsrc/textproc/hs-ansi-wl-pprint/PLIST:1.3 Wed Jan 25 14:03:57 2023
+++ pkgsrc/textproc/hs-ansi-wl-pprint/PLIST     Fri Oct 27 13:20:48 2023
@@ -1,46 +1,21 @@
-@comment $NetBSD: PLIST,v 1.3 2023/01/25 14:03:57 pho Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/10/27 13:20:48 pho Exp $
 lib/ansi-wl-pprint-${PKGVERSION}/${HS_VERSION}/package-description
 lib/ansi-wl-pprint-${PKGVERSION}/${HS_VERSION}/package-id
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/PrettyPrint/ANSI/Leijen.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Text/PrettyPrint/ANSI/Leijen.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/PrettyPrint/ANSI/Leijen.p_hi
-${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/PrettyPrint/ANSI/Leijen/Internal.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/PrettyPrint/ANSI/Leijen/Internal.hi
-${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/PrettyPrint/ANSI/Leijen/Internal.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/LICENSE
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/Text-PrettyPrint-ANSI-Leijen-Internal.html
+share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/Text-PrettyPrint-ANSI-Leijen.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/ansi-wl-pprint.haddock
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-60.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-A.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-All.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-B.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-C.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-D.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-E.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-F.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-G.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-H.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-I.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-L.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-M.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-N.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-O.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-P.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-R.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-S.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-T.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-U.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-V.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-W.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index-Y.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/ansi-wl-pprint-${PKGVERSION}/html/synopsis.png

Index: pkgsrc/textproc/hs-ansi-wl-pprint/buildlink3.mk
diff -u pkgsrc/textproc/hs-ansi-wl-pprint/buildlink3.mk:1.8 pkgsrc/textproc/hs-ansi-wl-pprint/buildlink3.mk:1.9
--- pkgsrc/textproc/hs-ansi-wl-pprint/buildlink3.mk:1.8 Mon Oct  9 04:54:48 2023
+++ pkgsrc/textproc/hs-ansi-wl-pprint/buildlink3.mk     Fri Oct 27 13:20:48 2023
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2023/10/09 04:54:48 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2023/10/27 13:20:48 pho Exp $
 
 BUILDLINK_TREE+=       hs-ansi-wl-pprint
 
 .if !defined(HS_ANSI_WL_PPRINT_BUILDLINK3_MK)
 HS_ANSI_WL_PPRINT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-ansi-wl-pprint+=      hs-ansi-wl-pprint>=0.6.9
-BUILDLINK_ABI_DEPENDS.hs-ansi-wl-pprint+=      hs-ansi-wl-pprint>=0.6.9nb7
+BUILDLINK_API_DEPENDS.hs-ansi-wl-pprint+=      hs-ansi-wl-pprint>=1.0.2
+BUILDLINK_ABI_DEPENDS.hs-ansi-wl-pprint+=      hs-ansi-wl-pprint>=1.0.2
 BUILDLINK_PKGSRCDIR.hs-ansi-wl-pprint?=                ../../textproc/hs-ansi-wl-pprint
 
-.include "../../devel/hs-ansi-terminal/buildlink3.mk"
+.include "../../textproc/hs-prettyprinter-compat-ansi-wl-pprint/buildlink3.mk"
 .endif # HS_ANSI_WL_PPRINT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-ansi-wl-pprint

Index: pkgsrc/textproc/hs-ansi-wl-pprint/distinfo
diff -u pkgsrc/textproc/hs-ansi-wl-pprint/distinfo:1.5 pkgsrc/textproc/hs-ansi-wl-pprint/distinfo:1.6
--- pkgsrc/textproc/hs-ansi-wl-pprint/distinfo:1.5      Wed Jan 25 14:03:57 2023
+++ pkgsrc/textproc/hs-ansi-wl-pprint/distinfo  Fri Oct 27 13:20:48 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2023/01/25 14:03:57 pho Exp $
+$NetBSD: distinfo,v 1.6 2023/10/27 13:20:48 pho Exp $
 
-BLAKE2s (ansi-wl-pprint-0.6.9.tar.gz) = c716c7162deb1392c306a653805c9c5407b86c582621028510a2433c3749b59b
-SHA512 (ansi-wl-pprint-0.6.9.tar.gz) = 2a66236f740f0b45b6133555e8b1315dc85ece1c16dd51e4aa7f31d2fee03d66869af5f81e6383aa840f503c2cad46f3655f53b784ebca7b3480efb53eea2a04
-Size (ansi-wl-pprint-0.6.9.tar.gz) = 16723 bytes
+BLAKE2s (ansi-wl-pprint-1.0.2.tar.gz) = 44cfd8ac45b0dfba8b8e082822312989719b82234f578d11876c3d27b32bbaa4
+SHA512 (ansi-wl-pprint-1.0.2.tar.gz) = 2b6db1f25b180f53f2a81d2658d36f91d7b112aa242709e0693712ea6974cb0790ea56789678e714cd572ea226f2803484af572ae6fc7c4dc84536020701e3ac
+Size (ansi-wl-pprint-1.0.2.tar.gz) = 5699 bytes