pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/gri
Module Name: pkgsrc
Committed By: joerg
Date: Sat Jun 17 19:42:26 UTC 2017
Modified Files:
pkgsrc/graphics/gri: distinfo
Added Files:
pkgsrc/graphics/gri/patches: patch-doc_texinfo2HTML
Log Message:
Fix build with Perl 5.26.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/gri/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gri/patches/patch-doc_texinfo2HTML
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/gri/distinfo
diff -u pkgsrc/graphics/gri/distinfo:1.11 pkgsrc/graphics/gri/distinfo:1.12
--- pkgsrc/graphics/gri/distinfo:1.11 Tue Nov 3 21:34:02 2015
+++ pkgsrc/graphics/gri/distinfo Sat Jun 17 19:42:26 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 21:34:02 agc Exp $
+$NetBSD: distinfo,v 1.12 2017/06/17 19:42:26 joerg Exp $
SHA1 (gri-2.12.23.tar.gz) = 75856cc100040da28ba7d667e12301293e7dd5a5
RMD160 (gri-2.12.23.tar.gz) = 9cd7861c88f7db0ec9a23e9cc2a2971a9d763842
@@ -9,3 +9,4 @@ SHA1 (patch-ab) = a6bfac5aa9d3dd1228a35d
SHA1 (patch-ac) = 23ff5c44f023395a0af21e329c887bb846d9dfba
SHA1 (patch-ae) = f3f25302a8893b3cbe23f909ffd5c8a2782c5b1f
SHA1 (patch-doc_Makefile_am) = 990c56b17bbc6bf35076e9ac9cd8768b9d3e7f2c
+SHA1 (patch-doc_texinfo2HTML) = 0be027738a703da6811911b18b5b7c9b3af5994c
Added files:
Index: pkgsrc/graphics/gri/patches/patch-doc_texinfo2HTML
diff -u /dev/null pkgsrc/graphics/gri/patches/patch-doc_texinfo2HTML:1.1
--- /dev/null Sat Jun 17 19:42:26 2017
+++ pkgsrc/graphics/gri/patches/patch-doc_texinfo2HTML Sat Jun 17 19:42:26 2017
@@ -0,0 +1,158 @@
+$NetBSD: patch-doc_texinfo2HTML,v 1.1 2017/06/17 19:42:26 joerg Exp $
+
+5.26 requires quoting of { in certain regex contexts.
+
+--- doc/texinfo2HTML.orig 2017-06-10 18:03:25.861306247 +0000
++++ doc/texinfo2HTML
+@@ -120,7 +120,7 @@ while(get_a_line()) {
+ next;
+ }
+ # Process image commands (NOT...it's there already)
+- if (/\@image{(.*)}/) {
++ if (/\@image\{(.*)\}/) {
+ #print "<img src=\"$1.gif\" border=\"1\">\n";
+ next;
+ }
+@@ -208,12 +208,12 @@ while(get_a_line()) {
+ s,<,<,og;
+ # Special tweak to make 'Gri' look cooler.
+ # s, Gri , G<FONT SIZE=-1>RI</FONT> ,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 +237,18 @@ while(get_a_line()) {
+ }
+ next;
+ }
+- while (/\@url{([^}]*)}/) {
++ while (/\@url\{([^}]*)\}/) {
+ $the_url = $1;
+- s:\@url{[^}]*}:<a href="$the_url">\@code{$the_url}</a>:;
++ s:\@url\{[^}]*\}:<a href="$the_url">\@code{$the_url}</a>:;
+ }
+- while (/\@uref{([^}]*)}/) {
++ while (/\@uref\{([^}]*)\}/) {
+ @items = split(/,/, $1);
+ if ($#items == 0) {
+- s:\@uref{[^}]*}:<a href="$items[0]">$items[0]</a>:;
++ s:\@uref\{[^}]*\}:<a href="$items[0]">$items[0]</a>:;
+ } elsif ($#items == 1) {
+- s:\@uref{[^}]*}:<a href="$items[0]">$items[1]</a>:;
++ s:\@uref\{[^}]*\}:<a href="$items[0]">$items[1]</a>:;
+ } 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 +330,7 @@ while(get_a_line()) {
+ while(get_a_line()) {
+ next if /\@sp/;
+ next if /\@cindex/;
+- s|\@anchor{([^}]*)}|<a name=\"$1\"></a>|g;
++ s|\@anchor\{([^}]*)\}|<a name=\"$1\"></a>|g;
+ &process_examples();
+ # Handle HTML inserts
+ if (/^\@c HTML (.*)/o) {
+@@ -346,10 +346,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:\@\@:\@:og;
+- $the_item =~ s:\@code{([^}]*)}:`<font color="$ex_color"><code>$1</code></font>':og;
++ $the_item =~ s:\@code\{([^}]*)\}:`<font color="$ex_color"><code>$1</code></font>':og;
+ print "<dt> $start_item$the_item$end_item\n<dd>";
+ } else {
+ print "<p>" if (/^$/o);
+@@ -402,38 +402,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{([^}]*)}|<a name=\"$1\"></a>|g;
++ s|\@anchor\{([^}]*)\}|<a name=\"$1\"></a>|g;
+ # Change e.g.
+ # @xref{Viewing}
+ # into
+ # <a href="#Viewing">see Viewing</a>
+
+ #if (/\@ref/){print "AAA[$_]AAA\n";
+- s|\@ref{([^}]*)}|see <a href="#$1">$1</a>|g;
++ s|\@ref\{([^}]*)\}|see <a href="#$1">$1</a>|g;
+ #print "BBB[$_]BBB\n";}
+
+- s|\@xref{([^}]*)}|see <a href="#$1">$1</a>|g;
+- s|\@pxref{([^}]*)}|see <a href="#$1">$1.</a>|g;
+- while (/\@url{([^}]*)}/) {
++ s|\@xref\{([^}]*)\}|see <a href="#$1">$1</a>|g;
++ s|\@pxref\{([^}]*)\}|see <a href="#$1">$1.</a>|g;
++ while (/\@url\{([^}]*)\}/) {
+ $the_url = $1;
+- s:\@url{[^}]*}:<a href="$the_url">\@code{$the_url}</a>:;
++ s:\@url\{[^}]*\}:<a href="$the_url">\@code{$the_url}</a>:;
+ }
+- while (/\@uref{([^}]*)}/) {
++ while (/\@uref\{([^}]*)\}/) {
+ @items = split(/,/, $1);
+ if ($#items == 0) {
+- s:\@uref{[^}]*}:<a href="$items[0]">$items[0]</a>:;
++ s:\@uref\{[^}]*\}:<a href="$items[0]">$items[0]</a>:;
+ } elsif ($#items == 1) {
+- s:\@uref{[^}]*}:<a href="$items[0]">$items[1]</a>:;
++ s:\@uref\{[^}]*\}:<a href="$items[0]">$items[1]</a>:;
+ } 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 +466,17 @@ sub sub_headings {
+ sub sub_emphasis {
+ s,<<,<<,g;
+ s,>>,>>,g;
+- s,\@emph{([^}]*)},<em>$1</em>,g;
+- s,\@strong{([^}]*)},<b>$1</b>,g;
+- s,\@footnote{([^}]*)}, [$1],g;
+- s,\@b{([^}]*)},<b>$1</b>,g;
++ s,\@emph\{([^}]*)\},<em>$1</em>,g;
++ s,\@strong\{([^}]*)\},<b>$1</b>,g;
++ s,\@footnote\{([^}]*)\}, [$1],g;
++ s,\@b\{([^}]*)\},<b>$1</b>,g;
+
+- s,\@code{([^}]*)},`<font color="$ex_color"><code>$1</code></font>',g;
++ s,\@code\{([^}]*)\},`<font color="$ex_color"><code>$1</code></font>',g;
+ s,\@\@,\@,g;
+- s,\@samp{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g;
+- s,\@key{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g;
+- s,\@kbd{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g;
+- s,\@file{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g;
++ s,\@samp\{([^}]*)\},`<font color="$ex_color"><samp>$1</samp></font>',g;
++ s,\@key\{([^}]*)\},`<font color="$ex_color"><kbd>$1</kbd></font>',g;
++ s,\@kbd\{([^}]*)\},`<font color="$ex_color"><kbd>$1</kbd></font>',g;
++ s,\@file\{([^}]*)\},`<font color="$ex_color"><samp>$1</samp></font>',g;
+ s,TEXINFO2HTML-CLOSE-BRACE,},g;
+ s,TEXINFO2HTML-AT-AT,\@,g;
+ s,TEXINFO2HTML-ACCENT-ACUTE-a,á,g;
Home |
Main Index |
Thread Index |
Old Index