head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.32 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.30 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.28 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.26 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.24 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.22 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.20 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.18 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.16 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.14 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.12 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.10 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.8 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.2; locks; strict; comment @# @; 1.3 date 2006.09.07.15.40.01; author taca; state dead; branches; next 1.2; 1.2 date 2006.07.31.11.29.03; author taca; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2006.07.30.23.12.50; author taca; state Exp; branches; next ; 1.2.2.1 date 2006.07.31.11.29.03; author salo; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2006.07.31.22.43.13; author salo; state Exp; branches; next ; desc @@ 1.3 log @Update Ruby to 1.8.5 (+ ruby-1-8 branch on 2006-09-07). pkgsrc changes: * Add RUBY_DYNAMIC_DIRS which cause generating dynamic PLIST entries. * Move using buildlinks to rubyversion.mk. * Merge converters/ruby-iconv to ruby18-base. Ruby changes: * too may, see ChangeLog file or http://eigenclass.org/hiki.rb?ruby+1.8.5+changelog @ text @$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 @@@@ -306,15 +306,8 @@@@ class OptionParser end # - # OptionParser::Switch#parse_arg(arg) {non-serious error handler} - # - # Parses argument and returns rest of ((|arg|)), and matched portion - # to the argument pattern. - # :Parameters: - # : ((|arg|)) - # option argument to be parsed. - # : (({block})) - # yields when the pattern doesn't match sub-string. + # Parses +arg+ and returns rest of +arg+ and matched portion to the + # argument pattern. Yields when the pattern doesn't match substring. # def parse_arg(arg) pattern or return nil, arg @@@@ -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 - # :nodoc: - def add_officious + def add_officious # :nodoc: list = base() Officious.each_pair do |opt, block| list.long[opt] ||= block.call(self) @ 1.2 log @- Fix PLIST problem; a extra entry. - Reduce warning of optparse.rb when generating ri(1) database. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-cm,v 1.1 2006/07/30 23:12:50 taca Exp $ @ 1.2.2.1 log @file patch-cm was added on branch pkgsrc-2006Q2 on 2006-07-31 11:29:03 +0000 @ text @d1 223 @ 1.2.2.2 log @Pullup ticket 1764 - requested by taca security fix for ruby18-base Module Name: pkgsrc Committed By: taca Date: Sun Jul 30 23:12:50 UTC 2006 Modified Files: pkgsrc/lang/ruby18-base: Makefile PLIST distinfo pkgsrc/lang/ruby18-base/patches: patch-ad patch-cc Added Files: pkgsrc/lang/ruby18-base/patches: patch-ck patch-cl patch-cm patch-cn patch-co Log Message: - Security fix for CVE-2006-3694 (JVN#13947696 and JVN#83768862). - Import yaml problem and fix document generation for ri(1). - minor clean up to pkgsrc. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: taca Date: Mon Jul 31 11:29:03 UTC 2006 Modified Files: pkgsrc/lang/ruby18-base: Makefile PLIST distinfo pkgsrc/lang/ruby18-base/patches: patch-cm Log Message: - Fix PLIST problem; a extra entry. - Reduce warning of optparse.rb when generating ri(1) database. Bump PKGREVISION. @ text @a0 223 $NetBSD: patch-cm,v 1.2.2.1 2006/07/31 22:43:13 salo Exp $ --- lib/optparse.rb.orig 2005-11-22 23:53:16.000000000 +0900 +++ lib/optparse.rb @@@@ -306,15 +306,8 @@@@ class OptionParser end # - # OptionParser::Switch#parse_arg(arg) {non-serious error handler} - # - # Parses argument and returns rest of ((|arg|)), and matched portion - # to the argument pattern. - # :Parameters: - # : ((|arg|)) - # option argument to be parsed. - # : (({block})) - # yields when the pattern doesn't match sub-string. + # Parses +arg+ and returns rest of +arg+ and matched portion to the + # argument pattern. Yields when the pattern doesn't match substring. # def parse_arg(arg) pattern or return nil, arg @@@@ -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 - # :nodoc: - def add_officious + def add_officious # :nodoc: list = base() Officious.each_pair do |opt, block| list.long[opt] ||= block.call(self) @ 1.1 log @- Security fix for CVE-2006-3694 (JVN#13947696 and JVN#83768862). - Import yaml problem and fix document generation for ri(1). - minor clean up to pkgsrc. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d23 192 a214 1 @@@@ -815,8 +808,7 @@@@ class OptionParser @