Sat Apr 24 05:36:32 2021 UTC ()
Fix build with GHC 9


(pho)
diff -r1.3 -r1.4 pkgsrc/devel/hs-wizards/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/hs-wizards/PLIST
diff -r1.1 -r1.2 pkgsrc/devel/hs-wizards/distinfo
diff -r0 -r1.1 pkgsrc/devel/hs-wizards/patches/patch-wizards.cabal
cvs diff -r1.3 -r1.4 pkgsrc/devel/hs-wizards/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/hs-wizards/Makefile 2021/02/28 14:19:37 1.3
+++ pkgsrc/devel/hs-wizards/Makefile 2021/04/24 05:36:32 1.4
@@ -1,18 +1,12 @@ @@ -1,18 +1,12 @@
1# $NetBSD: Makefile,v 1.3 2021/02/28 14:19:37 mef Exp $ 1# $NetBSD: Makefile,v 1.4 2021/04/24 05:36:32 pho Exp $
2 2
3DISTNAME= wizards-1.0.3 3DISTNAME= wizards-1.0.3
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_HASKELL_HACKAGE:=wizards-${PKGVERSION_NOREV}/} 
6 5
7MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://hackage.haskell.org/package/wizards 
9COMMENT= High level, generic library for interrogative user interfaces 7COMMENT= High level, generic library for interrogative user interfaces
10LICENSE= modified-bsd 8LICENSE= modified-bsd
11 9
12USE_LANGUAGES= # none 
13 
14.include "../../devel/hs-control-monad-free/buildlink3.mk" 10.include "../../devel/hs-control-monad-free/buildlink3.mk"
15BUILDLINK_API_DEPENDS.ghc+= ghc<=8.10 
16BUILDLINK_API_DEPENDS.ghc+= ghc>=8.8 
17.include "../../mk/haskell.mk" 11.include "../../mk/haskell.mk"
18.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/hs-wizards/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/hs-wizards/PLIST 2020/05/11 17:52:09 1.1
+++ pkgsrc/devel/hs-wizards/PLIST 2021/04/24 05:36:32 1.2
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:09 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.2 2021/04/24 05:36:32 pho Exp $
2${HS_INTF}/package-description 2lib/wizards-${PKGVERSION}/${HS_VERSION}/package-description
3${HS_INTF}/package-id 3lib/wizards-${PKGVERSION}/${HS_VERSION}/package-id
4lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 4lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
5${HS_IMPL}/System/Console/Wizard.dyn_hi 5lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard.dyn_hi
6${HS_IMPL}/System/Console/Wizard.hi 6lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard.hi
7${HS_IMPL}/System/Console/Wizard.p_hi 7lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard.p_hi
8${HS_IMPL}/System/Console/Wizard/BasicIO.dyn_hi 8lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/BasicIO.dyn_hi
9${HS_IMPL}/System/Console/Wizard/BasicIO.hi 9lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/BasicIO.hi
10${HS_IMPL}/System/Console/Wizard/BasicIO.p_hi 10lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/BasicIO.p_hi
11${HS_IMPL}/System/Console/Wizard/Haskeline.dyn_hi 11lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Haskeline.dyn_hi
12${HS_IMPL}/System/Console/Wizard/Haskeline.hi 12lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Haskeline.hi
13${HS_IMPL}/System/Console/Wizard/Haskeline.p_hi 13lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Haskeline.p_hi
14${HS_IMPL}/System/Console/Wizard/Internal.dyn_hi 14lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Internal.dyn_hi
15${HS_IMPL}/System/Console/Wizard/Internal.hi 15lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Internal.hi
16${HS_IMPL}/System/Console/Wizard/Internal.p_hi 16lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Internal.p_hi
17${HS_IMPL}/System/Console/Wizard/Pure.dyn_hi 17lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Pure.dyn_hi
18${HS_IMPL}/System/Console/Wizard/Pure.hi 18lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Pure.hi
19${HS_IMPL}/System/Console/Wizard/Pure.p_hi 19lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Pure.p_hi
20${HS_IMPL}/libHS${HS_PKGID}.a 20lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
21${HS_IMPL}/libHS${HS_PKGID}_p.a 21lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
22${HS_DOCS}/LICENSE 22share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/LICENSE
23${HS_DOCS}/html/System-Console-Wizard-BasicIO.html 23share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard-BasicIO.html
24${HS_DOCS}/html/System-Console-Wizard-Haskeline.html 24share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard-Haskeline.html
25${HS_DOCS}/html/System-Console-Wizard-Internal.html 25share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard-Internal.html
26${HS_DOCS}/html/System-Console-Wizard-Pure.html 26share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard-Pure.html
27${HS_DOCS}/html/System-Console-Wizard.html 27share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard.html
28${HS_DOCS}/html/doc-index.html 28share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/doc-index.html
29${HS_DOCS}/html/haddock-bundle.min.js 29share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/haddock-bundle.min.js
30${HS_DOCS}/html/index.html 30share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/index.html
31${HS_DOCS}/html/linuwial.css 31share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/linuwial.css
32${HS_DOCS}/html/meta.json 32share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/meta.json
33${HS_DOCS}/html/quick-jump.css 33share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/quick-jump.css
34${HS_DOCS}/html/synopsis.png 34share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/synopsis.png
35${HS_DOCS}/html/wizards.haddock 35share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/wizards.haddock
cvs diff -r1.1 -r1.2 pkgsrc/devel/hs-wizards/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/hs-wizards/distinfo 2020/03/30 16:43:35 1.1
+++ pkgsrc/devel/hs-wizards/distinfo 2021/04/24 05:36:32 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2020/03/30 16:43:35 riastradh Exp $ 1$NetBSD: distinfo,v 1.2 2021/04/24 05:36:32 pho Exp $
2 2
3SHA1 (wizards-1.0.3.tar.gz) = 29e9e914663151dade9fd3cf979167275ae3793b 3SHA1 (wizards-1.0.3.tar.gz) = 29e9e914663151dade9fd3cf979167275ae3793b
4RMD160 (wizards-1.0.3.tar.gz) = 4562593266b075ed942e61aa01b7eb26003a23a1 4RMD160 (wizards-1.0.3.tar.gz) = 4562593266b075ed942e61aa01b7eb26003a23a1
5SHA512 (wizards-1.0.3.tar.gz) = 74289bce609954ecd2d16729b67f4655ebfa2b5211303c2c64c1a7636e78e2b1dc3823472be8d5851fc490d9ff80559bdfbfda59cc753b60cacc4dd1b512663c 5SHA512 (wizards-1.0.3.tar.gz) = 74289bce609954ecd2d16729b67f4655ebfa2b5211303c2c64c1a7636e78e2b1dc3823472be8d5851fc490d9ff80559bdfbfda59cc753b60cacc4dd1b512663c
6Size (wizards-1.0.3.tar.gz) = 8243 bytes 6Size (wizards-1.0.3.tar.gz) = 8243 bytes
 7SHA1 (patch-wizards.cabal) = cb2e6ab55548ecc1e9f2e9f0c9c5c4ebb7cd2448
File Added: pkgsrc/devel/hs-wizards/patches/Attic/patch-wizards.cabal
$NetBSD: patch-wizards.cabal,v 1.1 2021/04/24 05:36:32 pho Exp $

Fix build with GHC 9.

--- wizards.cabal.orig	2018-11-16 03:04:17.000000000 +0000
+++ wizards.cabal
@@ -83,7 +83,7 @@ Library
   Extensions: OverlappingInstances                   
   
   -- Packages needed in order to build this package.
-  Build-depends: base == 4.*, haskeline >= 0.6 && < 0.8, mtl >= 2.0 && < 2.3, transformers >= 0.1 && < 0.6, control-monad-free >= 0.5 && < 0.7, containers >= 0.4 && < 0.7
+  Build-depends: base == 4.*, haskeline >= 0.6 && < 0.9, mtl >= 2.0 && < 2.3, transformers >= 0.1 && < 0.6, control-monad-free >= 0.5 && < 0.7, containers >= 0.4 && < 0.7
 
   -- Modules not exported by this package.
   -- Other-modules: