Mon Apr 29 09:08:07 2024 UTC (29d)
textproc/hs-regex-tdfa: Fix build with GHC 9.8

This breaks build with the currently default GHC 9.6. Please bear with me
until I switch the default compiler.


(pho)
diff -r1.12 -r1.13 pkgsrc/textproc/hs-regex-tdfa/Makefile
diff -r1.3 -r1.4 pkgsrc/textproc/hs-regex-tdfa/PLIST
cvs diff -r1.12 -r1.13 pkgsrc/textproc/hs-regex-tdfa/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/hs-regex-tdfa/Makefile 2023/11/02 06:37:36 1.12
+++ pkgsrc/textproc/hs-regex-tdfa/Makefile 2024/04/29 09:08:06 1.13
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1# $NetBSD: Makefile,v 1.12 2023/11/02 06:37:36 pho Exp $ 1# $NetBSD: Makefile,v 1.13 2024/04/29 09:08:06 pho Exp $
2 2
3DISTNAME= regex-tdfa-1.3.2.2 3DISTNAME= regex-tdfa-1.3.2.2
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= textproc 5CATEGORIES= textproc
6 6
7MAINTAINER= pho@cielonegro.org 7MAINTAINER= pho@cielonegro.org
8COMMENT= Pure Haskell Tagged DFA Backend for "Text.Regex" (regex-base) 8COMMENT= Pure Haskell Tagged DFA Backend for "Text.Regex" (regex-base)
9LICENSE= modified-bsd 9LICENSE= modified-bsd
10 10
 11HASKELL_UNRESTRICT_DEPENDENCIES+= \
 12 text
 13
11.include "../../mk/haskell.mk" 14.include "../../mk/haskell.mk"
12.include "../../textproc/hs-regex-base/buildlink3.mk" 15.include "../../textproc/hs-regex-base/buildlink3.mk"
13.include "../../mk/bsd.pkg.mk" 16.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/textproc/hs-regex-tdfa/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/hs-regex-tdfa/PLIST 2023/10/27 19:16:49 1.3
+++ pkgsrc/textproc/hs-regex-tdfa/PLIST 2024/04/29 09:08:06 1.4
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2023/10/27 19:16:49 pho Exp $ 1@comment $NetBSD: PLIST,v 1.4 2024/04/29 09:08:06 pho Exp $
2lib/regex-tdfa-${PKGVERSION}/${HS_VERSION}/package-description 
3lib/regex-tdfa-${PKGVERSION}/${HS_VERSION}/package-id 
4${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 2${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
5${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/CharMap2.dyn_hi 3${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/CharMap2.dyn_hi
6lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/CharMap2.hi 4lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/CharMap2.hi
7${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/CharMap2.p_hi 5${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/CharMap2.p_hi
8${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/EnumMap2.dyn_hi 6${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/EnumMap2.dyn_hi
9lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/EnumMap2.hi 7lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/EnumMap2.hi
10${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/EnumMap2.p_hi 8${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntMap/EnumMap2.p_hi
11${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntSet/EnumSet2.dyn_hi 9${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntSet/EnumSet2.dyn_hi
12lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntSet/EnumSet2.hi 10lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntSet/EnumSet2.hi
13${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntSet/EnumSet2.p_hi 11${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/IntSet/EnumSet2.p_hi
14${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_tdfa.dyn_hi 12${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_tdfa.dyn_hi
15lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_tdfa.hi 13lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_tdfa.hi
16${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_tdfa.p_hi 14${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_tdfa.p_hi
@@ -69,26 +67,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P @@ -69,26 +67,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P
69lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TDFA.hi 67lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TDFA.hi
70${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TDFA.p_hi 68${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TDFA.p_hi
71${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TNFA.dyn_hi 69${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TNFA.dyn_hi
72lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TNFA.hi 70lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TNFA.hi
73${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TNFA.p_hi 71${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/TNFA.p_hi
74${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text.dyn_hi 72${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text.dyn_hi
75lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text.hi 73lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text.hi
76${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text.p_hi 74${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text.p_hi
77${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text/Lazy.dyn_hi 75${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text/Lazy.dyn_hi
78lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text/Lazy.hi 76lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text/Lazy.hi
79${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text/Lazy.p_hi 77${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/TDFA/Text/Lazy.p_hi
80lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a 78lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
81${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a 79${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 80lib/regex-tdfa-${PKGVERSION}/${HS_VERSION}/package-description
 81lib/regex-tdfa-${PKGVERSION}/${HS_VERSION}/package-id
82share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/LICENSE 82share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/LICENSE
83${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Data-IntMap-CharMap2.html 83${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Data-IntMap-CharMap2.html
84${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Data-IntMap-EnumMap2.html 84${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Data-IntMap-EnumMap2.html
85${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Data-IntSet-EnumSet2.html 85${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Data-IntSet-EnumSet2.html
86${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-ByteString-Lazy.html 86${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-ByteString-Lazy.html
87${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-ByteString.html 87${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-ByteString.html
88${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-Common.html 88${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-Common.html
89${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-CorePattern.html 89${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-CorePattern.html
90${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-IntArrTrieSet.html 90${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-IntArrTrieSet.html
91${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-NewDFA-Engine.html 91${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-NewDFA-Engine.html
92${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-NewDFA-Engine_FA.html 92${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-NewDFA-Engine_FA.html
93${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-NewDFA-Engine_NC.html 93${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-NewDFA-Engine_NC.html
94${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-NewDFA-Engine_NC_FA.html 94${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/Text-Regex-TDFA-NewDFA-Engine_NC_FA.html
@@ -120,22 +120,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/reg @@ -120,22 +120,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/reg
120${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-L.html 120${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-L.html
121${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-M.html 121${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-M.html
122${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-N.html 122${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-N.html
123${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-O.html 123${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-O.html
124${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-P.html 124${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-P.html
125${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-Q.html 125${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-Q.html
126${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-R.html 126${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-R.html
127${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-S.html 127${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-S.html
128${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-T.html 128${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-T.html
129${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-U.html 129${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-U.html
130${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-V.html 130${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-V.html
131${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-W.html 131${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index-W.html
132${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index.html 132${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index.html
133${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/doc-index.json 
134${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/haddock-bundle.min.js 133${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/haddock-bundle.min.js
135${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/index.html 134${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/index.html
136${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/linuwial.css 135${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/linuwial.css
137${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/meta.json 136${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/meta.json
138${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/quick-jump.css 137${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/quick-jump.css
139${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/quick-jump.min.js 
140${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/regex-tdfa.haddock 138${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/regex-tdfa.haddock
141${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/synopsis.png 139${PLIST.doc}share/doc/${HS_PLATFORM}/regex-tdfa-${PKGVERSION}/html/synopsis.png