Thu Oct 26 04:43:55 2023 UTC ()
devel/hs-hscolour: Fix build with GHC 9.6


(pho)
diff -r1.11 -r1.12 pkgsrc/textproc/hs-hscolour/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/hs-hscolour/PLIST
diff -r1.9 -r1.10 pkgsrc/textproc/hs-hscolour/buildlink3.mk
diff -r1.7 -r1.8 pkgsrc/textproc/hs-hscolour/distinfo
cvs diff -r1.11 -r1.12 pkgsrc/textproc/hs-hscolour/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/hs-hscolour/Makefile 2023/10/09 04:54:51 1.11
+++ pkgsrc/textproc/hs-hscolour/Makefile 2023/10/26 04:43:55 1.12
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: Makefile,v 1.11 2023/10/09 04:54:51 pho Exp $ 1# $NetBSD: Makefile,v 1.12 2023/10/26 04:43:55 pho Exp $
2 2
3DISTNAME= hscolour-1.24.4 3DISTNAME= hscolour-1.25
4PKGREVISION= 6 4# TODO: Rename this package to hscolour, not hs-hscolour
5CATEGORIES= textproc 5CATEGORIES= textproc
6 6
7MAINTAINER= pho@cielonegro.org 7MAINTAINER= pho@cielonegro.org
8COMMENT= Colourise Haskell code 8COMMENT= Colourise Haskell code
9LICENSE= gnu-gpl-v2 9LICENSE= gnu-gpl-v2
10 10
11.include "../../mk/haskell.mk" 11.include "../../mk/haskell.mk"
12.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/hs-hscolour/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/hs-hscolour/PLIST 2023/01/25 01:08:03 1.5
+++ pkgsrc/textproc/hs-hscolour/PLIST 2023/10/26 04:43:55 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2023/01/25 01:08:03 pho Exp $ 1@comment $NetBSD: PLIST,v 1.6 2023/10/26 04:43:55 pho Exp $
2bin/HsColour 2bin/HsColour
3lib/hscolour-${PKGVERSION}/${HS_VERSION}/package-description 3lib/hscolour-${PKGVERSION}/${HS_VERSION}/package-description
4lib/hscolour-${PKGVERSION}/${HS_VERSION}/package-id 4lib/hscolour-${PKGVERSION}/${HS_VERSION}/package-id
5${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour.dyn_hi 5${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour.dyn_hi
6lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour.hi 6lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour.hi
7${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour.p_hi 7${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour.p_hi
8${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ACSS.dyn_hi 8${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ACSS.dyn_hi
9lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ACSS.hi 9lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ACSS.hi
10${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ACSS.p_hi 10${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ACSS.p_hi
11${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ANSI.dyn_hi 11${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ANSI.dyn_hi
12lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ANSI.hi 12lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ANSI.hi
13${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ANSI.p_hi 13${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ANSI.p_hi
14${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Anchors.dyn_hi 14${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Anchors.dyn_hi
@@ -43,40 +43,42 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/ @@ -43,40 +43,42 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/
43${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/MIRC.p_hi 43${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/MIRC.p_hi
44${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Options.dyn_hi 44${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Options.dyn_hi
45lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Options.hi 45lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Options.hi
46${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Options.p_hi 46${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Options.p_hi
47${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Output.dyn_hi 47${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Output.dyn_hi
48lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Output.hi 48lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Output.hi
49${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Output.p_hi 49${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Output.p_hi
50${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/TTY.dyn_hi 50${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/TTY.dyn_hi
51lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/TTY.hi 51lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/TTY.hi
52${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/TTY.p_hi 52${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/TTY.p_hi
53lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a 53lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
54${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a 54${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
55${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 55${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
56${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/LICENCE-LGPL 56share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/LICENCE-LGPL
57${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ACSS.html 57${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ACSS.html
58${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ANSI.html 58${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ANSI.html
59${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Anchors.html 59${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Anchors.html
60${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-CSS.html 60${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-CSS.html
61${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Classify.html 61${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Classify.html
62${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ColourHighlight.html 62${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ColourHighlight.html
63${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Colourise.html 63${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Colourise.html
64${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-General.html 64${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-General.html
65${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-HTML.html 65${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-HTML.html
66${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-InlineCSS.html 66${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-InlineCSS.html
67${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-LaTeX.html 67${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-LaTeX.html
68${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-MIRC.html 68${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-MIRC.html
69${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Options.html 69${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Options.html
70${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Output.html 70${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Output.html
71${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-TTY.html 71${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-TTY.html
72${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour.html 72${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour.html
73${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/doc-index.html 73${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/doc-index.html
 74${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/doc-index.json
74${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/haddock-bundle.min.js 75${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/haddock-bundle.min.js
75${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/hscolour.haddock 76${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/hscolour.haddock
76${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/index.html 77${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/index.html
77${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/linuwial.css 78${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/linuwial.css
78${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/meta.json 79${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/meta.json
79${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/quick-jump.css 80${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/quick-jump.css
 81${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/quick-jump.min.js
80${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/synopsis.png 82${PLIST.doc}share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/synopsis.png
81share/${HS_PLATFORM}/hscolour-${PKGVERSION}/data/rgb24-example-.hscolour 83share/${HS_PLATFORM}/hscolour-${PKGVERSION}/data/rgb24-example-.hscolour
82share/${HS_PLATFORM}/hscolour-${PKGVERSION}/hscolour.css 84share/${HS_PLATFORM}/hscolour-${PKGVERSION}/hscolour.css
cvs diff -r1.9 -r1.10 pkgsrc/textproc/hs-hscolour/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/hs-hscolour/buildlink3.mk 2023/10/09 04:54:51 1.9
+++ pkgsrc/textproc/hs-hscolour/buildlink3.mk 2023/10/26 04:43:55 1.10
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.9 2023/10/09 04:54:51 pho Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2023/10/26 04:43:55 pho Exp $
2 2
3BUILDLINK_TREE+= hs-hscolour 3BUILDLINK_TREE+= hs-hscolour
4 4
5.if !defined(HS_HSCOLOUR_BUILDLINK3_MK) 5.if !defined(HS_HSCOLOUR_BUILDLINK3_MK)
6HS_HSCOLOUR_BUILDLINK3_MK:= 6HS_HSCOLOUR_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.hs-hscolour+= hs-hscolour>=1.24.4 8BUILDLINK_API_DEPENDS.hs-hscolour+= hs-hscolour>=1.25
9BUILDLINK_ABI_DEPENDS.hs-hscolour+= hs-hscolour>=1.24.4nb6 9BUILDLINK_ABI_DEPENDS.hs-hscolour+= hs-hscolour>=1.25
10BUILDLINK_PKGSRCDIR.hs-hscolour?= ../../textproc/hs-hscolour 10BUILDLINK_PKGSRCDIR.hs-hscolour?= ../../textproc/hs-hscolour
11.endif # HS_HSCOLOUR_BUILDLINK3_MK 11.endif # HS_HSCOLOUR_BUILDLINK3_MK
12 12
13BUILDLINK_TREE+= -hs-hscolour 13BUILDLINK_TREE+= -hs-hscolour
cvs diff -r1.7 -r1.8 pkgsrc/textproc/hs-hscolour/distinfo (expand / switch to unified diff)

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