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

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0bc3874d432
branches:  trunk
changeset: 347401:d0bc3874d432
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat Jan 11 09:31:04 2020 +0000

description:
Remove dependency on devel/hs-text

It's now part of GHC.
Also fail and semigroups are no longer required as of GHC 8.

diffstat:

 devel/hs-hashable/Makefile                            |   3 +-
 devel/hs-hashable/buildlink3.mk                       |   4 +-
 math/hs-scientific/Makefile                           |   5 +-
 math/hs-scientific/buildlink3.mk                      |   5 +-
 textproc/hs-attoparsec/Makefile                       |   5 +--
 textproc/hs-attoparsec/buildlink3.mk                  |   5 +--
 textproc/hs-attoparsec/distinfo                       |   3 +-
 textproc/hs-attoparsec/patches/patch-attoparsec.cabal |  33 -------------------
 8 files changed, 9 insertions(+), 54 deletions(-)

diffs (158 lines):

diff -r fae7c903121a -r d0bc3874d432 devel/hs-hashable/Makefile
--- a/devel/hs-hashable/Makefile        Sat Jan 11 09:22:13 2020 +0000
+++ b/devel/hs-hashable/Makefile        Sat Jan 11 09:31:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/12/31 12:47:44 pho Exp $
+# $NetBSD: Makefile,v 1.11 2020/01/11 09:31:04 pho Exp $
 
 DISTNAME=      hashable-1.3.0.0
 CATEGORIES=    devel
@@ -8,5 +8,4 @@
 LICENSE=       modified-bsd
 
 .include "../../mk/haskell.mk"
-.include "../../devel/hs-text/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fae7c903121a -r d0bc3874d432 devel/hs-hashable/buildlink3.mk
--- a/devel/hs-hashable/buildlink3.mk   Sat Jan 11 09:22:13 2020 +0000
+++ b/devel/hs-hashable/buildlink3.mk   Sat Jan 11 09:31:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2019/12/31 12:47:44 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2020/01/11 09:31:04 pho Exp $
 
 BUILDLINK_TREE+=       hs-hashable
 
@@ -8,8 +8,6 @@
 BUILDLINK_API_DEPENDS.hs-hashable+=    hs-hashable>=1.3.0
 BUILDLINK_ABI_DEPENDS.hs-hashable+=    hs-hashable>=1.3.0.0
 BUILDLINK_PKGSRCDIR.hs-hashable?=      ../../devel/hs-hashable
-
-.include "../../devel/hs-text/buildlink3.mk"
 .endif # HS_HASHABLE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-hashable
diff -r fae7c903121a -r d0bc3874d432 math/hs-scientific/Makefile
--- a/math/hs-scientific/Makefile       Sat Jan 11 09:22:13 2020 +0000
+++ b/math/hs-scientific/Makefile       Sat Jan 11 09:31:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/12/31 17:27:24 pho Exp $
+# $NetBSD: Makefile,v 1.15 2020/01/11 09:32:03 pho Exp $
 
 DISTNAME=      scientific-0.3.6.2
 PKGREVISION=   1
@@ -10,7 +10,6 @@
 
 .include "../../mk/haskell.mk"
 .include "../../devel/hs-hashable/buildlink3.mk"
+.include "../../math/hs-integer-logarithms/buildlink3.mk"
 .include "../../devel/hs-primitive/buildlink3.mk"
-.include "../../devel/hs-text/buildlink3.mk"
-.include "../../math/hs-integer-logarithms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fae7c903121a -r d0bc3874d432 math/hs-scientific/buildlink3.mk
--- a/math/hs-scientific/buildlink3.mk  Sat Jan 11 09:22:13 2020 +0000
+++ b/math/hs-scientific/buildlink3.mk  Sat Jan 11 09:31:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2019/12/31 17:27:24 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2020/01/11 09:32:03 pho Exp $
 
 BUILDLINK_TREE+=       hs-scientific
 
@@ -10,9 +10,8 @@
 BUILDLINK_PKGSRCDIR.hs-scientific?=    ../../math/hs-scientific
 
 .include "../../devel/hs-hashable/buildlink3.mk"
+.include "../../math/hs-integer-logarithms/buildlink3.mk"
 .include "../../devel/hs-primitive/buildlink3.mk"
-.include "../../devel/hs-text/buildlink3.mk"
-.include "../../math/hs-integer-logarithms/buildlink3.mk"
 .endif # HS_SCIENTIFIC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-scientific
diff -r fae7c903121a -r d0bc3874d432 textproc/hs-attoparsec/Makefile
--- a/textproc/hs-attoparsec/Makefile   Sat Jan 11 09:22:13 2020 +0000
+++ b/textproc/hs-attoparsec/Makefile   Sat Jan 11 09:31:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/12/31 19:00:39 pho Exp $
+# $NetBSD: Makefile,v 1.13 2020/01/11 09:34:21 pho Exp $
 
 DISTNAME=      attoparsec-0.13.2.3
 PKGREVISION=   1
@@ -9,8 +9,5 @@
 LICENSE=       modified-bsd
 
 .include "../../mk/haskell.mk"
-.include "../../devel/hs-fail/buildlink3.mk"
-.include "../../math/hs-semigroups/buildlink3.mk"
 .include "../../math/hs-scientific/buildlink3.mk"
-.include "../../devel/hs-text/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fae7c903121a -r d0bc3874d432 textproc/hs-attoparsec/buildlink3.mk
--- a/textproc/hs-attoparsec/buildlink3.mk      Sat Jan 11 09:22:13 2020 +0000
+++ b/textproc/hs-attoparsec/buildlink3.mk      Sat Jan 11 09:31:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2019/12/31 19:00:39 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2020/01/11 09:34:21 pho Exp $
 
 BUILDLINK_TREE+=       hs-attoparsec
 
@@ -9,10 +9,7 @@
 BUILDLINK_ABI_DEPENDS.hs-attoparsec+=  hs-attoparsec>=0.13.2.3
 BUILDLINK_PKGSRCDIR.hs-attoparsec?=    ../../textproc/hs-attoparsec
 
-.include "../../devel/hs-fail/buildlink3.mk"
-.include "../../math/hs-semigroups/buildlink3.mk"
 .include "../../math/hs-scientific/buildlink3.mk"
-.include "../../devel/hs-text/buildlink3.mk"
 .endif # HS_ATTOPARSEC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-attoparsec
diff -r fae7c903121a -r d0bc3874d432 textproc/hs-attoparsec/distinfo
--- a/textproc/hs-attoparsec/distinfo   Sat Jan 11 09:22:13 2020 +0000
+++ b/textproc/hs-attoparsec/distinfo   Sat Jan 11 09:31:04 2020 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2019/12/31 17:33:18 pho Exp $
+$NetBSD: distinfo,v 1.4 2020/01/11 09:34:21 pho Exp $
 
 SHA1 (attoparsec-0.13.2.3.tar.gz) = 69e0e8c54907548a29eed55e3fd343cbd3c37f32
 RMD160 (attoparsec-0.13.2.3.tar.gz) = 66268808f781b9903dad709b6e8eaf576d4f6513
 SHA512 (attoparsec-0.13.2.3.tar.gz) = 84805ff547f1aa5eebd320c1bd738bc1098a9789fb330eff7bdcb1b0477e9709d86f93bd8848f4a8501a123b6add6bd22af59cfa94af66f1d57703745706a194
 Size (attoparsec-0.13.2.3.tar.gz) = 162346 bytes
-SHA1 (patch-attoparsec.cabal) = e44f2964ca04fff266ce5dbc6db8f3b56d0015ac
diff -r fae7c903121a -r d0bc3874d432 textproc/hs-attoparsec/patches/patch-attoparsec.cabal
--- a/textproc/hs-attoparsec/patches/patch-attoparsec.cabal     Sat Jan 11 09:22:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-attoparsec.cabal,v 1.1 2019/12/31 17:33:18 pho Exp $
-
-Relax the upper bound for semigroups
-
---- attoparsec.cabal.orig      2019-08-31 09:36:08.000000000 +0000
-+++ attoparsec.cabal
-@@ -53,7 +53,7 @@ library
-   if !impl(ghc >= 8.0)
-     -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
-     build-depends: fail == 4.9.*,
--                   semigroups >=0.16.1 && <0.19
-+                   semigroups >=0.16.1 && <0.20
- 
-   exposed-modules: Data.Attoparsec
-                    Data.Attoparsec.ByteString
-@@ -139,7 +139,7 @@ test-suite tests
-   if !impl(ghc >= 8.0)
-     -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
-     build-depends: fail == 4.9.*,
--                   semigroups >=0.16.1 && <0.19
-+                   semigroups >=0.16.1 && <0.20
- 
- benchmark benchmarks
-   type: exitcode-stdio-1.0
-@@ -185,7 +185,7 @@ benchmark benchmarks
-   if !impl(ghc >= 8.0)
-     -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
-     build-depends: fail == 4.9.*,
--                   semigroups >=0.16.1 && <0.19
-+                   semigroups >=0.16.1 && <0.20
- 
- source-repository head
-   type:     git