Thu Jan 26 17:50:53 2023 UTC ()
textproc/hs-xml-conduit: Fix build with resourcet-1.3


(pho)
diff -r1.8 -r1.9 pkgsrc/textproc/hs-xml-conduit/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/hs-xml-conduit/PLIST
cvs diff -r1.8 -r1.9 pkgsrc/textproc/hs-xml-conduit/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/hs-xml-conduit/Makefile 2022/09/07 06:50:52 1.8
+++ pkgsrc/textproc/hs-xml-conduit/Makefile 2023/01/26 17:50:53 1.9
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1# $NetBSD: Makefile,v 1.8 2022/09/07 06:50:52 pho Exp $ 1# $NetBSD: Makefile,v 1.9 2023/01/26 17:50:53 pho Exp $
2 2
3DISTNAME= xml-conduit-1.9.1.1 3DISTNAME= xml-conduit-1.9.1.1
4PKGREVISION= 7 4PKGREVISION= 7
5CATEGORIES= textproc 5CATEGORIES= textproc
6 6
7MAINTAINER= pho@cielonegro.org 7MAINTAINER= pho@cielonegro.org
8COMMENT= Pure-Haskell utilities for dealing with XML with the conduit package 8COMMENT= Pure-Haskell utilities for dealing with XML with the conduit package
9LICENSE= mit 9LICENSE= mit
10 10
11# Setup.hs mentions Distribution.Extra.Doctest which isn't a part of 11# Setup.hs mentions Distribution.Extra.Doctest which isn't a part of
12# Cabal but is from cabal-doctest. We don't run the doctest anyway, so 12# Cabal but is from cabal-doctest. We don't run the doctest anyway, so
13# just overwrite it. 13# just overwrite it.
14post-extract: 14post-extract:
15 ${CP} -f ${FILESDIR}/Setup.hs ${WRKSRC}/Setup.hs 15 ${CP} -f ${FILESDIR}/Setup.hs ${WRKSRC}/Setup.hs
16 16
 17HASKELL_UNRESTRICT_DEPENDENCIES+= \
 18 resourcet
 19
17.include "../../textproc/hs-attoparsec/buildlink3.mk" 20.include "../../textproc/hs-attoparsec/buildlink3.mk"
18.include "../../textproc/hs-blaze-html/buildlink3.mk" 21.include "../../textproc/hs-blaze-html/buildlink3.mk"
19.include "../../textproc/hs-blaze-markup/buildlink3.mk" 22.include "../../textproc/hs-blaze-markup/buildlink3.mk"
20.include "../../devel/hs-conduit/buildlink3.mk" 23.include "../../devel/hs-conduit/buildlink3.mk"
21.include "../../devel/hs-conduit-extra/buildlink3.mk" 24.include "../../devel/hs-conduit-extra/buildlink3.mk"
22.include "../../devel/hs-data-default-class/buildlink3.mk" 25.include "../../devel/hs-data-default-class/buildlink3.mk"
23.include "../../devel/hs-resourcet/buildlink3.mk" 26.include "../../devel/hs-resourcet/buildlink3.mk"
24.include "../../textproc/hs-xml-types/buildlink3.mk" 27.include "../../textproc/hs-xml-types/buildlink3.mk"
25.include "../../mk/haskell.mk" 28.include "../../mk/haskell.mk"
26.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/textproc/hs-xml-conduit/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/hs-xml-conduit/PLIST 2021/04/24 16:23:13 1.1
+++ pkgsrc/textproc/hs-xml-conduit/PLIST 2023/01/26 17:50:53 1.2
@@ -1,65 +1,65 @@ @@ -1,65 +1,65 @@
1@comment $NetBSD: PLIST,v 1.1 2021/04/24 16:23:13 pho Exp $ 1@comment $NetBSD: PLIST,v 1.2 2023/01/26 17:50:53 pho Exp $
2lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 2${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
3lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML.dyn_hi 3${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML.dyn_hi
4lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML.hi 4lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML.hi
5lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML.p_hi 5${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML.p_hi
6lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor.dyn_hi 6${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor.dyn_hi
7lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor.hi 7lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor.hi
8lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor.p_hi 8${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor.p_hi
9lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor/Generic.dyn_hi 9${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor/Generic.dyn_hi
10lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor/Generic.hi 10lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor/Generic.hi
11lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor/Generic.p_hi 11${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Cursor/Generic.p_hi
12lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Parse.dyn_hi 12${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Parse.dyn_hi
13lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Parse.hi 13lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Parse.hi
14lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Parse.p_hi 14${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Parse.p_hi
15lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Render.dyn_hi 15${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Render.dyn_hi
16lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Render.hi 16lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Render.hi
17lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Render.p_hi 17${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Render.p_hi
18lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Token.dyn_hi 18${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Token.dyn_hi
19lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Token.hi 19lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Token.hi
20lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Token.p_hi 20${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Stream/Token.p_hi
21lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Unresolved.dyn_hi 21${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Unresolved.dyn_hi
22lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Unresolved.hi 22lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Unresolved.hi
23lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Unresolved.p_hi 23${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML/Unresolved.p_hi
24lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a 24lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
25lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a 25${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
26lib/xml-conduit-${PKGVERSION}/${HS_VERSION}/package-description 26lib/xml-conduit-${PKGVERSION}/${HS_VERSION}/package-description
27lib/xml-conduit-${PKGVERSION}/${HS_VERSION}/package-id 27lib/xml-conduit-${PKGVERSION}/${HS_VERSION}/package-id
28share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/LICENSE 28${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/LICENSE
29share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Cursor-Generic.html 29${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Cursor-Generic.html
30share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Cursor.html 30${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Cursor.html
31share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Stream-Parse.html 31${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Stream-Parse.html
32share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Stream-Render.html 32${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Stream-Render.html
33share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Unresolved.html 33${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Unresolved.html
34share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML.html 34${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML.html
35share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-36.html 35${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-36.html
36share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-38.html 36${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-38.html
37share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-62.html 37${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-62.html
38share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-A.html 38${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-A.html
39share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-All.html 39${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-All.html
40share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-B.html 40${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-B.html
41share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-C.html 41${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-C.html
42share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-D.html 42${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-D.html
43share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-E.html 43${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-E.html
44share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-F.html 44${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-F.html
45share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-H.html 45${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-H.html
46share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-I.html 46${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-I.html
47share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-L.html 47${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-L.html
48share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-M.html 48${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-M.html
49share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-N.html 49${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-N.html
50share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-O.html 50${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-O.html
51share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-P.html 51${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-P.html
52share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-R.html 52${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-R.html
53share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-S.html 53${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-S.html
54share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-T.html 54${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-T.html
55share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-U.html 55${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-U.html
56share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-W.html 56${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-W.html
57share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-X.html 57${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-X.html
58share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index.html 58${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index.html
59share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/haddock-bundle.min.js 59${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/haddock-bundle.min.js
60share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/index.html 60${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/index.html
61share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/linuwial.css 61${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/linuwial.css
62share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/meta.json 62${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/meta.json
63share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/quick-jump.css 63${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/quick-jump.css
64share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/synopsis.png 64${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/synopsis.png
65share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/xml-conduit.haddock 65${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/xml-conduit.haddock