Re: PerlRE fix for print/texinfo

On Wed, Apr 03, 2019 at 02:45:19PM +0200, Christian Weisgerber wrote:
> The bulk build logs show a number of warnings
>
> Unescaped left brace in regex is deprecated here (and will be
> fatal in Perl 5.32)
>
> coming out of Texinfo/Parser.pm.
> Fix below, identical to what textinfo-6.6 does.

Looks reasonable.

> ok?

I just checked the sources of texinfo 6.6 (which explains above "looks
reasonable") but did not test your diff.

However, I am not confident enough to give an explicit OK right before
6.5 release without compiling and testing your diff (and ENOTIME in the
next days/weeks).

But if you feel confident please do not wait for my approval as
maintainer. You could even update to texinfo 6.6 if you like (afresh1@
has already fixed potential show stoppers:
https://marc.info/?l=openbsd-ports&m=155336926023801&w=2)

Best regards,
Ingo

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/print/texinfo/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 1 Jul 2018 09:02:41 -0000 1.10
> +++ Makefile 3 Apr 2019 12:40:59 -0000
> @@ -3,7 +3,7 @@
> COMMENT = official documentation format of the GNU project
>
> DISTNAME = texinfo-6.5
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = print
>
> Index: patches/patch-tp_Texinfo_Parser_pm
> ===================================================================
> RCS file: patches/patch-tp_Texinfo_Parser_pm
> diff -N patches/patch-tp_Texinfo_Parser_pm
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-tp_Texinfo_Parser_pm 3 Apr 2019 12:40:59 -0000
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +Index: tp/Texinfo/Parser.pm
> +--- tp/Texinfo/Parser.pm.orig
> ++++ tp/Texinfo/Parser.pm
> +@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$)
> + }
> + } elsif ($command eq 'clickstyle') {
> + # REMACRO
> +- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
> ++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
> + $args = ['@'.$1];
> + $self->{'clickstyle'} = $1;
> + $remaining = $line;
> +- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
> ++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
> + $has_comment = 1 if (defined($4));
> + } else {
> + $self->line_error (sprintf($self->__(
>
> --
> Christian "naddy" Weisgerber naddy@mips.inka.de