Update to contravariant-1.5.3

* Explicitly mark modules as Safe.

4 files changed, 41 insertions, 39 deletions

diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index f4eb2329746..ac96ba3e1f3 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2020/01/01 02:29:19 pho Exp $
+# $NetBSD: Makefile,v 1.2 2021/04/23 07:16:05 pho Exp $
 
-DISTNAME=	contravariant-1.5.2
+DISTNAME=	contravariant-1.5.3
 CATEGORIES=	math
 
 MAINTAINER=	pho@cielonegro.org
@@ -8,7 +8,8 @@ COMMENT=	Contravariant functors
 LICENSE=	modified-bsd
 
 .include "../../mk/haskell.mk"
+.include "../../devel/hs-StateVar/buildlink3.mk"
+.include "../../devel/hs-tagged/buildlink3.mk"
 .include "../../devel/hs-transformers-compat/buildlink3.mk"
 .include "../../math/hs-semigroups/buildlink3.mk"
-.include "../../devel/hs-StateVar/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/hs-contravariant/PLIST b/math/hs-contravariant/PLIST
index 81d4686635f..8e14e12b585 100644
--- a/math/hs-contravariant/PLIST
+++ b/math/hs-contravariant/PLIST
@@ -1,27 +1,27 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:10 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
-${HS_IMPL}/Data/Functor/Contravariant/Compose.dyn_hi
-${HS_IMPL}/Data/Functor/Contravariant/Compose.hi
-${HS_IMPL}/Data/Functor/Contravariant/Compose.p_hi
-${HS_IMPL}/Data/Functor/Contravariant/Divisible.dyn_hi
-${HS_IMPL}/Data/Functor/Contravariant/Divisible.hi
-${HS_IMPL}/Data/Functor/Contravariant/Divisible.p_hi
-${HS_IMPL}/Data/Functor/Contravariant/Generic.dyn_hi
-${HS_IMPL}/Data/Functor/Contravariant/Generic.hi
-${HS_IMPL}/Data/Functor/Contravariant/Generic.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
+@comment $NetBSD: PLIST,v 1.2 2021/04/23 07:16:05 pho Exp $
+lib/contravariant-${PKGVERSION}/${HS_VERSION}/package-description
+lib/contravariant-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/Contravariant/Compose.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/Contravariant/Compose.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/Contravariant/Compose.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/Contravariant/Divisible.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/Contravariant/Divisible.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/Contravariant/Divisible.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/Contravariant/Generic.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/Contravariant/Generic.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/Contravariant/Generic.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Data-Functor-Contravariant-Compose.html
-${HS_DOCS}/html/Data-Functor-Contravariant-Divisible.html
-${HS_DOCS}/html/Data-Functor-Contravariant-Generic.html
-${HS_DOCS}/html/contravariant.haddock
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/synopsis.png
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/Data-Functor-Contravariant-Compose.html
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/Data-Functor-Contravariant-Divisible.html
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/Data-Functor-Contravariant-Generic.html
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/contravariant.haddock
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/contravariant-${PKGVERSION}/html/synopsis.png
diff --git a/math/hs-contravariant/buildlink3.mk b/math/hs-contravariant/buildlink3.mk
index 0342ac7d5fc..92e5f655de2 100644
--- a/math/hs-contravariant/buildlink3.mk
+++ b/math/hs-contravariant/buildlink3.mk
@@ -1,17 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/01/01 02:29:19 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/04/23 07:16:05 pho Exp $
 
 BUILDLINK_TREE+=	hs-contravariant
 
 .if !defined(HS_CONTRAVARIANT_BUILDLINK3_MK)
 HS_CONTRAVARIANT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-contravariant+=	hs-contravariant>=1.5.2
-BUILDLINK_ABI_DEPENDS.hs-contravariant+=	hs-contravariant>=1.5.2
-BUILDLINK_PKGSRCDIR.hs-contravariant?=	../../math/hs-contravariant
+BUILDLINK_API_DEPENDS.hs-contravariant+=	hs-contravariant>=1.5.3
+BUILDLINK_ABI_DEPENDS.hs-contravariant+=	hs-contravariant>=1.5.3
+BUILDLINK_PKGSRCDIR.hs-contravariant?=		../../math/hs-contravariant
 
+.include "../../devel/hs-StateVar/buildlink3.mk"
+.include "../../devel/hs-tagged/buildlink3.mk"
 .include "../../devel/hs-transformers-compat/buildlink3.mk"
 .include "../../math/hs-semigroups/buildlink3.mk"
-.include "../../devel/hs-StateVar/buildlink3.mk"
 .endif	# HS_CONTRAVARIANT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-contravariant
diff --git a/math/hs-contravariant/distinfo b/math/hs-contravariant/distinfo
index a6230bdd2d3..c4b48625b21 100644
--- a/math/hs-contravariant/distinfo
+++ b/math/hs-contravariant/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2020/01/01 02:29:19 pho Exp $
+$NetBSD: distinfo,v 1.2 2021/04/23 07:16:05 pho Exp $
 
-SHA1 (contravariant-1.5.2.tar.gz) = 21782e04bd877921b13ba9cbf5a83132a6260bf8
-RMD160 (contravariant-1.5.2.tar.gz) = 142d8aa32515fe8db59c3ecde43b337c72343e75
-SHA512 (contravariant-1.5.2.tar.gz) = f59cfbb2c7b1dec7532c3ffb260b5788fc3fe160ad730c1b49ff85d57cc46c4af24e37ecc8cd46df112ff1e92b5b03f2064b81f8ccda88465e1fe695331f5410
-Size (contravariant-1.5.2.tar.gz) = 16006 bytes
+SHA1 (contravariant-1.5.3.tar.gz) = 9606d2e5d0018638d26ed76a55f581805bc70496
+RMD160 (contravariant-1.5.3.tar.gz) = 4f77ee2f74813ff4a403606ad5ffdf6b6ac8ab96
+SHA512 (contravariant-1.5.3.tar.gz) = f84e534ea208ebb949e6e1114233e56f284b94ceb756bddeb5786d2c1ed7ed7ec93defcabfa285887316cf880e7b6d2575a76c72bdd9ad73530b4397f5466c87
+Size (contravariant-1.5.3.tar.gz) = 13726 bytes