Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1644585331272520"
MIME-Version: 1.0
Date: Fri, 11 Feb 2022 13:15:31 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/net/hs-resolv
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20220211131531.8E5EEFB24@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1644585331272520
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pho
Date:		Fri Feb 11 13:15:31 UTC 2022

Modified Files:
	pkgsrc/net/hs-resolv: distinfo
	pkgsrc/net/hs-resolv/patches: patch-resolv.cabal

Log Message:
Fix build with GHC 9.2


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/hs-resolv/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/hs-resolv/patches/patch-resolv.cabal

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


--_----------=_1644585331272520
Content-Disposition: inline
Content-Length: 2104
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/hs-resolv/distinfo
diff -u pkgsrc/net/hs-resolv/distinfo:1.4 pkgsrc/net/hs-resolv/distinfo:1.5
--- pkgsrc/net/hs-resolv/distinfo:1.4	Tue Oct 26 11:05:46 2021
+++ pkgsrc/net/hs-resolv/distinfo	Fri Feb 11 13:15:31 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:05:46 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/02/11 13:15:31 pho Exp $
 
 BLAKE2s (resolv-0.1.2.0.tar.gz) = 33bc573ba6213afe7e033d640580197d85daaff8e3a95ff2a1b29b11cccab5e5
 SHA512 (resolv-0.1.2.0.tar.gz) = fae2d0717a109b0d6cc19c51c773bc68c64c0048b9d930528cf5622ee270ebaddec180c1d444542e8eb036262611f5b88deadeea223fb2ef2b15b41369a2376e
 Size (resolv-0.1.2.0.tar.gz) = 156710 bytes
-SHA1 (patch-resolv.cabal) = 9d0fd43d1ce8a7ed070af07c3a94a9d6ba51a441
+SHA1 (patch-resolv.cabal) = f7672ad5a72afabfe61fe80beab9f533ae7f9650

Index: pkgsrc/net/hs-resolv/patches/patch-resolv.cabal
diff -u pkgsrc/net/hs-resolv/patches/patch-resolv.cabal:1.1 pkgsrc/net/hs-resolv/patches/patch-resolv.cabal:1.2
--- pkgsrc/net/hs-resolv/patches/patch-resolv.cabal:1.1	Sat Apr 24 12:25:09 2021
+++ pkgsrc/net/hs-resolv/patches/patch-resolv.cabal	Fri Feb 11 13:15:31 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-resolv.cabal,v 1.1 2021/04/24 12:25:09 pho Exp $
+$NetBSD: patch-resolv.cabal,v 1.2 2022/02/11 13:15:31 pho Exp $
 
 Fix build with GHC 9.
 Fix build with base16-bytestring-1.0.*.
 
 --- resolv.cabal.orig	2001-09-09 01:46:40.000000000 +0000
 +++ resolv.cabal
-@@ -92,8 +92,8 @@ library
+@@ -92,10 +92,10 @@ library
                       Compat
  
    -- we need binary-0.7.3 for isolate
@@ -14,5 +14,8 @@ Fix build with base16-bytestring-1.0.*.
 +  build-depends:     base               >= 4.5 && <5
 +                   , base16-bytestring ^>= 1.0
                     , binary            ^>=0.7.3 || ^>= 0.8
-                    , bytestring        ^>=0.9.2 || ^>= 0.10
+-                   , bytestring        ^>=0.9.2 || ^>= 0.10
++                   , bytestring        ^>=0.9.2 || ^>= 0.10 || ^>= 0.11
                     , containers        ^>=0.4.2.1 || ^>= 0.5 || ^>= 0.6
+ 
+   ghc-options:       -Wall


--_----------=_1644585331272520--