From 350025bb9d58cdd646dc39eba3cc3a62cb56aeba Mon Sep 17 00:00:00 2001 From: taca Date: Mon, 31 Jul 2006 11:29:01 +0000 Subject: - Fix PLIST problem; a extra entry. - Reduce warning of optparse.rb when generating ri(1) database. Bump PKGREVISION. --- lang/ruby18-base/Makefile | 4 +- lang/ruby18-base/PLIST | 3 +- lang/ruby18-base/distinfo | 4 +- lang/ruby18-base/patches/patch-cm | 195 +++++++++++++++++++++++++++++++++++++- 4 files changed, 198 insertions(+), 8 deletions(-) (limited to 'lang') diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index ac041063fcf..17e77e93cd3 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2006/07/30 23:12:49 taca Exp $ +# $NetBSD: Makefile,v 1.22 2006/07/31 11:29:01 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST index e857e4c8cb6..3242c22baf7 100644 --- a/lang/ruby18-base/PLIST +++ b/lang/ruby18-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2006/07/30 23:12:49 taca Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/07/31 11:29:01 taca Exp $ bin/erb${RUBY_VER} bin/h2rb${RUBY_VER} bin/irb${RUBY_VER} @@ -2895,7 +2895,6 @@ ${RUBY_SYSRIDIR}/OptionParser/Switch/summarize-i.yaml ${RUBY_SYSRIDIR}/OptionParser/abort-i.yaml ${RUBY_SYSRIDIR}/OptionParser/accept-c.yaml ${RUBY_SYSRIDIR}/OptionParser/accept-i.yaml -${RUBY_SYSRIDIR}/OptionParser/add_officious-i.yaml ${RUBY_SYSRIDIR}/OptionParser/banner-i.yaml ${RUBY_SYSRIDIR}/OptionParser/base-i.yaml ${RUBY_SYSRIDIR}/OptionParser/cdesc-OptionParser.yaml diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo index cd7f57a3191..83557a9d29e 100644 --- a/lang/ruby18-base/distinfo +++ b/lang/ruby18-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2006/07/30 23:12:49 taca Exp $ +$NetBSD: distinfo,v 1.12 2006/07/31 11:29:03 taca Exp $ SHA1 (ruby-1.8.4.tar.gz) = 93999577c7fc4decc6b2fe8fefa96e743f278fbf RMD160 (ruby-1.8.4.tar.gz) = 1c0572a4ee369af57a3db68027b2566052eac944 @@ -16,7 +16,7 @@ SHA1 (patch-bz) = 8c035d5cd91e72ea95d94e048bbdcd15c663f613 SHA1 (patch-cc) = d9adab0707c178140e4eb6ab458501a66903d88c SHA1 (patch-ck) = 554a8a5f30b9cb32d1585b7b683da0ca2ad0bcb4 SHA1 (patch-cl) = 73d5d356456ca40ca0b40371dc690e856aa6cd6b -SHA1 (patch-cm) = b90067d80081175576a4e07e13f27ac5b85e2dcf +SHA1 (patch-cm) = f444a84fb22df1406509609bda20e8f5a471649c SHA1 (patch-cn) = 89793e4c2f409b4959a3b972acc1ae5529d099c2 SHA1 (patch-co) = 1f064e6b4eef16021e4dd402f05b239a85fa2f51 SHA1 (patch-cp) = a80a9544f2808d3b6b32ad8bc2ce233b4ac95a84 diff --git a/lang/ruby18-base/patches/patch-cm b/lang/ruby18-base/patches/patch-cm index d87964e98b9..afe4194accf 100644 --- a/lang/ruby18-base/patches/patch-cm +++ b/lang/ruby18-base/patches/patch-cm @@ -1,4 +1,4 @@ -$NetBSD: patch-cm,v 1.1 2006/07/30 23:12:50 taca Exp $ +$NetBSD: patch-cm,v 1.2 2006/07/31 11:29:03 taca Exp $ --- lib/optparse.rb.orig 2005-11-22 23:53:16.000000000 +0900 +++ lib/optparse.rb @@ -20,7 +20,198 @@ $NetBSD: patch-cm,v 1.1 2006/07/30 23:12:50 taca Exp $ # def parse_arg(arg) pattern or return nil, arg -@@ -815,8 +808,7 @@ class OptionParser +@@ -337,20 +330,9 @@ class OptionParser + private :parse_arg + + # +- # OptionParser::Switch#conv_arg(arg, val) {semi-error handler} +- # +- # Parses argument, convert and returns ((|arg|)), ((|block|)) and +- # result of conversion. +- # : Arguments to ((|@conv|)) +- # substrings matched to ((|@pattern|)), ((|$&|)), ((|$1|)), +- # ((|$2|)) and so on. +- # :Parameters: +- # : ((|arg|)) +- # argument string follows the switch. +- # : ((|val|)) +- # following argument. +- # : (({block})) +- # (({yields})) at semi-error condition, instead of raises exception. ++ # Parses argument, converts and returns +arg+, +block+ and result of ++ # conversion. Yields at semi-error condition instead of raising an ++ # exception. + # + def conv_arg(arg, val = nil) + if block +@@ -367,23 +349,16 @@ class OptionParser + private :conv_arg + + # +- # OptionParser::Switch#summarize(sdone, ldone, width, max, indent) ++ # Produces the summary text. Each line of the summary is yielded to the ++ # block (without newline). + # +- # Makes summary strings. +- # :Parameters: +- # : ((|sdone|)) +- # already summarized short style options keyed hash. +- # : ((|ldone|)) +- # already summarized long style options keyed hash. +- # : ((|width|)) +- # width of left side, option part. in other word, right side, +- # description part strings start at ((|width|)) column. +- # : ((|max|)) +- # maximum width of left side, options are filled within ((|max|)) columns. +- # : ((|indent|)) +- # prefix string indents each summarized lines. +- # : (({block})) +- # to be passed each lines(without newline). ++ # +sdone+:: Already summarized short style options keyed hash. ++ # +ldone+:: Already summarized long style options keyed hash. ++ # +width+:: Width of left side (option part). In other words, the right ++ # side (description part) starts after +width+ columns. ++ # +max+:: Maximum width of left side -> the options are filled within ++ # +max+ columns. ++ # +indent+:: Prefix string indents all summarized lines. + # + def summarize(sdone = [], ldone = [], width = 1, max = width - 1, indent = "") + sopts, lopts, s = [], [], nil +@@ -541,19 +516,12 @@ class OptionParser + end + + # +- # OptionParser::List#update(sw, sopts, lopts, nlopts = nil) ++ # Adds +sw+ according to +sopts+, +lopts+ and +nlopts+. + # +- # Adds ((|sw|)) according to ((|sopts|)), ((|lopts|)) and +- # ((|nlopts|)). +- # :Parameters: +- # : ((|sw|)) +- # (()) instance to be added. +- # : ((|sopts|)) +- # short style options list. +- # : ((|lopts|)) +- # long style options list. +- # : ((|nlopts|)) +- # negated long style options list. ++ # +sw+:: OptionParser::Switch instance to be added. ++ # +sopts+:: Short style option list. ++ # +lopts+:: Long style option list. ++ # +nlopts+:: Negated long style options list. + # + def update(sw, sopts, lopts, nsw = nil, nlopts = nil) + o = nil +@@ -566,45 +534,40 @@ class OptionParser + private :update + + # +- # OptionParser::List#prepend(switch, short_opts, long_opts, nolong_opts) ++ # Inserts +switch+ at the head of the list, and associates short, long ++ # and negated long options. Arguments are: ++ # ++ # +switch+:: OptionParser::Switch instance to be inserted. ++ # +short_opts+:: List of short style options. ++ # +long_opts+:: List of long style options. ++ # +nolong_opts+:: List of long style options with "no-" prefix. ++ # ++ # prepend(switch, short_opts, long_opts, nolong_opts) + # +- # Inserts ((|switch|)) at head of the list, and associates short, +- # long and negated long options. + def prepend(*args) + update(*args) + @list.unshift(args[0]) + end + + # +- # OptionParser::List#append(switch, short_opts, long_opts, nolong_opts) ++ # Appends +switch+ at the tail of the list, and associates short, long ++ # and negated long options. Arguments are: ++ # ++ # +switch+:: OptionParser::Switch instance to be inserted. ++ # +short_opts+:: List of short style options. ++ # +long_opts+:: List of long style options. ++ # +nolong_opts+:: List of long style options with "no-" prefix. ++ # ++ # append(switch, short_opts, long_opts, nolong_opts) + # +- # Appends ((|switch|)) at tail of the list, and associates short, +- # long and negated long options. +- # :Parameters: +- # : ((|switch|)) +- # (()) instance to be inserted. +- # : ((|short_opts|)) +- # list of short style options. +- # : ((|long_opts|)) +- # list of long style options. +- # : ((|nolong_opts|)) +- # list of long style options with (({"no-"})) prefix. + def append(*args) + update(*args) + @list.push(args[0]) + end + + # +- # OptionParser::List#search(id, key) [{block}] +- # +- # Searches ((|key|)) in ((|id|)) list. +- # :Parameters: +- # : ((|id|)) +- # searching list. +- # : ((|k|)) +- # searching key. +- # : (({block})) +- # yielded with the found value when succeeded. ++ # Searches +key+ in +id+ list. The result is returned or yielded if a ++ # block is given. If it isn't found, nil is returned. + # + def search(id, key) + if list = __send__(id) +@@ -615,35 +578,19 @@ class OptionParser + end + + # +- # OptionParser::List#complete(id, opt, *pat, &block) +- # +- # Searches list ((|id|)) for ((|opt|)) and ((|*pat|)). +- # :Parameters: +- # : ((|id|)) +- # searching list. +- # : ((|opt|)) +- # searching key. +- # : ((|icase|)) +- # search case insensitive if true. +- # : ((|*pat|)) +- # optional pattern for completion. +- # : (({block})) +- # yielded with the found value when succeeded. ++ # Searches list +id+ for +opt+ and the optional patterns for completion ++ # +pat+. If +icase+ is true, the search is case insensitive. The result ++ # is returned or yielded if a block is given. If it isn't found, nil is ++ # returned. + # + def complete(id, opt, icase = false, *pat, &block) + __send__(id).complete(opt, icase, *pat, &block) + end + + # +- # OptionParser::List#summarize(*args) {...} +- # +- # Making summary table, yields the (({block})) with each lines. +- # Each elements of (({@list})) should be able to (({summarize})). +- # :Parameters: +- # : ((|args|)) +- # passed to elements#summarize through. +- # : (({block})) +- # to be passed each lines(without newline). ++ # Creates the summary table, passing each line to the +block+ (without ++ # newline). The arguments +args+ are passed along to the summarize ++ # method which is called on every option. + # + def summarize(*args, &block) + list.each do |opt| +@@ -815,8 +762,7 @@ class OptionParser yield self if block_given? end -- cgit v1.2.3