On 2024/07/24 12:25, Stuart Henderson wrote: > > - patch tests to fix them on OpenBSD, see commit > > https://github.com/PCRE2Project/pcre2/commit/7e141969b538917c9f4a85839031d066eec67ad2 > > Please add patches rather than using sed, unless patches are super > unwieldy. > > Here's a simpler update diff.
> --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-RunGrepTest 24 Jul 2024 11:24:37 -0000 > @@ -0,0 +1,17 @@ > +Index: RunGrepTest > +--- RunGrepTest.orig > ++++ RunGrepTest oh, I should have added a comment to show that these are from an upstream commit. ok? Index: Makefile =================================================================== RCS file: /cvs/ports/devel/pcre2/Makefile,v diff -u -p -r1.20 Makefile --- Makefile 8 Feb 2024 00:57:55 -0000 1.20 +++ Makefile 24 Jul 2024 11:56:26 -0000 @@ -1,21 +1,15 @@ COMMENT = perl-compatible regular expression library, version 2 -DISTNAME = pcre2-10.37 +DISTNAME = pcre2-10.44 -SHARED_LIBS += pcre2-16 0.5 # 10.37 -SHARED_LIBS += pcre2-32 0.5 # 10.37 -SHARED_LIBS += pcre2-8 0.6 # 10.37 -SHARED_LIBS += pcre2-posix 1.0 # 2.3 +SHARED_LIBS += pcre2-16 0.6 # 13.0 +SHARED_LIBS += pcre2-32 0.6 # 13.0 +SHARED_LIBS += pcre2-8 0.7 # 13.0 +SHARED_LIBS += pcre2-posix 1.0 # 3.5 CATEGORIES = devel -REVISION = 2 - -SITES = https://github.com/PCRE2Project/pcre2/releases/download/${DISTNAME}/ \ - https://ftp.pcre.org/pub/pcre/ \ - ${SITE_SOURCEFORGE:=pcre/} \ - http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ +SITES = https://github.com/PCRE2Project/pcre2/releases/download/${DISTNAME}/ HOMEPAGE = https://www.pcre.org/ MAINTAINER = Nam Nguyen <n...@openbsd.org> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/pcre2/distinfo,v diff -u -p -r1.9 distinfo --- distinfo 5 Nov 2021 22:18:23 -0000 1.9 +++ distinfo 24 Jul 2024 11:56:26 -0000 @@ -1,2 +1,2 @@ -SHA256 (pcre2-10.37.tar.gz) = BOIUwMQKl7ilwrSuiKOqipPm8uRcazU03aw1HyZUhXc= -SIZE (pcre2-10.37.tar.gz) = 2299767 +SHA256 (pcre2-10.44.tar.gz) = hrnLCqO8t5lPqogBgpK8cEzbtwjnhffHQ1L/bqfTF1s= +SIZE (pcre2-10.44.tar.gz) = 2552792 Index: patches/patch-RunGrepTest =================================================================== RCS file: patches/patch-RunGrepTest diff -N patches/patch-RunGrepTest --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-RunGrepTest 24 Jul 2024 11:56:26 -0000 @@ -0,0 +1,28 @@ +From 7e141969b538917c9f4a85839031d066eec67ad2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <care...@gmail.com> +Date: Tue, 18 Jun 2024 07:46:41 -0700 +Subject: [PATCH] test: use a fully spec locale name in RunGrepTest (#429) + +A locale contains an optional charmap that might be relevant in +determining if the setlocale() function considers it valid. + +Change the bad locale used when testing to one that contains also +an invalid charmap and therefore fix this test in OpenBSD. + +Index: RunGrepTest +--- RunGrepTest.orig ++++ RunGrepTest +@@ -842,11 +842,11 @@ echo "RC=$?" >>testtrygrep + echo "---------------------------- Test 150 -----------------------------" >>testtrygrep + which locale >/dev/null 2>&1 + if [ $? -ne 0 ]; then +- echo "pcre2grep: Failed to set locale badlocale (obtained from LC_CTYPE)" >>testtrygrep ++ echo "pcre2grep: Failed to set locale locale.bad (obtained from LC_CTYPE)" >>testtrygrep + echo "RC=2" >>testtrygrep + else + +- (cd $srcdir; unset LC_ALL; env LC_CTYPE=badlocale $valgrind $vjs $pcre2grep abc /dev/null) >>testtrygrep 2>&1 ++ (cd $srcdir; unset LC_ALL; env LC_CTYPE=locale.bad $valgrind $vjs $pcre2grep abc /dev/null) >>testtrygrep 2>&1 + echo "RC=$?" >>testtrygrep + fi + Index: patches/patch-testdata_grepoutput =================================================================== RCS file: patches/patch-testdata_grepoutput diff -N patches/patch-testdata_grepoutput --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-testdata_grepoutput 24 Jul 2024 11:56:26 -0000 @@ -0,0 +1,23 @@ +From 7e141969b538917c9f4a85839031d066eec67ad2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <care...@gmail.com> +Date: Tue, 18 Jun 2024 07:46:41 -0700 +Subject: [PATCH] test: use a fully spec locale name in RunGrepTest (#429) + +A locale contains an optional charmap that might be relevant in +determining if the setlocale() function considers it valid. + +Change the bad locale used when testing to one that contains also +an invalid charmap and therefore fix this test in OpenBSD. + +Index: testdata/grepoutput +--- testdata/grepoutput.orig ++++ testdata/grepoutput +@@ -1225,7 +1225,7 @@ Usage: pcre2grep [-AaBCcDdEeFfHhIilLMmNnOoPqrstuUVvwxZ + Type "pcre2grep --help" for more information and the long options. + RC=2 + ---------------------------- Test 150 ----------------------------- +-pcre2grep: Failed to set locale badlocale (obtained from LC_CTYPE) ++pcre2grep: Failed to set locale locale.bad (obtained from LC_CTYPE) + RC=2 + ---------------------------- Test 151 ----------------------------- + [1;31mThe[0m quick brown Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/pcre2/pkg/PLIST,v diff -u -p -r1.6 PLIST --- pkg/PLIST 11 Mar 2022 18:52:29 -0000 1.6 +++ pkg/PLIST 24 Jul 2024 11:56:26 -0000 @@ -42,6 +42,7 @@ lib/pkgconfig/libpcre2-posix.pc @man man/man3/pcre2_general_context_free.3 @man man/man3/pcre2_get_error_message.3 @man man/man3/pcre2_get_mark.3 +@man man/man3/pcre2_get_match_data_heapframes_size.3 @man man/man3/pcre2_get_match_data_size.3 @man man/man3/pcre2_get_ovector_count.3 @man man/man3/pcre2_get_ovector_pointer.3 @@ -77,7 +78,9 @@ lib/pkgconfig/libpcre2-posix.pc @man man/man3/pcre2_set_glob_separator.3 @man man/man3/pcre2_set_heap_limit.3 @man man/man3/pcre2_set_match_limit.3 +@man man/man3/pcre2_set_max_pattern_compiled_length.3 @man man/man3/pcre2_set_max_pattern_length.3 +@man man/man3/pcre2_set_max_varlookbehind.3 @man man/man3/pcre2_set_newline.3 @man man/man3/pcre2_set_offset_limit.3 @man man/man3/pcre2_set_parens_nest_limit.3 @@ -145,6 +148,7 @@ share/doc/pcre2/html/pcre2_general_conte share/doc/pcre2/html/pcre2_general_context_free.html share/doc/pcre2/html/pcre2_get_error_message.html share/doc/pcre2/html/pcre2_get_mark.html +share/doc/pcre2/html/pcre2_get_match_data_heapframes_size.html share/doc/pcre2/html/pcre2_get_match_data_size.html share/doc/pcre2/html/pcre2_get_ovector_count.html share/doc/pcre2/html/pcre2_get_ovector_pointer.html @@ -180,7 +184,9 @@ share/doc/pcre2/html/pcre2_set_glob_esca share/doc/pcre2/html/pcre2_set_glob_separator.html share/doc/pcre2/html/pcre2_set_heap_limit.html share/doc/pcre2/html/pcre2_set_match_limit.html +share/doc/pcre2/html/pcre2_set_max_pattern_compiled_length.html share/doc/pcre2/html/pcre2_set_max_pattern_length.html +share/doc/pcre2/html/pcre2_set_max_varlookbehind.html share/doc/pcre2/html/pcre2_set_newline.html share/doc/pcre2/html/pcre2_set_offset_limit.html share/doc/pcre2/html/pcre2_set_parens_nest_limit.html
