From owner-svn-ports-all@freebsd.org Wed Mar 28 16:52:58 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 59398F6C2F3; Wed, 28 Mar 2018 16:52:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0AB4B76935; Wed, 28 Mar 2018 16:52:56 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A9E85B8E; Wed, 28 Mar 2018 16:52:55 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2SGqtfs071706; Wed, 28 Mar 2018 16:52:55 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2SGqsN1071699; Wed, 28 Mar 2018 16:52:54 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201803281652.w2SGqsN1071699@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 28 Mar 2018 16:52:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465819 - in head: math/gri/files math/oleo/files net/ldapsdk/files textproc/latex2html textproc/latex2html/files textproc/linuxdoc-tools/files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head: math/gri/files math/oleo/files net/ldapsdk/files textproc/latex2html textproc/latex2html/files textproc/linuxdoc-tools/files X-SVN-Commit-Revision: 465819 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2018 16:52:58 -0000 Author: mat Date: Wed Mar 28 16:52:54 2018 New Revision: 465819 URL: https://svnweb.freebsd.org/changeset/ports/465819 Log: Fix build with Perl 5.26. Unescaped left brace in regex is illegal in regex when not used as a quantifier. - /foo{3}/ will match foofoofoo. - /\\new{bar}/ is illegal and should be written as /\\new\{bar}/. PR: 226817 Sponsored by: Absolight Added: head/net/ldapsdk/files/patch-ldap_build_replace.pm (contents, props changed) head/textproc/latex2html/files/patch-latex2html.pin (contents, props changed) head/textproc/latex2html/files/patch-versions_html4__0.pl (contents, props changed) head/textproc/linuxdoc-tools/files/patch-lib_fmt_fmt__latex2e.pl (contents, props changed) Modified: head/math/gri/files/patch-doc__texinfo2HTML (contents, props changed) head/math/oleo/files/patch-doc_texi2html.in (contents, props changed) head/textproc/latex2html/Makefile (contents, props changed) Modified: head/math/gri/files/patch-doc__texinfo2HTML ============================================================================== --- head/math/gri/files/patch-doc__texinfo2HTML Wed Mar 28 16:52:49 2018 (r465818) +++ head/math/gri/files/patch-doc__texinfo2HTML Wed Mar 28 16:52:54 2018 (r465819) @@ -1,5 +1,5 @@ ---- ./doc/texinfo2HTML.orig 2013-10-05 13:52:30.000000000 +0400 -+++ ./doc/texinfo2HTML 2013-10-05 13:53:16.000000000 +0400 +--- doc/texinfo2HTML.orig 2009-12-12 18:11:23 UTC ++++ doc/texinfo2HTML @@ -1,5 +1,8 @@ #!/usr/bin/perl -w @@ -9,7 +9,7 @@ #$example_indent = " "; $example_indent = ""; -@@ -54,12 +57,10 @@ +@@ -54,12 +57,10 @@ BUGS: the end is here} and more blah will not get the \@code{} item converted correctly. "; @@ -23,3 +23,154 @@ $print_help = 0; $print_help = $opt_h if $opt_h; if ($print_help) { +@@ -120,7 +121,7 @@ while(get_a_line()) { + next; + } + # Process image commands (NOT...it's there already) +- if (/\@image{(.*)}/) { ++ if (/\@image\{(.*)\}/) { + #print "\n"; + next; + } +@@ -208,12 +209,12 @@ while(get_a_line()) { + s,<,<,og; + # Special tweak to make 'Gri' look cooler. + # s, Gri , GRI ,og; +- s,\@code{\@\@},\@code{TEXINFO2HTML-AT-AT},og; ++ s,\@code\{\@\@\},\@code\{TEXINFO2HTML-AT-AT\},og; + s,\@},TEXINFO2HTML-CLOSE-BRACE,og; # retain inside e.g. @code{} + s,\@\@,TEXINFO2HTML-AT-AT,og; +- s,\@{,{,og; +- s,\@TeX{},TeX,og; +- s,\@dots{},...,og; ++ s,\@\{,\{,og; ++ s,\@TeX\{\},TeX,og; ++ s,\@dots\{\},...,og; + # Put in place-holders for some accents. I should check for all + # of them, but for now, I'm just kludging in a couple, + # to solve an immediate problem and to serve as a place-holder +@@ -237,18 +238,18 @@ while(get_a_line()) { + } + next; + } +- while (/\@url{([^}]*)}/) { ++ while (/\@url\{([^}]*)\}/) { + $the_url = $1; +- s:\@url{[^}]*}:\@code{$the_url}:; ++ s:\@url\{[^}]*}:\@code{$the_url}:; + } +- while (/\@uref{([^}]*)}/) { ++ while (/\@uref\{([^}]*)\}/) { + @items = split(/,/, $1); + if ($#items == 0) { +- s:\@uref{[^}]*}:$items[0]:; ++ s:\@uref\{[^}]*}:$items[0]:; + } elsif ($#items == 1) { +- s:\@uref{[^}]*}:$items[1]:; ++ s:\@uref\{[^}]*}:$items[1]:; + } elsif ($#items == 2) { +- s:\@uref{[^}]*}:\@code{$items[2]}:; ++ s:\@uref\{[^}]*}:\@code{$items[2]}:; + } else { + die "Cannot have more than 3 items in a 'uref' at \"$_\""; + } +@@ -330,7 +331,7 @@ while(get_a_line()) { + while(get_a_line()) { + next if /\@sp/; + next if /\@cindex/; +- s|\@anchor{([^}]*)}||g; ++ s|\@anchor\{([^}]*)}||g; + &process_examples(); + # Handle HTML inserts + if (/^\@c HTML (.*)/o) { +@@ -346,10 +347,10 @@ while(get_a_line()) { + } + if (/\s*\@item\s*(.*)/o) { + $the_item = $1; +- $the_item =~ s:\@{:{:og; ++ $the_item =~ s:\@\{:{:og; + $the_item =~ s:\@}:}:og; + $the_item =~ s:\@\@:\@:og; +- $the_item =~ s:\@code{([^}]*)}:`$1':og; ++ $the_item =~ s:\@code\{([^}]*)}:`$1':og; + print "
$start_item$the_item$end_item\n
"; + } else { + print "

" if (/^$/o); +@@ -402,38 +403,38 @@ sub process_examples() { + } else { + s,\@value\{([^}]*)\},$value{$1},g; # Substitute set/value pair + s,\@},},og; +- s,\@{,{,og; ++ s,\@\{,{,og; + } + } + + + sub sub_refs { +- die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref{(.*)}(.*)\@[px]*ref{(.*)}/); ++ die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref\{(.*)}(.*)\@[px]*ref\{(.*)}/); + # anchors +- s|\@anchor{([^}]*)}||g; ++ s|\@anchor\{([^}]*)}||g; + # Change e.g. + # @xref{Viewing} + # into + # see Viewing + + #if (/\@ref/){print "AAA[$_]AAA\n"; +- s|\@ref{([^}]*)}|see $1|g; ++ s|\@ref\{([^}]*)}|see $1|g; + #print "BBB[$_]BBB\n";} + +- s|\@xref{([^}]*)}|see $1|g; +- s|\@pxref{([^}]*)}|see $1.|g; +- while (/\@url{([^}]*)}/) { ++ s|\@xref\{([^}]*)}|see $1|g; ++ s|\@pxref\{([^}]*)}|see $1.|g; ++ while (/\@url\{([^}]*)}/) { + $the_url = $1; +- s:\@url{[^}]*}:\@code{$the_url}:; ++ s:\@url\{[^}]*}:\@code{$the_url}:; + } +- while (/\@uref{([^}]*)}/) { ++ while (/\@uref\{([^}]*)}/) { + @items = split(/,/, $1); + if ($#items == 0) { +- s:\@uref{[^}]*}:$items[0]:; ++ s:\@uref\{[^}]*}:$items[0]:; + } elsif ($#items == 1) { +- s:\@uref{[^}]*}:$items[1]:; ++ s:\@uref\{[^}]*}:$items[1]:; + } elsif ($#items == 2) { +- s:\@uref{[^}]*}:\@code{$items[2]}:; ++ s:\@uref\{[^}]*}:\@code{$items[2]}:; + } else { + die "Cannot have more than 3 items in a 'uref' at \"$_\""; + } +@@ -466,17 +467,17 @@ sub sub_headings { + sub sub_emphasis { + s,<<,<<,g; + s,>>,>>,g; +- s,\@emph{([^}]*)},$1,g; +- s,\@strong{([^}]*)},$1,g; +- s,\@footnote{([^}]*)}, [$1],g; +- s,\@b{([^}]*)},$1,g; ++ s,\@emph\{([^}]*)},$1,g; ++ s,\@strong\{([^}]*)},$1,g; ++ s,\@footnote\{([^}]*)}, [$1],g; ++ s,\@b\{([^}]*)},$1,g; + +- s,\@code{([^}]*)},`$1',g; ++ s,\@code\{([^}]*)},`$1',g; + s,\@\@,\@,g; +- s,\@samp{([^}]*)},`$1',g; +- s,\@key{([^}]*)},`$1',g; +- s,\@kbd{([^}]*)},`$1',g; +- s,\@file{([^}]*)},`$1',g; ++ s,\@samp\{([^}]*)},`$1',g; ++ s,\@key\{([^}]*)},`$1',g; ++ s,\@kbd\{([^}]*)},`$1',g; ++ s,\@file\{([^}]*)},`$1',g; + s,TEXINFO2HTML-CLOSE-BRACE,},g; + s,TEXINFO2HTML-AT-AT,\@,g; + s,TEXINFO2HTML-ACCENT-ACUTE-a,á,g; Modified: head/math/oleo/files/patch-doc_texi2html.in ============================================================================== --- head/math/oleo/files/patch-doc_texi2html.in Wed Mar 28 16:52:49 2018 (r465818) +++ head/math/oleo/files/patch-doc_texi2html.in Wed Mar 28 16:52:54 2018 (r465819) @@ -1,5 +1,23 @@ --- doc/texi2html.in.orig 2000-04-08 12:20:05 UTC +++ doc/texi2html.in +@@ -2752,7 +2752,7 @@ INPUT_LINE: while ($_ = &next_line) { + s/\@refill\s+//g; + # other substitutions + &simple_substitutions; +- s/\@value{($VARRE)}/$value{$1}/eg; ++ s/\@value\{($VARRE)\}/$value{$1}/eg; + s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4 + # + # analyze the tag again +@@ -3174,7 +3174,7 @@ while (@lines) { + # + # xref + # +- while (/\@(x|px|info|)ref{([^{}]+)(}?)/) { ++ while (/\@(x|px|info|)ref\{([^{}]+)(\}?)/) { + # note: Texinfo may accept other characters + ($type, $nodes, $full) = ($1, $2, $3); + ($before, $after) = ($`, $'); @@ -3790,9 +3790,9 @@ sub update_sec_num { my $ret; @@ -21,3 +39,12 @@ { &incr_sec_num($level, @normal_sec_num); } +@@ -4168,7 +4168,7 @@ sub substitute_style { + while ($changed) { + $changed = 0; + $done = ''; +- while (/\@(\w+){([^\{\}]+)}/ || /\@(,){([^\{\}]+)}/) { ++ while (/\@(\w+)\{([^\{\}]+)\}/ || /\@(,)\{([^\{\}]+)\}/) { + $text = &apply_style($1, $2); + if ($text) { + $_ = "$`$text$'"; Added: head/net/ldapsdk/files/patch-ldap_build_replace.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ldapsdk/files/patch-ldap_build_replace.pm Wed Mar 28 16:52:54 2018 (r465819) @@ -0,0 +1,11 @@ +--- ldap/build/replace.pm.orig 2011-01-06 12:05:39 UTC ++++ ldap/build/replace.pm +@@ -62,7 +62,7 @@ sub GenerateHeader ($$\%) { + while(