Fix build with GHC 9

4 files changed, 24 insertions, 25 deletions

diff --git a/security/hs-ed25519/Makefile b/security/hs-ed25519/Makefile
index f07b3cb691b..892b778ab73 100644
--- a/security/hs-ed25519/Makefile
+++ b/security/hs-ed25519/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/02/18 15:07:27 mef Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/24 13:21:53 pho Exp $
 
 DISTNAME=	ed25519-0.0.5.0
 CATEGORIES=	security
@@ -7,6 +7,5 @@ MAINTAINER=	pho@cielonegro.org
 COMMENT=	Ed25519 cryptographic signatures
 LICENSE=	mit
 
-BUILDLINK_API_DEPENDS.ghc+=	ghc<8.10
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/hs-ed25519/PLIST b/security/hs-ed25519/PLIST
index 36c4f66e28a..c09269ea365 100644
--- a/security/hs-ed25519/PLIST
+++ b/security/hs-ed25519/PLIST
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:12 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
-${HS_IMPL}/Crypto/Sign/Ed25519.dyn_hi
-${HS_IMPL}/Crypto/Sign/Ed25519.hi
-${HS_IMPL}/Crypto/Sign/Ed25519.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
+@comment $NetBSD: PLIST,v 1.2 2021/04/24 13:21:53 pho Exp $
+lib/ed25519-${PKGVERSION}/${HS_VERSION}/package-description
+lib/ed25519-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Sign/Ed25519.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Sign/Ed25519.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Crypto/Sign/Ed25519.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.txt
-${HS_DOCS}/html/Crypto-Sign-Ed25519.html
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/ed25519.haddock
-${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}/ed25519-${PKGVERSION}/LICENSE.txt
+share/doc/${HS_PLATFORM}/ed25519-${PKGVERSION}/html/Crypto-Sign-Ed25519.html
+share/doc/${HS_PLATFORM}/ed25519-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/ed25519-${PKGVERSION}/html/ed25519.haddock
+share/doc/${HS_PLATFORM}/ed25519-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/ed25519-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/ed25519-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/ed25519-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/ed25519-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/ed25519-${PKGVERSION}/html/synopsis.png
diff --git a/security/hs-ed25519/distinfo b/security/hs-ed25519/distinfo
index d6f84cbbbba..3a41f30af50 100644
--- a/security/hs-ed25519/distinfo
+++ b/security/hs-ed25519/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/01/18 23:30:04 pho Exp $
+$NetBSD: distinfo,v 1.2 2021/04/24 13:21:53 pho Exp $
 
 SHA1 (ed25519-0.0.5.0.tar.gz) = 283d3f90f0c141bb711e8fc01830defbf46b8a38
 RMD160 (ed25519-0.0.5.0.tar.gz) = eebedb9ca2a80b47cb67af71ffd9c620b1c3d5e9
 SHA512 (ed25519-0.0.5.0.tar.gz) = cd2bb28de905c6d659f80f15e82970a9634c959432c73b6fd3b10ebca42a1ce734429e7ac861d0ab328904d99651a6d2fcaaf4d74ab75a3c0be68607e8f54ce9
 Size (ed25519-0.0.5.0.tar.gz) = 80034 bytes
-SHA1 (patch-ed25519.cabal) = 60b114a83195f7fcbdb0841ab0748c6cbf446b78
+SHA1 (patch-ed25519.cabal) = e5989fa52c3b59d7ce459ca7358df8e086ef5120
diff --git a/security/hs-ed25519/patches/patch-ed25519.cabal b/security/hs-ed25519/patches/patch-ed25519.cabal
index 0847102bfe2..630b57d7896 100644
--- a/security/hs-ed25519/patches/patch-ed25519.cabal
+++ b/security/hs-ed25519/patches/patch-ed25519.cabal
@@ -1,6 +1,6 @@
-$NetBSD: patch-ed25519.cabal,v 1.1 2020/01/18 23:30:04 pho Exp $
+$NetBSD: patch-ed25519.cabal,v 1.2 2021/04/24 13:21:53 pho Exp $
 
-Fix build with GHC 8.8
+Fix build with GHC 9.
 
 --- ed25519.cabal.orig	2015-10-11 23:24:33.000000000 +0000
 +++ ed25519.cabal
@@ -9,7 +9,7 @@ Fix build with GHC 8.8
  library
    build-depends:
 -    ghc-prim    >= 0.1 && < 0.5,
-+    ghc-prim    >= 0.1 && < 0.6,
++    ghc-prim    >= 0.1 && < 0.8,
      base        >= 4   && < 5,
      bytestring  >= 0.9 && < 0.11