CVS commit: pkgsrc/devel/hs-wizards

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/hs-wizards
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Sat, 24 Apr 2021 05:36:32 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Apr 24 05:36:32 UTC 2021

Modified Files:
        pkgsrc/devel/hs-wizards: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/hs-wizards/patches: patch-wizards.cabal

Log Message:
Fix build with GHC 9


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-wizards/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hs-wizards/PLIST \
    pkgsrc/devel/hs-wizards/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/hs-wizards/patches/patch-wizards.cabal

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/hs-wizards/Makefile
diff -u pkgsrc/devel/hs-wizards/Makefile:1.3 pkgsrc/devel/hs-wizards/Makefile:1.4
--- pkgsrc/devel/hs-wizards/Makefile:1.3        Sun Feb 28 14:19:37 2021
+++ pkgsrc/devel/hs-wizards/Makefile    Sat Apr 24 05:36:32 2021
@@ -1,18 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2021/02/28 14:19:37 mef Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/24 05:36:32 pho Exp $
 
 DISTNAME=      wizards-1.0.3
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_HASKELL_HACKAGE:=wizards-${PKGVERSION_NOREV}/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://hackage.haskell.org/package/wizards
 COMMENT=       High level, generic library for interrogative user interfaces
 LICENSE=       modified-bsd
 
-USE_LANGUAGES= # none
-
 .include "../../devel/hs-control-monad-free/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ghc+=    ghc<=8.10
-BUILDLINK_API_DEPENDS.ghc+=    ghc>=8.8
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/hs-wizards/PLIST
diff -u pkgsrc/devel/hs-wizards/PLIST:1.1 pkgsrc/devel/hs-wizards/PLIST:1.2
--- pkgsrc/devel/hs-wizards/PLIST:1.1   Mon May 11 17:52:09 2020
+++ pkgsrc/devel/hs-wizards/PLIST       Sat Apr 24 05:36:32 2021
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:09 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.2 2021/04/24 05:36:32 pho Exp $
+lib/wizards-${PKGVERSION}/${HS_VERSION}/package-description
+lib/wizards-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/System/Console/Wizard.dyn_hi
-${HS_IMPL}/System/Console/Wizard.hi
-${HS_IMPL}/System/Console/Wizard.p_hi
-${HS_IMPL}/System/Console/Wizard/BasicIO.dyn_hi
-${HS_IMPL}/System/Console/Wizard/BasicIO.hi
-${HS_IMPL}/System/Console/Wizard/BasicIO.p_hi
-${HS_IMPL}/System/Console/Wizard/Haskeline.dyn_hi
-${HS_IMPL}/System/Console/Wizard/Haskeline.hi
-${HS_IMPL}/System/Console/Wizard/Haskeline.p_hi
-${HS_IMPL}/System/Console/Wizard/Internal.dyn_hi
-${HS_IMPL}/System/Console/Wizard/Internal.hi
-${HS_IMPL}/System/Console/Wizard/Internal.p_hi
-${HS_IMPL}/System/Console/Wizard/Pure.dyn_hi
-${HS_IMPL}/System/Console/Wizard/Pure.hi
-${HS_IMPL}/System/Console/Wizard/Pure.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/System-Console-Wizard-BasicIO.html
-${HS_DOCS}/html/System-Console-Wizard-Haskeline.html
-${HS_DOCS}/html/System-Console-Wizard-Internal.html
-${HS_DOCS}/html/System-Console-Wizard-Pure.html
-${HS_DOCS}/html/System-Console-Wizard.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/synopsis.png
-${HS_DOCS}/html/wizards.haddock
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/BasicIO.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/BasicIO.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/BasicIO.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Haskeline.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Haskeline.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Haskeline.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Internal.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Internal.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Internal.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Pure.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Pure.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Console/Wizard/Pure.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}/wizards-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard-BasicIO.html
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard-Haskeline.html
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard-Internal.html
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard-Pure.html
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/System-Console-Wizard.html
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/synopsis.png
+share/doc/${HS_PLATFORM}/wizards-${PKGVERSION}/html/wizards.haddock
Index: pkgsrc/devel/hs-wizards/distinfo
diff -u pkgsrc/devel/hs-wizards/distinfo:1.1 pkgsrc/devel/hs-wizards/distinfo:1.2
--- pkgsrc/devel/hs-wizards/distinfo:1.1        Mon Mar 30 16:43:35 2020
+++ pkgsrc/devel/hs-wizards/distinfo    Sat Apr 24 05:36:32 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/03/30 16:43:35 riastradh Exp $
+$NetBSD: distinfo,v 1.2 2021/04/24 05:36:32 pho Exp $
 
 SHA1 (wizards-1.0.3.tar.gz) = 29e9e914663151dade9fd3cf979167275ae3793b
 RMD160 (wizards-1.0.3.tar.gz) = 4562593266b075ed942e61aa01b7eb26003a23a1
 SHA512 (wizards-1.0.3.tar.gz) = 74289bce609954ecd2d16729b67f4655ebfa2b5211303c2c64c1a7636e78e2b1dc3823472be8d5851fc490d9ff80559bdfbfda59cc753b60cacc4dd1b512663c
 Size (wizards-1.0.3.tar.gz) = 8243 bytes
+SHA1 (patch-wizards.cabal) = cb2e6ab55548ecc1e9f2e9f0c9c5c4ebb7cd2448

Added files:

Index: pkgsrc/devel/hs-wizards/patches/patch-wizards.cabal
diff -u /dev/null pkgsrc/devel/hs-wizards/patches/patch-wizards.cabal:1.1
--- /dev/null   Sat Apr 24 05:36:32 2021
+++ pkgsrc/devel/hs-wizards/patches/patch-wizards.cabal Sat Apr 24 05:36:32 2021
@@ -0,0 +1,15 @@
+$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:

Prev by Date: CVS commit: pkgsrc/devel/hs-utility-ht
Next by Date: CVS commit: pkgsrc/finance/hs-Decimal
Previous by Thread: CVS commit: pkgsrc/devel/hs-utility-ht
Next by Thread: CVS commit: pkgsrc/finance/hs-Decimal
Indexes:

Home | Main Index | Thread Index | Old Index