CVS commit: pkgsrc/devel/pcre2

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec  6 20:46:24 UTC 2022

Modified Files:
        pkgsrc/devel/pcre2: Makefile buildlink3.mk distinfo options.mk

Log Message:
pcre2: updated to 2.10.41

PCRE2-10.41
Mainly bug fixes and tidies; pcre2grep has been made more like GNU grep for multiple patterns that match more than once on a line.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/pcre2/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/pcre2/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/pcre2/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/pcre2/options.mk

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

Modified files:

Index: pkgsrc/devel/pcre2/Makefile
diff -u pkgsrc/devel/pcre2/Makefile:1.24 pkgsrc/devel/pcre2/Makefile:1.25
--- pkgsrc/devel/pcre2/Makefile:1.24    Wed Sep 14 09:35:01 2022
+++ pkgsrc/devel/pcre2/Makefile Tue Dec  6 20:46:24 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2022/09/14 09:35:01 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/12/06 20:46:24 adam Exp $
 
-DISTNAME=      pcre2-10.40
-PKGREVISION=   1
+DISTNAME=      pcre2-10.41
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=PhilipHazel/}
 GITHUB_RELEASE=        ${DISTNAME}

Index: pkgsrc/devel/pcre2/buildlink3.mk
diff -u pkgsrc/devel/pcre2/buildlink3.mk:1.5 pkgsrc/devel/pcre2/buildlink3.mk:1.6
--- pkgsrc/devel/pcre2/buildlink3.mk:1.5        Thu Aug 17 19:53:54 2017
+++ pkgsrc/devel/pcre2/buildlink3.mk    Tue Dec  6 20:46:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/08/17 19:53:54 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2022/12/06 20:46:24 adam Exp $
 
 BUILDLINK_TREE+=       pcre2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        pcre2
 PCRE2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pcre2+=  pcre2>=10.21
-BUILDLINK_ABI_DEPENDS.pcre2?=  pcre2>=10.30
+BUILDLINK_ABI_DEPENDS.pcre2+=  pcre2>=10.30
 BUILDLINK_PKGSRCDIR.pcre2?=    ../../devel/pcre2
 .endif # PCRE2_BUILDLINK3_MK
 

Index: pkgsrc/devel/pcre2/distinfo
diff -u pkgsrc/devel/pcre2/distinfo:1.21 pkgsrc/devel/pcre2/distinfo:1.22
--- pkgsrc/devel/pcre2/distinfo:1.21    Wed Apr 20 20:14:48 2022
+++ pkgsrc/devel/pcre2/distinfo Tue Dec  6 20:46:24 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2022/04/20 20:14:48 wiz Exp $
+$NetBSD: distinfo,v 1.22 2022/12/06 20:46:24 adam Exp $
 
-BLAKE2s (pcre2-10.40.tar.gz) = 777be6f5cf7889f49c92e0c9e4033b0811672fd7e6a43faf83e6ebbfc8151db7
-SHA512 (pcre2-10.40.tar.gz) = 679c6f540571850adec880934812e4f26f08ad858c776f10d1ed68ed3c0d4f91f6e1b53d781b53340af43a22c521e585cfc908f3659013c630a320e4fb246dc2
-Size (pcre2-10.40.tar.gz) = 2359622 bytes
+BLAKE2s (pcre2-10.41.tar.gz) = 09470e7332ed4501041b2012e7cc20eff0fb15dd76267e4792f89eb2f1d2905f
+SHA512 (pcre2-10.41.tar.gz) = 94f962901c2929eafb9d540f3b8cd64feba95017bc29bd369b29231c50df1ade07b3c0509d031e4fc5c9e46cd64499dde6568f5325de805877f7391fa4621227
+Size (pcre2-10.41.tar.gz) = 2393262 bytes

Index: pkgsrc/devel/pcre2/options.mk
diff -u pkgsrc/devel/pcre2/options.mk:1.3 pkgsrc/devel/pcre2/options.mk:1.4
--- pkgsrc/devel/pcre2/options.mk:1.3   Wed Sep 14 09:35:01 2022
+++ pkgsrc/devel/pcre2/options.mk       Tue Dec  6 20:46:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2022/09/14 09:35:01 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2022/12/06 20:46:24 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pcre2
 PKG_SUPPORTED_OPTIONS= pcre2-jit
@@ -10,12 +10,12 @@ PKG_SUPPORTED_OPTIONS=      pcre2-jit
     ${MACHINE_ARCH} == "mips" || \
     ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "sparc" || \
-    (!empty(MACHINE_ARCH:M*arm*) && empty(MACHINE_ARCH:M*armv4*)))
-.if ${OPSYS} != "NetBSD"
+    (${MACHINE_ARCH:M*arm*} && !${MACHINE_ARCH:M*armv4*}))
+.  if ${OPSYS} != "NetBSD"
 # causes core dumps in rspamd
 # https://mail-index.netbsd.org/pkgsrc-users/2022/09/11/msg036184.html
 PKG_SUGGESTED_OPTIONS= pcre2-jit
-.endif
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mpcre2-jit)