Remove dependency on devel/hs-mtl

mtl is now a part of GHC.
Also hs-fail is no longer required as of GHC 8.

8 files changed, 23 insertions, 17 deletions

diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index f1a14bb9ccd..d7033866978 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/02 02:47:31 pho Exp $
+# $NetBSD: Makefile,v 1.5 2020/01/11 08:05:40 pho Exp $
 
 DISTNAME=	MonadRandom-0.5.1.1
 CATEGORIES=	devel
@@ -9,9 +9,7 @@ LICENSE=	2-clause-bsd
 # http://www.haskell.org/haskellwiki/HaskellWiki:Copyrights
 
 .include "../../mk/haskell.mk"
-.include "../../devel/hs-mtl/buildlink3.mk"
 .include "../../devel/hs-primitive/buildlink3.mk"
 .include "../../devel/hs-random/buildlink3.mk"
 .include "../../devel/hs-transformers-compat/buildlink3.mk"
-.include "../../devel/hs-fail/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hs-MonadRandom/buildlink3.mk b/devel/hs-MonadRandom/buildlink3.mk
index 783a6567352..edc9814b418 100644
--- a/devel/hs-MonadRandom/buildlink3.mk
+++ b/devel/hs-MonadRandom/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/01/02 02:47:31 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/01/11 08:05:40 pho Exp $
 
 BUILDLINK_TREE+=	hs-MonadRandom
 
@@ -9,11 +9,9 @@ BUILDLINK_API_DEPENDS.hs-MonadRandom+=	hs-MonadRandom>=0.5.1
 BUILDLINK_ABI_DEPENDS.hs-MonadRandom+=	hs-MonadRandom>=0.5.1.1
 BUILDLINK_PKGSRCDIR.hs-MonadRandom?=	../../devel/hs-MonadRandom
 
-.include "../../devel/hs-mtl/buildlink3.mk"
 .include "../../devel/hs-primitive/buildlink3.mk"
 .include "../../devel/hs-random/buildlink3.mk"
 .include "../../devel/hs-transformers-compat/buildlink3.mk"
-.include "../../devel/hs-fail/buildlink3.mk"
 .endif	# HS_MONADRANDOM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-MonadRandom
diff --git a/devel/hs-MonadRandom/distinfo b/devel/hs-MonadRandom/distinfo
index beb0d0811b1..e8202c529d7 100644
--- a/devel/hs-MonadRandom/distinfo
+++ b/devel/hs-MonadRandom/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2020/01/02 02:47:31 pho Exp $
+$NetBSD: distinfo,v 1.4 2020/01/11 08:05:40 pho Exp $
 
 SHA1 (MonadRandom-0.5.1.1.tar.gz) = f4292738672239e2968347cf959190b2c46a2135
 RMD160 (MonadRandom-0.5.1.1.tar.gz) = 313ca19433cfc7131220defca8e9779707350609
 SHA512 (MonadRandom-0.5.1.1.tar.gz) = 0a3c15076f162e985b37c14981d1fb89ab835cbfde207b7825ae27088d81218949336599b56c56c36a653a99566319c60d95bea9acab3248749b39597a297edb
 Size (MonadRandom-0.5.1.1.tar.gz) = 10404 bytes
+SHA1 (patch-MonadRandom.cabal) = 82622c9986cbff23256d2bf990775e641ad68678
diff --git a/devel/hs-MonadRandom/patches/patch-MonadRandom.cabal b/devel/hs-MonadRandom/patches/patch-MonadRandom.cabal
new file mode 100644
index 00000000000..5fd199fb33c
--- /dev/null
+++ b/devel/hs-MonadRandom/patches/patch-MonadRandom.cabal
@@ -0,0 +1,15 @@
+$NetBSD: patch-MonadRandom.cabal,v 1.1 2020/01/11 08:05:40 pho Exp $
+
+Relax the upper bound on primitive
+
+--- MonadRandom.cabal.orig	2018-05-22 03:16:57.000000000 +0000
++++ MonadRandom.cabal
+@@ -38,7 +38,7 @@ library
+     transformers        >=0.3 && <0.6,
+     transformers-compat >=0.4 && <0.7,
+     mtl                 >=2.1 && <2.3,
+-    primitive           >=0.6 && <0.7,
++    primitive           >=0.6 && <0.8,
+     random
+   ghc-options:         -Wall
+   default-language:    Haskell2010
diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile
index 4231b4b1133..d8be374c5dc 100644
--- a/devel/hs-exceptions/Makefile
+++ b/devel/hs-exceptions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/01 04:23:34 pho Exp $
+# $NetBSD: Makefile,v 1.5 2020/01/11 08:09:43 pho Exp $
 
 DISTNAME=	exceptions-0.10.4
 CATEGORIES=	devel
@@ -8,7 +8,5 @@ COMMENT=	Extensible optionally-pure exceptions
 LICENSE=	modified-bsd
 
 .include "../../mk/haskell.mk"
-.include "../../devel/hs-mtl/buildlink3.mk"
 .include "../../devel/hs-stm/buildlink3.mk"
-.include "../../devel/hs-fail/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hs-exceptions/buildlink3.mk b/devel/hs-exceptions/buildlink3.mk
index 32c203716d2..e4767af846a 100644
--- a/devel/hs-exceptions/buildlink3.mk
+++ b/devel/hs-exceptions/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/01/01 04:23:34 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/01/11 08:09:43 pho Exp $
 
 BUILDLINK_TREE+=	hs-exceptions
 
@@ -9,9 +9,7 @@ BUILDLINK_API_DEPENDS.hs-exceptions+=	hs-exceptions>=0.10.4
 BUILDLINK_ABI_DEPENDS.hs-exceptions+=	hs-exceptions>=0.10.4
 BUILDLINK_PKGSRCDIR.hs-exceptions?=	../../devel/hs-exceptions
 
-.include "../../devel/hs-mtl/buildlink3.mk"
 .include "../../devel/hs-stm/buildlink3.mk"
-.include "../../devel/hs-fail/buildlink3.mk"
 .endif	# HS_EXCEPTIONS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-exceptions
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index f45a124e717..42c08b21772 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/11/23 12:52:32 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/11 08:11:30 pho Exp $
 
 DISTNAME=	ghc-mtl-1.2.1.0
 PKGREVISION=	1
@@ -11,5 +11,4 @@ LICENSE=	modified-bsd
 .include "../../mk/haskell.mk"
 .include "../../devel/hs-exceptions/buildlink3.mk"
 .include "../../devel/hs-extensible-exceptions/buildlink3.mk"
-.include "../../devel/hs-mtl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hs-ghc-mtl/buildlink3.mk b/devel/hs-ghc-mtl/buildlink3.mk
index 82d19c2956c..eaff80b2b76 100644
--- a/devel/hs-ghc-mtl/buildlink3.mk
+++ b/devel/hs-ghc-mtl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/11/23 12:52:32 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/01/11 08:11:30 pho Exp $
 
 BUILDLINK_TREE+=	hs-ghc-mtl
 
@@ -11,7 +11,6 @@ BUILDLINK_PKGSRCDIR.hs-ghc-mtl?=	../../devel/hs-ghc-mtl
 
 .include "../../devel/hs-exceptions/buildlink3.mk"
 .include "../../devel/hs-extensible-exceptions/buildlink3.mk"
-.include "../../devel/hs-mtl/buildlink3.mk"
 .endif	# HS_GHC_MTL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-ghc-mtl