From e553002fb7521aae0b5e6e7f352951d872eb6085 Mon Sep 17 00:00:00 2001
From: pho <pho@pkgsrc.org>
Date: Fri, 23 Apr 2021 12:30:17 +0000
Subject: [PATCH] Update to reflection-2.1.6

Fix a bug in which give (and possibly reify, reifyNat, and
reifySymbol) could be unsoundly inlined by GHC 8.10 or older to
produce incorrect runtime results.
---
 devel/hs-reflection/Makefile      |  5 ++---
 devel/hs-reflection/PLIST         | 36 +++++++++++++++----------------
 devel/hs-reflection/buildlink3.mk |  8 +++----
 devel/hs-reflection/distinfo      | 10 ++++-----
 4 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index b7a0727775eb..4b9877202bab 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/01/02 07:16:27 pho Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/23 12:30:17 pho Exp $
 
-DISTNAME=	reflection-2.1.5
+DISTNAME=	reflection-2.1.6
 CATEGORIES=	devel
 
 MAINTAINER=	szptvlfn@NetBSD.org
@@ -8,5 +8,4 @@ COMMENT=	Reifies arbitrary terms into types
 LICENSE=	modified-bsd
 
 .include "../../mk/haskell.mk"
-.include "../../math/hs-semigroups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hs-reflection/PLIST b/devel/hs-reflection/PLIST
index 179fb51f49be..ee977170e08e 100644
--- a/devel/hs-reflection/PLIST
+++ b/devel/hs-reflection/PLIST
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/13 04:53:16 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.4 2021/04/23 12:30:17 pho Exp $
+lib/reflection-${PKGVERSION}/${HS_VERSION}/package-description
+lib/reflection-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/Data/Reflection.dyn_hi
-${HS_IMPL}/Data/Reflection.hi
-${HS_IMPL}/Data/Reflection.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Data-Reflection.html
-${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/reflection.haddock
-${HS_DOCS}/html/synopsis.png
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Reflection.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Reflection.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Reflection.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/html/Data-Reflection.html
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/html/reflection.haddock
+share/doc/${HS_PLATFORM}/reflection-${PKGVERSION}/html/synopsis.png
diff --git a/devel/hs-reflection/buildlink3.mk b/devel/hs-reflection/buildlink3.mk
index 485615cd546e..34f8a4f07de9 100644
--- a/devel/hs-reflection/buildlink3.mk
+++ b/devel/hs-reflection/buildlink3.mk
@@ -1,15 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/01/02 07:16:27 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2021/04/23 12:30:17 pho Exp $
 
 BUILDLINK_TREE+=	hs-reflection
 
 .if !defined(HS_REFLECTION_BUILDLINK3_MK)
 HS_REFLECTION_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-reflection+=	hs-reflection>=2.1.5
-BUILDLINK_ABI_DEPENDS.hs-reflection+=	hs-reflection>=2.1.5
+BUILDLINK_API_DEPENDS.hs-reflection+=	hs-reflection>=2.1.6
+BUILDLINK_ABI_DEPENDS.hs-reflection+=	hs-reflection>=2.1.6
 BUILDLINK_PKGSRCDIR.hs-reflection?=	../../devel/hs-reflection
-
-.include "../../math/hs-semigroups/buildlink3.mk"
 .endif	# HS_REFLECTION_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-reflection
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index 886e45bb86d2..1fe8096e9020 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2020/01/02 07:16:27 pho Exp $
+$NetBSD: distinfo,v 1.4 2021/04/23 12:30:17 pho Exp $
 
-SHA1 (reflection-2.1.5.tar.gz) = 4cafda8b1f6e88d138b5d6d1ca3bcbac24d09188
-RMD160 (reflection-2.1.5.tar.gz) = 70dd58a3e57667dd1720ab7ef0b09b419034cb17
-SHA512 (reflection-2.1.5.tar.gz) = 4b7c909d61ba6d19f8e120e9e53de7bf9e3fb69038cfa7e3027160e4c6e22b415d1d0cce60476e14bf0a205b848d53f1751915bdebfe83a400003f4aaf6286eb
-Size (reflection-2.1.5.tar.gz) = 19532 bytes
+SHA1 (reflection-2.1.6.tar.gz) = 8691f218ac37fce941f84b8afaf8a85f787577ae
+RMD160 (reflection-2.1.6.tar.gz) = aed75dc9ea7cf2485b3368b9d3f47c5d3e63a54e
+SHA512 (reflection-2.1.6.tar.gz) = d7f615b6f361b2ca7266e8c4611c939d9f80684ca173080e9ad8227f04f2731899113dcb87ecb051d47b29fb860d7caa15c99c7d3d7493e7e73745d085518fdd
+Size (reflection-2.1.6.tar.gz) = 19976 bytes