Update to distributive-0.6.1

0.6.1 [2019.09.06]
* Add a Distributive instance for WrappedMonad m.

0.6 [2018.07.02]
* Remove fmapCollect.
* Avoid incurring some dependencies when using recent GHCs.

0.5.3
* Support doctest-0.12

0.5.2
* Revamp Setup.hs to use cabal-doctest. This makes distributive build
  with Cabal-1.25, and makes the doctests work with cabal new-build
  and sandboxes.
* Fix bugs in Data.Distributive.Generic that cause generic
  Distributive instances not to work properly for datatypes with
  recursive types
* Add genericCollect to Data.Distributive.Generic, and switch the
  underlying machinery in that module to work on a collect-like method
  instead of a distribute-like one
* Add a test suite for regression-testing Data.Distributive.Generic

0.5.1
* Add Distributive instances for datatypes from Data.Semigroup and
  GHC.Generics
* Add MINIMAL pragma for Distributive

0.5.0.2
* A more elegant fix for builds on GHC 7.2

0.5.0.1
* Fix builds on GHC 7.2

0.5
* Added flags for removing some dependencies.
* Support doctests when building to non-standard locations (such as
  when using stack.)
* Support base-orphans

4 files changed, 14 insertions, 37 deletions

diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index eab04bef4b6..423a9749501 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/11/23 12:52:33 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/01 05:21:17 pho Exp $
 
-DISTNAME=	distributive-0.4.4
-PKGREVISION=	1
+DISTNAME=	distributive-0.6.1
 CATEGORIES=	math devel
 
 MAINTAINER=	pho@cielonegro.org
@@ -9,7 +8,7 @@ COMMENT=	Haskell 98 Distributive functors -- Dual to Traversable
 LICENSE=	modified-bsd
 
 .include "../../mk/haskell.mk"
+.include "../../devel/hs-base-orphans/buildlink3.mk"
 .include "../../devel/hs-tagged/buildlink3.mk"
-.include "../../devel/hs-transformers/buildlink3.mk"
-.include "../../devel/hs-transformers-compat/buildlink3.mk"
+.include "../../math/hs-semigroups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/hs-distributive/PLIST b/math/hs-distributive/PLIST
deleted file mode 100644
index 1270754aa13..00000000000
--- a/math/hs-distributive/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/08/02 21:42:23 szptvlfn Exp $
-lib/distributive-${PKGVERSION}/${HASKELL_VERSION}/Data/Distributive.hi
-lib/distributive-${PKGVERSION}/${HASKELL_VERSION}/Data/Distributive/Generic.hi
-lib/distributive-${PKGVERSION}/${HASKELL_VERSION}/HSdistributive-${PKGVERSION}.o
-lib/distributive-${PKGVERSION}/${HASKELL_VERSION}/libHSdistributive-${PKGVERSION}.a
-lib/distributive-${PKGVERSION}/${HASKELL_VERSION}/package-description
-share/doc/distributive-${PKGVERSION}/LICENSE
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/Data-Distributive-Generic.html
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/Data-Distributive.html
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/distributive.haddock
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/frames.html
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/haddock-util.js
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/hslogo-16.png
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/index-frames.html
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/index.html
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/mini_Data-Distributive-Generic.html
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/mini_Data-Distributive.html
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/minus.gif
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/ocean.css
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/plus.gif
-${PLIST.doc}share/doc/distributive-${PKGVERSION}/html/synopsis.png
diff --git a/math/hs-distributive/buildlink3.mk b/math/hs-distributive/buildlink3.mk
index 48b1ab98b68..54f23a3de4e 100644
--- a/math/hs-distributive/buildlink3.mk
+++ b/math/hs-distributive/buildlink3.mk
@@ -1,17 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/11/23 12:52:33 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2020/01/01 05:21:17 pho Exp $
 
 BUILDLINK_TREE+=	hs-distributive
 
 .if !defined(HS_DISTRIBUTIVE_BUILDLINK3_MK)
 HS_DISTRIBUTIVE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-distributive+=	hs-distributive>=0.4.4
-BUILDLINK_ABI_DEPENDS.hs-distributive+=	hs-distributive>=0.4.4nb1
+BUILDLINK_API_DEPENDS.hs-distributive+=	hs-distributive>=0.6.1
+BUILDLINK_ABI_DEPENDS.hs-distributive+=	hs-distributive>=0.6.1
 BUILDLINK_PKGSRCDIR.hs-distributive?=	../../math/hs-distributive
 
+.include "../../devel/hs-base-orphans/buildlink3.mk"
 .include "../../devel/hs-tagged/buildlink3.mk"
-.include "../../devel/hs-transformers/buildlink3.mk"
-.include "../../devel/hs-transformers-compat/buildlink3.mk"
+.include "../../math/hs-semigroups/buildlink3.mk"
 .endif	# HS_DISTRIBUTIVE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-distributive
diff --git a/math/hs-distributive/distinfo b/math/hs-distributive/distinfo
index fe2a7e43f2b..f0fee1f5d57 100644
--- a/math/hs-distributive/distinfo
+++ b/math/hs-distributive/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 23:33:35 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/01/01 05:21:17 pho Exp $
 
-SHA1 (distributive-0.4.4.tar.gz) = 792a2e68674e30293b5dbda29d8094982b406e4c
-RMD160 (distributive-0.4.4.tar.gz) = 888bdf40f2b8def1f49c5df2cf4991b081a5387d
-SHA512 (distributive-0.4.4.tar.gz) = 35f73d575f31b7ddc7ee5f58e4e2e871c3ea607c7147b96467937b5ffb80bcaeec6da616bfb596ffe1bc28bd7f4062d56496eb5b5cc9e45249865c216139dd4f
-Size (distributive-0.4.4.tar.gz) = 6686 bytes
+SHA1 (distributive-0.6.1.tar.gz) = fd50e156bda77d46225a07ace5c74244844d75cb
+RMD160 (distributive-0.6.1.tar.gz) = d0f710e29138150b1c235e0d8b6e283fd14daf69
+SHA512 (distributive-0.6.1.tar.gz) = 6f14660e14ff5dfe90eb44386ed111829d4a621f77908049197ce1802b4d5ddd67ec66dadb92f8726c03f455e077ea6a5b8503e24bd5d205883d53f13cceb630
+Size (distributive-0.6.1.tar.gz) = 11256 bytes