Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 350F31A9239 for ; Mon, 14 Feb 2022 14:43:00 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 53C8284D93; Mon, 14 Feb 2022 14:42:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8BFD084D14 for ; Mon, 14 Feb 2022 14:42:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id lXfJ9XWejAPp for ; Mon, 14 Feb 2022 14:42:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A6E8784CE8 for ; Mon, 14 Feb 2022 14:42:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A4DA9FB24; Mon, 14 Feb 2022 14:42:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1644849777240" MIME-Version: 1.0 Date: Mon, 14 Feb 2022 14:42:57 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/textproc/hs-regex-compat-tdfa To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20220214144257.A4DA9FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1644849777240 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Mon Feb 14 14:42:57 UTC 2022 Added Files: pkgsrc/textproc/hs-regex-compat-tdfa: DESCR Makefile PLIST buildlink3.mk distinfo pkgsrc/textproc/hs-regex-compat-tdfa/patches: patch-Text_Regex.hs Log Message: textproc/hs-regex-compat-tdfa: import hs-regex-compat-tdfa-0.95.1.4 This package provide a fork of the regex-compat package which supports Unicode. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/hs-regex-compat-tdfa/DESCR \ pkgsrc/textproc/hs-regex-compat-tdfa/Makefile \ pkgsrc/textproc/hs-regex-compat-tdfa/PLIST \ pkgsrc/textproc/hs-regex-compat-tdfa/buildlink3.mk \ pkgsrc/textproc/hs-regex-compat-tdfa/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/textproc/hs-regex-compat-tdfa/patches/patch-Text_Regex.hs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1644849777240 Content-Disposition: inline Content-Length: 4976 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/textproc/hs-regex-compat-tdfa/DESCR diff -u /dev/null pkgsrc/textproc/hs-regex-compat-tdfa/DESCR:1.1 --- /dev/null Mon Feb 14 14:42:57 2022 +++ pkgsrc/textproc/hs-regex-compat-tdfa/DESCR Mon Feb 14 14:42:57 2022 @@ -0,0 +1,2 @@ +This package provide a fork of the regex-compat package which supports +Unicode. Index: pkgsrc/textproc/hs-regex-compat-tdfa/Makefile diff -u /dev/null pkgsrc/textproc/hs-regex-compat-tdfa/Makefile:1.1 --- /dev/null Mon Feb 14 14:42:57 2022 +++ pkgsrc/textproc/hs-regex-compat-tdfa/Makefile Mon Feb 14 14:42:57 2022 @@ -0,0 +1,13 @@ +# $NetBSD: Makefile,v 1.1 2022/02/14 14:42:57 pho Exp $ + +DISTNAME= regex-compat-tdfa-0.95.1.4 +CATEGORIES= textproc + +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Unicode supporting version of Text.Regex, using regex-tdfa +LICENSE= modified-bsd + +.include "../../textproc/hs-regex-base/buildlink3.mk" +.include "../../textproc/hs-regex-tdfa/buildlink3.mk" +.include "../../mk/haskell.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/hs-regex-compat-tdfa/PLIST diff -u /dev/null pkgsrc/textproc/hs-regex-compat-tdfa/PLIST:1.1 --- /dev/null Mon Feb 14 14:42:57 2022 +++ pkgsrc/textproc/hs-regex-compat-tdfa/PLIST Mon Feb 14 14:42:57 2022 @@ -0,0 +1,19 @@ +@comment $NetBSD: PLIST,v 1.1 2022/02/14 14:42:57 pho Exp $ +lib/regex-compat-tdfa-${PKGVERSION}/${HS_VERSION}/package-description +lib/regex-compat-tdfa-${PKGVERSION}/${HS_VERSION}/package-id +lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so +lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex.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}/regex-compat-tdfa-${PKGVERSION}/LICENSE +share/doc/${HS_PLATFORM}/regex-compat-tdfa-${PKGVERSION}/html/Text-Regex.html +share/doc/${HS_PLATFORM}/regex-compat-tdfa-${PKGVERSION}/html/doc-index.html +share/doc/${HS_PLATFORM}/regex-compat-tdfa-${PKGVERSION}/html/haddock-bundle.min.js +share/doc/${HS_PLATFORM}/regex-compat-tdfa-${PKGVERSION}/html/index.html +share/doc/${HS_PLATFORM}/regex-compat-tdfa-${PKGVERSION}/html/linuwial.css +share/doc/${HS_PLATFORM}/regex-compat-tdfa-${PKGVERSION}/html/meta.json +share/doc/${HS_PLATFORM}/regex-compat-tdfa-${PKGVERSION}/html/quick-jump.css +share/doc/${HS_PLATFORM}/regex-compat-tdfa-${PKGVERSION}/html/regex-compat-tdfa.haddock +share/doc/${HS_PLATFORM}/regex-compat-tdfa-${PKGVERSION}/html/synopsis.png Index: pkgsrc/textproc/hs-regex-compat-tdfa/buildlink3.mk diff -u /dev/null pkgsrc/textproc/hs-regex-compat-tdfa/buildlink3.mk:1.1 --- /dev/null Mon Feb 14 14:42:57 2022 +++ pkgsrc/textproc/hs-regex-compat-tdfa/buildlink3.mk Mon Feb 14 14:42:57 2022 @@ -0,0 +1,16 @@ +# $NetBSD: buildlink3.mk,v 1.1 2022/02/14 14:42:57 pho Exp $ + +BUILDLINK_TREE+= hs-regex-compat-tdfa + +.if !defined(HS_REGEX_COMPAT_TDFA_BUILDLINK3_MK) +HS_REGEX_COMPAT_TDFA_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.hs-regex-compat-tdfa+= hs-regex-compat-tdfa>=0.95.1 +BUILDLINK_ABI_DEPENDS.hs-regex-compat-tdfa+= hs-regex-compat-tdfa>=0.95.1.4 +BUILDLINK_PKGSRCDIR.hs-regex-compat-tdfa?= ../../textproc/hs-regex-compat-tdfa + +.include "../../textproc/hs-regex-base/buildlink3.mk" +.include "../../textproc/hs-regex-tdfa/buildlink3.mk" +.endif # HS_REGEX_COMPAT_TDFA_BUILDLINK3_MK + +BUILDLINK_TREE+= -hs-regex-compat-tdfa Index: pkgsrc/textproc/hs-regex-compat-tdfa/distinfo diff -u /dev/null pkgsrc/textproc/hs-regex-compat-tdfa/distinfo:1.1 --- /dev/null Mon Feb 14 14:42:57 2022 +++ pkgsrc/textproc/hs-regex-compat-tdfa/distinfo Mon Feb 14 14:42:57 2022 @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2022/02/14 14:42:57 pho Exp $ + +BLAKE2s (regex-compat-tdfa-0.95.1.4.tar.gz) = ec78b18adf8947ff23aabc8f22930c2de93ae0f608c8833593eeb90484a2929b +SHA512 (regex-compat-tdfa-0.95.1.4.tar.gz) = 7e387a7713ff8e43cfce4262b1288b85f8b60729162a842186bf6a7e1078dfb9e26013087ff7e9bcf81521f8c352926873bb280b9df57b016aef2ca4ce70aa14 +Size (regex-compat-tdfa-0.95.1.4.tar.gz) = 4146 bytes +SHA1 (patch-Text_Regex.hs) = 0cf5feac131cafa73d8857ff695ba5d647f7412e Index: pkgsrc/textproc/hs-regex-compat-tdfa/patches/patch-Text_Regex.hs diff -u /dev/null pkgsrc/textproc/hs-regex-compat-tdfa/patches/patch-Text_Regex.hs:1.1 --- /dev/null Mon Feb 14 14:42:57 2022 +++ pkgsrc/textproc/hs-regex-compat-tdfa/patches/patch-Text_Regex.hs Mon Feb 14 14:42:57 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-Text_Regex.hs,v 1.1 2022/02/14 14:42:57 pho Exp $ + +Fix build with GHC 9.2 + +--- Text/Regex.hs.orig 2022-02-14 13:00:42.545834464 +0000 ++++ Text/Regex.hs +@@ -139,7 +139,7 @@ behavior of the the original Text.Regex + splitRegex :: Regex -> String -> [String] + splitRegex _ [] = [] + splitRegex delim strIn = +- let matches = map (!0) (matchAll delim strIn) ++ let matches = map (! 0) (matchAll delim strIn) + go _i str [] = str : [] + go i str ((off,len):rest) = + let i' = off+len --_----------=_1644849777240--