Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 03D7284DBD for ; Tue, 31 Oct 2023 10:58:54 +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 CNkQqjrZQiwq for ; Tue, 31 Oct 2023 10:58:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 904E684D6F for ; Tue, 31 Oct 2023 10:58:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 89E72FADC; Tue, 31 Oct 2023 10:58:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1698749932159860" MIME-Version: 1.0 Date: Tue, 31 Oct 2023 10:58:52 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/devel/darcs To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20231031105852.89E72FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1698749932159860 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Tue Oct 31 10:58:52 UTC 2023 Modified Files: pkgsrc/devel/darcs: Makefile PLIST distinfo Added Files: pkgsrc/devel/darcs/patches: patch-src_Darcs_Patch_Annotate.hs patch-src_Darcs_Patch_Index_Monad.hs patch-src_Darcs_UI_Commands_Log.hs patch-src_Darcs_Util_Compat.hs patch-src_Darcs_Util_Tree_Hashed.hs patch-src_Darcs_Util_Tree_Monad.hs Log Message: devel/darcs: Fix build with GHC 9.6 To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 pkgsrc/devel/darcs/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/darcs/PLIST cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/darcs/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/darcs/patches/patch-src_Darcs_Patch_Annotate.hs \ pkgsrc/devel/darcs/patches/patch-src_Darcs_Patch_Index_Monad.hs \ pkgsrc/devel/darcs/patches/patch-src_Darcs_UI_Commands_Log.hs \ pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Compat.hs \ pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Tree_Hashed.hs \ pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Tree_Monad.hs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1698749932159860 Content-Disposition: inline Content-Length: 10360 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/darcs/Makefile diff -u pkgsrc/devel/darcs/Makefile:1.71 pkgsrc/devel/darcs/Makefile:1.72 --- pkgsrc/devel/darcs/Makefile:1.71 Mon Oct 9 04:54:04 2023 +++ pkgsrc/devel/darcs/Makefile Tue Oct 31 10:58:52 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2023/10/09 04:54:04 pho Exp $ +# $NetBSD: Makefile,v 1.72 2023/10/31 10:58:52 pho Exp $ DISTNAME= darcs-2.16.5 PKGNAME= ${DISTNAME} @@ -19,12 +19,21 @@ HASKELL_UNRESTRICT_DEPENDENCIES+= \ fgl \ hashable \ memory \ + mtl \ regex-tdfa \ text \ time \ + transformers \ + unix \ unix-compat \ vector +# Use crypton instead of outdated cryptonite. +SUBST_CLASSES+= crypton +SUBST_STAGE.crypton= post-extract +SUBST_FILES.crypton= darcs.cabal +SUBST_SED.crypton= -e 's/cryptonite/crypton/g' + # If darcs is to be linked dynamically, it will depend on nearly 140 shared # objects and the dynamic linker will spend more than a second to resolve # symbols on startup. This is unacceptable because darcs tends to be @@ -49,7 +58,7 @@ post-install: .include "../../converters/hs-base16-bytestring/buildlink3.mk" .include "../../devel/hs-conduit/buildlink3.mk" .include "../../devel/hs-constraints/buildlink3.mk" -.include "../../security/hs-cryptonite/buildlink3.mk" +.include "../../security/hs-crypton/buildlink3.mk" .include "../../devel/hs-data-ordlist/buildlink3.mk" .include "../../devel/hs-fgl/buildlink3.mk" .include "../../devel/hs-hashable/buildlink3.mk" Index: pkgsrc/devel/darcs/PLIST diff -u pkgsrc/devel/darcs/PLIST:1.10 pkgsrc/devel/darcs/PLIST:1.11 --- pkgsrc/devel/darcs/PLIST:1.10 Mon Jan 30 04:36:10 2023 +++ pkgsrc/devel/darcs/PLIST Tue Oct 31 10:58:52 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2023/01/30 04:36:10 pho Exp $ +@comment $NetBSD: PLIST,v 1.11 2023/10/31 10:58:52 pho Exp $ bin/darcs lib/${PKGNAME}/${HS_VERSION}/package-description lib/${PKGNAME}/${HS_VERSION}/package-id @@ -244,7 +244,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Version.h lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a man/man1/darcs.1 share/bash-completion/completions/darcs -${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/COPYING +share/doc/${HS_PLATFORM}/${PKGNAME}/COPYING ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Patch-Annotate.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Patch-Apply.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Darcs-Patch-ApplyMonad.html @@ -529,10 +529,12 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Y.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Z.html ${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/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/zsh/site-functions/_darcs Index: pkgsrc/devel/darcs/distinfo diff -u pkgsrc/devel/darcs/distinfo:1.16 pkgsrc/devel/darcs/distinfo:1.17 --- pkgsrc/devel/darcs/distinfo:1.16 Mon Jan 30 04:36:10 2023 +++ pkgsrc/devel/darcs/distinfo Tue Oct 31 10:58:52 2023 @@ -1,6 +1,12 @@ -$NetBSD: distinfo,v 1.16 2023/01/30 04:36:10 pho Exp $ +$NetBSD: distinfo,v 1.17 2023/10/31 10:58:52 pho Exp $ BLAKE2s (darcs-2.16.5.tar.gz) = c119005fe0f558b45e30f00a15c4dd9ab9496a430143376e64f7a6e8a75fc728 SHA512 (darcs-2.16.5.tar.gz) = 9116043943315417ff314197f6a143435b5545f614c6e6210c3645987a68c69c31f53f823ee5269cb663ccba393f8caf1834120783f15128e43b132c731a0edb Size (darcs-2.16.5.tar.gz) = 1271154 bytes SHA1 (patch-Setup.hs) = cb147ff81869ccbab7a301d54dca64d0a7801903 +SHA1 (patch-src_Darcs_Patch_Annotate.hs) = 29b88b1fc4a89314b79f2a2519af7334a56feeff +SHA1 (patch-src_Darcs_Patch_Index_Monad.hs) = d9a17e34b55e029df5f3ecfbfc5c06d1c7eff2b3 +SHA1 (patch-src_Darcs_UI_Commands_Log.hs) = fcc982bc24ff58719d23c488ab3f9ea3d2d31914 +SHA1 (patch-src_Darcs_Util_Compat.hs) = d9a7712f33a2e1ab71be89f1a40e5e1f03f7594c +SHA1 (patch-src_Darcs_Util_Tree_Hashed.hs) = 608253fa300b82119f812a92fbbd321ebf2d541c +SHA1 (patch-src_Darcs_Util_Tree_Monad.hs) = d19f6e0358c21fee7548486762ec923aa774f0a7 Added files: Index: pkgsrc/devel/darcs/patches/patch-src_Darcs_Patch_Annotate.hs diff -u /dev/null pkgsrc/devel/darcs/patches/patch-src_Darcs_Patch_Annotate.hs:1.1 --- /dev/null Tue Oct 31 10:58:52 2023 +++ pkgsrc/devel/darcs/patches/patch-src_Darcs_Patch_Annotate.hs Tue Oct 31 10:58:52 2023 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_Darcs_Patch_Annotate.hs,v 1.1 2023/10/31 10:58:52 pho Exp $ + +Control.Monad.State no longer re-exports functions from Control.Monad + +--- src/Darcs/Patch/Annotate.hs.orig 2023-10-31 10:50:55.484924756 +0000 ++++ src/Darcs/Patch/Annotate.hs +@@ -43,7 +43,8 @@ module Darcs.Patch.Annotate + + import Darcs.Prelude + +-import Control.Monad.State ( modify, modify', when, gets, State, execState ) ++import Control.Monad (when) ++import Control.Monad.State ( modify, modify', gets, State, execState ) + + import qualified Data.ByteString as B + import qualified Data.ByteString.Char8 as BC Index: pkgsrc/devel/darcs/patches/patch-src_Darcs_Patch_Index_Monad.hs diff -u /dev/null pkgsrc/devel/darcs/patches/patch-src_Darcs_Patch_Index_Monad.hs:1.1 --- /dev/null Tue Oct 31 10:58:52 2023 +++ pkgsrc/devel/darcs/patches/patch-src_Darcs_Patch_Index_Monad.hs Tue Oct 31 10:58:52 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Darcs_Patch_Index_Monad.hs,v 1.1 2023/10/31 10:58:52 pho Exp $ + +Control.Monad.State no longer re-exports functions from Control.Monad + +--- src/Darcs/Patch/Index/Monad.hs.orig 2023-10-31 10:51:28.174682881 +0000 ++++ src/Darcs/Patch/Index/Monad.hs +@@ -30,6 +30,7 @@ import Darcs.Patch.Index.Types ( PatchMo + import Darcs.Patch.Info ( makePatchname, PatchInfo ) + import Darcs.Patch.Apply ( Apply(..) ) + import Darcs.Patch.ApplyMonad ( ApplyMonad(..), ApplyMonadTree(..) ) ++import Control.Monad + import Control.Monad.State + import Control.Arrow + import Darcs.Util.Path ( AnchoredPath, anchorPath, movedirfilename, isPrefix ) Index: pkgsrc/devel/darcs/patches/patch-src_Darcs_UI_Commands_Log.hs diff -u /dev/null pkgsrc/devel/darcs/patches/patch-src_Darcs_UI_Commands_Log.hs:1.1 --- /dev/null Tue Oct 31 10:58:52 2023 +++ pkgsrc/devel/darcs/patches/patch-src_Darcs_UI_Commands_Log.hs Tue Oct 31 10:58:52 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Darcs_UI_Commands_Log.hs,v 1.1 2023/10/31 10:58:52 pho Exp $ + +Control.Monad.State no longer re-exports functions from Control.Monad + +--- src/Darcs/UI/Commands/Log.hs.orig 2023-10-31 10:53:52.414049806 +0000 ++++ src/Darcs/UI/Commands/Log.hs +@@ -30,6 +30,7 @@ import Data.List.Ordered ( nubSort ) + import Data.Maybe ( fromMaybe, isJust ) + import Control.Arrow ( second ) + import Control.Exception ( catch, IOException ) ++import Control.Monad + import Control.Monad.State.Strict + + import Darcs.UI.PrintPatch ( showFriendly ) Index: pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Compat.hs diff -u /dev/null pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Compat.hs:1.1 --- /dev/null Tue Oct 31 10:58:52 2023 +++ pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Compat.hs Tue Oct 31 10:58:52 2023 @@ -0,0 +1,27 @@ +$NetBSD: patch-src_Darcs_Util_Compat.hs,v 1.1 2023/10/31 10:58:52 pho Exp $ + +Fix build with GHC 9.6 (unix-2.8.1.0). + +--- src/Darcs/Util/Compat.hs.orig 2023-10-31 10:50:00.729609111 +0000 ++++ src/Darcs/Util/Compat.hs +@@ -20,7 +20,7 @@ import System.Directory ( getCurrentDire + import System.IO.Error ( mkIOError, alreadyExistsErrorType ) + import System.Posix.Files ( stdFileMode ) + import System.Posix.IO ( openFd, closeFd, +- defaultFileFlags, exclusive, ++ defaultFileFlags, exclusive, creat, + OpenMode(WriteOnly) ) + + import Darcs.Util.SignalHandler ( stdoutIsAPipe ) +@@ -63,9 +63,9 @@ maybeRelink src dst = + + sloppyAtomicCreate :: FilePath -> IO () + sloppyAtomicCreate fp +- = do fd <- openFd fp WriteOnly (Just stdFileMode) flags ++ = do fd <- openFd fp WriteOnly flags + closeFd fd +- where flags = defaultFileFlags { exclusive = True } ++ where flags = defaultFileFlags { exclusive = True, creat = Just stdFileMode } + + atomicCreate :: FilePath -> IO () + atomicCreate fp = withCString fp $ \cstr -> do Index: pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Tree_Hashed.hs diff -u /dev/null pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Tree_Hashed.hs:1.1 --- /dev/null Tue Oct 31 10:58:52 2023 +++ pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Tree_Hashed.hs Tue Oct 31 10:58:52 2023 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_Darcs_Util_Tree_Hashed.hs,v 1.1 2023/10/31 10:58:52 pho Exp $ + +Control.Monad.State.Strict no longer re-exports functions from Control.Monad + +--- src/Darcs/Util/Tree/Hashed.hs.orig 2023-10-31 10:45:13.546672960 +0000 ++++ src/Darcs/Util/Tree/Hashed.hs +@@ -40,7 +40,8 @@ import qualified Data.ByteString as B + + import Data.List( sortBy ) + import Data.Maybe( fromJust, isJust ) +-import Control.Monad.State.Strict (liftIO,when,unless) ++import Control.Monad (when, unless) ++import Control.Monad.State.Strict (liftIO) + + import Darcs.Prelude + Index: pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Tree_Monad.hs diff -u /dev/null pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Tree_Monad.hs:1.1 --- /dev/null Tue Oct 31 10:58:52 2023 +++ pkgsrc/devel/darcs/patches/patch-src_Darcs_Util_Tree_Monad.hs Tue Oct 31 10:58:52 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Darcs_Util_Tree_Monad.hs,v 1.1 2023/10/31 10:58:52 pho Exp $ + +Control.Monad.RWS.Strict no longer re-exports functions from Control.Monad + +--- src/Darcs/Util/Tree/Monad.hs.orig 2023-10-31 10:44:12.313929632 +0000 ++++ src/Darcs/Util/Tree/Monad.hs +@@ -45,6 +45,7 @@ import Data.Int( Int64 ) + import Data.Maybe( isNothing, isJust ) + + import qualified Data.ByteString.Lazy as BL ++import Control.Monad + import Control.Monad.RWS.Strict + import qualified Data.Map as M + --_----------=_1698749932159860--