diff options
| author | taca <taca@pkgsrc.org> | 2006-01-03 14:37:24 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2006-01-03 14:37:24 +0000 |
| commit | 1d7a540d0181dc4527ca5bc73d66b519aadc5d6f (patch) | |
| tree | 6793c1691e1a32360081689e3dc05d8b28f93dd7 /lang | |
| parent | 29eb5102129abd7f1faa09da69c9cb151997f116 (diff) | |
| download | pkgsrc-1d7a540d0181dc4527ca5bc73d66b519aadc5d6f.tar.gz | |
Update ruby18-base package to Ruby 1.8.4.
Ruby 1.8.4 are maintainous release of Ruby programming language.
Changes are too huge to list here, please see http://www.ruby-lang.org/.
And this package contains some bug fixes after release of 1.8.4.
Tue Dec 27 08:29:18 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
treat wildcard character in commonName. [ruby-dev:28121]
Mon Dec 26 22:32:47 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
NODE_UNDEF and NODE_ALIAS.
backported from trunk. fixed: [ruby-dev:28105]
Mon Dec 26 08:50:36 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (ev_const_get): fixed a bug in constant reference during
instance_eval. [yarv-dev:707]
* eval.c (ev_const_defined): ditto.
* lib/yaml.rb (YAML::add_domain_type): typo fixed. a patch from
Joel VanderWerf <vjoel at path.berkeley.edu>.
[ruby-talk:165285] [ruby-core:6995]
Diffstat (limited to 'lang')
47 files changed, 372 insertions, 1982 deletions
diff --git a/lang/ruby18-base/MESSAGE b/lang/ruby18-base/MESSAGE index 4143fc2340b..6d700311773 100644 --- a/lang/ruby18-base/MESSAGE +++ b/lang/ruby18-base/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2005/11/13 16:27:41 jschauma Exp $ +$NetBSD: MESSAGE,v 1.4 2006/01/03 14:37:24 taca Exp $ Note that this is a minimal package. @@ -10,7 +10,6 @@ libraries, some of which are provided as separate packages: databases/ruby-gdbm: GDBM module devel/ruby-curses: Curses module devel/ruby-readline: readline module - x11/ruby-tcltklib: Tcl/Tk libraries x11/ruby-tk: Tk modules =========================================================================== diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index d12914e74d0..bfda3f315a1 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2005/12/29 06:21:47 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/01/03 14:37:24 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} -PKGREVISION= 2 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} @@ -15,7 +14,8 @@ RUBY_VERSION= ${RUBY18_VERSION} CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \ ${RUBY_PKGPREFIX}-digest-[0-9]* \ - ${RUBY_PKGPREFIX}-openssl-[0-9]* + ${RUBY_PKGPREFIX}-openssl-[0-9]* \ + ${RUBY_PKGPREFIX}-tcltk-[0-9]* USE_LANGUAGES= c USE_TOOLS+= yacc diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST index 94a2349f65f..5baf2411f18 100644 --- a/lang/ruby18-base/PLIST +++ b/lang/ruby18-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2005/11/02 08:56:39 taca Exp $ +@comment $NetBSD: PLIST,v 1.5 2006/01/03 14:37:24 taca Exp $ bin/erb${RUBY_VER} bin/h2rb${RUBY_VER} bin/irb${RUBY_VER} @@ -976,8 +976,11 @@ ${RUBY_SYSRIDIR}/Bignum/divmod-i.yaml ${RUBY_SYSRIDIR}/Bignum/eql%3f-i.yaml ${RUBY_SYSRIDIR}/Bignum/hash-i.yaml ${RUBY_SYSRIDIR}/Bignum/modulo-i.yaml +${RUBY_SYSRIDIR}/Bignum/power%21-i.yaml ${RUBY_SYSRIDIR}/Bignum/quo-i.yaml +${RUBY_SYSRIDIR}/Bignum/rdiv-i.yaml ${RUBY_SYSRIDIR}/Bignum/remainder-i.yaml +${RUBY_SYSRIDIR}/Bignum/rpower-i.yaml ${RUBY_SYSRIDIR}/Bignum/size-i.yaml ${RUBY_SYSRIDIR}/Bignum/to_f-i.yaml ${RUBY_SYSRIDIR}/Bignum/to_s-i.yaml @@ -1238,6 +1241,14 @@ ${RUBY_SYSRIDIR}/DateTime/parse-c.yaml ${RUBY_SYSRIDIR}/DateTime/strptime-c.yaml ${RUBY_SYSRIDIR}/DateTime/valid_time%3f-c.yaml @dirrm ${RUBY_SYSRIDIR}/DateTime +${RUBY_SYSRIDIR}/Delegator/__getobj__-i.yaml +${RUBY_SYSRIDIR}/Delegator/cdesc-Delegator.yaml +${RUBY_SYSRIDIR}/Delegator/marshal_dump-i.yaml +${RUBY_SYSRIDIR}/Delegator/marshal_load-i.yaml +${RUBY_SYSRIDIR}/Delegator/method_missing-i.yaml +${RUBY_SYSRIDIR}/Delegator/new-c.yaml +${RUBY_SYSRIDIR}/Delegator/respond_to%3f-i.yaml +@dirrm ${RUBY_SYSRIDIR}/Delegator ${RUBY_SYSRIDIR}/Dir/%5b%5d-c.yaml ${RUBY_SYSRIDIR}/Dir/cdesc-Dir.yaml ${RUBY_SYSRIDIR}/Dir/chdir-c.yaml @@ -1261,17 +1272,60 @@ ${RUBY_SYSRIDIR}/Dir/rewind-i.yaml ${RUBY_SYSRIDIR}/Dir/rmdir-c.yaml ${RUBY_SYSRIDIR}/Dir/seek-i.yaml ${RUBY_SYSRIDIR}/Dir/tell-i.yaml +${RUBY_SYSRIDIR}/Dir/tmpdir-c.yaml ${RUBY_SYSRIDIR}/Dir/unlink-c.yaml @dirrm ${RUBY_SYSRIDIR}/Dir ${RUBY_SYSRIDIR}/EOFError/cdesc-EOFError.yaml @dirrm ${RUBY_SYSRIDIR}/EOFError +${RUBY_SYSRIDIR}/ERB/Compiler/Buffer/cdesc-Buffer.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Compiler/Buffer +${RUBY_SYSRIDIR}/ERB/Compiler/ExplicitScanner/cdesc-ExplicitScanner.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Compiler/ExplicitScanner +${RUBY_SYSRIDIR}/ERB/Compiler/PercentLine/cdesc-PercentLine.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Compiler/PercentLine +${RUBY_SYSRIDIR}/ERB/Compiler/PercentScanner/cdesc-PercentScanner.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Compiler/PercentScanner +${RUBY_SYSRIDIR}/ERB/Compiler/Scanner/cdesc-Scanner.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Compiler/Scanner +${RUBY_SYSRIDIR}/ERB/Compiler/SimpleScanner/cdesc-SimpleScanner.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Compiler/SimpleScanner +${RUBY_SYSRIDIR}/ERB/Compiler/SimpleScanner2/cdesc-SimpleScanner2.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Compiler/SimpleScanner2 +${RUBY_SYSRIDIR}/ERB/Compiler/TrimScanner/cdesc-TrimScanner.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Compiler/TrimScanner +${RUBY_SYSRIDIR}/ERB/Compiler/cdesc-Compiler.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Compiler +${RUBY_SYSRIDIR}/ERB/DefMethod/cdesc-DefMethod.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/DefMethod +${RUBY_SYSRIDIR}/ERB/Util/cdesc-Util.yaml +${RUBY_SYSRIDIR}/ERB/Util/h-i.yaml +${RUBY_SYSRIDIR}/ERB/Util/html_escape-i.yaml +${RUBY_SYSRIDIR}/ERB/Util/u-i.yaml +${RUBY_SYSRIDIR}/ERB/Util/url_encode-i.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB/Util +${RUBY_SYSRIDIR}/ERB/cdesc-ERB.yaml +${RUBY_SYSRIDIR}/ERB/new-c.yaml +${RUBY_SYSRIDIR}/ERB/result-i.yaml +${RUBY_SYSRIDIR}/ERB/run-i.yaml +${RUBY_SYSRIDIR}/ERB/set_eoutvar-i.yaml +${RUBY_SYSRIDIR}/ERB/version-c.yaml +@dirrm ${RUBY_SYSRIDIR}/ERB +${RUBY_SYSRIDIR}/Enumerable/Enumerator/cdesc-Enumerator.yaml +${RUBY_SYSRIDIR}/Enumerable/Enumerator/each-i.yaml +${RUBY_SYSRIDIR}/Enumerable/Enumerator/new-c.yaml +@dirrm ${RUBY_SYSRIDIR}/Enumerable/Enumerator ${RUBY_SYSRIDIR}/Enumerable/all%3f-i.yaml ${RUBY_SYSRIDIR}/Enumerable/any%3f-i.yaml ${RUBY_SYSRIDIR}/Enumerable/cdesc-Enumerable.yaml ${RUBY_SYSRIDIR}/Enumerable/collect-i.yaml ${RUBY_SYSRIDIR}/Enumerable/detect-i.yaml +${RUBY_SYSRIDIR}/Enumerable/each_cons-i.yaml +${RUBY_SYSRIDIR}/Enumerable/each_slice-i.yaml ${RUBY_SYSRIDIR}/Enumerable/each_with_index-i.yaml ${RUBY_SYSRIDIR}/Enumerable/entries-i.yaml +${RUBY_SYSRIDIR}/Enumerable/enum_cons-i.yaml +${RUBY_SYSRIDIR}/Enumerable/enum_slice-i.yaml +${RUBY_SYSRIDIR}/Enumerable/enum_with_index-i.yaml ${RUBY_SYSRIDIR}/Enumerable/find-i.yaml ${RUBY_SYSRIDIR}/Enumerable/find_all-i.yaml ${RUBY_SYSRIDIR}/Enumerable/grep-i.yaml @@ -1383,6 +1437,7 @@ ${RUBY_SYSRIDIR}/File/fnmatch%3f-c.yaml ${RUBY_SYSRIDIR}/File/fnmatch-c.yaml ${RUBY_SYSRIDIR}/File/ftype-c.yaml ${RUBY_SYSRIDIR}/File/grpowned%3f-c.yaml +${RUBY_SYSRIDIR}/File/identical%3f-c.yaml ${RUBY_SYSRIDIR}/File/join-c.yaml ${RUBY_SYSRIDIR}/File/lchmod-c.yaml ${RUBY_SYSRIDIR}/File/lchown-c.yaml @@ -1428,6 +1483,7 @@ ${RUBY_SYSRIDIR}/FileTest/exist%3f-i.yaml ${RUBY_SYSRIDIR}/FileTest/exists%3f-i.yaml ${RUBY_SYSRIDIR}/FileTest/file%3f-i.yaml ${RUBY_SYSRIDIR}/FileTest/grpowned%3f-i.yaml +${RUBY_SYSRIDIR}/FileTest/identical%3f-i.yaml ${RUBY_SYSRIDIR}/FileTest/owned%3f-i.yaml ${RUBY_SYSRIDIR}/FileTest/pipe%3f-i.yaml ${RUBY_SYSRIDIR}/FileTest/readable%3f-i.yaml @@ -1541,7 +1597,10 @@ ${RUBY_SYSRIDIR}/Fixnum/divmod-i.yaml ${RUBY_SYSRIDIR}/Fixnum/id2name-i.yaml ${RUBY_SYSRIDIR}/Fixnum/induced_from-c.yaml ${RUBY_SYSRIDIR}/Fixnum/modulo-i.yaml +${RUBY_SYSRIDIR}/Fixnum/power%21-i.yaml ${RUBY_SYSRIDIR}/Fixnum/quo-i.yaml +${RUBY_SYSRIDIR}/Fixnum/rdiv-i.yaml +${RUBY_SYSRIDIR}/Fixnum/rpower-i.yaml ${RUBY_SYSRIDIR}/Fixnum/size-i.yaml ${RUBY_SYSRIDIR}/Fixnum/to_f-i.yaml ${RUBY_SYSRIDIR}/Fixnum/to_s-i.yaml @@ -1584,6 +1643,12 @@ ${RUBY_SYSRIDIR}/Float/zero%3f-i.yaml @dirrm ${RUBY_SYSRIDIR}/Float ${RUBY_SYSRIDIR}/FloatDomainError/cdesc-FloatDomainError.yaml @dirrm ${RUBY_SYSRIDIR}/FloatDomainError +${RUBY_SYSRIDIR}/Forwardable/cdesc-Forwardable.yaml +${RUBY_SYSRIDIR}/Forwardable/def_delegator-i.yaml +${RUBY_SYSRIDIR}/Forwardable/def_delegators-i.yaml +${RUBY_SYSRIDIR}/Forwardable/def_instance_delegator-i.yaml +${RUBY_SYSRIDIR}/Forwardable/def_instance_delegators-i.yaml +@dirrm ${RUBY_SYSRIDIR}/Forwardable ${RUBY_SYSRIDIR}/GC/cdesc-GC.yaml ${RUBY_SYSRIDIR}/GC/disable-c.yaml ${RUBY_SYSRIDIR}/GC/enable-c.yaml @@ -1715,6 +1780,8 @@ ${RUBY_SYSRIDIR}/IO/write-i.yaml @dirrm ${RUBY_SYSRIDIR}/IO ${RUBY_SYSRIDIR}/IOError/cdesc-IOError.yaml @dirrm ${RUBY_SYSRIDIR}/IOError +${RUBY_SYSRIDIR}/Iconv/BrokenLibrary/cdesc-BrokenLibrary.yaml +@dirrm ${RUBY_SYSRIDIR}/Iconv/BrokenLibrary ${RUBY_SYSRIDIR}/Iconv/Failure/cdesc-Failure.yaml ${RUBY_SYSRIDIR}/Iconv/Failure/failed-i.yaml ${RUBY_SYSRIDIR}/Iconv/Failure/inspect-i.yaml @@ -1743,22 +1810,96 @@ ${RUBY_SYSRIDIR}/IndexError/cdesc-IndexError.yaml ${RUBY_SYSRIDIR}/Integer/cdesc-Integer.yaml ${RUBY_SYSRIDIR}/Integer/ceil-i.yaml ${RUBY_SYSRIDIR}/Integer/chr-i.yaml +${RUBY_SYSRIDIR}/Integer/denominator-i.yaml ${RUBY_SYSRIDIR}/Integer/downto-i.yaml ${RUBY_SYSRIDIR}/Integer/floor-i.yaml +${RUBY_SYSRIDIR}/Integer/gcd-i.yaml +${RUBY_SYSRIDIR}/Integer/gcd2-i.yaml +${RUBY_SYSRIDIR}/Integer/gcdlcm-i.yaml ${RUBY_SYSRIDIR}/Integer/induced_from-c.yaml ${RUBY_SYSRIDIR}/Integer/integer%3f-i.yaml +${RUBY_SYSRIDIR}/Integer/lcm-i.yaml ${RUBY_SYSRIDIR}/Integer/next-i.yaml +${RUBY_SYSRIDIR}/Integer/numerator-i.yaml ${RUBY_SYSRIDIR}/Integer/round-i.yaml ${RUBY_SYSRIDIR}/Integer/succ-i.yaml ${RUBY_SYSRIDIR}/Integer/times-i.yaml ${RUBY_SYSRIDIR}/Integer/to_i-i.yaml ${RUBY_SYSRIDIR}/Integer/to_int-i.yaml +${RUBY_SYSRIDIR}/Integer/to_r-i.yaml ${RUBY_SYSRIDIR}/Integer/truncate-i.yaml ${RUBY_SYSRIDIR}/Integer/upto-i.yaml @dirrm ${RUBY_SYSRIDIR}/Integer ${RUBY_SYSRIDIR}/Interrupt/cdesc-Interrupt.yaml @dirrm ${RUBY_SYSRIDIR}/Interrupt +${RUBY_SYSRIDIR}/Kernel/%60-i.yaml ${RUBY_SYSRIDIR}/Kernel/cdesc-Kernel.yaml +${RUBY_SYSRIDIR}/Kernel/Array-i.yaml +${RUBY_SYSRIDIR}/Kernel/Float-i.yaml +${RUBY_SYSRIDIR}/Kernel/Integer-i.yaml +${RUBY_SYSRIDIR}/Kernel/String-i.yaml +${RUBY_SYSRIDIR}/Kernel/URI-i.yaml +${RUBY_SYSRIDIR}/Kernel/abort-i.yaml +${RUBY_SYSRIDIR}/Kernel/at_exit-i.yaml +${RUBY_SYSRIDIR}/Kernel/autoload%3f-i.yaml +${RUBY_SYSRIDIR}/Kernel/autoload-i.yaml +${RUBY_SYSRIDIR}/Kernel/binding-i.yaml +${RUBY_SYSRIDIR}/Kernel/block_given%3f-i.yaml +${RUBY_SYSRIDIR}/Kernel/callcc-i.yaml +${RUBY_SYSRIDIR}/Kernel/caller-i.yaml +${RUBY_SYSRIDIR}/Kernel/catch-i.yaml +${RUBY_SYSRIDIR}/Kernel/chomp%21-i.yaml +${RUBY_SYSRIDIR}/Kernel/chomp-i.yaml +${RUBY_SYSRIDIR}/Kernel/chop%21-i.yaml +${RUBY_SYSRIDIR}/Kernel/chop-i.yaml +${RUBY_SYSRIDIR}/Kernel/eval-i.yaml +${RUBY_SYSRIDIR}/Kernel/exec-i.yaml +${RUBY_SYSRIDIR}/Kernel/exit%21-i.yaml +${RUBY_SYSRIDIR}/Kernel/exit-i.yaml +${RUBY_SYSRIDIR}/Kernel/fail-i.yaml +${RUBY_SYSRIDIR}/Kernel/fork-i.yaml +${RUBY_SYSRIDIR}/Kernel/format-i.yaml +${RUBY_SYSRIDIR}/Kernel/getc-i.yaml +${RUBY_SYSRIDIR}/Kernel/gets-i.yaml +${RUBY_SYSRIDIR}/Kernel/global_variables-i.yaml +${RUBY_SYSRIDIR}/Kernel/gsub%21-i.yaml +${RUBY_SYSRIDIR}/Kernel/gsub-i.yaml +${RUBY_SYSRIDIR}/Kernel/iterator%3f-i.yaml +${RUBY_SYSRIDIR}/Kernel/lambda-i.yaml +${RUBY_SYSRIDIR}/Kernel/load-i.yaml +${RUBY_SYSRIDIR}/Kernel/local_variables-i.yaml +${RUBY_SYSRIDIR}/Kernel/loop-i.yaml +${RUBY_SYSRIDIR}/Kernel/method_missing-i.yaml +${RUBY_SYSRIDIR}/Kernel/open-i.yaml +${RUBY_SYSRIDIR}/Kernel/p-i.yaml +${RUBY_SYSRIDIR}/Kernel/print-i.yaml +${RUBY_SYSRIDIR}/Kernel/printf-i.yaml +${RUBY_SYSRIDIR}/Kernel/proc-i.yaml +${RUBY_SYSRIDIR}/Kernel/putc-i.yaml +${RUBY_SYSRIDIR}/Kernel/puts-i.yaml +${RUBY_SYSRIDIR}/Kernel/raise-i.yaml +${RUBY_SYSRIDIR}/Kernel/rand-i.yaml +${RUBY_SYSRIDIR}/Kernel/readline-i.yaml +${RUBY_SYSRIDIR}/Kernel/readlines-i.yaml +${RUBY_SYSRIDIR}/Kernel/require-i.yaml +${RUBY_SYSRIDIR}/Kernel/scan-i.yaml +${RUBY_SYSRIDIR}/Kernel/select-i.yaml +${RUBY_SYSRIDIR}/Kernel/set_trace_func-i.yaml +${RUBY_SYSRIDIR}/Kernel/sleep-i.yaml +${RUBY_SYSRIDIR}/Kernel/split-i.yaml +${RUBY_SYSRIDIR}/Kernel/sprintf-i.yaml +${RUBY_SYSRIDIR}/Kernel/srand-i.yaml +${RUBY_SYSRIDIR}/Kernel/sub%21-i.yaml +${RUBY_SYSRIDIR}/Kernel/sub-i.yaml +${RUBY_SYSRIDIR}/Kernel/syscall-i.yaml +${RUBY_SYSRIDIR}/Kernel/system-i.yaml +${RUBY_SYSRIDIR}/Kernel/test-i.yaml +${RUBY_SYSRIDIR}/Kernel/throw-i.yaml +${RUBY_SYSRIDIR}/Kernel/trace_var-i.yaml +${RUBY_SYSRIDIR}/Kernel/trap-i.yaml +${RUBY_SYSRIDIR}/Kernel/untrace_var-i.yaml +${RUBY_SYSRIDIR}/Kernel/warn-i.yaml +${RUBY_SYSRIDIR}/Kernel/y-i.yaml @dirrm ${RUBY_SYSRIDIR}/Kernel ${RUBY_SYSRIDIR}/LoadError/cdesc-LoadError.yaml @dirrm ${RUBY_SYSRIDIR}/LoadError @@ -2090,6 +2231,7 @@ ${RUBY_SYSRIDIR}/Object/class-i.yaml ${RUBY_SYSRIDIR}/Object/clone-i.yaml ${RUBY_SYSRIDIR}/Object/display-i.yaml ${RUBY_SYSRIDIR}/Object/dup-i.yaml +${RUBY_SYSRIDIR}/Object/enum_for-i.yaml ${RUBY_SYSRIDIR}/Object/eql%3f-i.yaml ${RUBY_SYSRIDIR}/Object/equal%3f-i.yaml ${RUBY_SYSRIDIR}/Object/extend-i.yaml @@ -2123,6 +2265,7 @@ ${RUBY_SYSRIDIR}/Object/singleton_methods-i.yaml ${RUBY_SYSRIDIR}/Object/taint-i.yaml ${RUBY_SYSRIDIR}/Object/tainted%3f-i.yaml ${RUBY_SYSRIDIR}/Object/to_a-i.yaml +${RUBY_SYSRIDIR}/Object/to_enum-i.yaml ${RUBY_SYSRIDIR}/Object/to_s-i.yaml ${RUBY_SYSRIDIR}/Object/type-i.yaml ${RUBY_SYSRIDIR}/Object/untaint-i.yaml @@ -2147,6 +2290,24 @@ ${RUBY_SYSRIDIR}/Observable/delete_observer-i.yaml ${RUBY_SYSRIDIR}/Observable/delete_observers-i.yaml ${RUBY_SYSRIDIR}/Observable/notify_observers-i.yaml @dirrm ${RUBY_SYSRIDIR}/Observable +${RUBY_SYSRIDIR}/PStore/%5b%5d%3d-i.yaml +${RUBY_SYSRIDIR}/PStore/%5b%5d-i.yaml +${RUBY_SYSRIDIR}/PStore/Error/cdesc-Error.yaml +@dirrm ${RUBY_SYSRIDIR}/PStore/Error +${RUBY_SYSRIDIR}/PStore/abort-i.yaml +${RUBY_SYSRIDIR}/PStore/cdesc-PStore.yaml +${RUBY_SYSRIDIR}/PStore/commit-i.yaml +${RUBY_SYSRIDIR}/PStore/commit_new-i.yaml +${RUBY_SYSRIDIR}/PStore/delete-i.yaml +${RUBY_SYSRIDIR}/PStore/fetch-i.yaml +${RUBY_SYSRIDIR}/PStore/in_transaction-i.yaml +${RUBY_SYSRIDIR}/PStore/in_transaction_wr-i.yaml +${RUBY_SYSRIDIR}/PStore/new-c.yaml +${RUBY_SYSRIDIR}/PStore/path-i.yaml +${RUBY_SYSRIDIR}/PStore/root%3f-i.yaml +${RUBY_SYSRIDIR}/PStore/roots-i.yaml +${RUBY_SYSRIDIR}/PStore/transaction-i.yaml +@dirrm ${RUBY_SYSRIDIR}/PStore ${RUBY_SYSRIDIR}/Pathname/%2b-i.yaml ${RUBY_SYSRIDIR}/Pathname/%3c%3d%3e-i.yaml ${RUBY_SYSRIDIR}/Pathname/%3d%3d%3d-i.yaml @@ -2391,6 +2552,28 @@ ${RUBY_SYSRIDIR}/Range/to_s-i.yaml @dirrm ${RUBY_SYSRIDIR}/Range ${RUBY_SYSRIDIR}/RangeError/cdesc-RangeError.yaml @dirrm ${RUBY_SYSRIDIR}/RangeError +${RUBY_SYSRIDIR}/Rational/%25-i.yaml +${RUBY_SYSRIDIR}/Rational/%2a%2a-i.yaml +${RUBY_SYSRIDIR}/Rational/%2a-i.yaml +${RUBY_SYSRIDIR}/Rational/%2b-i.yaml +${RUBY_SYSRIDIR}/Rational/%2d-i.yaml +${RUBY_SYSRIDIR}/Rational/%2f-i.yaml +${RUBY_SYSRIDIR}/Rational/%3c%3d%3e-i.yaml +${RUBY_SYSRIDIR}/Rational/%3d%3d-i.yaml +${RUBY_SYSRIDIR}/Rational/abs-i.yaml +${RUBY_SYSRIDIR}/Rational/cdesc-Rational.yaml +${RUBY_SYSRIDIR}/Rational/coerce-i.yaml +${RUBY_SYSRIDIR}/Rational/divmod-i.yaml +${RUBY_SYSRIDIR}/Rational/hash-i.yaml +${RUBY_SYSRIDIR}/Rational/inspect-i.yaml +${RUBY_SYSRIDIR}/Rational/new%21-c.yaml +${RUBY_SYSRIDIR}/Rational/new-c.yaml +${RUBY_SYSRIDIR}/Rational/reduce-c.yaml +${RUBY_SYSRIDIR}/Rational/to_f-i.yaml +${RUBY_SYSRIDIR}/Rational/to_i-i.yaml +${RUBY_SYSRIDIR}/Rational/to_r-i.yaml +${RUBY_SYSRIDIR}/Rational/to_s-i.yaml +@dirrm ${RUBY_SYSRIDIR}/Rational ${RUBY_SYSRIDIR}/Regexp/%3d%3d%3d-i.yaml ${RUBY_SYSRIDIR}/Regexp/%3d%3d-i.yaml ${RUBY_SYSRIDIR}/Regexp/%3d%7e-i.yaml @@ -2467,12 +2650,25 @@ ${RUBY_SYSRIDIR}/Set/union-i.yaml ${RUBY_SYSRIDIR}/Shellwords/cdesc-Shellwords.yaml ${RUBY_SYSRIDIR}/Shellwords/shellwords-i.yaml @dirrm ${RUBY_SYSRIDIR}/Shellwords +${RUBY_SYSRIDIR}/SimpleDelegator/__getobj__-i.yaml +${RUBY_SYSRIDIR}/SimpleDelegator/__setobj__-i.yaml +${RUBY_SYSRIDIR}/SimpleDelegator/cdesc-SimpleDelegator.yaml +${RUBY_SYSRIDIR}/SimpleDelegator/clone-i.yaml +${RUBY_SYSRIDIR}/SimpleDelegator/dup-i.yaml +${RUBY_SYSRIDIR}/SimpleDelegator/new-c.yaml +@dirrm ${RUBY_SYSRIDIR}/SimpleDelegator ${RUBY_SYSRIDIR}/Signal/cdesc-Signal.yaml ${RUBY_SYSRIDIR}/Signal/list-i.yaml ${RUBY_SYSRIDIR}/Signal/trap-i.yaml @dirrm ${RUBY_SYSRIDIR}/Signal ${RUBY_SYSRIDIR}/SignalException/cdesc-SignalException.yaml @dirrm ${RUBY_SYSRIDIR}/SignalException +${RUBY_SYSRIDIR}/SingleForwardable/cdesc-SingleForwardable.yaml +${RUBY_SYSRIDIR}/SingleForwardable/def_delegator-i.yaml +${RUBY_SYSRIDIR}/SingleForwardable/def_delegators-i.yaml +${RUBY_SYSRIDIR}/SingleForwardable/def_singleton_delegator-i.yaml +${RUBY_SYSRIDIR}/SingleForwardable/def_singleton_delegators-i.yaml +@dirrm ${RUBY_SYSRIDIR}/SingleForwardable ${RUBY_SYSRIDIR}/Singleton/_dump-i.yaml ${RUBY_SYSRIDIR}/Singleton/cdesc-Singleton.yaml ${RUBY_SYSRIDIR}/Singleton/clone-i.yaml @@ -2887,6 +3083,11 @@ ${RUBY_SYSRIDIR}/Time/zone_utc%3f-c.yaml @dirrm ${RUBY_SYSRIDIR}/Time ${RUBY_SYSRIDIR}/TimeExtentionTest/cdesc-TimeExtentionTest.yaml @dirrm ${RUBY_SYSRIDIR}/TimeExtentionTest +${RUBY_SYSRIDIR}/Timeout/Error/cdesc-Error.yaml +@dirrm ${RUBY_SYSRIDIR}/Timeout/Error +${RUBY_SYSRIDIR}/Timeout/cdesc-Timeout.yaml +${RUBY_SYSRIDIR}/Timeout/timeout-i.yaml +@dirrm ${RUBY_SYSRIDIR}/Timeout ${RUBY_SYSRIDIR}/TrueClass/%26-i.yaml ${RUBY_SYSRIDIR}/TrueClass/%5e-i.yaml ${RUBY_SYSRIDIR}/TrueClass/%7c-i.yaml diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo index 618048efc23..072aef78806 100644 --- a/lang/ruby18-base/distinfo +++ b/lang/ruby18-base/distinfo @@ -1,49 +1,16 @@ -$NetBSD: distinfo,v 1.8 2005/11/08 15:52:38 minskim Exp $ +$NetBSD: distinfo,v 1.9 2006/01/03 14:37:24 taca Exp $ -SHA1 (ruby/ruby-1.8.3.tar.gz) = 407e70377214fcb812cdbb86a3e1b735e69b7cff -RMD160 (ruby/ruby-1.8.3.tar.gz) = b4244a288d04fca29556144636b5e093b78a8cd5 -Size (ruby/ruby-1.8.3.tar.gz) = 4227276 bytes -SHA1 (patch-aa) = fcd7a15ed5d89e534b6de3e1ecee38bb5bc89cfb -SHA1 (patch-ab) = 0abdff0ce4e7a926ed5422b668f7a3574152bc69 -SHA1 (patch-ac) = a9c11048b1c7d712d08a6540014eeda3569ece3f -SHA1 (patch-ad) = acbe8fc8491c2341a951b395359009aca1afeb2f +SHA1 (ruby-1.8.4.tar.gz) = 93999577c7fc4decc6b2fe8fefa96e743f278fbf +RMD160 (ruby-1.8.4.tar.gz) = 1c0572a4ee369af57a3db68027b2566052eac944 +Size (ruby-1.8.4.tar.gz) = 4312965 bytes +SHA1 (patch-aa) = 01e457e3133dfd4089941dcfa691382d603cca6f +SHA1 (patch-ab) = 4cfb46508d50e34999c3f5ac173b628ac0345703 +SHA1 (patch-ad) = d30c8a267ef1eb54e875f6899461b30f8c323d6d SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228 -SHA1 (patch-at) = 97a1240fef51c7266652788f855c9c69b2745b3a -SHA1 (patch-ay) = 546b926d9bfb1e251810f3d9c91ccd420a0868e0 -SHA1 (patch-az) = a5bd277387b6a2622dbc26623e6acaf9559d8627 -SHA1 (patch-ba) = adbedb02eb15de56c0561a7deba7ace5f2321a25 -SHA1 (patch-bb) = 8dae0d8c400d4a44d74f1c7f1146c741ffcf5879 -SHA1 (patch-bc) = 947d41216b418c01c53262e3fe06632c25577bad -SHA1 (patch-bd) = 35e9ee8bd7f4d0e7cc49315c5ecc999b56afc6d5 -SHA1 (patch-be) = 892255087c0c17039d610928ed62789effceffd4 -SHA1 (patch-bf) = 548211e291b497b1489dee02893b403f2070af2d -SHA1 (patch-bg) = cb80043712ab6153c27bd57a930f57109f718a3d -SHA1 (patch-bh) = 01aba5d2b8fa0c56eb12d52b6c9c0193cb304f37 -SHA1 (patch-bi) = 04a844f62ed2795e7f81a871f25e7cddb889e9e4 -SHA1 (patch-bj) = 0aa32dfc67d1b3a04d68549ab54e0135421866d0 -SHA1 (patch-bk) = deb6a02a9b5805c84c4881f154f0e6b74ab1e506 -SHA1 (patch-bl) = cad0e79cf5b231f63d2236a2186208c08fc3af56 -SHA1 (patch-bm) = 1d87cf4f33d083d9733fc8a68aa79f56cf355390 -SHA1 (patch-bn) = 2145789663bda7ec6ce11faaa64c91a459becc31 -SHA1 (patch-bo) = dafc7b1635ec371376e026ea8eed829184abd5bc -SHA1 (patch-bp) = caaf77b172dd7282ad693e04e89d23986556cbc1 -SHA1 (patch-bq) = ccb52322a458e66ba480dec1515bf4ad6a1a9257 -SHA1 (patch-br) = dfa310e2f3e58ce703efa0b53e1654b3011a981e -SHA1 (patch-bs) = d8522250fa892e06631dadcf2182e4a278a985e2 -SHA1 (patch-bt) = a66efa441c6d4e85ee53afaa08d90c84b6213402 -SHA1 (patch-bu) = 2e02dca144802380e69a02bffd7d10508bd8eae4 -SHA1 (patch-bv) = 8964ac0a56d9702ced9fd90b42c80c201a05799b -SHA1 (patch-bw) = aa4db9de23c9954a0296a9aeaa0b06238fd27cb3 -SHA1 (patch-bx) = 20866aa61c8f367b6d0d102a9141412bf31f249a -SHA1 (patch-by) = 357b5ede514ba7cc74d0bd5678fcf87b59a17931 -SHA1 (patch-bz) = 747e9ad15131f2e67e74ec22f0839de8ad19e15f -SHA1 (patch-ca) = 92f64a91a2fdb77e30a2dd90975c6be091c16b96 -SHA1 (patch-cb) = 21e0b141cf3e74cdac363e0c6340565dfd982cea -SHA1 (patch-cc) = 820b215abd22ec6fc042425cd4d306689328c88c -SHA1 (patch-cd) = 962afa433bcd95d54055012f2d31e5160fc46ebc -SHA1 (patch-ce) = 8296601b98d1b3a8ec7e57d153488b69956b05b1 -SHA1 (patch-cf) = 2f954fb7db08ac723a3ded6728f14f1e42809425 -SHA1 (patch-cg) = c8781f952b1f987c53f31d2958e69aac9de84cf7 -SHA1 (patch-ch) = 2c2ce227a6f1660edd091a4beb2bfa115265bf54 -SHA1 (patch-ci) = 8cedb24882d37cbe8cf6542760de00577535fc8f -SHA1 (patch-cj) = 7e0c72457bbd5878eefa17a23567088045e612e4 +SHA1 (patch-af) = d00e67015793b04498418bfa12a28aaeb0c93d3b +SHA1 (patch-ag) = fd6d991728011f937ac6d2b99a13cc733f96b8d6 +SHA1 (patch-ah) = 78af1cec735cd1235d4c0d231d423e089bfff268 +SHA1 (patch-ai) = b17295268f67b73711b1b9eaac8728214974564f +SHA1 (patch-bj) = d7daabc52ed338c4bb2c206e6729059109b8f2c2 +SHA1 (patch-bz) = 8c035d5cd91e72ea95d94e048bbdcd15c663f613 +SHA1 (patch-cc) = c088b65dde0f6317740907f75eb3b3f278c98dda diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa index c4681802679..47d4fafeeb0 100644 --- a/lang/ruby18-base/patches/patch-aa +++ b/lang/ruby18-base/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2005/11/02 08:56:40 taca Exp $ +$NetBSD: patch-aa,v 1.4 2006/01/03 14:37:24 taca Exp $ ---- configure.in.orig 2005-09-07 08:22:56.000000000 +0900 +--- configure.in.orig 2005-11-24 21:07:18.000000000 +0900 +++ configure.in -@@ -348,6 +348,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" +@@ -359,6 +359,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" ac_cv_func_getpgrp_void=yes ac_cv_func_setitimer=no ;; @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/02 08:56:40 taca Exp $ freebsd*) LIBS="-lm $LIBS" AC_CACHE_CHECK([whether -lxpg4 has to be linked], rb_cv_lib_xpg4_needed, -@@ -890,6 +893,13 @@ if test "$with_dln_a_out" != yes; then +@@ -901,6 +904,13 @@ if test "$with_dln_a_out" != yes; then LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes ;; @@ -26,20 +26,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/02 08:56:40 taca Exp $ interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L'%1\$-s'" -@@ -970,7 +980,11 @@ if test "$with_dln_a_out" != yes; then - [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"]) - if test "$enable_rpath" = yes; then - LIBPATHFLAG=" -L'%1\$-s'" -- RPATHFLAG=" -Wl,-R'%1\$-s'" -+ if test "$GCC" = yes; then -+ RPATHFLAG=" -Wl,-R'%1\$-s'" -+ else -+ RPATHFLAG=" -R'%1\$-s'" -+ fi - fi - fi - AC_SUBST(LINK_SO) -@@ -1251,6 +1265,14 @@ if test "$enable_shared" = 'yes'; then +@@ -1266,6 +1276,14 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib' ;; diff --git a/lang/ruby18-base/patches/patch-ab b/lang/ruby18-base/patches/patch-ab index db950112599..a5215f03b30 100644 --- a/lang/ruby18-base/patches/patch-ab +++ b/lang/ruby18-base/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2005/11/02 08:56:40 taca Exp $ +$NetBSD: patch-ab,v 1.4 2006/01/03 14:37:24 taca Exp $ ---- configure.orig 2005-09-21 09:10:31.000000000 +0900 +--- configure.orig 2005-12-24 21:36:33.000000000 +0900 +++ configure -@@ -9295,6 +9295,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" +@@ -9356,6 +9356,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" ac_cv_func_getpgrp_void=yes ac_cv_func_setitimer=no ;; @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.3 2005/11/02 08:56:40 taca Exp $ freebsd*) LIBS="-lm $LIBS" echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5 echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6 -@@ -14305,6 +14308,13 @@ echo $ECHO_N "checking whether OS depend +@@ -14368,6 +14371,13 @@ echo $ECHO_N "checking whether OS depend LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes ;; @@ -26,20 +26,7 @@ $NetBSD: patch-ab,v 1.3 2005/11/02 08:56:40 taca Exp $ interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L'%1\$-s'" -@@ -14390,7 +14400,11 @@ else - fi; - if test "$enable_rpath" = yes; then - LIBPATHFLAG=" -L'%1\$-s'" -- RPATHFLAG=" -Wl,-R'%1\$-s'" -+ if test "$GCC" = yes; then -+ RPATHFLAG=" -Wl,-R'%1\$-s'" -+ else -+ RPATHFLAG=" -R'%1\$-s'" -+ fi - fi - fi - -@@ -15088,6 +15102,14 @@ if test "$enable_shared" = 'yes'; then +@@ -15155,6 +15165,14 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib' ;; diff --git a/lang/ruby18-base/patches/patch-ac b/lang/ruby18-base/patches/patch-ac deleted file mode 100644 index e926e6f445c..00000000000 --- a/lang/ruby18-base/patches/patch-ac +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2005/11/08 15:52:38 minskim Exp $ - ---- Makefile.in.orig 2005-11-05 09:25:06.000000000 -0800 -+++ Makefile.in -@@ -92,11 +92,11 @@ all: - - miniruby$(EXEEXT): - @$(RM) $@ -- $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(MAINLIBS) -+ $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG) $@ $(LDFLAGS) $(MAINLIBS) - - $(PROGRAM): - @$(RM) $@ -- $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@ -+ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG) $@ - - # We must `rm' the library each time this rule is invoked because "updating" a - # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not -@@ -107,7 +107,7 @@ $(LIBRUBY_A): - @-$(RANLIB) $@ 2> /dev/null || true - - $(LIBRUBY_SO): -- $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ -+ $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG) $@ - @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ - File.symlink "$(LIBRUBY_SO)", link}' \ - $(LIBRUBY_ALIASES) || true diff --git a/lang/ruby18-base/patches/patch-ad b/lang/ruby18-base/patches/patch-ad index cf9d5c82060..d6ceabb07de 100644 --- a/lang/ruby18-base/patches/patch-ad +++ b/lang/ruby18-base/patches/patch-ad @@ -1,189 +1,70 @@ -$NetBSD: patch-ad,v 1.3 2005/11/02 08:56:40 taca Exp $ +$NetBSD: patch-ad,v 1.4 2006/01/03 14:37:24 taca Exp $ ---- eval.c.orig 2005-09-20 18:26:35.000000000 +0900 +--- eval.c.orig 2005-12-20 22:41:47.000000000 +0900 +++ eval.c -@@ -1837,7 +1837,7 @@ ev_const_get(cref, id, self) - if (NIL_P(klass)) return rb_const_get(CLASS_OF(self), id); - while (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, id, &result)) { - if (result == Qundef) { -- rb_autoload_load(klass, id); -+ if (!RTEST(rb_autoload_load(klass, id))) break; - continue; - } - return result; -@@ -2545,6 +2545,7 @@ set_trace_func(obj, trace) - { - rb_event_hook_t *hook; - -+ rb_secure(4); - if (NIL_P(trace)) { - trace_func = 0; - rb_remove_event_hook(call_trace_func); -@@ -2814,7 +2815,15 @@ unknown_node(node) - NODE *volatile node; - { - ruby_current_node = 0; -- rb_bug("unknown node type %d", nd_type(node)); -+ if (node->flags == 0) { -+ rb_bug("terminated node (0x%lx)", node); -+ } -+ else if (BUILTIN_TYPE(node) != T_NODE) { -+ rb_bug("not a node 0x%02lx (0x%lx)", BUILTIN_TYPE(node), node); -+ } -+ else { -+ rb_bug("unknown node type %d (0x%lx)", nd_type(node), node); -+ } - } - - static VALUE -@@ -4091,21 +4100,32 @@ module_setup(module, n) - static NODE *basic_respond_to = 0; - - int --rb_respond_to(obj, id) -+rb_obj_respond_to(obj, id, priv) - VALUE obj; - ID id; -+ int priv; - { - VALUE klass = CLASS_OF(obj); -- if (rb_method_node(klass, respond_to) == basic_respond_to && -- rb_method_boundp(klass, id, 0)) { -- return Qtrue; -+ -+ if (rb_method_node(klass, respond_to) == basic_respond_to) { -+ return rb_method_boundp(klass, id, !priv); - } -- else{ -- return rb_funcall(obj, respond_to, 1, ID2SYM(id)); -+ else { -+ VALUE args[2]; -+ int n = 0; -+ args[n++] = ID2SYM(id); -+ if (priv) args[n++] = Qtrue; -+ return rb_funcall2(obj, respond_to, n, args); - } -- return Qfalse; - } - -+int -+rb_respond_to(obj, id) -+ VALUE obj; -+ ID id; -+{ -+ return rb_obj_respond_to(obj, id, Qfalse); -+} - - /* - * call-seq: -@@ -4117,7 +4137,7 @@ rb_respond_to(obj, id) - */ +@@ -1810,12 +1810,13 @@ ev_const_defined(cref, id, self) + while (cbase && cbase->nd_next) { + struct RClass *klass = RCLASS(cbase->nd_clss); - static VALUE --rb_obj_respond_to(argc, argv, obj) -+obj_respond_to(argc, argv, obj) - int argc; - VALUE *argv; - VALUE obj; -@@ -5921,7 +5941,7 @@ rb_apply(recv, mid, args) - * obj.__send__(symbol [, args...]) => obj - * - * Invokes the method identified by _symbol_, passing it any -- * arguments specified. You can use <code>__send__</code> if the name -+ * arguments specified. You can use <code>\_\_send__</code> if the name - * +send+ clashes with an existing method in _obj_. - * - * class Klass -@@ -6060,6 +6080,9 @@ rb_call_super(argc, argv) - - self = ruby_frame->self; - klass = ruby_frame->last_class; -+ if (RCLASS(klass)->super == 0) { -+ return method_missing(self, ruby_frame->last_func, argc, argv, CSTAT_SUPER); -+ } - - PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT); - result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3); -@@ -6419,14 +6442,16 @@ exec_under(func, under, cbase, args) - VALUE val = Qnil; /* OK */ - int state; - int mode; -+ struct FRAME *f = ruby_frame->prev; - - PUSH_CLASS(under); - PUSH_FRAME(); -- ruby_frame->self = _frame.prev->self; -- ruby_frame->last_func = _frame.prev->last_func; -- ruby_frame->last_class = _frame.prev->last_class; -- ruby_frame->argc = _frame.prev->argc; -- ruby_frame->argv = _frame.prev->argv; -+ ruby_frame->self = f->self; -+ ruby_frame->last_func = f->last_func; -+ ruby_frame->orig_func = f->orig_func; -+ ruby_frame->last_class = f->last_class; -+ ruby_frame->argc = f->argc; -+ ruby_frame->argv = f->argv; - if (cbase) { - PUSH_CREF(cbase); +- if (NIL_P(klass)) return rb_const_defined(CLASS_OF(self), id); +- if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) { +- if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) { +- return Qfalse; ++ if (!NIL_P(klass)) { ++ if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) { ++ if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) { ++ return Qfalse; ++ } ++ return Qtrue; + } +- return Qtrue; + } + cbase = cbase->nd_next; } -@@ -6844,19 +6869,19 @@ rb_provide(feature) - rb_provide_feature(rb_str_new2(feature)); - } +@@ -1834,13 +1835,15 @@ ev_const_get(cref, id, self) + while (cbase && cbase->nd_next) { + VALUE klass = cbase->nd_clss; --static void -+static int - load_wait(ftptr) - char *ftptr; - { - st_data_t th; - -- if (!loading_tbl) return; -- if (!st_lookup(loading_tbl, (st_data_t)ftptr, &th)) return; -- if ((rb_thread_t)th == curr_thread) return; -+ if (!loading_tbl) return Qfalse; -+ if (!st_lookup(loading_tbl, (st_data_t)ftptr, &th)) return Qfalse; - do { -+ if ((rb_thread_t)th == curr_thread) return Qtrue; - CHECK_INTS; -- rb_thread_schedule(); - } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th)); -+ return Qtrue; - } - - /* -@@ -6987,8 +7012,7 @@ rb_require_safe(fname, safe) - ruby_safe_level = safe; - found = search_required(fname, &feature, &path); - if (found) { -- if (!path) { -- load_wait(RSTRING(feature)->ptr); -+ if (!path || load_wait(RSTRING(path)->ptr)) { - result = Qfalse; +- if (NIL_P(klass)) return rb_const_get(CLASS_OF(self), id); +- while (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, id, &result)) { +- if (result == Qundef) { +- if (!RTEST(rb_autoload_load(klass, id))) break; +- continue; ++ if (!NIL_P(klass)) { ++ while (RCLASS(klass)->iv_tbl && ++ st_lookup(RCLASS(klass)->iv_tbl, id, &result)) { ++ if (result == Qundef) { ++ if (!RTEST(rb_autoload_load(klass, id))) break; ++ continue; ++ } ++ return result; } - else { -@@ -7751,7 +7775,7 @@ Init_eval() - rb_define_global_function("method_missing", rb_method_missing, -1); - rb_define_global_function("loop", rb_f_loop, 0); - -- rb_define_method(rb_mKernel, "respond_to?", rb_obj_respond_to, -1); -+ rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1); - respond_to = rb_intern("respond_to?"); - basic_respond_to = rb_method_node(rb_cObject, respond_to); - rb_global_variable((VALUE*)&basic_respond_to); -@@ -9383,6 +9407,7 @@ rb_mod_define_method(argc, argv, mod) - noex = NOEX_PUBLIC; +- return result; + } + cbase = cbase->nd_next; } - rb_add_method(mod, id, node, noex); -+ rb_define_method(rb_cBinding, "dup", proc_dup, 0); - return body; - } +@@ -3886,7 +3889,7 @@ rb_eval(self, n) + if (NIL_P(ruby_class)) { + rb_raise(rb_eTypeError, "no class to undef method"); + } +- rb_undef(ruby_class, node->nd_mid); ++ rb_undef(ruby_class, rb_to_id(rb_eval(self, node->u2.node))); + result = Qnil; + break; + +@@ -3894,12 +3897,13 @@ rb_eval(self, n) + if (NIL_P(ruby_class)) { + rb_raise(rb_eTypeError, "no class to make alias"); + } +- rb_alias(ruby_class, node->nd_new, node->nd_old); ++ rb_alias(ruby_class, rb_to_id(rb_eval(self, node->u1.node)), ++ rb_to_id(rb_eval(self, node->u2.node))); + result = Qnil; + break; -@@ -12549,7 +12574,7 @@ thgroup_list(group) - * ThreadError: can't move from the enclosed thread group - */ + case NODE_VALIAS: +- rb_alias_variable(node->nd_new, node->nd_old); ++ rb_alias_variable(node->u1.id, node->u2.id); + result = Qnil; + break; --VALUE -+static VALUE - thgroup_enclose(group) - VALUE group; - { diff --git a/lang/ruby18-base/patches/patch-at b/lang/ruby18-base/patches/patch-at deleted file mode 100644 index 9e69ab09575..00000000000 --- a/lang/ruby18-base/patches/patch-at +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-at,v 1.2 2005/11/02 08:56:40 taca Exp $ - ---- variable.c.orig 2005-07-27 12:07:01.000000000 +0900 -+++ variable.c -@@ -1329,7 +1329,7 @@ autoload_delete(mod, id) - return (NODE *)load; - } - --void -+VALUE - rb_autoload_load(klass, id) - VALUE klass; - ID id; -@@ -1338,9 +1338,9 @@ rb_autoload_load(klass, id) - NODE *load = autoload_delete(klass, id); - - if (!load || !(file = load->nd_lit) || rb_provided(RSTRING(file)->ptr)) { -- const_missing(klass, id); -+ return Qfalse; - } -- rb_require_safe(file, load->nd_nth); -+ return rb_require_safe(file, load->nd_nth); - } - - static VALUE -@@ -1406,7 +1406,7 @@ rb_const_get_0(klass, id, exclude, recur - while (tmp) { - while (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl,id,&value)) { - if (value == Qundef) { -- rb_autoload_load(tmp, id); -+ if (!RTEST(rb_autoload_load(tmp, id))) break; - continue; - } - if (exclude && tmp == rb_cObject && klass != rb_cObject) { diff --git a/lang/ruby18-base/patches/patch-ay b/lang/ruby18-base/patches/patch-ay deleted file mode 100644 index ce66e6c1a89..00000000000 --- a/lang/ruby18-base/patches/patch-ay +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ay,v 1.2 2005/11/02 08:56:40 taca Exp $ - ---- ext/dl/dl.c.orig 2005-09-19 18:38:39.000000000 +0900 -+++ ext/dl/dl.c -@@ -557,11 +557,7 @@ rb_io_to_ptr(VALUE self) - GetOpenFile(self, fptr); - fp = fptr->f; - --#if defined(__DragonFly__) - return fp ? rb_dlptr_new(fp, 0, 0) : Qnil; --#else -- return fp ? rb_dlptr_new(fp, sizeof(FILE), 0) : Qnil; --#endif - } - - VALUE diff --git a/lang/ruby18-base/patches/patch-az b/lang/ruby18-base/patches/patch-az deleted file mode 100644 index 87fbe939dbb..00000000000 --- a/lang/ruby18-base/patches/patch-az +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-az,v 1.2 2005/11/02 08:56:40 taca Exp $ - ---- io.c.orig 2005-09-20 17:11:35.000000000 +0900 -+++ io.c -@@ -1020,8 +1020,10 @@ read_buffered_data(ptr, len, f) - if (n > len) n = len; - return fread(ptr, 1, n, f); - #else -- for (n = 0; n < len && READ_DATA_PENDING(f); ++n) { -- *ptr++ = getc(f); -+ int c; -+ -+ for (n = 0; n < len && READ_DATA_PENDING(f) && (c = getc(f)) != EOF; ++n) { -+ *ptr++ = c; - } - return n; - #endif -@@ -3516,6 +3518,7 @@ rb_io_reopen(argc, argv, file) - return file; - } - -+/* :nodoc: */ - static VALUE - rb_io_init_copy(dest, io) - VALUE dest, io; -@@ -3632,7 +3635,7 @@ rb_f_printf(argc, argv) - * ios.print(obj, ...) => nil - * - * Writes the given object(s) to <em>ios</em>. The stream must be -- * opened for writing. If the output record separator (<code>$\</code>) -+ * opened for writing. If the output record separator (<code>$\\</code>) - * is not <code>nil</code>, it will be appended to the output. If no - * arguments are given, prints <code>$_</code>. Objects that aren't - * strings will be converted by calling their <code>to_s</code> method. -@@ -3688,7 +3691,7 @@ rb_io_print(argc, argv, out) - * Prints each object in turn to <code>$stdout</code>. If the output - * field separator (<code>$,</code>) is not +nil+, its - * contents will appear between each field. If the output record -- * separator (<code>$\</code>) is not +nil+, it will be -+ * separator (<code>$\\</code>) is not +nil+, it will be - * appended to the output. If no arguments are given, prints - * <code>$_</code>. Objects that aren't strings will be converted by - * calling their <code>to_s</code> method. diff --git a/lang/ruby18-base/patches/patch-ba b/lang/ruby18-base/patches/patch-ba deleted file mode 100644 index c6f3f522048..00000000000 --- a/lang/ruby18-base/patches/patch-ba +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- bignum.c.orig 2005-09-07 08:22:56.000000000 +0900 -+++ bignum.c -@@ -46,7 +46,7 @@ bignew_1(klass, len, sign) - { - NEWOBJ(big, struct RBignum); - OBJSETUP(big, klass, T_BIGNUM); -- big->sign = (char)sign; -+ big->sign = sign?1:0; - big->len = len; - big->digits = ALLOC_N(BDIGIT, len); - -@@ -1088,7 +1088,7 @@ bigsub(x, y) - } - } - -- z = bignew(RBIGNUM(x)->len, (z == 0)?1:0); -+ z = bignew(RBIGNUM(x)->len, z==0); - zds = BDIGITS(z); - - for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) { diff --git a/lang/ruby18-base/patches/patch-bb b/lang/ruby18-base/patches/patch-bb deleted file mode 100644 index 3f7805ebb6a..00000000000 --- a/lang/ruby18-base/patches/patch-bb +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- ext/extmk.rb.orig 2005-08-05 00:20:10.000000000 +0900 -+++ ext/extmk.rb -@@ -350,12 +350,30 @@ end unless $extstatic - - ext_prefix = "#{$top_srcdir}/ext" - exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t} --exts |= $extension if $extension --exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d| -- d = File.dirname(d) -- d.slice!(0, ext_prefix.length + 1) -- d --}.sort unless $extension -+if $extension -+ exts |= $extension.select {|d| File.directory?("#{ext_prefix}/#{d}")} -+else -+ withes, withouts = %w[--with --without].collect {|w| -+ if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any? -+ proc {false} -+ elsif (w = w.grep(String)).empty? -+ proc {true} -+ else -+ w.collect {|opt| opt.split(/,/)}.flatten.method(:any?) -+ end -+ } -+ cond = proc {|ext| -+ cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)} -+ withes.call(&cond1) or !withouts.call(&cond1) -+ } -+ exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d| -+ d = File.dirname(d) -+ d.slice!(0, ext_prefix.length + 1) -+ d -+ }.find_all {|ext| -+ with_config(ext, &cond) -+ }.sort -+end - - if $extout - Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir)) diff --git a/lang/ruby18-base/patches/patch-bc b/lang/ruby18-base/patches/patch-bc deleted file mode 100644 index c1848c7bc05..00000000000 --- a/lang/ruby18-base/patches/patch-bc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- ext/openssl/extconf.rb.orig 2005-04-16 04:16:18.000000000 +0900 -+++ ext/openssl/extconf.rb -@@ -62,6 +62,7 @@ unless have_header("openssl/conf_api.h") - end - - message "=== Checking for OpenSSL features... ===\n" -+have_func("ERR_peek_last_error") - have_func("BN_mod_add") - have_func("BN_mod_sqr") - have_func("BN_mod_sub") diff --git a/lang/ruby18-base/patches/patch-bd b/lang/ruby18-base/patches/patch-bd deleted file mode 100644 index a495b74052a..00000000000 --- a/lang/ruby18-base/patches/patch-bd +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- ext/openssl/ossl.c.orig 2005-09-10 09:54:29.000000000 +0900 -+++ ext/openssl/ossl.c -@@ -278,9 +278,14 @@ ossl_raise(VALUE exc, const char *fmt, . - va_list args; - char buf[BUFSIZ]; - const char *msg; -- long e = ERR_peek_last_error(); -+ long e; - int len = 0; - -+#ifdef HAVE_ERR_PEEK_LAST_ERROR -+ e = ERR_peek_last_error(); -+#else -+ e = ERR_peek_error(); -+#endif - if (fmt) { - va_start(args, fmt); - len = vsnprintf(buf, BUFSIZ, fmt, args); -@@ -382,6 +387,7 @@ Init_openssl() - */ - /* CRYPTO_malloc_init(); */ - /* ENGINE_load_builtin_engines(); */ -+ OpenSSL_add_ssl_algorithms(); - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); - SSL_load_error_strings(); diff --git a/lang/ruby18-base/patches/patch-be b/lang/ruby18-base/patches/patch-be deleted file mode 100644 index 2a030210d59..00000000000 --- a/lang/ruby18-base/patches/patch-be +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-be,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- ext/openssl/ossl_cipher.c.orig 2005-02-28 11:45:17.000000000 +0900 -+++ ext/openssl/ossl_cipher.c -@@ -224,7 +224,8 @@ ossl_cipher_update(VALUE self, VALUE dat - - StringValue(data); - in = RSTRING(data)->ptr; -- in_len = RSTRING(data)->len; -+ if ((in_len = RSTRING(data)->len) == 0) -+ rb_raise(rb_eArgError, "data must not be empty"); - GetCipher(self, ctx); - str = rb_str_new(0, in_len+EVP_CIPHER_CTX_block_size(ctx)); - if (!EVP_CipherUpdate(ctx, RSTRING(str)->ptr, &out_len, in, in_len)) diff --git a/lang/ruby18-base/patches/patch-bf b/lang/ruby18-base/patches/patch-bf deleted file mode 100644 index 0d9f069139f..00000000000 --- a/lang/ruby18-base/patches/patch-bf +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- ext/readline/readline.c.orig 2005-05-25 22:01:56.000000000 +0900 -+++ ext/readline/readline.c -@@ -69,10 +69,12 @@ readline_readline(argc, argv, self) - - if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "stdin closed"); - -+ Check_Type(rb_stdout, T_FILE); - GetOpenFile(rb_stdout, ofp); -- rl_outstream = ofp->f; -+ rl_outstream = GetWriteFile(ofp); -+ Check_Type(rb_stdin, T_FILE); - GetOpenFile(rb_stdin, ifp); -- rl_instream = ifp->f; -+ rl_instream = GetReadFile(ifp); - buff = (char*)rb_protect((VALUE(*)_((VALUE)))readline, (VALUE)prompt, - &status); - if (status) { diff --git a/lang/ruby18-base/patches/patch-bg b/lang/ruby18-base/patches/patch-bg deleted file mode 100644 index 1e232bb0d08..00000000000 --- a/lang/ruby18-base/patches/patch-bg +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- ext/syck/implicit.c.orig 2005-09-20 15:46:43.000000000 +0900 -+++ ext/syck/implicit.c -@@ -2481,7 +2481,7 @@ yy244: ++YYCURSOR; - goto yy245; - yy245: - #line 174 "implicit.re" --{ return type_id; } -+{ return syck_strndup( type_id, strlen( type_id ) ); } - #line 2485 "<stdout>" - yy246: yych = *++YYCURSOR; - switch(yych){ -@@ -2928,7 +2928,7 @@ yy264: ++YYCURSOR; - goto yy265; - yy265: - #line 172 "implicit.re" --{ return type_id; } -+{ return syck_strndup( type_id, strlen( type_id ) ); } - #line 2932 "<stdout>" - yy266: yych = *++YYCURSOR; - switch(yych){ diff --git a/lang/ruby18-base/patches/patch-bh b/lang/ruby18-base/patches/patch-bh deleted file mode 100644 index 7a92da08806..00000000000 --- a/lang/ruby18-base/patches/patch-bh +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bh,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- ext/strscan/strscan.c.orig 2005-03-04 19:39:45.000000000 +0900 -+++ ext/strscan/strscan.c -@@ -176,7 +176,6 @@ strscan_free(p) - struct strscanner *p; - { - re_free_registers(&(p->regs)); -- memset(p, sizeof(struct strscanner), 0); - free(p); - } - diff --git a/lang/ruby18-base/patches/patch-bi b/lang/ruby18-base/patches/patch-bi deleted file mode 100644 index cbba9e6db8a..00000000000 --- a/lang/ruby18-base/patches/patch-bi +++ /dev/null @@ -1,317 +0,0 @@ -$NetBSD: patch-bi,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- file.c.orig 2005-09-21 02:51:20.000000000 +0900 -+++ file.c -@@ -75,9 +75,10 @@ VALUE rb_cFile; - VALUE rb_mFileTest; - static VALUE rb_cStat; - -+static long apply2files _((void (*)(const char *, void *), VALUE, void *)); - static long - apply2files(func, vargs, arg) -- void (*func)(); -+ void (*func)_((const char *, void *)); - VALUE vargs; - void *arg; - { -@@ -179,6 +180,20 @@ rb_stat_cmp(self, other) - return Qnil; - } - -+static VALUE rb_stat_dev _((VALUE)); -+static VALUE rb_stat_ino _((VALUE)); -+static VALUE rb_stat_mode _((VALUE)); -+static VALUE rb_stat_nlink _((VALUE)); -+static VALUE rb_stat_uid _((VALUE)); -+static VALUE rb_stat_gid _((VALUE)); -+static VALUE rb_stat_rdev _((VALUE)); -+static VALUE rb_stat_size _((VALUE)); -+static VALUE rb_stat_blksize _((VALUE)); -+static VALUE rb_stat_blocks _((VALUE)); -+static VALUE rb_stat_atime _((VALUE)); -+static VALUE rb_stat_mtime _((VALUE)); -+static VALUE rb_stat_ctime _((VALUE)); -+ - /* - * call-seq: - * stat.dev => fixnum -@@ -547,23 +562,23 @@ rb_stat_inspect(self) - { - VALUE str; - int i; -- static struct { -- char *name; -- VALUE (*func)(); -+ static const struct { -+ const char *name; -+ VALUE (*func)_((VALUE)); - } member[] = { -- {"dev", rb_stat_dev}, -- {"ino", rb_stat_ino}, -- {"mode", rb_stat_mode}, -- {"nlink", rb_stat_nlink}, -- {"uid", rb_stat_uid}, -- {"gid", rb_stat_gid}, -- {"rdev", rb_stat_rdev}, -- {"size", rb_stat_size}, -- {"blksize", rb_stat_blksize}, -- {"blocks", rb_stat_blocks}, -- {"atime", rb_stat_atime}, -- {"mtime", rb_stat_mtime}, -- {"ctime", rb_stat_ctime}, -+ {"dev", rb_stat_dev}, -+ {"ino", rb_stat_ino}, -+ {"mode", rb_stat_mode}, -+ {"nlink", rb_stat_nlink}, -+ {"uid", rb_stat_uid}, -+ {"gid", rb_stat_gid}, -+ {"rdev", rb_stat_rdev}, -+ {"size", rb_stat_size}, -+ {"blksize", rb_stat_blksize}, -+ {"blocks", rb_stat_blocks}, -+ {"atime", rb_stat_atime}, -+ {"mtime", rb_stat_mtime}, -+ {"ctime", rb_stat_ctime}, - }; - - str = rb_str_buf_new2("#<"); -@@ -1545,12 +1560,13 @@ rb_file_ctime(obj) - return rb_time_new(st.st_ctime, 0); - } - -+static void chmod_internal _((const char *, void *)); - static void - chmod_internal(path, mode) - const char *path; -- int mode; -+ void *mode; - { -- if (chmod(path, mode) < 0) -+ if (chmod(path, (int)mode) < 0) - rb_sys_fail(path); - } - -@@ -1622,12 +1638,13 @@ rb_file_chmod(obj, vmode) - } - - #if defined(HAVE_LCHMOD) -+static void lchmod_internal _((const char *, void *)); - static void - lchmod_internal(path, mode) - const char *path; -- int mode; -+ void *mode; - { -- if (lchmod(path, mode) < 0) -+ if (lchmod(path, (int)mode) < 0) - rb_sys_fail(path); - } - -@@ -1672,11 +1689,13 @@ struct chown_args { - int owner, group; - }; - -+static void chown_internal _((const char *, void *)); - static void --chown_internal(path, args) -+chown_internal(path, argp) - const char *path; -- struct chown_args *args; -+ void *argp; - { -+ struct chown_args *args = (struct chown_args *)argp; - if (chown(path, args->owner, args->group) < 0) - rb_sys_fail(path); - } -@@ -1763,11 +1782,13 @@ rb_file_chown(obj, owner, group) - } - - #if defined(HAVE_LCHOWN) && !defined(__CHECKER__) -+static void lchown_internal _((const char *, void *)); - static void --lchown_internal(path, args) -+lchown_internal(path, argp) - const char *path; -- struct chown_args *args; -+ void *argp; - { -+ struct chown_args *args = (struct chown_args *)argp; - if (lchown(path, args->owner, args->group) < 0) - rb_sys_fail(path); - } -@@ -1823,13 +1844,16 @@ rb_file_s_lchown(argc, argv) - - struct timeval rb_time_timeval(); - -+static void utime_internal _((const char *, void *)); -+ - #if defined(HAVE_UTIMES) && !defined(__CHECKER__) - - static void --utime_internal(path, tvp) -- char *path; -- struct timeval tvp[]; -+utime_internal(path, arg) -+ const char *path; -+ void *arg; - { -+ struct timeval *tvp = arg; - if (utimes(path, tvp) < 0) - rb_sys_fail(path); - } -@@ -1871,10 +1895,11 @@ struct utimbuf { - #endif - - static void --utime_internal(path, utp) -+utime_internal(path, arg) - const char *path; -- struct utimbuf *utp; -+ void *arg; - { -+ struct utimbuf *utp = arg; - if (utime(path, utp) < 0) - rb_sys_fail(path); - } -@@ -2012,9 +2037,11 @@ rb_file_s_readlink(klass, path) - #endif - } - -+static void unlink_internal _((const char *, void *)); - static void --unlink_internal(path) -+unlink_internal(path, arg) - const char *path; -+ void *arg; - { - if (unlink(path) < 0) - rb_sys_fail(path); -@@ -2625,8 +2652,8 @@ rb_file_s_dirname(klass, fname) - name = StringValueCStr(fname); - root = skiproot(name); - #ifdef DOSISH_UNC -- if (root > name + 2 && isdirsep(*name)) -- name = root - 2; -+ if (root > name + 1 && isdirsep(*name)) -+ root = skipprefix(name = root - 2); - #else - if (root > name + 1) - name = root - 1; -@@ -2762,7 +2789,7 @@ rb_file_join(ary, sep) - name = StringValueCStr(result); - if (i > 0 && !NIL_P(sep)) { - tail = chompdirsep(name); -- if (isdirsep(RSTRING(tmp)->ptr[0])) { -+ if (RSTRING(tmp)->ptr && isdirsep(RSTRING(tmp)->ptr[0])) { - RSTRING(result)->len = tail - name; - } - else if (!*tail) { -@@ -2915,23 +2942,23 @@ rb_thread_flock(fd, op, fptr) - OpenFile *fptr; - { - if (rb_thread_alone() || (op & LOCK_NB)) { -- int ret; -- TRAP_BEG; -+ int ret; -+ TRAP_BEG; - ret = flock(fd, op); -- TRAP_END; -+ TRAP_END; - return ret; - } - op |= LOCK_NB; - while (flock(fd, op) < 0) { - switch (errno) { -- case EAGAIN: -- case EACCES: -+ case EAGAIN: -+ case EACCES: - #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN - case EWOULDBLOCK: - #endif - rb_thread_polling(); /* busy wait */ - rb_io_check_closed(fptr); -- continue; -+ continue; - default: - return -1; - } -@@ -2988,19 +3015,19 @@ rb_file_flock(obj, operation) - } - retry: - if (flock(fileno(fptr->f), op) < 0) { -- switch (errno) { -- case EAGAIN: -- case EACCES: -+ switch (errno) { -+ case EAGAIN: -+ case EACCES: - #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN -- case EWOULDBLOCK: -+ case EWOULDBLOCK: - #endif -- return Qfalse; -+ return Qfalse; - case EINTR: - #if defined(ERESTART) - case ERESTART: - #endif - goto retry; -- } -+ } - rb_sys_fail(fptr->path); - } - #endif -@@ -3049,14 +3076,14 @@ test_check(n, argc, argv) - * ?d | boolean | True if file1 exists and is a directory - * ?e | boolean | True if file1 exists - * ?f | boolean | True if file1 exists and is a regular file -- * ?g | boolean | True if files has the \CF{setgid} bit -+ * ?g | boolean | True if file1 has the \CF{setgid} bit - * | | set (false under NT) - * ?G | boolean | True if file1 exists and has a group - * | | ownership equal to the caller's group - * ?k | boolean | True if file1 exists and has the sticky bit set -- * ?l | boolean | True if files exists and is a symbolic link -+ * ?l | boolean | True if file1 exists and is a symbolic link - * ?M | Time | Last modification time for file1 -- * ?o | boolean | True if files exists and is owned by -+ * ?o | boolean | True if file1 exists and is owned by - * | | the caller's effective uid - * ?O | boolean | True if file1 exists and is owned by - * | | the caller's real uid -@@ -3065,7 +3092,7 @@ test_check(n, argc, argv) - * | | uid/gid of the caller - * ?R | boolean | True if file is readable by the real - * | | uid/gid of the caller -- * ?s | int/nil | If files has nonzero size, return the size, -+ * ?s | int/nil | If file1 has nonzero size, return the size, - * | | otherwise return nil - * ?S | boolean | True if file1 exists and is a socket - * ?u | boolean | True if file1 has the setuid bit set -@@ -3206,7 +3233,7 @@ rb_f_test(argc, argv) - case '-': - if (st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) - return Qtrue; -- return Qfalse; -+ return Qfalse; - - case '=': - if (st1.st_mtime == st2.st_mtime) return Qtrue; -@@ -3219,7 +3246,7 @@ rb_f_test(argc, argv) - case '<': - if (st1.st_mtime < st2.st_mtime) return Qtrue; - return Qfalse; -- } -+ } - } - /* unknown command */ - rb_raise(rb_eArgError, "unknown command ?%c", cmd); -@@ -3281,6 +3308,7 @@ rb_stat_init(obj, fname) - return Qnil; - } - -+/* :nodoc: */ - static VALUE - rb_stat_init_copy(copy, orig) - VALUE copy, orig; diff --git a/lang/ruby18-base/patches/patch-bj b/lang/ruby18-base/patches/patch-bj index 73688952603..e990e1ce61f 100644 --- a/lang/ruby18-base/patches/patch-bj +++ b/lang/ruby18-base/patches/patch-bj @@ -1,48 +1,33 @@ -$NetBSD: patch-bj,v 1.1 2005/11/02 08:56:40 taca Exp $ +$NetBSD: patch-bj,v 1.2 2006/01/03 14:37:24 taca Exp $ ---- gc.c.orig 2005-07-27 23:29:11.000000000 +0900 +--- gc.c.orig 2005-12-16 13:58:51.000000000 +0900 +++ gc.c -@@ -649,7 +649,7 @@ mark_entry(key, value, lev) - return ST_CONTINUE; - } - --void -+static void - mark_tbl(tbl, lev) - st_table *tbl; - int lev; -@@ -676,7 +676,7 @@ mark_keyvalue(key, value, lev) - return ST_CONTINUE; - } - --void -+static void - mark_hash(tbl, lev) - st_table *tbl; - int lev; -@@ -880,13 +880,11 @@ gc_mark_children(ptr, lev) - case NODE_BLOCK_ARG: - case NODE_POSTEXE: - break; --#ifdef C_ALLOCA - case NODE_ALLOCA: - mark_locations_array((VALUE*)obj->as.node.u1.value, - obj->as.node.u3.cnt); +@@ -814,6 +814,8 @@ gc_mark_children(ptr, lev) + case NODE_OP_ASGN_OR: + case NODE_OP_ASGN_AND: + case NODE_MODULE: ++ case NODE_ALIAS: ++ case NODE_VALIAS: + gc_mark((VALUE)obj->as.node.u1.node, lev); + /* fall through */ + case NODE_METHOD: /* 2 */ +@@ -828,6 +830,7 @@ gc_mark_children(ptr, lev) + case NODE_COLON3: + case NODE_OPT_N: + case NODE_EVSTR: ++ case NODE_UNDEF: ptr = (VALUE)obj->as.node.u2.node; goto again; --#endif - - default: /* unlisted NODE */ - if (is_pointer_to_heap(obj->as.node.u1.node)) { -@@ -1230,11 +1228,9 @@ obj_free(obj) - RUBY_CRITICAL(free(RANY(obj)->as.node.u1.tbl)); - } - break; --#ifdef C_ALLOCA - case NODE_ALLOCA: - RUBY_CRITICAL(free(RANY(obj)->as.node.u1.node)); - break; --#endif - } - return; /* no need to free iv_tbl */ +@@ -867,11 +870,8 @@ gc_mark_children(ptr, lev) + case NODE_CVAR: + case NODE_NTH_REF: + case NODE_BACK_REF: +- case NODE_ALIAS: +- case NODE_VALIAS: + case NODE_REDO: + case NODE_RETRY: +- case NODE_UNDEF: + case NODE_SELF: + case NODE_NIL: + case NODE_TRUE: diff --git a/lang/ruby18-base/patches/patch-bk b/lang/ruby18-base/patches/patch-bk deleted file mode 100644 index fc22a3641f6..00000000000 --- a/lang/ruby18-base/patches/patch-bk +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-bk,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- intern.h.orig 2005-06-13 01:58:41.000000000 +0900 -+++ intern.h -@@ -164,6 +164,7 @@ void rb_dvar_asgn _((ID, VALUE)); - void rb_dvar_push _((ID, VALUE)); - VALUE *rb_svar _((int)); - VALUE rb_eval_cmd _((VALUE, VALUE, int)); -+int rb_obj_respond_to _((VALUE, ID, int)); - int rb_respond_to _((VALUE, ID)); - void rb_interrupt _((void)); - VALUE rb_apply _((VALUE, ID, VALUE)); -@@ -334,6 +335,7 @@ int rb_is_instance_id _((ID)); - int rb_is_class_id _((ID)); - int rb_is_local_id _((ID)); - int rb_is_junk_id _((ID)); -+int rb_symname_p _((const char*)); - VALUE rb_backref_get _((void)); - void rb_backref_set _((VALUE)); - VALUE rb_lastline_get _((void)); -@@ -449,7 +451,7 @@ VALUE rb_path2class _((const char*)); - void rb_name_class _((VALUE, ID)); - VALUE rb_class_name _((VALUE)); - void rb_autoload _((VALUE, ID, const char*)); --void rb_autoload_load _((VALUE, ID)); -+VALUE rb_autoload_load _((VALUE, ID)); - VALUE rb_autoload_p _((VALUE, ID)); - void rb_gc_mark_global_tbl _((void)); - VALUE rb_f_trace_var _((int, VALUE*)); diff --git a/lang/ruby18-base/patches/patch-bl b/lang/ruby18-base/patches/patch-bl deleted file mode 100644 index 438f3e13bd3..00000000000 --- a/lang/ruby18-base/patches/patch-bl +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bl,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/cgi.rb.orig 2005-09-17 23:55:05.000000000 +0900 -+++ lib/cgi.rb -@@ -870,7 +870,7 @@ class CGI - cookies = Hash.new([]) - return cookies unless raw_cookie - -- raw_cookie.split(/[;,] /).each do |pairs| -+ raw_cookie.split(/[;,]\s?/).each do |pairs| - name, values = pairs.split('=',2) - next unless name and values - name = CGI::unescape(name) diff --git a/lang/ruby18-base/patches/patch-bm b/lang/ruby18-base/patches/patch-bm deleted file mode 100644 index fe320cf49d6..00000000000 --- a/lang/ruby18-base/patches/patch-bm +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-bm,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/fileutils.rb.orig 2005-09-19 10:37:27.000000000 +0900 -+++ lib/fileutils.rb -@@ -118,7 +118,7 @@ module FileUtils - def cd(dir, options = {}, &block) # :yield: dir - fu_check_options options, :verbose - fu_output_message "cd #{dir}" if options[:verbose] -- Dir.chdir(dir, &block) unless options[:noop] -+ Dir.chdir(dir, &block) - fu_output_message 'cd -' if options[:verbose] and block - end - module_function :cd -@@ -1443,6 +1443,8 @@ module FileUtils - end - private_module_function :fu_output_message - -+ METHODS = singleton_methods() - ['private_module_function'] -+ - # - # Returns an Array of method names which have any options. - # -@@ -1505,9 +1507,15 @@ module FileUtils - def #{name}(*args) - super(*fu_update_option(args, :verbose => true)) - end -+ private :#{name} - EOS - end - extend self -+ class << self -+ ::FileUtils::METHODS.each do |m| -+ public m -+ end -+ end - end - - # -@@ -1524,9 +1532,15 @@ module FileUtils - def #{name}(*args) - super(*fu_update_option(args, :noop => true)) - end -+ private :#{name} - EOS - end - extend self -+ class << self -+ ::FileUtils::METHODS.each do |m| -+ public m -+ end -+ end - end - - # -@@ -1544,9 +1558,15 @@ module FileUtils - def #{name}(*args) - super(*fu_update_option(args, :noop => true, :verbose => true)) - end -+ private :#{name} - EOS - end - extend self -+ class << self -+ ::FileUtils::METHODS.each do |m| -+ public m -+ end -+ end - end - - end diff --git a/lang/ruby18-base/patches/patch-bn b/lang/ruby18-base/patches/patch-bn deleted file mode 100644 index 6c4adc49152..00000000000 --- a/lang/ruby18-base/patches/patch-bn +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bn,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/irb.rb.orig 2005-04-20 04:24:56.000000000 +0900 -+++ lib/irb.rb -@@ -119,7 +119,7 @@ module IRB - end - if @context.auto_indent_mode - unless ltype -- ind = prompt(@context.prompt_i, ltype, indent, line_no).size + -+ ind = prompt(@context.prompt_i, ltype, indent, line_no)[/.*\z/].size + - indent * 2 - p.size - ind += 2 if continue - @context.io.prompt = p + " " * ind if ind > 0 diff --git a/lang/ruby18-base/patches/patch-bo b/lang/ruby18-base/patches/patch-bo deleted file mode 100644 index bb78a6fa4ec..00000000000 --- a/lang/ruby18-base/patches/patch-bo +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-bo,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/optparse.rb.orig 2005-09-21 07:45:06.000000000 +0900 -+++ lib/optparse.rb -@@ -441,12 +441,12 @@ class OptionParser - # - # Raises an exception if argument is not present. - # -- def parse(arg, argv, &error) -+ def parse(arg, argv) - unless arg - raise MissingArgument if argv.empty? - arg = argv.shift - end -- conv_arg(*parse_arg(arg, &error)) -+ conv_arg(*parse_arg(arg) {|*exc| raise(*exc)}) - end - end - diff --git a/lang/ruby18-base/patches/patch-bp b/lang/ruby18-base/patches/patch-bp deleted file mode 100644 index 5bb9ea9d35c..00000000000 --- a/lang/ruby18-base/patches/patch-bp +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bp,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/rdoc/markup/simple_markup.rb.orig 2004-04-24 10:39:45.000000000 +0900 -+++ lib/rdoc/markup/simple_markup.rb -@@ -194,8 +194,7 @@ module SM #:nodoc: - LABEL_LIST_RE = /^( - ( \[.*?\] (?# labeled ) - |\S.*:: (?# note ) -- )(?=\s|$) -- \s* -+ )(?:\s+|$) - )/x - - diff --git a/lang/ruby18-base/patches/patch-bq b/lang/ruby18-base/patches/patch-bq deleted file mode 100644 index 13f5fe73852..00000000000 --- a/lang/ruby18-base/patches/patch-bq +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bq,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/webrick/cgi.rb.orig 2005-09-16 00:07:05.000000000 +0900 -+++ lib/webrick/cgi.rb -@@ -66,6 +66,7 @@ module WEBrick - req.parse(sock) - req.script_name = (env["SCRIPT_NAME"] || File.expand_path($0)).dup - req.path_info = (env["PATH_INFO"] || "").dup -+ req.query_string = env["QUERY_STRING"] - req.user = env["REMOTE_USER"] - res.request_method = req.request_method - res.request_uri = req.request_uri diff --git a/lang/ruby18-base/patches/patch-br b/lang/ruby18-base/patches/patch-br deleted file mode 100644 index a965e7e2f51..00000000000 --- a/lang/ruby18-base/patches/patch-br +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-br,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/webrick/config.rb.orig 2004-12-16 18:45:59.000000000 +0900 -+++ lib/webrick/config.rb -@@ -71,7 +71,7 @@ module WEBrick - :HandlerCallback => nil, - :DirectoryCallback => nil, - :FileCallback => nil, -- :UserDir => "public_html", -+ :UserDir => nil, # e.g. "public_html" - :AcceptableLanguages => [] # ["en", "ja", ... ] - } - diff --git a/lang/ruby18-base/patches/patch-bs b/lang/ruby18-base/patches/patch-bs deleted file mode 100644 index 740f03b3503..00000000000 --- a/lang/ruby18-base/patches/patch-bs +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-bs,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/webrick/cookie.rb.orig 2003-07-24 01:51:36.000000000 +0900 -+++ lib/webrick/cookie.rb -@@ -76,5 +76,29 @@ module WEBrick - end - end - -+ def self.parse_set_cookie(str) -+ cookie_elem = str.split(/;/) -+ first_elem = cookie_elem.shift -+ first_elem.strip! -+ key, value = first_elem.split(/=/, 2) -+ cookie = new(key, HTTPUtils.dequote(value)) -+ cookie_elem.each{|pair| -+ pair.strip! -+ key, value = pair.split(/=/, 2) -+ if value -+ value = HTTPUtils.dequote(value.strip) -+ end -+ case key.downcase -+ when "domain" then cookie.domain = value -+ when "path" then cookie.path = value -+ when "expires" then cookie.expires = value -+ when "max-age" then cookie.max_age = Integer(value) -+ when "comment" then cookie.comment = value -+ when "version" then cookie.version = Integer(value) -+ when "secure" then cookie.secure = true -+ end -+ } -+ return cookie -+ end - end - end diff --git a/lang/ruby18-base/patches/patch-bt b/lang/ruby18-base/patches/patch-bt deleted file mode 100644 index 3b6b6fd6e70..00000000000 --- a/lang/ruby18-base/patches/patch-bt +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bt,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/webrick/httprequest.rb.orig 2005-07-15 08:00:22.000000000 +0900 -+++ lib/webrick/httprequest.rb -@@ -27,8 +27,8 @@ module WEBrick - attr_reader :request_method, :unparsed_uri, :http_version - - # Request-URI -- attr_reader :request_uri, :host, :port, :path, :query_string -- attr_accessor :script_name, :path_info -+ attr_reader :request_uri, :host, :port, :path -+ attr_accessor :script_name, :path_info, :query_string - - # Header and entity body - attr_reader :raw_header, :header, :cookies diff --git a/lang/ruby18-base/patches/patch-bu b/lang/ruby18-base/patches/patch-bu deleted file mode 100644 index 1496344912a..00000000000 --- a/lang/ruby18-base/patches/patch-bu +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bu,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/webrick/httpservlet/cgihandler.rb.orig 2004-07-19 01:15:37.000000000 +0900 -+++ lib/webrick/httpservlet/cgihandler.rb -@@ -85,6 +85,12 @@ module WEBrick - res.status = $1.to_i - header.delete('status') - end -+ if header.has_key?('set-cookie') -+ header['set-cookie'].each{|k| -+ res.cookies << Cookie.parse_set_cookie(k) -+ } -+ header.delete('set-cookie') -+ end - header.each{|key, val| res[key] = val.join(", ") } - rescue => ex - raise HTTPStatus::InternalServerError, ex.message diff --git a/lang/ruby18-base/patches/patch-bv b/lang/ruby18-base/patches/patch-bv deleted file mode 100644 index 9b37eb0ae3a..00000000000 --- a/lang/ruby18-base/patches/patch-bv +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bv,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/xmlrpc/server.rb.orig 2005-09-20 17:51:02.000000000 +0900 -+++ lib/xmlrpc/server.rb -@@ -634,7 +634,7 @@ class Server < WEBrickServlet - require 'webrick' - @server = WEBrick::HTTPServer.new(:Port => port, :BindAddress => host, :MaxClients => maxConnections, - :Logger => WEBrick::Log.new(stdlog)) -- @server.mount("/RPC2", self) -+ @server.mount("/", self) - end - - def serve -@@ -645,7 +645,7 @@ class Server < WEBrickServlet - end - trap(signal) { @server.shutdown } - -- @server.start.join -+ @server.start - end - - def shutdown diff --git a/lang/ruby18-base/patches/patch-bw b/lang/ruby18-base/patches/patch-bw deleted file mode 100644 index ce8b21e2d1c..00000000000 --- a/lang/ruby18-base/patches/patch-bw +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bw,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/yaml/basenode.rb.orig 2005-09-20 15:46:45.000000000 +0900 -+++ lib/yaml/basenode.rb -@@ -148,7 +148,7 @@ module YAML - if pred - case pred - when /^\.=/ -- pred = $' -+ pred = $' # ' - match_nodes.reject! { |n| - n.last.value != pred - } -@@ -187,7 +187,7 @@ module YAML - v = @value.detect { |k,v| k.transform == key.first } - v[1] if v - elsif Array === @value -- @value.[]( *k ) -+ @value.[]( *key ) - end - end - diff --git a/lang/ruby18-base/patches/patch-bx b/lang/ruby18-base/patches/patch-bx deleted file mode 100644 index 9433abfc851..00000000000 --- a/lang/ruby18-base/patches/patch-bx +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-bx,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/yaml/tag.rb.orig 2005-09-13 12:58:33.000000000 +0900 -+++ lib/yaml/tag.rb -@@ -55,13 +55,14 @@ class Module # :nodoc: all - # in YAML. See YAML::tag_class for detailed information on typing and - # taguris. - def yaml_as( tag, sc = true ) -- class_eval <<-"end;" -- attr_accessor :taguri -+ verbose, $VERBOSE = $VERBOSE, nil -+ class_eval <<-"end;", __FILE__, __LINE__+1 -+ attr_writer :taguri - def taguri - if respond_to? :to_yaml_type - YAML::tagurize( to_yaml_type[1..-1] ) - else -- return @taguri if @taguri -+ return @taguri if defined?(@taguri) and @taguri - tag = #{ tag.dump } - if self.class.yaml_tag_subclasses? and self.class != YAML::tagged_classes[tag] - tag = "\#{ tag }:\#{ self.class.yaml_tag_class_name }" -@@ -72,6 +73,8 @@ class Module # :nodoc: all - def self.yaml_tag_subclasses?; #{ sc ? 'true' : 'false' }; end - end; - YAML::tag_class tag, self -+ ensure -+ $VERBOSE = verbose - end - # Transforms the subclass name into a name suitable for display - # in a subclassed tag. diff --git a/lang/ruby18-base/patches/patch-by b/lang/ruby18-base/patches/patch-by deleted file mode 100644 index c122b3473fb..00000000000 --- a/lang/ruby18-base/patches/patch-by +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-by,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- lib/yaml/types.rb.orig 2005-09-13 12:58:33.000000000 +0900 -+++ lib/yaml/types.rb -@@ -10,6 +10,7 @@ module YAML - class PrivateType - def self.tag_subclasses?; false; end - attr_accessor :type_id, :value -+ verbose, $VERBOSE = $VERBOSE, nil - def initialize( type, val ) - @type_id = type; @value = val - @value.taguri = "x-private:#{ @type_id }" -@@ -17,6 +18,8 @@ module YAML - def to_yaml( opts = {} ) - @value.to_yaml( opts ) - end -+ ensure -+ $VERBOSE = verbose - end - - # -@@ -25,6 +28,7 @@ module YAML - class DomainType - def self.tag_subclasses?; false; end - attr_accessor :domain, :type_id, :value -+ verbose, $VERBOSE = $VERBOSE, nil - def initialize( domain, type, val ) - @domain = domain; @type_id = type; @value = val - @value.taguri = "tag:#{ @domain }:#{ @type_id }" -@@ -32,6 +36,8 @@ module YAML - def to_yaml( opts = {} ) - @value.to_yaml( opts ) - end -+ ensure -+ $VERBOSE = verbose - end - - # diff --git a/lang/ruby18-base/patches/patch-bz b/lang/ruby18-base/patches/patch-bz index d1085871423..f4f49949b34 100644 --- a/lang/ruby18-base/patches/patch-bz +++ b/lang/ruby18-base/patches/patch-bz @@ -1,14 +1,25 @@ -$NetBSD: patch-bz,v 1.1 2005/11/02 08:56:40 taca Exp $ +$NetBSD: patch-bz,v 1.2 2006/01/03 14:37:24 taca Exp $ ---- node.h.orig 2005-03-22 17:35:23.000000000 +0900 +--- node.h.orig 2005-10-08 18:57:12.000000000 +0900 +++ node.h -@@ -115,9 +115,7 @@ enum node_type { - NODE_DEFINED, - NODE_NEWLINE, - NODE_POSTEXE, --#ifdef C_ALLOCA - NODE_ALLOCA, --#endif - NODE_DMETHOD, - NODE_BMETHOD, - NODE_MEMO, +@@ -209,9 +209,6 @@ typedef struct RNode { + #define nd_noex u1.id + #define nd_defn u3.node + +-#define nd_old u1.id +-#define nd_new u2.id +- + #define nd_cfnc u1.cfunc + #define nd_argc u2.argc + +@@ -311,8 +308,8 @@ typedef struct RNode { + #define NEW_SVALUE(a) NEW_NODE(NODE_SVALUE,a,0,0) + #define NEW_BLOCK_ARG(v) NEW_NODE(NODE_BLOCK_ARG,v,0,local_cnt(v)) + #define NEW_BLOCK_PASS(b) NEW_NODE(NODE_BLOCK_PASS,0,b,0) +-#define NEW_ALIAS(n,o) NEW_NODE(NODE_ALIAS,o,n,0) +-#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,o,n,0) ++#define NEW_ALIAS(n,o) NEW_NODE(NODE_ALIAS,n,o,0) ++#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,n,o,0) + #define NEW_UNDEF(i) NEW_NODE(NODE_UNDEF,0,i,0) + #define NEW_CLASS(n,b,s) NEW_NODE(NODE_CLASS,n,NEW_SCOPE(b),(s)) + #define NEW_SCLASS(r,b) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(b),0) diff --git a/lang/ruby18-base/patches/patch-ca b/lang/ruby18-base/patches/patch-ca deleted file mode 100644 index 36d25bb217f..00000000000 --- a/lang/ruby18-base/patches/patch-ca +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- object.c.orig 2005-09-08 14:59:33.000000000 +0900 -+++ object.c -@@ -303,6 +303,7 @@ rb_obj_dup(obj) - return dup; - } - -+/* :nodoc: */ - VALUE - rb_obj_init_copy(obj, orig) - VALUE obj, orig; -@@ -1173,7 +1174,7 @@ sym_inspect(sym) - str = rb_str_new(0, strlen(name)+1); - RSTRING(str)->ptr[0] = ':'; - strcpy(RSTRING(str)->ptr+1, name); -- if (rb_is_junk_id(id)) { -+ if (!rb_symname_p(name)) { - str = rb_str_dump(str); - strncpy(RSTRING(str)->ptr, ":\"", 2); - } -@@ -2701,7 +2702,7 @@ Init_Object() - rb_define_method(rb_cModule, "<=", rb_class_inherited_p, 1); - rb_define_method(rb_cModule, ">", rb_mod_gt, 1); - rb_define_method(rb_cModule, ">=", rb_mod_ge, 1); -- rb_define_method(rb_cModule, "initialize_copy", rb_mod_init_copy, 1); -+ rb_define_method(rb_cModule, "initialize_copy", rb_mod_init_copy, 1); /* in class.c */ - rb_define_method(rb_cModule, "to_s", rb_mod_to_s, 0); - rb_define_method(rb_cModule, "included_modules", - rb_mod_included_modules, 0); /* in class.c */ -@@ -2743,7 +2744,7 @@ Init_Object() - rb_define_method(rb_cClass, "allocate", rb_obj_alloc, 0); - rb_define_method(rb_cClass, "new", rb_class_new_instance, -1); - rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1); -- rb_define_method(rb_cClass, "initialize_copy", rb_class_init_copy, 1); -+ rb_define_method(rb_cClass, "initialize_copy", rb_class_init_copy, 1); /* in class.c */ - rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0); - rb_define_alloc_func(rb_cClass, rb_class_s_alloc); - rb_undef_method(rb_cClass, "extend_object"); diff --git a/lang/ruby18-base/patches/patch-cb b/lang/ruby18-base/patches/patch-cb deleted file mode 100644 index 4e83504dd15..00000000000 --- a/lang/ruby18-base/patches/patch-cb +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-cb,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- pack.c.orig 2005-02-28 11:45:19.000000000 +0900 -+++ pack.c -@@ -351,12 +351,12 @@ num2i32(x) - # define EXTEND32(x) - #else - /* invariant in modulo 1<<31 */ --# define EXTEND32(x) do {if (!natint) {(x) = (I32)(((1<<31)-1-(x))^~(~0<<31))}} while(0) -+# define EXTEND32(x) do {if (!natint) {(x) = (I32)(((1<<31)-1-(x))^~(~0<<31));}} while(0) - #endif - #if SIZEOF_SHORT == SIZE16 - # define EXTEND16(x) - #else --# define EXTEND16(x) do { if (!natint) {(x) = (short)(((1<<15)-1-(x))^~(~0<<15))}} while(0) -+# define EXTEND16(x) do { if (!natint) {(x) = (short)(((1<<15)-1-(x))^~(~0<<15));}} while(0) - #endif - - #ifdef HAVE_LONG_LONG -@@ -2036,7 +2036,7 @@ uv_to_utf8(buf, uv) - rb_raise(rb_eRangeError, "pack(U): value out of range"); - } - --static const long utf8_limits[] = { -+static const unsigned long utf8_limits[] = { - 0x0, /* 1 */ - 0x80, /* 2 */ - 0x800, /* 3 */ diff --git a/lang/ruby18-base/patches/patch-cc b/lang/ruby18-base/patches/patch-cc index 5a4a70e2aef..0b4dcae9873 100644 --- a/lang/ruby18-base/patches/patch-cc +++ b/lang/ruby18-base/patches/patch-cc @@ -1,372 +1,35 @@ -$NetBSD: patch-cc,v 1.1 2005/11/02 08:56:40 taca Exp $ +$NetBSD: patch-cc,v 1.2 2006/01/03 14:37:24 taca Exp $ ---- parse.y.orig 2005-05-12 01:21:33.000000000 +0900 -+++ parse.y -@@ -13,6 +13,10 @@ - %{ - - #define YYDEBUG 1 -+#define YYERROR_VERBOSE 1 -+#ifndef YYSTACK_USE_ALLOCA -+#define YYSTACK_USE_ALLOCA 0 -+#endif - - #include "ruby.h" - #include "env.h" -@@ -23,6 +27,19 @@ - #include <errno.h> - #include <ctype.h> - -+#define YYMALLOC rb_parser_malloc -+#define YYREALLOC rb_parser_realloc -+#define YYCALLOC rb_parser_calloc -+#define YYFREE rb_parser_free -+#define malloc YYMALLOC -+#define realloc YYREALLOC -+#define calloc YYCALLOC -+#define free YYFREE -+static void *rb_parser_malloc _((size_t)); -+static void *rb_parser_realloc _((void *, size_t)); -+static void *rb_parser_calloc _((size_t, size_t)); -+static void rb_parser_free _((void *)); -+ - #define yyparse ruby_yyparse - #define yylex ruby_yylex - #define yyerror ruby_yyerror -@@ -2450,6 +2467,10 @@ terms : term - none : /* none */ {$$ = 0;} +--- parse.y 19 Dec 2005 14:33:05 -0000 1.307.2.25 ++++ parse.y 26 Dec 2005 13:33:14 -0000 1.307.2.26 +@@ -277,9 +277,9 @@ static void top_local_setup(); + %type <node> mrhs superclass block_call block_command + %type <node> f_arglist f_args f_optarg f_opt f_block_arg opt_f_block_arg + %type <node> assoc_list assocs assoc undef_list backref string_dvar +-%type <node> block_var opt_block_var brace_block cmd_brace_block do_block lhs none ++%type <node> block_var opt_block_var brace_block cmd_brace_block do_block lhs none fitem + %type <node> mlhs mlhs_head mlhs_basic mlhs_entry mlhs_item mlhs_node +-%type <id> fitem variable sym symbol operation operation2 operation3 ++%type <id> fsym variable sym symbol operation operation2 operation3 + %type <id> cname fname op f_rest_arg + %type <num> f_norm_arg f_arg + %token tUPLUS /* unary+ */ +@@ -916,10 +916,17 @@ fname : tIDENTIFIER + } ; - %% -+#ifdef yystacksize -+#undef YYMALLOC -+#endif -+ - #include "regex.h" - #include "util.h" - -@@ -2528,6 +2549,9 @@ int ruby_in_compile = 0; - int ruby__end__seen; - - static VALUE ruby_debug_lines; -+#ifdef YYMALLOC -+static NODE *parser_heap; -+#endif - - static NODE* - yycompile(f, line) -@@ -2992,7 +3016,7 @@ static void - dispose_string(str) - VALUE str; - { -- free(RSTRING(str)->ptr); -+ xfree(RSTRING(str)->ptr); - rb_gc_force_recycle(str); - } - -@@ -3320,6 +3344,7 @@ yylex() - register int c; - int space_seen = 0; - int cmd_state; -+ enum lex_state last_state; - - if (lex_strterm) { - int token; -@@ -4207,6 +4232,7 @@ yylex() - return '%'; - case '$': -+ last_state = lex_state; - lex_state = EXPR_END; - newtok(); - c = nextc(); -@@ -4249,7 +4275,13 @@ yylex() - tokadd('$'); - tokadd(c); - c = nextc(); -- tokadd(c); -+ if (is_identchar(c)) { -+ tokadd(c); -+ } -+ else { -+ pushback(c); -+ } -+ gvar: - tokfix(); - yylval.id = rb_intern(tok()); - /* xxx shouldn't check if valid option variable */ -@@ -4259,6 +4291,11 @@ yylex() - case '`': /* $`: string before last match */ - case '\'': /* $': string after last match */ - case '+': /* $+: string matches last paren. */ -+ if (last_state == EXPR_FNAME) { -+ tokadd('$'); -+ tokadd(c); -+ goto gvar; -+ } - yylval.node = NEW_BACK_REF(c); - return tBACK_REF; - -@@ -4271,6 +4308,7 @@ yylex() - c = nextc(); - } while (ISDIGIT(c)); - pushback(c); -+ if (last_state == EXPR_FNAME) goto gvar; - tokfix(); - yylval.node = NEW_NTH_REF(atoi(tok()+1)); - return tNTH_REF; -@@ -4348,8 +4386,8 @@ yylex() - - { - int result = 0; -- enum lex_state last_state = lex_state; - -+ last_state = lex_state; - switch (tok()[0]) { - case '$': - lex_state = EXPR_END; -@@ -5563,11 +5601,11 @@ local_pop() - struct local_vars *local = lvtbl->prev; - - if (lvtbl->tbl) { -- if (!lvtbl->nofree) free(lvtbl->tbl); -+ if (!lvtbl->nofree) xfree(lvtbl->tbl); - else lvtbl->tbl[0] = lvtbl->cnt; - } - ruby_dyna_vars = lvtbl->dyna_vars; -- free(lvtbl); -+ xfree(lvtbl); - lvtbl = local; - } - -@@ -5675,7 +5713,7 @@ top_local_setup() - rb_mem_clear(ruby_scope->local_vars+i, len-i); - } - if (ruby_scope->local_tbl && ruby_scope->local_vars[-1] == 0) { -- free(ruby_scope->local_tbl); -+ xfree(ruby_scope->local_tbl); - } - ruby_scope->local_vars[-1] = 0; - ruby_scope->local_tbl = local_tbl(); -@@ -5726,7 +5764,7 @@ dyna_init(node, pre) - int - ruby_parser_stack_on_heap() - { --#if defined(YYBISON) && !defined(C_ALLOCA) -+#if defined(YYMALLOC) - return Qfalse; - #else - return Qtrue; -@@ -5736,6 +5774,12 @@ ruby_parser_stack_on_heap() - void - rb_gc_mark_parser() - { -+#if defined YYMALLOC -+ rb_gc_mark((VALUE)parser_heap); -+#elif defined yystacksize -+ if (yyvsp) rb_gc_mark_locations((VALUE *)yyvs, (VALUE *)yyvsp); -+#endif -+ - if (!ruby_in_compile) return; - - rb_gc_mark_maybe((VALUE)yylval.node); -@@ -5837,6 +5881,99 @@ internal_id() - return ID_INTERNAL | (++last_id << ID_SCOPE_SHIFT); - } - -+static int -+is_special_global_name(m) -+ const char *m; -+{ -+ switch (*m) { -+ case '~': case '*': case '$': case '?': case '!': case '@': -+ case '/': case '\\': case ';': case ',': case '.': case '=': -+ case ':': case '<': case '>': case '\"': -+ case '&': case '`': case '\'': case '+': -+ case '0': -+ ++m; -+ break; -+ case '-': -+ ++m; -+ if (is_identchar(*m)) m += mbclen(*m); -+ break; -+ default: -+ if (!ISDIGIT(*m)) return 0; -+ do ++m; while (ISDIGIT(*m)); -+ } -+ return !*m; -+} -+ -+int -+rb_symname_p(name) -+ const char *name; -+{ -+ const char *m = name; -+ int localid = Qfalse; -+ -+ if (!m) return Qfalse; -+ switch (*m) { -+ case '\0': -+ return Qfalse; -+ -+ case '$': -+ if (is_special_global_name(++m)) return Qtrue; -+ goto id; -+ -+ case '@': -+ if (*++m == '@') ++m; -+ goto id; -+ -+ case '<': -+ switch (*++m) { -+ case '<': ++m; break; -+ case '=': if (*++m == '>') ++m; break; -+ default: break; -+ } -+ break; -+ -+ case '>': -+ if (*++m == '>') ++m; -+ break; -+ -+ case '=': -+ switch (*++m) { -+ case '~': ++m; break; -+ case '=': if (*++m == '=') ++m; break; -+ default: return Qfalse; -+ } -+ break; -+ -+ case '*': -+ if (*++m == '*') ++m; -+ break; -+ -+ case '+': case '-': -+ if (*++m == '@') ++m; -+ break; -+ -+ case '|': case '^': case '&': case '/': case '%': case '~': case '`': -+ break; -+ -+ case '[': -+ if (*++m == ']' && *++m == '=') ++m; -+ break; -+ -+ default: -+ localid = !ISUPPER(*m); -+ id: -+ if (*m != '_' && !ISALPHA(*m) && !ismbchar(*m)) return Qfalse; -+ while (is_identchar(*m)) m += mbclen(*m); -+ if (localid) { -+ switch (*m) { -+ case '!': case '?': case '=': ++m; -+ } -+ } -+ break; -+ } -+ return *m ? Qfalse : Qtrue; -+} -+ - ID - rb_intern(name) - const char *name; -@@ -5853,8 +5990,7 @@ rb_intern(name) - switch (*name) { - case '$': - id |= ID_GLOBAL; -- m++; -- if (!is_identchar(*m)) m++; -+ if (is_special_global_name(++m)) goto new_id; - break; - case '@': - if (name[1] == '@') { -@@ -5867,7 +6003,7 @@ rb_intern(name) - m++; - break; - default: -- if (name[0] != '_' && !ISALPHA(name[0]) && !ismbchar(name[0])) { -+ if (name[0] != '_' && ISASCII(name[0]) && !ISALNUM(name[0])) { - /* operators */ - int i; +-fitem : fname ++fsym : fname + | symbol + ; -@@ -5901,10 +6037,13 @@ rb_intern(name) - } - break; - } -- while (m <= name + last && is_identchar(*m)) { -- m += mbclen(*m); -+ if (!ISDIGIT(*m)) { -+ while (m <= name + last && is_identchar(*m)) { -+ m += mbclen(*m); -+ } - } - if (*m) id = ID_JUNK; -+ new_id: - id |= ++last_id << ID_SCOPE_SHIFT; - id_regist: - name = strdup(name); -@@ -6085,3 +6224,65 @@ rb_lastline_set(val) - special_local_set('_', val); - } - } -+ -+#ifdef YYMALLOC -+#define HEAPCNT(n, size) ((n) * (size) / sizeof(YYSTYPE)) -+#define NEWHEAP(cnt) rb_node_newnode(NODE_ALLOCA, 0, (VALUE)parser_heap, cnt) -+#define ADD2HEAP(n, ptr) ((parser_heap = (n))->u1.node = (ptr)) -+ -+static void * -+rb_parser_malloc(size) -+ size_t size; -+{ -+ NODE *n = NEWHEAP(HEAPCNT(1, size)); -+ -+ return ADD2HEAP(n, xmalloc(size)); -+} -+ -+static void * -+rb_parser_calloc(nelem, size) -+ size_t nelem, size; -+{ -+ NODE *n = NEWHEAP(HEAPCNT(nelem, size)); -+ -+ return ADD2HEAP(n, xcalloc(nelem, size)); -+} -+ -+static void * -+rb_parser_realloc(ptr, size) -+ void *ptr; -+ size_t size; -+{ -+ NODE *n; -+ size_t cnt = HEAPCNT(1, size); -+ -+ if (ptr && (n = parser_heap) != NULL) { -+ do { -+ if (n->u1.node == ptr) { -+ n->u1.node = ptr = xrealloc(ptr, size); -+ if (n->u3.cnt) n->u3.cnt = cnt; -+ return ptr; -+ } -+ } while ((n = n->u2.node) != NULL); -+ } -+ n = NEWHEAP(cnt); -+ return ADD2HEAP(n, xrealloc(ptr, size)); -+} -+ -+static void -+rb_parser_free(ptr) -+ void *ptr; -+{ -+ NODE **prev = &parser_heap, *n; ++fitem : fsym ++ { ++ $$ = NEW_LIT(ID2SYM($1)); ++ } ++ | dsym ++ ; + -+ while (n = *prev) { -+ if (n->u1.node == ptr) { -+ *prev = n->u2.node; -+ rb_gc_force_recycle((VALUE)n); -+ break; -+ } -+ prev = &n->u2.node; -+ } -+ xfree(ptr); -+} -+#endif + undef_list : fitem + { + $$ = NEW_UNDEF($1); diff --git a/lang/ruby18-base/patches/patch-cd b/lang/ruby18-base/patches/patch-cd deleted file mode 100644 index 8f0a29abaa4..00000000000 --- a/lang/ruby18-base/patches/patch-cd +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- regex.c.orig 2005-07-11 08:32:50.000000000 +0900 -+++ regex.c -@@ -1725,6 +1725,7 @@ re_compile_pattern(pattern, size, bufp) - memmove(&b[(unsigned char)b[-1]], &b[(1 << BYTEWIDTH) / BYTEWIDTH], - 2 + EXTRACT_UNSIGNED(&b[(1 << BYTEWIDTH) / BYTEWIDTH])*8); - b += b[-1] + 2 + EXTRACT_UNSIGNED(&b[(unsigned char)b[-1]])*8; -+ had_num_literal = 0; - break; - - case '(': diff --git a/lang/ruby18-base/patches/patch-ce b/lang/ruby18-base/patches/patch-ce deleted file mode 100644 index 23e9616fac6..00000000000 --- a/lang/ruby18-base/patches/patch-ce +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- ruby.h.orig 2005-09-14 22:40:58.000000000 +0900 -+++ ruby.h -@@ -170,10 +170,10 @@ VALUE rb_ull2inum _((unsigned LONG_LONG) - #define SYM2ID(x) RSHIFT((long)x,8) - - /* special contants - i.e. non-zero and non-fixnum constants */ --#define Qfalse 0 --#define Qtrue 2 --#define Qnil 4 --#define Qundef 6 /* undefined value for placeholder */ -+#define Qfalse ((VALUE)0) -+#define Qtrue ((VALUE)2) -+#define Qnil ((VALUE)4) -+#define Qundef ((VALUE)6) /* undefined value for placeholder */ - - #define RTEST(v) (((VALUE)(v) & ~Qnil) != 0) - #define NIL_P(v) ((VALUE)(v) == Qnil) diff --git a/lang/ruby18-base/patches/patch-cf b/lang/ruby18-base/patches/patch-cf deleted file mode 100644 index 0994d3409b3..00000000000 --- a/lang/ruby18-base/patches/patch-cf +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- rubysig.h.orig 2004-12-06 17:19:20.000000000 +0900 -+++ rubysig.h -@@ -79,13 +79,12 @@ void rb_trap_restore_mask _((void)); - - RUBY_EXTERN int rb_thread_critical; - void rb_thread_schedule _((void)); --#if defined(HAVE_SETITIMER) -+#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE) - RUBY_EXTERN int rb_thread_pending; - # define CHECK_INTS do {\ -- if (!rb_prohibit_interrupt) {\ -+ if (!(rb_prohibit_interrupt || rb_thread_critical)) {\ -+ if (rb_thread_pending) rb_thread_schedule();\ - if (rb_trap_pending) rb_trap_exec();\ -- if (rb_thread_pending && !rb_thread_critical)\ -- rb_thread_schedule();\ - }\ - } while (0) - #else -@@ -93,15 +92,13 @@ RUBY_EXTERN int rb_thread_pending; - RUBY_EXTERN int rb_thread_tick; - #define THREAD_TICK 500 - #define CHECK_INTS do {\ -- if (!rb_prohibit_interrupt) {\ -- if (rb_trap_pending) rb_trap_exec();\ -- if (!rb_thread_critical) {\ -- if (rb_thread_tick-- <= 0) {\ -- rb_thread_tick = THREAD_TICK;\ -- rb_thread_schedule();\ -- }\ -+ if (!(rb_prohibit_interrupt || rb_thread_critical)) {\ -+ if (rb_thread_tick-- <= 0) {\ -+ rb_thread_tick = THREAD_TICK;\ -+ rb_thread_schedule();\ - }\ - }\ -+ if (rb_trap_pending) rb_trap_exec();\ - } while (0) - #endif - diff --git a/lang/ruby18-base/patches/patch-cg b/lang/ruby18-base/patches/patch-cg deleted file mode 100644 index 549a09fc855..00000000000 --- a/lang/ruby18-base/patches/patch-cg +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-cg,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- st.c.orig 2005-02-08 09:50:33.000000000 +0900 -+++ st.c -@@ -218,12 +218,12 @@ st_free_table(table) - ptr = table->bins[i]; - while (ptr != 0) { - next = ptr->next; -- free(ptr); -+ xfree(ptr); - ptr = next; - } - } -- free(table->bins); -- free(table); -+ xfree(table->bins); -+ xfree(table); - } - - #define PTR_NOT_EQUAL(table, ptr, hash_val, key) \ -@@ -342,7 +342,7 @@ rehash(table) - ptr = next; - } - } -- free(table->bins); -+ xfree(table->bins); - table->num_bins = new_num_bins; - table->bins = new_bins; - } -@@ -365,7 +365,7 @@ st_copy(old_table) - Calloc((unsigned)num_bins, sizeof(st_table_entry*)); - - if (new_table->bins == 0) { -- free(new_table); -+ xfree(new_table); - return 0; - } - -@@ -375,8 +375,8 @@ st_copy(old_table) - while (ptr != 0) { - entry = alloc(st_table_entry); - if (entry == 0) { -- free(new_table->bins); -- free(new_table); -+ xfree(new_table->bins); -+ xfree(new_table); - return 0; - } - *entry = *ptr; -@@ -411,7 +411,7 @@ st_delete(table, key, value) - table->num_entries--; - if (value != 0) *value = ptr->record; - *key = ptr->key; -- free(ptr); -+ xfree(ptr); - return 1; - } - -@@ -422,7 +422,7 @@ st_delete(table, key, value) - table->num_entries--; - if (value != 0) *value = tmp->record; - *key = tmp->key; -- free(tmp); -+ xfree(tmp); - return 1; - } - } -@@ -522,7 +522,7 @@ st_foreach(table, func, arg) - last->next = ptr->next; - } - ptr = ptr->next; -- free(tmp); -+ xfree(tmp); - table->num_entries--; - } - } diff --git a/lang/ruby18-base/patches/patch-ch b/lang/ruby18-base/patches/patch-ch deleted file mode 100644 index efc350b85f7..00000000000 --- a/lang/ruby18-base/patches/patch-ch +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ch,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- string.c.orig 2005-09-17 23:55:06.000000000 +0900 -+++ string.c -@@ -4189,7 +4189,7 @@ scan_once(str, pat, start) - /* - * Always consume at least one character of the input string - */ -- if (RSTRING(str)->len < END(0)) -+ if (RSTRING(str)->len > END(0)) - *start = END(0)+mbclen2(RSTRING(str)->ptr[END(0)],pat); - else - *start = END(0)+1; diff --git a/lang/ruby18-base/patches/patch-ci b/lang/ruby18-base/patches/patch-ci deleted file mode 100644 index 5501b66f305..00000000000 --- a/lang/ruby18-base/patches/patch-ci +++ /dev/null @@ -1,81 +0,0 @@ -$NetBSD: patch-ci,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- time.c.orig 2005-01-20 18:34:36.000000000 +0900 -+++ time.c -@@ -109,7 +109,7 @@ time_init(time) - #define NDIV(x,y) (-(-((x)+1)/(y))-1) - #define NMOD(x,y) ((y)-(-((x)+1)%(y))-1) - --void -+static void - time_overflow_p(secp, usecp) - time_t *secp, *usecp; - { -@@ -1031,6 +1031,7 @@ time_hash(time) - return LONG2FIX(hash); - } - -+/* :nodoc: */ - static VALUE - time_init_copy(copy, time) - VALUE copy, time; -@@ -1259,7 +1260,7 @@ typedef unsigned long unsigned_time_t; - #elif SIZEOF_TIME_T == SIZEOF_INT - typedef unsigned int unsigned_time_t; - #elif SIZEOF_TIME_T == SIZEOF_LONG_LONG --typedef unsigned long long unsigned_time_t; -+typedef unsigned LONG_LONG unsigned_time_t; - #else - # error cannot find integer type which size is same as time_t. - #endif -@@ -1742,12 +1743,11 @@ time_to_a(time) - #define SMALLBUF 100 - static int - rb_strftime(buf, format, time) -- char ** volatile buf; -- char * volatile format; -- struct tm * volatile time; -+ char **buf; -+ const char *format; -+ struct tm *time; - { -- volatile int size; -- int len, flen; -+ int size, len, flen; - - (*buf)[0] = '\0'; - flen = strlen(format); -@@ -1819,8 +1819,8 @@ time_strftime(time, format) - VALUE time, format; - { - struct time_object *tobj; -- char buffer[SMALLBUF]; -- char *fmt, *buf = buffer; -+ char buffer[SMALLBUF], *buf = buffer; -+ const char *fmt; - long len; - VALUE str; - -@@ -1837,19 +1837,19 @@ time_strftime(time, format) - } - else if (strlen(fmt) < len) { - /* Ruby string may contain \0's. */ -- char *p = fmt, *pe = fmt + len; -+ const char *p = fmt, *pe = fmt + len; - - str = rb_str_new(0, 0); - while (p < pe) { - len = rb_strftime(&buf, p, &tobj->tm); - rb_str_cat(str, buf, len); - p += strlen(p) + 1; -- if (p <= pe) -- rb_str_cat(str, "\0", 1); - if (buf != buffer) { - free(buf); - buf = buffer; - } -+ for (fmt = p; p < pe && !*p; ++p); -+ if (p > fmt) rb_str_cat(str, fmt, p - fmt); - } - return str; - } diff --git a/lang/ruby18-base/patches/patch-cj b/lang/ruby18-base/patches/patch-cj deleted file mode 100644 index 2f6c1664611..00000000000 --- a/lang/ruby18-base/patches/patch-cj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cj,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- util.h.orig 2004-09-21 18:35:28.000000000 +0900 -+++ util.h -@@ -61,6 +61,7 @@ char *ruby_getcwd _((void)); - #define my_getcwd() ruby_getcwd() - - double ruby_strtod _((const char*, char **)); -+#undef strtod - #define strtod(s,e) ruby_strtod(s,e) - - #endif /* UTIL_H */ |