Saturday, November 05, 2022

Re: pcre2: newline any => anycrlf

On Fri, Nov 04 2022, YASUOKA Masahiko <yasuoka@openbsd.org> wrote:
> Hi,
>
> On Fri, 04 Nov 2022 00:13:20 +0100
> Jeremie Courreges-Anglas <jca@wxcvbn.org> wrote:
>> On Thu, Nov 03 2022, Christian Weisgerber <naddy@mips.inka.de> wrote:
>>> YASUOKA Masahiko:
>>>
>>>> Currently pcre2 is configured with "--enable-newline-is-any".
>>>> I think we should change it to --enable-newline-is-anycrlf to avoid the
>>>> conflict.
>>>
>>> If I may ask: Why do we diverge from the default newline setting
>>> at all?
>>>
>>> I notice that (1) the FreeBSD port doesn't and (2) callers that
>>> need to process non-Unix newlines can individually set this.
>>
>> I took a look yesterday and I suspect that czarkoff@ enabled it out of
>> excessive zeal, along with the other --enable-* flags. This is present
>> since https://github.com/jasperla/openbsd-wip/commit/07650bf8fcd5da17ccdf71387917f5e30da5eb50
>> with no rationale or discussion on this list.
>
> It seems no reason is found to diverge from the upstream default.
>
> So let's remove the flag.
>
> ok?

Fine with me.

> Index: devel/pcre2/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/pcre2/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- devel/pcre2/Makefile 3 Nov 2022 03:33:46 -0000 1.17
> +++ devel/pcre2/Makefile 4 Nov 2022 02:27:24 -0000
> @@ -9,7 +9,7 @@ SHARED_LIBS += pcre2-posix
>
> CATEGORIES = devel
>
> -REVISION = 0
> +REVISION = 1
>
> MASTER_SITES = https://ftp.pcre.org/pub/pcre/ \
> ${MASTER_SITE_SOURCEFORGE:=pcre/} \
> @@ -29,7 +29,6 @@ LIB_DEPENDS = archivers/bzip2
> CONFIGURE_STYLE = gnu
> CONFIGURE_ARGS = --enable-pcre2-16 \
> --enable-pcre2-32 \
> - --enable-newline-is-anycrlf \
> --enable-pcre2grep-libz \
> --enable-pcre2grep-libbz2 \
> --enable-pcre2test-libreadline
>

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE

No comments:

Post a Comment