Re: [PATCH 5/7] Use devel/cabal module for devel/darcs and upgrade to 2.16.3

2021-02-27 Thread James Cook
On Thu, Feb 25, 2021 at 08:16:43PM -0800, Greg Steuck wrote:
> From 3d80a96ac1803a72ea1fe7ab6ac28b5f79aad684 Mon Sep 17 00:00:00 2001
> From: Greg Steuck 
> Date: Mon, 24 Aug 2020 19:23:42 -0700
> Subject: [PATCH 5/7] Use devel/cabal module for devel/darcs and upgrade to
>  2.16.3

I gave this version a quick try and it seems to work; thanks.

-- 
James



[PATCH 5/7] Use devel/cabal module for devel/darcs and upgrade to 2.16.3

2021-02-25 Thread Greg Steuck
>From 3d80a96ac1803a72ea1fe7ab6ac28b5f79aad684 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Mon, 24 Aug 2020 19:23:42 -0700
Subject: [PATCH 5/7] Use devel/cabal module for devel/darcs and upgrade to
 2.16.3

---
 devel/darcs/Makefile  | 156 +++-
 devel/darcs/distinfo  | 230 +-
 devel/darcs/patches/patch-darcs_cabal |  38 ++-
 ...tch-tests_issue1857-pristine-conversion_sh |  12 -
 ...ch-tests_issue1875-honor-no-set-default_sh |  15 --
 devel/darcs/pkg/PLIST |   4 +-
 6 files changed, 356 insertions(+), 99 deletions(-)
 delete mode 100644 
devel/darcs/patches/patch-tests_issue1857-pristine-conversion_sh
 delete mode 100644 
devel/darcs/patches/patch-tests_issue1875-honor-no-set-default_sh

diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index 977cc186963..fe1f69a8c15 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -1,77 +1,117 @@
 # $OpenBSD: Makefile,v 1.71 2019/09/30 11:54:43 kili Exp $
 
-USE_WXNEEDED = Yes
-
 COMMENT =  advanced revision control system written in Haskell
 
-DISTNAME = darcs-2.14.2
+MODCABAL_STEM =darcs
+MODCABAL_VERSION = 2.16.3
 CATEGORIES =   devel
 HOMEPAGE = http://www.darcs.net/
 
 WANTLIB =  c charset curl>=2 curses ffi gmp iconv m \
pthread util z
-MODULES =  lang/ghc
-MODGHC_BUILD = cabal hackage nort
-MODGHC_SETUP_CONF_ARGS =-f 'curl -library' --enable-tests
+
+MODULES =  devel/cabal
+MODCABAL_FLAGS =   curl -library
+MODCABAL_MANIFEST =\
+   aeson   1.5.6.0 0   \
+   asn1-encoding   0.9.6   2   \
+   asn1-parse  0.9.5   0   \
+   asn1-types  0.3.4   0   \
+   assoc   1.0.2   1   \
+   async   2.2.3   0   \
+   attoparsec  0.13.2.50   \
+   base-compat 0.11.2  0   \
+   base-compat-batteries   0.11.2  0   \
+   base-orphans0.8.4   0   \
+   base16-bytestring   1.0.1.0 0   \
+   base64-bytestring   1.2.0.1 0   \
+   basement0.0.11  2   \
+   bifunctors  5.5.10  0   \
+   blaze-builder   0.4.2.1 0   \
+   case-insensitive1.2.1.0 0   \
+   cereal  0.5.8.1 0   \
+   comonad 5.0.8   0   \
+   conduit 1.3.4   0   \
+   conduit-extra   1.3.5   0   \
+   connection  0.3.1   1   \
+   constraints 0.120   \
+   cookie  0.4.5   0   \
+   cryptonite  0.270   \
+   data-default-class  0.1.2.0 0   \
+   data-fix0.3.1   0   \
+   data-ordlist0.4.7.0 0   \
+   digest  0.0.1.2 0   \
+   distributive0.6.2.1 0   \
+   dlist   1.0 0   \
+   exceptions  0.10.4  1   \
+   fgl 5.7.0.3 0   \
+   filtrable   0.1.6.0 0   \
+   hashable1.3.1.0 0   \
+   hourglass   0.2.12  0   \
+   hsc2hs  0.68.7  1   \
+   html1.0.1.2 0   \
+   http-client 0.7.6   0   \
+   http-client-tls 0.3.5.3 1   \
+   http-conduit2.3.8   0   \
+   http-types  0.12.3  0   \
+   indexed-traversable 0.1.1   0   \
+   integer-logarithms  1.0.3.1 0   \
+   memory  0.15.0  1   \
+   mime-types  0.1.0.9 0   \
+   mmap0.5.9   0   \
+   mono-traversable1.0.15.10   \
+   network 3.1.2.1 1   \
+   network-uri 2.6.4.1 0   \
+   old-locale  1.0.0.7 2   \
+   old-time1.1.0.3 2   \
+   pem 0.2.4   0   \
+   primitive   0.7.1.0 2   \
+   random  1.2.0   5   \
+   regex-applicative   0.3.4   0   \
+   regex-base  0.94.0.10   \
+   regex-compat-tdfa   0.95.1.40   \
+   regex-tdfa  1.3.1.0 2   \
+   resourcet   1.2.4.2 0   \
+   scientific  0.3.6.2 0   \
+   semigroups  0.19.1  0   \
+   socks   0.6.1   0   \
+   split   0.2.3.4 0   \
+   splitmix0.1.0.3 0   \
+   streaming-commons   0.2.2.1 0   \
+   strict  0.4.0.1 0   \
+   tagged  0.8.6.1 0   \
+   tar 0.5.1.1 3   \
+   temporary   1.3 0   \
+   th-abstraction  0.4.2.0 0   \
+   th-compat   0.1.1   0   \
+   these   1.1.1.1 1   \
+   time-compat 1.9.5   1   \
+   tls 1.5.5   0   \
+   transformers-compat 0.6.6   0   \
+   type-equality   1   2   \
+   typed-process   0.2.6.0 0   \
+   unix-compat 0.5.3   0   \
+   unliftio-core   0.2.0.1 1   \
+   unordered-containers0.2.13.00   \
+