Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5EF4C84DBD for ; Tue, 31 Oct 2023 11:30:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id WnVT0e8Rg7U6 for ; Tue, 31 Oct 2023 11:30:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3162284D6F for ; Tue, 31 Oct 2023 11:30:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2AD79FADC; Tue, 31 Oct 2023 11:30:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1698751809124340" MIME-Version: 1.0 Date: Tue, 31 Oct 2023 11:30:09 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/net/hoogle To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20231031113009.2AD79FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1698751809124340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Tue Oct 31 11:30:09 UTC 2023 Modified Files: pkgsrc/net/hoogle: Makefile PLIST buildlink3.mk Log Message: net/hoogle: Fix build with GHC 9.6 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/hoogle/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/hoogle/PLIST cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/hoogle/buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1698751809124340 Content-Disposition: inline Content-Length: 12572 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/hoogle/Makefile diff -u pkgsrc/net/hoogle/Makefile:1.11 pkgsrc/net/hoogle/Makefile:1.12 --- pkgsrc/net/hoogle/Makefile:1.11 Mon Oct 9 04:54:42 2023 +++ pkgsrc/net/hoogle/Makefile Tue Oct 31 11:30:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2023/10/09 04:54:42 pho Exp $ +# $NetBSD: Makefile,v 1.12 2023/10/31 11:30:08 pho Exp $ DISTNAME= hoogle-5.0.18.3 PKGNAME= ${DISTNAME} @@ -16,13 +16,20 @@ LICENSE= modified-bsd # time is more expensive than disks. HASKELL_ENABLE_DYNAMIC_EXECUTABLE= no +# "connection" is outdated and is no longer buildable. Use +# crypton-connection instead. +SUBST_CLASSES+= conn +SUBST_STAGE.conn= post-extract +SUBST_FILES.conn= hoogle.cabal +SUBST_SED.conn= -e 's/connection,/crypton-connection,/' + .include "../../converters/hs-aeson/buildlink3.mk" .include "../../textproc/hs-blaze-html/buildlink3.mk" .include "../../textproc/hs-blaze-markup/buildlink3.mk" .include "../../devel/hs-cmdargs/buildlink3.mk" .include "../../devel/hs-conduit/buildlink3.mk" .include "../../devel/hs-conduit-extra/buildlink3.mk" -.include "../../net/hs-connection/buildlink3.mk" +.include "../../net/hs-crypton-connection/buildlink3.mk" .include "../../misc/hs-extra/buildlink3.mk" .include "../../devel/hs-foundation/buildlink3.mk" .include "../../devel/hs-hashable/buildlink3.mk" Index: pkgsrc/net/hoogle/PLIST diff -u pkgsrc/net/hoogle/PLIST:1.1 pkgsrc/net/hoogle/PLIST:1.2 --- pkgsrc/net/hoogle/PLIST:1.1 Wed May 5 16:51:43 2021 +++ pkgsrc/net/hoogle/PLIST Tue Oct 31 11:30:08 2023 @@ -1,107 +1,109 @@ -@comment $NetBSD: PLIST,v 1.1 2021/05/05 16:51:43 pho Exp $ +@comment $NetBSD: PLIST,v 1.2 2023/10/31 11:30:08 pho Exp $ bin/hoogle lib/${PKGNAME}/${HS_VERSION}/package-description lib/${PKGNAME}/${HS_VERSION}/package-id -lib/${HS_PLATFORM}/${HS_PKGID}/Action/CmdLine.dyn_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Action/CmdLine.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Action/CmdLine.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Action/CmdLine.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Action/Generate.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Action/CmdLine.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Action/Generate.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Action/Generate.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Action/Generate.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Action/Search.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Action/Generate.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Action/Search.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Action/Search.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Action/Search.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Action/Server.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Action/Search.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Action/Server.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Action/Server.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Action/Server.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Action/Test.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Action/Server.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Action/Test.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Action/Test.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Action/Test.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Conduit.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Action/Test.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/General/Conduit.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/General/Conduit.hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Conduit.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/IString.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/General/Conduit.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/General/IString.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/General/IString.hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/IString.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Log.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/General/IString.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/General/Log.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/General/Log.hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Log.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Store.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/General/Log.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/General/Store.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/General/Store.hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Store.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Str.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/General/Store.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/General/Str.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/General/Str.hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Str.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Template.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/General/Str.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/General/Template.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/General/Template.hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Template.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Timing.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/General/Template.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/General/Timing.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/General/Timing.hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Timing.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Util.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/General/Timing.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/General/Util.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/General/Util.hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Util.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Web.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/General/Util.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/General/Web.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/General/Web.hi -lib/${HS_PLATFORM}/${HS_PKGID}/General/Web.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Hoogle.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/General/Web.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hoogle.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Hoogle.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Hoogle.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Cabal.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hoogle.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Cabal.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Input/Cabal.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Cabal.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Download.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Cabal.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Download.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Input/Download.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Download.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Haddock.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Download.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Haddock.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Input/Haddock.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Haddock.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Item.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Haddock.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Item.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Input/Item.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Item.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Reorder.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Item.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Reorder.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Input/Reorder.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Reorder.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Set.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Reorder.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Set.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Input/Set.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Set.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Settings.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Set.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Settings.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Input/Settings.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Input/Settings.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Output/Items.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Input/Settings.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Output/Items.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Output/Items.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Output/Items.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Output/Names.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Output/Items.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Output/Names.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Output/Names.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Output/Names.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Output/Tags.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Output/Names.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Output/Tags.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Output/Tags.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Output/Tags.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Output/Types.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Output/Tags.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Output/Types.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Output/Types.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Output/Types.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Paths_hoogle.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Output/Types.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_hoogle.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Paths_hoogle.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Paths_hoogle.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Query.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_hoogle.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Query.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Query.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Query.p_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Query.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/include/include.h lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a -lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a -lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a +${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE -share/doc/${HS_PLATFORM}/${PKGNAME}/html/CHANGES.txt -share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hoogle.html -share/doc/${HS_PLATFORM}/${PKGNAME}/html/README.md -share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html -share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js -share/doc/${HS_PLATFORM}/${PKGNAME}/html/hoogle.haddock -share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html -share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css -share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json -share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css -share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/CHANGES.txt +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hoogle.html +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/README.md +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.json +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/hoogle.haddock +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.min.js +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png share/${HS_PLATFORM}/${PKGNAME}/html/favicon.png share/${HS_PLATFORM}/${PKGNAME}/html/favicon57.png share/${HS_PLATFORM}/${PKGNAME}/html/favicon64.png Index: pkgsrc/net/hoogle/buildlink3.mk diff -u pkgsrc/net/hoogle/buildlink3.mk:1.10 pkgsrc/net/hoogle/buildlink3.mk:1.11 --- pkgsrc/net/hoogle/buildlink3.mk:1.10 Mon Oct 9 04:54:42 2023 +++ pkgsrc/net/hoogle/buildlink3.mk Tue Oct 31 11:30:08 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2023/10/09 04:54:42 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2023/10/31 11:30:08 pho Exp $ BUILDLINK_TREE+= hoogle @@ -15,7 +15,7 @@ BUILDLINK_PKGSRCDIR.hoogle?= ../../net/h .include "../../devel/hs-cmdargs/buildlink3.mk" .include "../../devel/hs-conduit/buildlink3.mk" .include "../../devel/hs-conduit-extra/buildlink3.mk" -.include "../../net/hs-connection/buildlink3.mk" +.include "../../net/hs-crypton-connection/buildlink3.mk" .include "../../misc/hs-extra/buildlink3.mk" .include "../../devel/hs-foundation/buildlink3.mk" .include "../../devel/hs-hashable/buildlink3.mk" --_----------=_1698751809124340--