diff options
| -rw-r--r-- | textproc/yodl/distinfo | 3 | ||||
| -rw-r--r-- | textproc/yodl/patches/patch-ac | 100 |
2 files changed, 1 insertions, 102 deletions
diff --git a/textproc/yodl/distinfo b/textproc/yodl/distinfo index 57d5d0a3501..a6372bda271 100644 --- a/textproc/yodl/distinfo +++ b/textproc/yodl/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2003/02/18 23:43:54 jtb Exp $ +$NetBSD: distinfo,v 1.4 2003/07/29 19:07:19 jtb Exp $ SHA1 (yodl-1.31.18.tar.gz) = 16f041cf8851027f96e5af82d0ac4f85a425553a Size (yodl-1.31.18.tar.gz) = 320053 bytes SHA1 (patch-aa) = ecb2e2f61d43e69b685b2821d9601e82cb0647ca SHA1 (patch-ab) = 70ccc5bab03a079935507d59a0e2f4a93b27a4ab -SHA1 (patch-ac) = 8368ab00a5fac4fd6c9107119b29414eb9340e2a diff --git a/textproc/yodl/patches/patch-ac b/textproc/yodl/patches/patch-ac deleted file mode 100644 index c5f0d049419..00000000000 --- a/textproc/yodl/patches/patch-ac +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/02/18 23:43:55 jtb Exp $ - ---- scripts/yodl2texinfo-post.py.orig Tue Feb 18 22:33:15 2003 -+++ scripts/yodl2texinfo-post.py -@@ -28,8 +28,7 @@ import sys - - import getopt - from string import * --import regex --import regsub -+import re - import time - - def program_id (): -@@ -141,16 +140,16 @@ class Pre_texinfo_file (Menu): - return n - - def eat_tag (this): -- i = regex.search ('@TAGSTART@', this.s) -+ i = re.search ('@TAGSTART@', this.s) - j = 0 - if i < 0: - return 0 -- j = regex.search ('@TAGEND@', this.s[i:]) -+ j = re.search ('@TAGEND@', this.s[i:]) - if j < 0: - raise 'huh?' - j = i + j + len ('@TAGEND@') - tag = this.s[i + len ('@TAGSTART@'):j - len ('@TAGEND@')] -- k = regex.search (' ', tag[1:]) + 1 -+ k = re.search (' ', tag[1:]) + 1 - tag_name = tag[1:k] - tag_string = tag[k:len (tag) - 1] - while tag_string[:1] == ' ': -@@ -161,13 +160,13 @@ class Pre_texinfo_file (Menu): - # various other characters in node names too - # - if urg_value: -- tag_string = regsub.gsub (not_in_node_set, '-', tag_string) -- tag_string = regsub.gsub ('--', '-', tag_string) -+ tag_string = re.sub (not_in_node_set, '-', tag_string) -+ tag_string = re.sub ('--', '-', tag_string) - # brr -- tag_string = regsub.gsub ('--', '-', tag_string) -- tag_string = regsub.gsub ('@code', '', tag_string) -- tag_string = regsub.gsub ('@emph', '', tag_string) -- tag_string = regsub.gsub ('@strong', '', tag_string) -+ tag_string = re.sub ('--', '-', tag_string) -+ tag_string = re.sub ('@code', '', tag_string) -+ tag_string = re.sub ('@emph', '', tag_string) -+ tag_string = re.sub ('@strong', '', tag_string) - if tag_name == 'menu': - this.default.top = 'Top' - n = this.new_node (i, tag_string) -@@ -214,23 +213,23 @@ class Pre_texinfo_file (Menu): - def create_node (this, n): - node = '@node ' - set = '' -- if not urg_value and regex.match (not_in_node, n.name) != -1: -+ if not urg_value and re.match (not_in_node, n.name) != -1: - set = set + "@set nodename " + n.name + "\n" - node = node + "@value{nodename}" - else: - node = node + n.name - if not simple_nodes: -- if not urg_value and regex.match (not_in_node, n.next) != -1: -+ if not urg_value and re.match (not_in_node, n.next) != -1: - set = set + "@set nextname " + n.next + "\n" - node = node + ", @value{nextname}" - else: - node = node + ", " + n.next -- if not urg_value and regex.match (not_in_node, n.prev) != -1: -+ if not urg_value and re.match (not_in_node, n.prev) != -1: - set = set + "@set prevname " + n.prev + "\n" - node = node + ", @value{prevname}" - else: - node = node + ", " + n.prev -- if not urg_value and regex.match (not_in_node, n.top) != -1: -+ if not urg_value and re.match (not_in_node, n.top) != -1: - set = set + "@set topname " + n.top + "\n" - node = node + ", @value{topname}" - else: -@@ -249,7 +248,7 @@ class Pre_texinfo_file (Menu): - d = n.description - if not d: - d = n.name -- if not urg_value and regex.match (not_in_node, n.name) != -1: -+ if not urg_value and re.match (not_in_node, n.name) != -1: - menu = menu + "@set nodename " + n.name + "\n" - menu = menu + "* @value{nodename}::" - menu = menu + ' ' * (TAB_POS - len (n.name)) + d + "\n" -@@ -309,7 +308,7 @@ class Pre_texinfo_file (Menu): - this.parse () - this.xrefs () - this.nodes_and_menus () -- this.s = regsub.gsub ('^\n\n', '\n', this.s) -+ this.s = re.sub ('^\n\n', '\n', this.s) - this.s = '\n' + this.s - infotitle = '' - basename = os.path.basename (os.path.splitext (this.filename)[0]) |