CVS commit: pkgsrc/textproc/hs-xml-conduit

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Oct 30 12:48:59 UTC 2023

Modified Files:
        pkgsrc/textproc/hs-xml-conduit: Makefile PLIST buildlink3.mk distinfo
Removed Files:
        pkgsrc/textproc/hs-xml-conduit/files: Setup.hs

Log Message:
textproc/hs-xml-conduit: Update to 1.9.1.3

No change log is provided by the upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/hs-xml-conduit/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/hs-xml-conduit/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/hs-xml-conduit/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/hs-xml-conduit/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/textproc/hs-xml-conduit/files/Setup.hs

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-xml-conduit/Makefile
diff -u pkgsrc/textproc/hs-xml-conduit/Makefile:1.11 pkgsrc/textproc/hs-xml-conduit/Makefile:1.12
--- pkgsrc/textproc/hs-xml-conduit/Makefile:1.11        Mon Oct  9 04:54:56 2023
+++ pkgsrc/textproc/hs-xml-conduit/Makefile     Mon Oct 30 12:48:59 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2023/10/09 04:54:56 pho Exp $
+# $NetBSD: Makefile,v 1.12 2023/10/30 12:48:59 pho Exp $
 
-DISTNAME=      xml-conduit-1.9.1.1
-PKGREVISION=   9
+DISTNAME=      xml-conduit-1.9.1.3
 CATEGORIES=    textproc
 
 MAINTAINER=    pho%cielonegro.org@localhost
@@ -10,12 +9,16 @@ LICENSE=     mit
 
 # Setup.hs mentions Distribution.Extra.Doctest which isn't a part of
 # Cabal but is from cabal-doctest. We don't run the doctest anyway, so
-# just overwrite it.
+# just remove it.
 post-extract:
-       ${CP} -f ${FILESDIR}/Setup.hs ${WRKSRC}/Setup.hs
+       ${RM} -f ${WRKSRC}/Setup.hs
 
-HASKELL_UNRESTRICT_DEPENDENCIES+=      \
-       resourcet
+# We also need to convince mk/haskell.mk that the package doesn't have any
+# special build hooks.
+SUBST_CLASSES+=                cabal
+SUBST_STAGE.cabal=     post-extract
+SUBST_FILES.cabal=     xml-conduit.cabal
+SUBST_SED.cabal=       -e '/^build-type:/s/Custom/Simple/'
 
 .include "../../textproc/hs-attoparsec/buildlink3.mk"
 .include "../../textproc/hs-blaze-html/buildlink3.mk"

Index: pkgsrc/textproc/hs-xml-conduit/PLIST
diff -u pkgsrc/textproc/hs-xml-conduit/PLIST:1.2 pkgsrc/textproc/hs-xml-conduit/PLIST:1.3
--- pkgsrc/textproc/hs-xml-conduit/PLIST:1.2    Thu Jan 26 17:50:53 2023
+++ pkgsrc/textproc/hs-xml-conduit/PLIST        Mon Oct 30 12:48:59 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/01/26 17:50:53 pho Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/10/30 12:48:59 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Text/XML.hi
@@ -25,7 +25,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 lib/xml-conduit-${PKGVERSION}/${HS_VERSION}/package-description
 lib/xml-conduit-${PKGVERSION}/${HS_VERSION}/package-id
-${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Cursor-Generic.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Cursor.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/Text-XML-Stream-Parse.html
@@ -56,10 +56,12 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/xml
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-W.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index-X.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/synopsis.png
 ${PLIST.doc}share/doc/${HS_PLATFORM}/xml-conduit-${PKGVERSION}/html/xml-conduit.haddock

Index: pkgsrc/textproc/hs-xml-conduit/buildlink3.mk
diff -u pkgsrc/textproc/hs-xml-conduit/buildlink3.mk:1.10 pkgsrc/textproc/hs-xml-conduit/buildlink3.mk:1.11
--- pkgsrc/textproc/hs-xml-conduit/buildlink3.mk:1.10   Mon Oct  9 04:54:56 2023
+++ pkgsrc/textproc/hs-xml-conduit/buildlink3.mk        Mon Oct 30 12:48:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2023/10/09 04:54:56 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2023/10/30 12:48:59 pho Exp $
 
 BUILDLINK_TREE+=       hs-xml-conduit
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        hs-xml-conduit
 HS_XML_CONDUIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-xml-conduit+= hs-xml-conduit>=1.9.1
-BUILDLINK_ABI_DEPENDS.hs-xml-conduit+= hs-xml-conduit>=1.9.1.1nb9
+BUILDLINK_ABI_DEPENDS.hs-xml-conduit+= hs-xml-conduit>=1.9.1.3
 BUILDLINK_PKGSRCDIR.hs-xml-conduit?=   ../../textproc/hs-xml-conduit
 
 .include "../../textproc/hs-attoparsec/buildlink3.mk"

Index: pkgsrc/textproc/hs-xml-conduit/distinfo
diff -u pkgsrc/textproc/hs-xml-conduit/distinfo:1.3 pkgsrc/textproc/hs-xml-conduit/distinfo:1.4
--- pkgsrc/textproc/hs-xml-conduit/distinfo:1.3 Tue Oct 26 11:22:04 2021
+++ pkgsrc/textproc/hs-xml-conduit/distinfo     Mon Oct 30 12:48:59 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:22:04 nia Exp $
+$NetBSD: distinfo,v 1.4 2023/10/30 12:48:59 pho Exp $
 
-BLAKE2s (xml-conduit-1.9.1.1.tar.gz) = f7d0e11409cea247a493f1a21f0a4b01e0e0014bcf04b58f2c11794d30998f64
-SHA512 (xml-conduit-1.9.1.1.tar.gz) = 4d75960eb400a4ac8cb13bb70f59b554659fa2a6165906f73097a2bc564505a1efa78e72b121d9ed0fd8b424ff25cd1d8368e6c1f2b6ffa4b0aa36f584727687
-Size (xml-conduit-1.9.1.1.tar.gz) = 42901 bytes
+BLAKE2s (xml-conduit-1.9.1.3.tar.gz) = 002aecc6eace3b3ac609304898fbceaa36d3de934aee0c173de1f9901e533be7
+SHA512 (xml-conduit-1.9.1.3.tar.gz) = e864ce8c8785c11d81743b6cfaab91d863c728e7f3a955d9d5ce603bd36754dad2c7066fd60270ca2a39239cb314536b4bfc02f836d53a251c842741c4909324
+Size (xml-conduit-1.9.1.3.tar.gz) = 44653 bytes