Pullup ticket #2792 - requested by taca

ruby-curses: security update
ruby-readline: security update
lang/ruby18-base: security update
ruby-tk: security update

Revisions pulled up:
- devel/ruby-curses/distinfo			1.19
- devel/ruby-readline/Makefile			1.26-1.27
- lang/ruby/rubyversion.mk			1.46
- lang/ruby18-base/PLIST			1.15
- lang/ruby18-base/distinfo			1.38
- lang/ruby18-base/patches/patch-bi		delete
- x11/ruby-tk/distinfo				1.22
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed May 20 00:58:30 UTC 2009

Modified Files:
	pkgsrc/devel/ruby-readline: Makefile

Log Message:
Recursive ABI depends update and PKGREVISION bump for readline-6.0 shlib
major change.

Reported by Robert Elz in PR 41345.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Wed Jun 10 12:45:34 UTC 2009

Modified Files:
	pkgsrc/lang/ruby: rubyversion.mk

Log Message:
Start update of Ruby programming language packages to 1.8.7.173 (1.8.7-p173).

- Add LICENSE.
- Update RUBY18_PATCHLEVEL to 173.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Wed Jun 10 12:46:47 UTC 2009

Modified Files:
	pkgsrc/lang/ruby18-base: PLIST distinfo
Removed Files:
	pkgsrc/lang/ruby18-base/patches: patch-bi

Log Message:
Update ruby18-base package to 1.8.7.173 (Ruby 1.8.7-p173).

Mon Jun  8 10:58:41 2009  NAKAMURA Usaku  <usa@ruby-lang.org>

	* eval.c (rb_thread_schedule): mswin32 doesn't have F_GETFD, so check
	  with another method.

Mon Jun  8 08:15:36 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>

	* ext/bigdecimal/bigdecimal.c (VpAlloc): avoid ALLOCA_N() to avoid
	  segmentation fault caused by (insanely) long decimal values.
	  backported from 1.9. CVE-2009-1904

	* ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_to_i,
	  BigDecimal_to_f, BigDecimal_to_s, BigDecimal_split,
	  BigDecimal_inspect): ditto.

Mon Jun  8 08:15:36 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>

	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): returns Inf if
	  exp is bigger than DBL_MANT_DIG.

Wed Jun  3 21:16:30 2009  Tanaka Akira  <akr@fsij.org>

	* file.c: include fcntl.h for O_RDONLY on Solaris.

Wed Jun  3 21:09:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>

	* util.c (rv_strdup): macro to duplicate nul-terminated string.
	  [ruby-core:22852]

	* util.c (ruby_dtoa): allocates one more byte to get rid of buffer
	  overrun.  a patch from Charlie Savage at [ruby-core:22604].

Wed Jun  3 21:09:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>

	* util.c (ruby_dtoa): allocates one more byte to get rid of buffer
	  overrun.  a patch from Charlie Savage at [ruby-core:22604].

Wed Jun  3 21:05:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>

	* ext/bigdecimal/bigdecimal.c (gfDebug): uncommented out.
	  [ruby-core:22600]

Wed Jun  3 20:54:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>

	* eval.c (rb_eval): needs to guard intermediate string objects.
	  based on a patch from Brent Roman <brent AT mbari.org> a
	  [ruby-core:22584].

Tue May 26 21:24:01 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>

	* Makefile.in (update-rubyspec, test-rubyspec): Catch up to
	  rubyspec merge.  A patch by Brian Ford at [ruby-core:21032]

Tue May 26 21:21:49 2009  Akinori MUSHA  <knu@iDaemons.org>

	* lib/soap/mimemessage.rb (MIMEMessage#to_s): Fix a fatal
	  method name typo. [Bug #1173]

Tue May 26 21:16:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>

	* file.c (rb_file_s_extname): fix for spaces before extention.
	  [ruby-dev:38044]

Tue May 26 21:09:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>

	* win32/win32.c (_CrtDbgReportW): prevent from false positive
	  assertions in msvcrtd.  [ruby-core:22116]

Tue May 26 21:02:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>

	* lib/ostruct.rb (OpenStruct#new_ostruct_member): checks if frozen.
	  [ruby-talk:328195], [ruby-core:22142]

Tue May 26 21:00:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>

	* lib/ostruct.rb (OpenStruct#inspect): fixed the recursion check.
	  Patch by Kornelius Kalnbach.  [ruby-core:20992].

	* test/ostruct/test_ostruct.rb: test for inspect.
	  Patch by Kornelius Kalnbach.  [ruby-core:20992].

Tue May 26 20:50:32 2009  Tanaka Akira  <akr@fsij.org>

	* eval.c (rb_thread_schedule): handle EBADF of select as well.
	  [ruby-core:21264]
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Wed Jun 10 12:47:36 UTC 2009

Modified Files:
	pkgsrc/devel/ruby-curses: distinfo

Log Message:
Update ruby-curses pakcage to 1.8.7.173 (1.8.7-p173).
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Wed Jun 10 12:48:07 UTC 2009

Modified Files:
	pkgsrc/devel/ruby-readline: Makefile

Log Message:
Update ruby-readline package to 1.8.7.173 (1.8.7-p173).

Reset PKGREVISION.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Wed Jun 10 12:48:38 UTC 2009

Modified Files:
	pkgsrc/x11/ruby-tk: distinfo

Log Message:
Update ruby-tk package to packages to 1.8.7.173 (1.8.7-p173).

6 files changed, 40 insertions, 59 deletions

diff --git a/devel/ruby-curses/distinfo b/devel/ruby-curses/distinfo
index f0098003c07..8502b529c27 100644
--- a/devel/ruby-curses/distinfo
+++ b/devel/ruby-curses/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17.8.1 2009/05/01 12:42:02 tron Exp $
+$NetBSD: distinfo,v 1.17.8.2 2009/06/11 22:21:57 tron Exp $
 
-SHA1 (ruby-1.8.7-p160.tar.bz2) = 64ed631a819f28d9dd86d2c699e1b0a94d7e5dc9
-RMD160 (ruby-1.8.7-p160.tar.bz2) = 77469c9c4e9303f2ec8ca72a0cbf98b674cb1415
-Size (ruby-1.8.7-p160.tar.bz2) = 4137518 bytes
+SHA1 (ruby-1.8.7-p173.tar.bz2) = 7dd92fedb49f8db5de7c501f5f0a27efd5e94010
+RMD160 (ruby-1.8.7-p173.tar.bz2) = 4892b14b9f86b6b9c2332f67c22badbc7ebd4201
+Size (ruby-1.8.7-p173.tar.bz2) = 4144667 bytes
 SHA1 (patch-aa) = 5e5dcea99e02716e42a428a2d01769c5709f0f45
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index 4da6bdf24ca..e12bf85c084 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.44.8.1 2009/05/01 12:42:02 tron Exp $
+# $NetBSD: rubyversion.mk,v 1.44.8.2 2009/06/11 22:21:57 tron Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -10,7 +10,7 @@ _RUBYVERSION_MK=	# defined
 RUBY18_VERSION=		1.8.7
 
 # patch
-RUBY18_PATCHLEVEL=	160
+RUBY18_PATCHLEVEL=	173
 
 # RUBY_VERSION_DEFAULT defines default version for Ruby related
 #	packages and user can define in mk.conf.  (1.6 or 1.8)
diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST
index fa0daed9948..385edb4777a 100644
--- a/lang/ruby18-base/PLIST
+++ b/lang/ruby18-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2008/06/19 14:35:37 taca Exp $
+@comment $NetBSD: PLIST,v 1.14.12.1 2009/06/11 22:21:57 tron Exp $
 bin/erb${RUBY_VER}
 bin/h2rb${RUBY_VER}
 bin/irb${RUBY_VER}
@@ -20,23 +20,24 @@ ${RUBY_LIB}/bigdecimal/ludcmp.rb
 ${RUBY_LIB}/bigdecimal/math.rb
 ${RUBY_LIB}/bigdecimal/newton.rb
 ${RUBY_LIB}/bigdecimal/util.rb
-${RUBY_LIB}/cgi/session/pstore.rb
-${RUBY_LIB}/cgi/session.rb
 ${RUBY_LIB}/cgi-lib.rb
 ${RUBY_LIB}/cgi.rb
+${RUBY_LIB}/cgi/session.rb
+${RUBY_LIB}/cgi/session/pstore.rb
 ${RUBY_LIB}/complex.rb
 ${RUBY_LIB}/csv.rb
-${RUBY_LIB}/digest/sha2.rb
-${RUBY_LIB}/digest.rb
-${RUBY_LIB}/date/format.rb
 ${RUBY_LIB}/date.rb
+${RUBY_LIB}/date/format.rb
 ${RUBY_LIB}/date2.rb
 ${RUBY_LIB}/debug.rb
 ${RUBY_LIB}/delegate.rb
+${RUBY_LIB}/digest.rb
+${RUBY_LIB}/digest/sha2.rb
 ${RUBY_LIB}/dl/import.rb
 ${RUBY_LIB}/dl/struct.rb
 ${RUBY_LIB}/dl/types.rb
 ${RUBY_LIB}/dl/win32.rb
+${RUBY_LIB}/drb.rb
 ${RUBY_LIB}/drb/acl.rb
 ${RUBY_LIB}/drb/drb.rb
 ${RUBY_LIB}/drb/eq.rb
@@ -48,7 +49,6 @@ ${RUBY_LIB}/drb/observer.rb
 ${RUBY_LIB}/drb/ssl.rb
 ${RUBY_LIB}/drb/timeridconv.rb
 ${RUBY_LIB}/drb/unix.rb
-${RUBY_LIB}/drb.rb
 ${RUBY_LIB}/e2mmap.rb
 ${RUBY_LIB}/erb.rb
 ${RUBY_LIB}/eregex.rb
@@ -64,17 +64,17 @@ ${RUBY_LIB}/getopts.rb
 ${RUBY_LIB}/gserver.rb
 ${RUBY_ARCHLIB}/bigdecimal.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/config.h
+${RUBY_ARCHLIB}/dbm.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/defines.h
 ${RUBY_ARCHLIB}/digest.h
-${RUBY_ARCHLIB}/dbm.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/digest.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/digest/bubblebabble.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/digest/md5.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/digest/rmd160.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/digest/sha1.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/digest/sha2.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/dl.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/dl.h
+${RUBY_ARCHLIB}/dl.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/dlconfig.h
 ${RUBY_ARCHLIB}/dln.h
 ${RUBY_ARCHLIB}/env.h
@@ -111,6 +111,7 @@ ${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT}
 ${RUBY_LIB}/importenv.rb
 ${PLIST.io}${RUBY_LIB}/io/nonblock.rb
 ${RUBY_LIB}/ipaddr.rb
+${RUBY_LIB}/irb.rb
 ${RUBY_LIB}/irb/cmd/chws.rb
 ${RUBY_LIB}/irb/cmd/fork.rb
 ${RUBY_LIB}/irb/cmd/help.rb
@@ -148,7 +149,6 @@ ${RUBY_LIB}/irb/version.rb
 ${RUBY_LIB}/irb/workspace.rb
 ${RUBY_LIB}/irb/ws-for-case-2.rb
 ${RUBY_LIB}/irb/xmp.rb
-${RUBY_LIB}/irb.rb
 ${RUBY_LIB}/jcode.rb
 ${RUBY_LIB}/kconv.rb
 ${RUBY_LIB}/logger.rb
@@ -180,12 +180,12 @@ ${RUBY_LIB}/openssl/digest.rb
 ${RUBY_LIB}/openssl/pkcs7.rb
 ${RUBY_LIB}/openssl/ssl.rb
 ${RUBY_LIB}/openssl/x509.rb
+${RUBY_LIB}/optparse.rb
 ${RUBY_LIB}/optparse/date.rb
 ${RUBY_LIB}/optparse/shellwords.rb
 ${RUBY_LIB}/optparse/time.rb
 ${RUBY_LIB}/optparse/uri.rb
 ${RUBY_LIB}/optparse/version.rb
-${RUBY_LIB}/optparse.rb
 ${RUBY_LIB}/ostruct.rb
 ${RUBY_LIB}/parsearg.rb
 ${RUBY_LIB}/parsedate.rb
@@ -215,6 +215,7 @@ ${RUBY_LIB}/rdoc/generators/template/xml/xml.rb
 ${RUBY_LIB}/rdoc/generators/xml_generator.rb
 ${RUBY_LIB}/rdoc/markup/sample/rdoc2latex.rb
 ${RUBY_LIB}/rdoc/markup/sample/sample.rb
+${RUBY_LIB}/rdoc/markup/simple_markup.rb
 ${RUBY_LIB}/rdoc/markup/simple_markup/fragments.rb
 ${RUBY_LIB}/rdoc/markup/simple_markup/inline.rb
 ${RUBY_LIB}/rdoc/markup/simple_markup/lines.rb
@@ -222,7 +223,6 @@ ${RUBY_LIB}/rdoc/markup/simple_markup/preprocess.rb
 ${RUBY_LIB}/rdoc/markup/simple_markup/to_flow.rb
 ${RUBY_LIB}/rdoc/markup/simple_markup/to_html.rb
 ${RUBY_LIB}/rdoc/markup/simple_markup/to_latex.rb
-${RUBY_LIB}/rdoc/markup/simple_markup.rb
 ${RUBY_LIB}/rdoc/markup/test/AllTests.rb
 ${RUBY_LIB}/rdoc/markup/test/TestInline.rb
 ${RUBY_LIB}/rdoc/markup/test/TestParse.rb
@@ -317,16 +317,17 @@ ${RUBY_LIB}/rss/0.9.rb
 ${RUBY_LIB}/rss/1.0.rb
 ${RUBY_LIB}/rss/2.0.rb
 ${RUBY_LIB}/rss/atom.rb
+${RUBY_LIB}/rss/content.rb
 ${RUBY_LIB}/rss/content/1.0.rb
 ${RUBY_LIB}/rss/content/2.0.rb
-${RUBY_LIB}/rss/content.rb
 ${RUBY_LIB}/rss/converter.rb
+${RUBY_LIB}/rss/dublincore.rb
 ${RUBY_LIB}/rss/dublincore/1.0.rb
 ${RUBY_LIB}/rss/dublincore/2.0.rb
 ${RUBY_LIB}/rss/dublincore/atom.rb
-${RUBY_LIB}/rss/dublincore.rb
 ${RUBY_LIB}/rss/image.rb
 ${RUBY_LIB}/rss/itunes.rb
+${RUBY_LIB}/rss/maker.rb
 ${RUBY_LIB}/rss/maker/0.9.rb
 ${RUBY_LIB}/rss/maker/1.0.rb
 ${RUBY_LIB}/rss/maker/2.0.rb
@@ -342,7 +343,6 @@ ${RUBY_LIB}/rss/maker/slash.rb
 ${RUBY_LIB}/rss/maker/syndication.rb
 ${RUBY_LIB}/rss/maker/taxonomy.rb
 ${RUBY_LIB}/rss/maker/trackback.rb
-${RUBY_LIB}/rss/maker.rb
 ${RUBY_LIB}/rss/parser.rb
 ${RUBY_LIB}/rss/rexmlparser.rb
 ${RUBY_LIB}/rss/rss.rb
@@ -367,6 +367,7 @@ ${RUBY_LIB}/scanf.rb
 ${RUBY_LIB}/securerandom.rb
 ${RUBY_LIB}/set.rb
 ${RUBY_LIB}/sha1.rb
+${RUBY_LIB}/shell.rb
 ${RUBY_LIB}/shell/builtin-command.rb
 ${RUBY_LIB}/shell/command-processor.rb
 ${RUBY_LIB}/shell/error.rb
@@ -374,7 +375,6 @@ ${RUBY_LIB}/shell/filter.rb
 ${RUBY_LIB}/shell/process-controller.rb
 ${RUBY_LIB}/shell/system-command.rb
 ${RUBY_LIB}/shell/version.rb
-${RUBY_LIB}/shell.rb
 ${RUBY_LIB}/shellwords.rb
 ${RUBY_LIB}/singleton.rb
 ${RUBY_LIB}/soap/attachment.rb
@@ -385,10 +385,11 @@ ${RUBY_LIB}/soap/encodingstyle/handler.rb
 ${RUBY_LIB}/soap/encodingstyle/literalHandler.rb
 ${RUBY_LIB}/soap/encodingstyle/soapHandler.rb
 ${RUBY_LIB}/soap/generator.rb
-${RUBY_LIB}/soap/httpconfigloader.rb
 ${RUBY_LIB}/soap/header/handler.rb
 ${RUBY_LIB}/soap/header/handlerset.rb
 ${RUBY_LIB}/soap/header/simplehandler.rb
+${RUBY_LIB}/soap/httpconfigloader.rb
+${RUBY_LIB}/soap/mapping.rb
 ${RUBY_LIB}/soap/mapping/factory.rb
 ${RUBY_LIB}/soap/mapping/mapping.rb
 ${RUBY_LIB}/soap/mapping/registry.rb
@@ -396,7 +397,6 @@ ${RUBY_LIB}/soap/mapping/rubytypeFactory.rb
 ${RUBY_LIB}/soap/mapping/typeMap.rb
 ${RUBY_LIB}/soap/mapping/wsdlencodedregistry.rb
 ${RUBY_LIB}/soap/mapping/wsdlliteralregistry.rb
-${RUBY_LIB}/soap/mapping.rb
 ${RUBY_LIB}/soap/marshal.rb
 ${RUBY_LIB}/soap/mimemessage.rb
 ${RUBY_LIB}/soap/netHttpClient.rb
@@ -417,12 +417,13 @@ ${RUBY_LIB}/soap/streamHandler.rb
 ${RUBY_LIB}/soap/wsdlDriver.rb
 ${RUBY_LIB}/sync.rb
 ${RUBY_LIB}/tempfile.rb
+${RUBY_LIB}/test/unit.rb
 ${RUBY_LIB}/test/unit/assertionfailederror.rb
 ${RUBY_LIB}/test/unit/assertions.rb
 ${RUBY_LIB}/test/unit/autorunner.rb
+${RUBY_LIB}/test/unit/collector.rb
 ${RUBY_LIB}/test/unit/collector/dir.rb
 ${RUBY_LIB}/test/unit/collector/objectspace.rb
-${RUBY_LIB}/test/unit/collector.rb
 ${RUBY_LIB}/test/unit/error.rb
 ${RUBY_LIB}/test/unit/failure.rb
 ${RUBY_LIB}/test/unit/testcase.rb
@@ -438,7 +439,6 @@ ${RUBY_LIB}/test/unit/ui/tk/testrunner.rb
 ${RUBY_LIB}/test/unit/util/backtracefilter.rb
 ${RUBY_LIB}/test/unit/util/observable.rb
 ${RUBY_LIB}/test/unit/util/procwrapper.rb
-${RUBY_LIB}/test/unit.rb
 ${RUBY_LIB}/thread.rb
 ${RUBY_LIB}/thwait.rb
 ${RUBY_LIB}/time.rb
@@ -447,6 +447,7 @@ ${RUBY_LIB}/tmpdir.rb
 ${RUBY_LIB}/tracer.rb
 ${RUBY_LIB}/tsort.rb
 ${RUBY_LIB}/un.rb
+${RUBY_LIB}/uri.rb
 ${RUBY_LIB}/uri/common.rb
 ${RUBY_LIB}/uri/ftp.rb
 ${RUBY_LIB}/uri/generic.rb
@@ -455,14 +456,15 @@ ${RUBY_LIB}/uri/https.rb
 ${RUBY_LIB}/uri/ldap.rb
 ${RUBY_LIB}/uri/ldaps.rb
 ${RUBY_LIB}/uri/mailto.rb
-${RUBY_LIB}/uri.rb
 ${RUBY_LIB}/weakref.rb
+${RUBY_LIB}/webrick.rb
 ${RUBY_LIB}/webrick/accesslog.rb
 ${RUBY_LIB}/webrick/cgi.rb
 ${RUBY_LIB}/webrick/compat.rb
 ${RUBY_LIB}/webrick/config.rb
 ${RUBY_LIB}/webrick/cookie.rb
 ${RUBY_LIB}/webrick/htmlutils.rb
+${RUBY_LIB}/webrick/httpauth.rb
 ${RUBY_LIB}/webrick/httpauth/authenticator.rb
 ${RUBY_LIB}/webrick/httpauth/basicauth.rb
 ${RUBY_LIB}/webrick/httpauth/digestauth.rb
@@ -470,19 +472,18 @@ ${RUBY_LIB}/webrick/httpauth/htdigest.rb
 ${RUBY_LIB}/webrick/httpauth/htgroup.rb
 ${RUBY_LIB}/webrick/httpauth/htpasswd.rb
 ${RUBY_LIB}/webrick/httpauth/userdb.rb
-${RUBY_LIB}/webrick/httpauth.rb
 ${RUBY_LIB}/webrick/httpproxy.rb
 ${RUBY_LIB}/webrick/httprequest.rb
 ${RUBY_LIB}/webrick/httpresponse.rb
 ${RUBY_LIB}/webrick/https.rb
 ${RUBY_LIB}/webrick/httpserver.rb
+${RUBY_LIB}/webrick/httpservlet.rb
 ${RUBY_LIB}/webrick/httpservlet/abstract.rb
 ${RUBY_LIB}/webrick/httpservlet/cgi_runner.rb
 ${RUBY_LIB}/webrick/httpservlet/cgihandler.rb
 ${RUBY_LIB}/webrick/httpservlet/erbhandler.rb
 ${RUBY_LIB}/webrick/httpservlet/filehandler.rb
 ${RUBY_LIB}/webrick/httpservlet/prochandler.rb
-${RUBY_LIB}/webrick/httpservlet.rb
 ${RUBY_LIB}/webrick/httpstatus.rb
 ${RUBY_LIB}/webrick/httputils.rb
 ${RUBY_LIB}/webrick/httpversion.rb
@@ -491,7 +492,6 @@ ${RUBY_LIB}/webrick/server.rb
 ${RUBY_LIB}/webrick/ssl.rb
 ${RUBY_LIB}/webrick/utils.rb
 ${RUBY_LIB}/webrick/version.rb
-${RUBY_LIB}/webrick.rb
 ${RUBY_LIB}/wsdl/binding.rb
 ${RUBY_LIB}/wsdl/data.rb
 ${RUBY_LIB}/wsdl/definitions.rb
@@ -580,11 +580,12 @@ ${RUBY_LIB}/xsd/mapping.rb
 ${RUBY_LIB}/xsd/namedelements.rb
 ${RUBY_LIB}/xsd/ns.rb
 ${RUBY_LIB}/xsd/qname.rb
+${RUBY_LIB}/xsd/xmlparser.rb
 ${RUBY_LIB}/xsd/xmlparser/parser.rb
 ${RUBY_LIB}/xsd/xmlparser/rexmlparser.rb
 ${RUBY_LIB}/xsd/xmlparser/xmlparser.rb
 ${RUBY_LIB}/xsd/xmlparser/xmlscanner.rb
-${RUBY_LIB}/xsd/xmlparser.rb
+${RUBY_LIB}/yaml.rb
 ${RUBY_LIB}/yaml/baseemitter.rb
 ${RUBY_LIB}/yaml/basenode.rb
 ${RUBY_LIB}/yaml/constants.rb
@@ -601,7 +602,6 @@ ${RUBY_LIB}/yaml/tag.rb
 ${RUBY_LIB}/yaml/types.rb
 ${RUBY_LIB}/yaml/yamlnode.rb
 ${RUBY_LIB}/yaml/ypath.rb
-${RUBY_LIB}/yaml.rb
 man/man1/${RUBY_NAME}.1
 ${RUBY_DOC}/CHANGES.pkgsrc
 ${RUBY_DOC}/COPYING
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index 979ed8e99b2..8397d947156 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.35.2.2 2009/05/10 07:41:59 tron Exp $
+$NetBSD: distinfo,v 1.35.2.3 2009/06/11 22:21:58 tron Exp $
 
-SHA1 (ruby-1.8.7-p160.tar.bz2) = 64ed631a819f28d9dd86d2c699e1b0a94d7e5dc9
-RMD160 (ruby-1.8.7-p160.tar.bz2) = 77469c9c4e9303f2ec8ca72a0cbf98b674cb1415
-Size (ruby-1.8.7-p160.tar.bz2) = 4137518 bytes
+SHA1 (ruby-1.8.7-p173.tar.bz2) = 7dd92fedb49f8db5de7c501f5f0a27efd5e94010
+RMD160 (ruby-1.8.7-p173.tar.bz2) = 4892b14b9f86b6b9c2332f67c22badbc7ebd4201
+Size (ruby-1.8.7-p173.tar.bz2) = 4144667 bytes
 SHA1 (patch-aa) = 59f4462dada7e7b00c7a773c8a95454f3dc4f994
 SHA1 (patch-ab) = 239872c5faf95c05d2a94fe5f40af5b8541423c7
 SHA1 (patch-ac) = eb4dd068729ba2a2c7d4d659f6bcdb1410227f3b
-SHA1 (patch-bi) = 4788a32945edfc6f992b7687688303afdb0408c4
diff --git a/lang/ruby18-base/patches/patch-bi b/lang/ruby18-base/patches/patch-bi
deleted file mode 100644
index 1c1f7d5c8d6..00000000000
--- a/lang/ruby18-base/patches/patch-bi
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bi,v 1.3.2.2 2009/05/10 07:41:59 tron Exp $
-
-Fix build problem on Solaris 10:
-	http://redmine.ruby-lang.org/repositories/revision/2?rev=22812
-
---- file.c.orig	2009-03-23 17:44:31.000000000 +0900
-+++ file.c
-@@ -68,6 +68,10 @@ char *strrchr _((const char*,const char)
- #include <sys/mkdev.h>
- #endif
- 
-+#if defined(HAVE_FCNTL_H)
-+#include <fcntl.h>
-+#endif
-+
- #if !defined HAVE_LSTAT && !defined lstat
- #define lstat stat
- #endif
diff --git a/x11/ruby-tk/distinfo b/x11/ruby-tk/distinfo
index 0f26206d84d..04190e5fd9c 100644
--- a/x11/ruby-tk/distinfo
+++ b/x11/ruby-tk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20.8.1 2009/05/01 12:42:03 tron Exp $
+$NetBSD: distinfo,v 1.20.8.2 2009/06/11 22:21:58 tron Exp $
 
-SHA1 (ruby-1.8.7-p160.tar.bz2) = 64ed631a819f28d9dd86d2c699e1b0a94d7e5dc9
-RMD160 (ruby-1.8.7-p160.tar.bz2) = 77469c9c4e9303f2ec8ca72a0cbf98b674cb1415
-Size (ruby-1.8.7-p160.tar.bz2) = 4137518 bytes
+SHA1 (ruby-1.8.7-p173.tar.bz2) = 7dd92fedb49f8db5de7c501f5f0a27efd5e94010
+RMD160 (ruby-1.8.7-p173.tar.bz2) = 4892b14b9f86b6b9c2332f67c22badbc7ebd4201
+Size (ruby-1.8.7-p173.tar.bz2) = 4144667 bytes
 SHA1 (patch-aa) = 3e4795c80ec44b8aade5ce5ed6c2936f9f1d1e09