CVS commit: pkgsrc/devel/hs-deepseq-generics

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Apr 23 11:03:28 UTC 2021

Modified Files:
        pkgsrc/devel/hs-deepseq-generics: Makefile PLIST distinfo
        pkgsrc/devel/hs-deepseq-generics/patches: patch-deepseq-generics.cabal

Log Message:
Fix build with GHC 9


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/hs-deepseq-generics/Makefile \
    pkgsrc/devel/hs-deepseq-generics/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-deepseq-generics/PLIST
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/hs-deepseq-generics/patches/patch-deepseq-generics.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-deepseq-generics/Makefile
diff -u pkgsrc/devel/hs-deepseq-generics/Makefile:1.4 pkgsrc/devel/hs-deepseq-generics/Makefile:1.5
--- pkgsrc/devel/hs-deepseq-generics/Makefile:1.4       Thu Feb 18 15:07:28 2021
+++ pkgsrc/devel/hs-deepseq-generics/Makefile   Fri Apr 23 11:03:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/02/18 15:07:28 mef Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/23 11:03:27 pho Exp $
 
 DISTNAME=      deepseq-generics-0.2.0.0
 CATEGORIES=    devel
@@ -7,6 +7,5 @@ MAINTAINER=     szptvlfn%NetBSD.org@localhost
 COMMENT=       GHC.Generics-based Control.DeepSeq.rnf implementation
 LICENSE=       modified-bsd
 
-BUILDLINK_API_DEPENDS.ghc+=    ghc<8.10
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/hs-deepseq-generics/distinfo
diff -u pkgsrc/devel/hs-deepseq-generics/distinfo:1.4 pkgsrc/devel/hs-deepseq-generics/distinfo:1.5
--- pkgsrc/devel/hs-deepseq-generics/distinfo:1.4       Sat Jan  4 12:09:28 2020
+++ pkgsrc/devel/hs-deepseq-generics/distinfo   Fri Apr 23 11:03:27 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2020/01/04 12:09:28 pho Exp $
+$NetBSD: distinfo,v 1.5 2021/04/23 11:03:27 pho Exp $
 
 SHA1 (deepseq-generics-0.2.0.0.tar.gz) = 033b92aee8192747a1d0f96410ef72dcdc5db78c
 RMD160 (deepseq-generics-0.2.0.0.tar.gz) = e7311659719a2c71c56d619a4dde51e4d4b29b90
 SHA512 (deepseq-generics-0.2.0.0.tar.gz) = 403d5fd9d8bee827ec2434841d06e78520f6ff5709e4b8e1223d926e819cb99727162d7004f98bff795beaff1dc7d42d07534300c11d453ac559a743a4d70e7e
 Size (deepseq-generics-0.2.0.0.tar.gz) = 5192 bytes
-SHA1 (patch-deepseq-generics.cabal) = cc48c8ab3048ff0a638f3a84b2096274e2146fe2
+SHA1 (patch-deepseq-generics.cabal) = 1d3c838d0b012d17e5780ac5cade84f6d7a616c7

Index: pkgsrc/devel/hs-deepseq-generics/PLIST
diff -u pkgsrc/devel/hs-deepseq-generics/PLIST:1.3 pkgsrc/devel/hs-deepseq-generics/PLIST:1.4
--- pkgsrc/devel/hs-deepseq-generics/PLIST:1.3  Wed May 13 04:53:15 2020
+++ pkgsrc/devel/hs-deepseq-generics/PLIST      Fri Apr 23 11:03:27 2021
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/13 04:53:15 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
-${HS_IMPL}/Control/DeepSeq/Generics.dyn_hi
-${HS_IMPL}/Control/DeepSeq/Generics.hi
-${HS_IMPL}/Control/DeepSeq/Generics.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
+@comment $NetBSD: PLIST,v 1.4 2021/04/23 11:03:27 pho Exp $
+lib/deepseq-generics-${PKGVERSION}/${HS_VERSION}/package-description
+lib/deepseq-generics-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/DeepSeq/Generics.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/DeepSeq/Generics.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/DeepSeq/Generics.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/Control-DeepSeq-Generics.html
-${HS_DOCS}/html/deepseq-generics.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}/deepseq-generics-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/deepseq-generics-${PKGVERSION}/html/Control-DeepSeq-Generics.html
+share/doc/${HS_PLATFORM}/deepseq-generics-${PKGVERSION}/html/deepseq-generics.haddock
+share/doc/${HS_PLATFORM}/deepseq-generics-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/deepseq-generics-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/deepseq-generics-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/deepseq-generics-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/deepseq-generics-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/deepseq-generics-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/deepseq-generics-${PKGVERSION}/html/synopsis.png

Index: pkgsrc/devel/hs-deepseq-generics/patches/patch-deepseq-generics.cabal
diff -u pkgsrc/devel/hs-deepseq-generics/patches/patch-deepseq-generics.cabal:1.1 pkgsrc/devel/hs-deepseq-generics/patches/patch-deepseq-generics.cabal:1.2
--- pkgsrc/devel/hs-deepseq-generics/patches/patch-deepseq-generics.cabal:1.1   Sat Jan  4 12:09:29 2020
+++ pkgsrc/devel/hs-deepseq-generics/patches/patch-deepseq-generics.cabal       Fri Apr 23 11:03:27 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-deepseq-generics.cabal,v 1.1 2020/01/04 12:09:29 pho Exp $
+$NetBSD: patch-deepseq-generics.cabal,v 1.2 2021/04/23 11:03:27 pho Exp $
 
 Relax the upper bound on base.
 
@@ -9,7 +9,7 @@ Relax the upper bound on base.
      default-language:    Haskell2010
      exposed-modules:     Control.DeepSeq.Generics
 -    build-depends:       base >= 4.5 && < 4.10, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5
-+    build-depends:       base >= 4.5 && < 4.14, ghc-prim >= 0.2 && < 0.6, deepseq >= 1.2.0.1 && < 1.5
++    build-depends:       base >= 4.5 && < 5, ghc-prim >= 0.2 && < 1, deepseq >= 1.2.0.1 && < 1.5
      other-extensions:    BangPatterns, FlexibleContexts, TypeOperators
      ghc-options:         -Wall