CVS commit: pkgsrc/textproc/hs-regex-pcre

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Feb 11 13:04:58 UTC 2022

Modified Files:
        pkgsrc/textproc/hs-regex-pcre: Makefile distinfo
        pkgsrc/textproc/hs-regex-pcre/patches: patch-regex-pcre.cabal

Log Message:
Fix build with GHC 9.2


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/hs-regex-pcre/Makefile \
    pkgsrc/textproc/hs-regex-pcre/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal

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

Modified files:

Index: pkgsrc/textproc/hs-regex-pcre/Makefile
diff -u pkgsrc/textproc/hs-regex-pcre/Makefile:1.4 pkgsrc/textproc/hs-regex-pcre/Makefile:1.5
--- pkgsrc/textproc/hs-regex-pcre/Makefile:1.4  Tue Jan 18 02:48:27 2022
+++ pkgsrc/textproc/hs-regex-pcre/Makefile      Fri Feb 11 13:04:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/18 02:48:27 pho Exp $
+# $NetBSD: Makefile,v 1.5 2022/02/11 13:04:57 pho Exp $
 
 DISTNAME=      regex-pcre-0.95.0.0
 PKGREVISION=   2
@@ -8,6 +8,8 @@ MAINTAINER=     pho%cielonegro.org@localhost
 COMMENT=       PCRE Backend for "Text.Regex" (regex-base)
 LICENSE=       modified-bsd
 
+USE_TOOLS+=    pkg-config
+
 .include "../../mk/haskell.mk"
 .include "../../textproc/hs-regex-base/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
Index: pkgsrc/textproc/hs-regex-pcre/distinfo
diff -u pkgsrc/textproc/hs-regex-pcre/distinfo:1.4 pkgsrc/textproc/hs-regex-pcre/distinfo:1.5
--- pkgsrc/textproc/hs-regex-pcre/distinfo:1.4  Tue Oct 26 11:22:02 2021
+++ pkgsrc/textproc/hs-regex-pcre/distinfo      Fri Feb 11 13:04:57 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:22:02 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/02/11 13:04:57 pho Exp $
 
 BLAKE2s (regex-pcre-0.95.0.0.tar.gz) = 61a6db3c02e7e53dc5445002c3cbaa0cc29882f890a95a5d55caa9498bf72de2
 SHA512 (regex-pcre-0.95.0.0.tar.gz) = 7c9ed0edd0c44d7118313c298c2658858117dd89eb7956566f5bb2fb75f2aaed70d201fda4102c46206b9951013bafee654ff39ed3c4bf9c5086f6c0cc217bdb
 Size (regex-pcre-0.95.0.0.tar.gz) = 9766 bytes
-SHA1 (patch-regex-pcre.cabal) = 9ecfc72485412437abeb56b1db40da05024f86eb
+SHA1 (patch-regex-pcre.cabal) = 1632a8cc4b1f8d762c7a7b72ca26783640e960f1

Index: pkgsrc/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal
diff -u pkgsrc/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal:1.1 pkgsrc/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal:1.2
--- pkgsrc/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal:1.1    Sat Apr 24 16:38:04 2021
+++ pkgsrc/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal        Fri Feb 11 13:04:58 2022
@@ -1,15 +1,18 @@
-$NetBSD: patch-regex-pcre.cabal,v 1.1 2021/04/24 16:38:04 pho Exp $
+$NetBSD: patch-regex-pcre.cabal,v 1.2 2022/02/11 13:04:58 pho Exp $
 
-Fix build with GHC 9.
+Fix build with GHC 9.2
 
 --- regex-pcre.cabal.orig      2001-09-09 01:46:40.000000000 +0000
 +++ regex-pcre.cabal
-@@ -54,7 +54,7 @@ library
+@@ -54,9 +54,9 @@ library
        FlexibleInstances
  
    build-depends: regex-base == 0.94.*
 -               , base       >= 4.3 && < 4.14
 +               , base       >= 4.3 && < 5
                 , containers >= 0.4 && < 0.7
-                , bytestring >= 0.9 && < 0.11
+-               , bytestring >= 0.9 && < 0.11
++               , bytestring >= 0.9 && < 0.12
                 , array      >= 0.3 && < 0.6
+ 
+   if !impl(ghc >= 8)