CVS commit: pkgsrc/devel/hs-vector

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 11 08:50:16 UTC 2020

Modified Files:
        pkgsrc/devel/hs-vector: Makefile buildlink3.mk distinfo
        pkgsrc/devel/hs-vector/patches: patch-vector.cabal

Log Message:
Fix build with GHC 8.8


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/hs-vector/Makefile \
    pkgsrc/devel/hs-vector/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/hs-vector/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hs-vector/patches/patch-vector.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-vector/Makefile
diff -u pkgsrc/devel/hs-vector/Makefile:1.7 pkgsrc/devel/hs-vector/Makefile:1.8
--- pkgsrc/devel/hs-vector/Makefile:1.7 Wed Jan  1 02:43:35 2020
+++ pkgsrc/devel/hs-vector/Makefile     Sat Jan 11 08:50:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/01/01 02:43:35 pho Exp $
+# $NetBSD: Makefile,v 1.8 2020/01/11 08:50:16 pho Exp $
 
 DISTNAME=      vector-0.12.0.3
 CATEGORIES=    devel
@@ -9,6 +9,4 @@ LICENSE=        modified-bsd
 
 .include "../../mk/haskell.mk"
 .include "../../devel/hs-primitive/buildlink3.mk"
-.include "../../devel/hs-fail/buildlink3.mk"
-.include "../../math/hs-semigroups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/hs-vector/distinfo
diff -u pkgsrc/devel/hs-vector/distinfo:1.7 pkgsrc/devel/hs-vector/distinfo:1.8
--- pkgsrc/devel/hs-vector/distinfo:1.7 Wed Jan  1 02:43:35 2020
+++ pkgsrc/devel/hs-vector/distinfo     Sat Jan 11 08:50:16 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2020/01/01 02:43:35 pho Exp $
+$NetBSD: distinfo,v 1.8 2020/01/11 08:50:16 pho Exp $
 
 SHA1 (vector-0.12.0.3.tar.gz) = c57440b2887ed62f7c83526f99e3ce8201e433c7
 RMD160 (vector-0.12.0.3.tar.gz) = c030f62c6116e7701ec727b18a9c630a77f70281
 SHA512 (vector-0.12.0.3.tar.gz) = 176646ae612866064303cd200e9d940fec1645bb88176a89adb00df3b9a6df96200e3c9cf85a57af3a1481d6633b353da8e03d7a6c467c40e926275fe8d36853
 Size (vector-0.12.0.3.tar.gz) = 124899 bytes
-SHA1 (patch-vector.cabal) = 878fc2b59215ca4bcc3e418534ef7b29f24ce743
+SHA1 (patch-vector.cabal) = d15623c2147bab0d9d4e859a1539519dd6bf69e3

Index: pkgsrc/devel/hs-vector/buildlink3.mk
diff -u pkgsrc/devel/hs-vector/buildlink3.mk:1.9 pkgsrc/devel/hs-vector/buildlink3.mk:1.10
--- pkgsrc/devel/hs-vector/buildlink3.mk:1.9    Wed Jan  1 02:43:35 2020
+++ pkgsrc/devel/hs-vector/buildlink3.mk        Sat Jan 11 08:50:16 2020
@@ -1,17 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2020/01/01 02:43:35 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2020/01/11 08:50:16 pho Exp $
 
 BUILDLINK_TREE+=       hs-vector
 
 .if !defined(HS_VECTOR_BUILDLINK3_MK)
 HS_VECTOR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-vector+=      hs-vector>=0.11.0
-BUILDLINK_ABI_DEPENDS.hs-vector+=      hs-vector>=0.11.0.0
+BUILDLINK_API_DEPENDS.hs-vector+=      hs-vector>=0.12.0
+BUILDLINK_ABI_DEPENDS.hs-vector+=      hs-vector>=0.12.0.3
 BUILDLINK_PKGSRCDIR.hs-vector?=                ../../devel/hs-vector
 
 .include "../../devel/hs-primitive/buildlink3.mk"
-.include "../../devel/hs-fail/buildlink3.mk"
-.include "../../math/hs-semigroups/buildlink3.mk"
 .endif # HS_VECTOR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-vector

Index: pkgsrc/devel/hs-vector/patches/patch-vector.cabal
diff -u pkgsrc/devel/hs-vector/patches/patch-vector.cabal:1.1 pkgsrc/devel/hs-vector/patches/patch-vector.cabal:1.2
--- pkgsrc/devel/hs-vector/patches/patch-vector.cabal:1.1       Wed Jan  1 02:43:36 2020
+++ pkgsrc/devel/hs-vector/patches/patch-vector.cabal   Sat Jan 11 08:50:16 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-vector.cabal,v 1.1 2020/01/01 02:43:36 pho Exp $
+$NetBSD: patch-vector.cabal,v 1.2 2020/01/11 08:50:16 pho Exp $
 
-Relax the upper bound on semigroups
+Fix build with GHC 8.8
 
 --- vector.cabal.orig  2001-09-09 01:46:40.000000000 +0000
 +++ vector.cabal
-@@ -150,7 +150,7 @@ Library
-                , deepseq >= 1.1 && < 1.5
-   if !impl(ghc > 8.0)
-     Build-Depends: fail == 4.9.*
--                 , semigroups >= 0.18 && < 0.19
-+                 , semigroups >= 0.18 && < 0.20
- 
-   Ghc-Options: -O2 -Wall
+@@ -144,7 +144,7 @@ Library
+   Install-Includes:
+         vector.h
  
+-  Build-Depends: base >= 4.5 && < 4.13
++  Build-Depends: base >= 4.5 && < 4.14
+                , primitive >= 0.5.0.1 && < 0.8
+                , ghc-prim >= 0.2 && < 0.6
+                , deepseq >= 1.1 && < 1.5