From: Laurent Cheylus Subject: Re: [update] devel/pcre2 10.44 To: Stuart Henderson Cc: Ports , namn@openbsd.org Date: Wed, 24 Jul 2024 14:59:54 +0200 Hi Stuart, ----- Mail original ----- > On 2024/07/02 10:32, Laurent Cheylus wrote: > > update of devel/pcre2 library to the latest version 10.44. > > > > Update Makefile: > > - use GH_* to download sources > > GH_* is for cases where there are no proper release tarballs. OK But we must change HOMEPAGE to https://pcre2project.github.io/pcre2/ The old HOMEPAGE (https://www.pcre.org/) is not an official site for the PCRE2 project. > > - bump minor versions for pcre2-8, pcre2-16 and pcre2-32 libraries > > (new functions added) > > Right. I don't understand the updated versions in comments of your patch (13.0 instead of 10.44 for pcre2-{8,16,32}, 3.5 instead of unchanged 2.3 for pcre2-posix). > > - use "devel/cmake" as module for build > > autoconf is still support, and sticking to it means that pcre2 will > be able to build on more archs. Also it results in fewer changes to the > installed files, so testing is easier (changing to cmake really wants > wider testing). OK to use autoconf/configure script instead of cmake. > > - 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. I used sed instead of patch files because testdata/grepoutput is not a regular text file. Error when patching files with the last version of your diff: $ make patch (...) ===> Applying OpenBSD patch patch-testdata_grepoutput Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 7e141969b538917c9f4a85839031d066eec67ad2 Mon Sep 17 00:00:00 2001 |From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= |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 -------------------------- Patching file testdata/grepoutput using Plan A... No such line 1224 in input file, ignoring Hunk #1 failed at 1225. 1 out of 1 hunks failed--saving rejects to testdata/grepoutput.rej done ***> patch-testdata_grepoutput did not apply cleanly ===> Failed patches: patch-testdata_grepoutput *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2931 '/usr/obj/ports/pcre2-10.44/.patch_done': @if cd /usr/ports/mystuff/devel/pc...) *** Error 2 in /usr/ports/mystuff/devel/pcre2-sthen (/usr/ports/infrastructure/mk/bsd.port.mk:2704 'patch': @lock=pcre2-10.44; export _LOCK...) Laurent