CVS commit: pkgsrc/textproc/hs-hscolour

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Oct 26 04:43:55 UTC 2023

Modified Files:
        pkgsrc/textproc/hs-hscolour: Makefile PLIST buildlink3.mk distinfo

Log Message:
devel/hs-hscolour: Fix build with GHC 9.6


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/hs-hscolour/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/hs-hscolour/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/hs-hscolour/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/hs-hscolour/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-hscolour/Makefile
diff -u pkgsrc/textproc/hs-hscolour/Makefile:1.11 pkgsrc/textproc/hs-hscolour/Makefile:1.12
--- pkgsrc/textproc/hs-hscolour/Makefile:1.11   Mon Oct  9 04:54:51 2023
+++ pkgsrc/textproc/hs-hscolour/Makefile        Thu Oct 26 04:43:55 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2023/10/09 04:54:51 pho Exp $
+# $NetBSD: Makefile,v 1.12 2023/10/26 04:43:55 pho Exp $
 
-DISTNAME=      hscolour-1.24.4
-PKGREVISION=   6
+DISTNAME=      hscolour-1.25
+# TODO: Rename this package to hscolour, not hs-hscolour
 CATEGORIES=    textproc
 
 MAINTAINER=    pho%cielonegro.org@localhost

Index: pkgsrc/textproc/hs-hscolour/PLIST
diff -u pkgsrc/textproc/hs-hscolour/PLIST:1.5 pkgsrc/textproc/hs-hscolour/PLIST:1.6
--- pkgsrc/textproc/hs-hscolour/PLIST:1.5       Wed Jan 25 01:08:03 2023
+++ pkgsrc/textproc/hs-hscolour/PLIST   Thu Oct 26 04:43:55 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/01/25 01:08:03 pho Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/10/26 04:43:55 pho Exp $
 bin/HsColour
 lib/hscolour-${PKGVERSION}/${HS_VERSION}/package-description
 lib/hscolour-${PKGVERSION}/${HS_VERSION}/package-id
@@ -53,7 +53,7 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
 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}/hscolour-${PKGVERSION}/LICENCE-LGPL
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/LICENCE-LGPL
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ACSS.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ANSI.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Anchors.html
@@ -71,12 +71,14 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/hsc
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-TTY.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/hscolour.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/synopsis.png
 share/${HS_PLATFORM}/hscolour-${PKGVERSION}/data/rgb24-example-.hscolour
 share/${HS_PLATFORM}/hscolour-${PKGVERSION}/hscolour.css

Index: pkgsrc/textproc/hs-hscolour/buildlink3.mk
diff -u pkgsrc/textproc/hs-hscolour/buildlink3.mk:1.9 pkgsrc/textproc/hs-hscolour/buildlink3.mk:1.10
--- pkgsrc/textproc/hs-hscolour/buildlink3.mk:1.9       Mon Oct  9 04:54:51 2023
+++ pkgsrc/textproc/hs-hscolour/buildlink3.mk   Thu Oct 26 04:43:55 2023
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.9 2023/10/09 04:54:51 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2023/10/26 04:43:55 pho Exp $
 
 BUILDLINK_TREE+=       hs-hscolour
 
 .if !defined(HS_HSCOLOUR_BUILDLINK3_MK)
 HS_HSCOLOUR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-hscolour+=    hs-hscolour>=1.24.4
-BUILDLINK_ABI_DEPENDS.hs-hscolour+=    hs-hscolour>=1.24.4nb6
+BUILDLINK_API_DEPENDS.hs-hscolour+=    hs-hscolour>=1.25
+BUILDLINK_ABI_DEPENDS.hs-hscolour+=    hs-hscolour>=1.25
 BUILDLINK_PKGSRCDIR.hs-hscolour?=      ../../textproc/hs-hscolour
 .endif # HS_HSCOLOUR_BUILDLINK3_MK
 

Index: pkgsrc/textproc/hs-hscolour/distinfo
diff -u pkgsrc/textproc/hs-hscolour/distinfo:1.7 pkgsrc/textproc/hs-hscolour/distinfo:1.8
--- pkgsrc/textproc/hs-hscolour/distinfo:1.7    Wed Jan 25 01:08:03 2023
+++ pkgsrc/textproc/hs-hscolour/distinfo        Thu Oct 26 04:43:55 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2023/01/25 01:08:03 pho Exp $
+$NetBSD: distinfo,v 1.8 2023/10/26 04:43:55 pho Exp $
 
-BLAKE2s (hscolour-1.24.4.tar.gz) = db6fbed1aab2ccea04dc576c564feae66e302b472535be7c107e0c0245bcf3b0
-SHA512 (hscolour-1.24.4.tar.gz) = 39b631c0a8346beff1c2e02ca8e72c1b1e3f7dafcedad7dc9de274e6750501de2bc553fe72a7d3459d4f9797e916f27e28ff96f705c2c0f9d3e0eec0ac6182c7
-Size (hscolour-1.24.4.tar.gz) = 28729 bytes
+BLAKE2s (hscolour-1.25.tar.gz) = 3b5c9341fe4effa9226a4092d57c0b7dee75be300012dc9f3ed9534c4604f141
+SHA512 (hscolour-1.25.tar.gz) = 00a9b679ae0fa13f3ad873991a1d1af953fb84cc2127387a014eaa8697265dc672c3c286b24a75e07c47b6c96a829aede6ef0e0d5f5939117821654319dc6c6c
+Size (hscolour-1.25.tar.gz) = 28695 bytes