[pkgsrc/trunk]: pkgsrc/devel Remove dependency on devel/hs-mtl

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel Remove dependency on devel/hs-mtl
From: pho <pho%pkgsrc.org@localhost>
Date: Sat, 11 Jan 2020 12:40:05 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a6f3a276435e
branches:  trunk
changeset: 347381:a6f3a276435e
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat Jan 11 08:05:40 2020 +0000

description:
Remove dependency on devel/hs-mtl

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

diffstat:

 devel/hs-MonadRandom/Makefile                        |   4 +---
 devel/hs-MonadRandom/buildlink3.mk                   |   4 +---
 devel/hs-MonadRandom/distinfo                        |   3 ++-
 devel/hs-MonadRandom/patches/patch-MonadRandom.cabal |  15 +++++++++++++++
 devel/hs-exceptions/Makefile                         |   4 +---
 devel/hs-exceptions/buildlink3.mk                    |   4 +---
 devel/hs-ghc-mtl/Makefile                            |   3 +--
 devel/hs-ghc-mtl/buildlink3.mk                       |   3 +--
 8 files changed, 23 insertions(+), 17 deletions(-)

diffs (139 lines):

diff -r b825eaefbf2c -r a6f3a276435e devel/hs-MonadRandom/Makefile
--- a/devel/hs-MonadRandom/Makefile     Sat Jan 11 07:54:04 2020 +0000
+++ b/devel/hs-MonadRandom/Makefile     Sat Jan 11 08:05:40 2020 +0000
@@ -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 @@
 # 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 -r b825eaefbf2c -r a6f3a276435e devel/hs-MonadRandom/buildlink3.mk
--- a/devel/hs-MonadRandom/buildlink3.mk        Sat Jan 11 07:54:04 2020 +0000
+++ b/devel/hs-MonadRandom/buildlink3.mk        Sat Jan 11 08:05:40 2020 +0000
@@ -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_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 -r b825eaefbf2c -r a6f3a276435e devel/hs-MonadRandom/distinfo
--- a/devel/hs-MonadRandom/distinfo     Sat Jan 11 07:54:04 2020 +0000
+++ b/devel/hs-MonadRandom/distinfo     Sat Jan 11 08:05:40 2020 +0000
@@ -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 -r b825eaefbf2c -r a6f3a276435e devel/hs-MonadRandom/patches/patch-MonadRandom.cabal
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/hs-MonadRandom/patches/patch-MonadRandom.cabal      Sat Jan 11 08:05:40 2020 +0000
@@ -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 -r b825eaefbf2c -r a6f3a276435e devel/hs-exceptions/Makefile
--- a/devel/hs-exceptions/Makefile      Sat Jan 11 07:54:04 2020 +0000
+++ b/devel/hs-exceptions/Makefile      Sat Jan 11 08:05:40 2020 +0000
@@ -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 @@
 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 -r b825eaefbf2c -r a6f3a276435e devel/hs-exceptions/buildlink3.mk
--- a/devel/hs-exceptions/buildlink3.mk Sat Jan 11 07:54:04 2020 +0000
+++ b/devel/hs-exceptions/buildlink3.mk Sat Jan 11 08:05:40 2020 +0000
@@ -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_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 -r b825eaefbf2c -r a6f3a276435e devel/hs-ghc-mtl/Makefile
--- a/devel/hs-ghc-mtl/Makefile Sat Jan 11 07:54:04 2020 +0000
+++ b/devel/hs-ghc-mtl/Makefile Sat Jan 11 08:05:40 2020 +0000
@@ -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 @@
 .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 -r b825eaefbf2c -r a6f3a276435e devel/hs-ghc-mtl/buildlink3.mk
--- a/devel/hs-ghc-mtl/buildlink3.mk    Sat Jan 11 07:54:04 2020 +0000
+++ b/devel/hs-ghc-mtl/buildlink3.mk    Sat Jan 11 08:05:40 2020 +0000
@@ -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 @@
 
 .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
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel Remove dependency on devel/hs-mtl
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/hs-hint Update to hint-0.9.0.2
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel Remove dependency on devel/hs-mtl
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/hs-hint Update to hint-0.9.0.2
Indexes:
Home | Main Index | Thread Index | Old Index