Update Ruby 1.8.2.

This is basically bug fix release, but official changes aren't provided
yet.  Please refer ChangeLog.

Here is pkgsrc changes:

o Set RUBY_HAS_ARCHLIB=yes for Ruby packages including archtecture depending
  extention library in order to depend more specific Ruby.

o Now install database for ri(1).  Fix PR pkg/28566.

o Net::IMAP

	* lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]

o NKF:

	* ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
	  variables.  fixed: [ruby-list:40445]

	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
	  0xfe.

	* ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16
	  properly.

o WEBrick

	* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
	  raise NotImplementedError if password is encrypted by digest
	  algorithms. This patch is contributed by sheepman. [ruby-list:40467]

	* lib/webrick/httpauth/digestauth.rb
	  (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
	  This patch is contributed by sheepman. [ruby-list:40482]

	* lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
	  encoding/decoding. fixed: [ruby-dev:25336]

22 files changed, 440 insertions, 317 deletions

diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 71eaa557cee..a64a873a86d 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/12/05 17:25:53 taca Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/23 17:33:19 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-${RUBY_VERSION}
-PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -19,6 +18,8 @@ GNU_CONFIGURE=		yes
 TEST_TARGET=		test
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=		PREFIX="${PREFIX}"
+INSTALL_TARGET=		install install-doc
+WRKSRC=			${RUBY_WRKSRC}
 
 # Ruby build process depends on config.status's content
 CONFIG_STATUS_OVERRIDE=	# empty
@@ -85,20 +86,20 @@ REPLACE_RUBY=	bin/erb bin/irb bin/rdoc bin/ri bin/testrb \
 		sample/uumerge.rb
 
 pre-configure:
-	${RM} -f ${WRKSRC}/ext/curses/MANIFEST
-	${RM} -f ${WRKSRC}/ext/dbm/MANIFEST
-	${RM} -f ${WRKSRC}/ext/gdbm/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/md5/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/rmd160/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/sha1/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/sha2/MANIFEST
-	${RM} -f ${WRKSRC}/ext/iconv/MANIFEST
-	${RM} -f ${WRKSRC}/ext/openssl/MANIFEST
-	${RM} -f ${WRKSRC}/ext/readline/MANIFEST
-	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
-	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
-	${RM} -f ${WRKSRC}/ext/zlib/MANIFEST
+	${RM} -f ${WRKSRC}/ext/curses/extconf.rb
+	${RM} -f ${WRKSRC}/ext/dbm/extconf.rb
+	${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb
+	${RM} -f ${WRKSRC}/ext/digest/extconf.rb
+	${RM} -f ${WRKSRC}/ext/digest/md5/extconf.rb
+	${RM} -f ${WRKSRC}/ext/digest/rmd160/extconf.rb
+	${RM} -f ${WRKSRC}/ext/digest/sha1/extconf.rb
+	${RM} -f ${WRKSRC}/ext/digest/sha2/extconf.rb
+	${RM} -f ${WRKSRC}/ext/iconv/extconf.rb
+	${RM} -f ${WRKSRC}/ext/openssl/extconf.rb
+	${RM} -f ${WRKSRC}/ext/readline/extconf.rb
+	${RM} -f ${WRKSRC}/ext/tcltklib/extconf.rb
+	${RM} -f ${WRKSRC}/ext/tk/extconf.rb
+	${RM} -f ${WRKSRC}/ext/zlib/extconf.rb
 	${RM} -f ${WRKSRC}/sample/dbmtest.rb
 	${RM} -rf ${WRKSRC}/sample/openssl
 
diff --git a/lang/ruby18/PLIST b/lang/ruby18/PLIST
index 348ae54c26d..e3e6f2300a8 100644
--- a/lang/ruby18/PLIST
+++ b/lang/ruby18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/04 17:20:46 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/01/23 17:33:19 taca Exp $
 bin/erb${RUBY_VER}
 bin/irb${RUBY_VER}
 bin/rdoc${RUBY_VER}
@@ -54,6 +54,51 @@ ${RUBY_EXAMPLESDIR}/dl/msgbox.rb
 ${RUBY_EXAMPLESDIR}/dl/msgbox2.rb
 ${RUBY_EXAMPLESDIR}/dl/stream.rb
 @dirrm ${RUBY_EXAMPLESDIR}/dl
+${RUBY_EXAMPLESDIR}/drb/README.rd
+${RUBY_EXAMPLESDIR}/drb/README.rd.ja
+${RUBY_EXAMPLESDIR}/drb/darray.rb
+${RUBY_EXAMPLESDIR}/drb/darrayc.rb
+${RUBY_EXAMPLESDIR}/drb/dbiff.rb
+${RUBY_EXAMPLESDIR}/drb/dcdbiff.rb
+${RUBY_EXAMPLESDIR}/drb/dchatc.rb
+${RUBY_EXAMPLESDIR}/drb/dchats.rb
+${RUBY_EXAMPLESDIR}/drb/dhasen.rb
+${RUBY_EXAMPLESDIR}/drb/dhasenc.rb
+${RUBY_EXAMPLESDIR}/drb/dlogc.rb
+${RUBY_EXAMPLESDIR}/drb/dlogd.rb
+${RUBY_EXAMPLESDIR}/drb/dqin.rb
+${RUBY_EXAMPLESDIR}/drb/dqlib.rb
+${RUBY_EXAMPLESDIR}/drb/dqout.rb
+${RUBY_EXAMPLESDIR}/drb/dqueue.rb
+${RUBY_EXAMPLESDIR}/drb/drbc.rb
+${RUBY_EXAMPLESDIR}/drb/drbch.rb
+${RUBY_EXAMPLESDIR}/drb/drbm.rb
+${RUBY_EXAMPLESDIR}/drb/drbmc.rb
+${RUBY_EXAMPLESDIR}/drb/drbs-acl.rb
+${RUBY_EXAMPLESDIR}/drb/drbs.rb
+${RUBY_EXAMPLESDIR}/drb/drbssl_c.rb
+${RUBY_EXAMPLESDIR}/drb/drbssl_s.rb
+${RUBY_EXAMPLESDIR}/drb/extserv_test.rb
+${RUBY_EXAMPLESDIR}/drb/gw_ct.rb
+${RUBY_EXAMPLESDIR}/drb/gw_cu.rb
+${RUBY_EXAMPLESDIR}/drb/gw_s.rb
+${RUBY_EXAMPLESDIR}/drb/holderc.rb
+${RUBY_EXAMPLESDIR}/drb/holders.rb
+${RUBY_EXAMPLESDIR}/drb/http0.rb
+${RUBY_EXAMPLESDIR}/drb/http0serv.rb
+${RUBY_EXAMPLESDIR}/drb/name.rb
+${RUBY_EXAMPLESDIR}/drb/namec.rb
+${RUBY_EXAMPLESDIR}/drb/old_tuplespace.rb
+${RUBY_EXAMPLESDIR}/drb/rinda_ts.rb
+${RUBY_EXAMPLESDIR}/drb/rindac.rb
+${RUBY_EXAMPLESDIR}/drb/rindas.rb
+${RUBY_EXAMPLESDIR}/drb/ring_echo.rb
+${RUBY_EXAMPLESDIR}/drb/ring_inspect.rb
+${RUBY_EXAMPLESDIR}/drb/ring_place.rb
+${RUBY_EXAMPLESDIR}/drb/simpletuple.rb
+${RUBY_EXAMPLESDIR}/drb/speedc.rb
+${RUBY_EXAMPLESDIR}/drb/speeds.rb
+@dirrm ${RUBY_EXAMPLESDIR}/drb
 ${RUBY_EXAMPLESDIR}/dualstack-fetch.rb
 ${RUBY_EXAMPLESDIR}/dualstack-httpd.rb
 ${RUBY_EXAMPLESDIR}/eval.rb
@@ -87,6 +132,7 @@ ${RUBY_EXAMPLESDIR}/occur.pl
 ${RUBY_EXAMPLESDIR}/occur.rb
 ${RUBY_EXAMPLESDIR}/occur2.rb
 ${RUBY_EXAMPLESDIR}/optparse/opttest.rb
+${RUBY_EXAMPLESDIR}/optparse/subcommand.rb
 @dirrm ${RUBY_EXAMPLESDIR}/optparse
 ${RUBY_EXAMPLESDIR}/philos.rb
 ${RUBY_EXAMPLESDIR}/pi.rb
@@ -98,13 +144,26 @@ ${RUBY_EXAMPLESDIR}/rcs.awk
 ${RUBY_EXAMPLESDIR}/rcs.dat
 ${RUBY_EXAMPLESDIR}/rcs.rb
 ${RUBY_EXAMPLESDIR}/regx.rb
+${RUBY_EXAMPLESDIR}/rss/blend.rb
+${RUBY_EXAMPLESDIR}/rss/list_description.rb
+${RUBY_EXAMPLESDIR}/rss/rss_recent.rb
+${RUBY_EXAMPLESDIR}/rss/tdiary_plugin/rss-recent.rb
+@dirrm ${RUBY_EXAMPLESDIR}/rss/tdiary_plugin
+@dirrm ${RUBY_EXAMPLESDIR}/rss
 ${RUBY_EXAMPLESDIR}/sieve.rb
+${RUBY_EXAMPLESDIR}/soap/authheader/authmgr.rb
+${RUBY_EXAMPLESDIR}/soap/authheader/client.rb
+${RUBY_EXAMPLESDIR}/soap/authheader/client2.rb
+${RUBY_EXAMPLESDIR}/soap/authheader/server.rb
+${RUBY_EXAMPLESDIR}/soap/authheader/server2.rb
+@dirrm ${RUBY_EXAMPLESDIR}/soap/authheader
 ${RUBY_EXAMPLESDIR}/soap/babelfish.rb
 ${RUBY_EXAMPLESDIR}/soap/calc/calc.rb
 ${RUBY_EXAMPLESDIR}/soap/calc/calc2.rb
 ${RUBY_EXAMPLESDIR}/soap/calc/client.rb
 ${RUBY_EXAMPLESDIR}/soap/calc/client2.rb
 ${RUBY_EXAMPLESDIR}/soap/calc/httpd.rb
+${RUBY_EXAMPLESDIR}/soap/calc/samplehttpd.conf
 ${RUBY_EXAMPLESDIR}/soap/calc/server.cgi
 ${RUBY_EXAMPLESDIR}/soap/calc/server.rb
 ${RUBY_EXAMPLESDIR}/soap/calc/server2.rb
@@ -113,11 +172,14 @@ ${RUBY_EXAMPLESDIR}/soap/digraph.rb
 ${RUBY_EXAMPLESDIR}/soap/exchange/client.rb
 ${RUBY_EXAMPLESDIR}/soap/exchange/exchange.rb
 ${RUBY_EXAMPLESDIR}/soap/exchange/httpd.rb
+${RUBY_EXAMPLESDIR}/soap/exchange/samplehttpd.conf
 ${RUBY_EXAMPLESDIR}/soap/exchange/server.cgi
 ${RUBY_EXAMPLESDIR}/soap/exchange/server.rb
 @dirrm ${RUBY_EXAMPLESDIR}/soap/exchange
 ${RUBY_EXAMPLESDIR}/soap/helloworld/hw_c.rb
 ${RUBY_EXAMPLESDIR}/soap/helloworld/hw_s.rb
+${RUBY_EXAMPLESDIR}/soap/helloworld/hw_c_gzip.rb
+${RUBY_EXAMPLESDIR}/soap/helloworld/hw_s_gzip.rb
 @dirrm ${RUBY_EXAMPLESDIR}/soap/helloworld
 ${RUBY_EXAMPLESDIR}/soap/icd/IICD.rb
 ${RUBY_EXAMPLESDIR}/soap/icd/icd.rb
@@ -125,13 +187,48 @@ ${RUBY_EXAMPLESDIR}/soap/icd/icd.rb
 ${RUBY_EXAMPLESDIR}/soap/raa/iRAA.rb
 ${RUBY_EXAMPLESDIR}/soap/raa/soap4r.rb
 @dirrm ${RUBY_EXAMPLESDIR}/soap/raa
+${RUBY_EXAMPLESDIR}/soap/raa2.4/raa.rb
+${RUBY_EXAMPLESDIR}/soap/raa2.4/raaDriver.rb
+${RUBY_EXAMPLESDIR}/soap/raa2.4/raaServiceClient.rb
+${RUBY_EXAMPLESDIR}/soap/raa2.4/sample.rb
+@dirrm ${RUBY_EXAMPLESDIR}/soap/raa2.4
 ${RUBY_EXAMPLESDIR}/soap/sampleStruct/client.rb
 ${RUBY_EXAMPLESDIR}/soap/sampleStruct/httpd.rb
 ${RUBY_EXAMPLESDIR}/soap/sampleStruct/iSampleStruct.rb
+${RUBY_EXAMPLESDIR}/soap/sampleStruct/samplehttpd.conf
 ${RUBY_EXAMPLESDIR}/soap/sampleStruct/sampleStruct.rb
 ${RUBY_EXAMPLESDIR}/soap/sampleStruct/server.cgi
 ${RUBY_EXAMPLESDIR}/soap/sampleStruct/server.rb
 @dirrm ${RUBY_EXAMPLESDIR}/soap/sampleStruct
+${RUBY_EXAMPLESDIR}/soap/scopesample/client.rb
+${RUBY_EXAMPLESDIR}/soap/scopesample/httpd.rb
+${RUBY_EXAMPLESDIR}/soap/scopesample/samplehttpd.conf
+${RUBY_EXAMPLESDIR}/soap/scopesample/servant.rb
+${RUBY_EXAMPLESDIR}/soap/scopesample/server.cgi
+${RUBY_EXAMPLESDIR}/soap/scopesample/server.rb
+@dirrm ${RUBY_EXAMPLESDIR}/soap/scopesample
+${RUBY_EXAMPLESDIR}/soap/ssl/files/README
+${RUBY_EXAMPLESDIR}/soap/ssl/files/ca.cert
+${RUBY_EXAMPLESDIR}/soap/ssl/files/client.cert
+${RUBY_EXAMPLESDIR}/soap/ssl/files/client.key
+${RUBY_EXAMPLESDIR}/soap/ssl/files/server.cert
+${RUBY_EXAMPLESDIR}/soap/ssl/files/server.key
+${RUBY_EXAMPLESDIR}/soap/ssl/files/sslclient.properties
+${RUBY_EXAMPLESDIR}/soap/ssl/files/sslclient_require_noserverauth.properties
+${RUBY_EXAMPLESDIR}/soap/ssl/files/sslclient_with_clientauth.properties
+${RUBY_EXAMPLESDIR}/soap/ssl/files/subca.cert
+@dirrm ${RUBY_EXAMPLESDIR}/soap/ssl/files
+${RUBY_EXAMPLESDIR}/soap/ssl/sslclient.rb
+${RUBY_EXAMPLESDIR}/soap/ssl/sslclient_require_noserverauth.rb
+${RUBY_EXAMPLESDIR}/soap/ssl/sslclient_with_clientauth.rb
+${RUBY_EXAMPLESDIR}/soap/ssl/sslserver.rb
+${RUBY_EXAMPLESDIR}/soap/ssl/sslserver_noauth.rb
+${RUBY_EXAMPLESDIR}/soap/ssl/sslserver_require_clientauth.rb
+@dirrm ${RUBY_EXAMPLESDIR}/soap/ssl
+${RUBY_EXAMPLESDIR}/soap/swa/client.rb
+${RUBY_EXAMPLESDIR}/soap/swa/server.rb
+@dirrm ${RUBY_EXAMPLESDIR}/soap/swa
+${RUBY_EXAMPLESDIR}/soap/whois.rb
 @dirrm ${RUBY_EXAMPLESDIR}/soap
 ${RUBY_EXAMPLESDIR}/svr.rb
 ${RUBY_EXAMPLESDIR}/test.rb
@@ -145,6 +242,15 @@ ${RUBY_EXAMPLESDIR}/time.rb
 ${RUBY_EXAMPLESDIR}/trojan.rb
 ${RUBY_EXAMPLESDIR}/tsvr.rb
 ${RUBY_EXAMPLESDIR}/uumerge.rb
+${RUBY_EXAMPLESDIR}/webrick/demo-app.rb
+${RUBY_EXAMPLESDIR}/webrick/demo-multipart.cgi
+${RUBY_EXAMPLESDIR}/webrick/demo-servlet.rb
+${RUBY_EXAMPLESDIR}/webrick/demo-urlencoded.cgi
+${RUBY_EXAMPLESDIR}/webrick/hello.cgi
+${RUBY_EXAMPLESDIR}/webrick/hello.rb
+${RUBY_EXAMPLESDIR}/webrick/httpd.rb
+${RUBY_EXAMPLESDIR}/webrick/httpsd.rb
+@dirrm ${RUBY_EXAMPLESDIR}/webrick
 ${RUBY_EXAMPLESDIR}/wsdl/amazon/AmazonSearch.rb
 ${RUBY_EXAMPLESDIR}/wsdl/amazon/AmazonSearchDriver.rb
 ${RUBY_EXAMPLESDIR}/wsdl/amazon/sampleClient.rb
@@ -155,12 +261,16 @@ ${RUBY_EXAMPLESDIR}/wsdl/googleSearch/GoogleSearchDriver.rb
 ${RUBY_EXAMPLESDIR}/wsdl/googleSearch/README
 ${RUBY_EXAMPLESDIR}/wsdl/googleSearch/httpd.rb
 ${RUBY_EXAMPLESDIR}/wsdl/googleSearch/sampleClient.rb
+${RUBY_EXAMPLESDIR}/wsdl/googleSearch/samplehttpd.conf
 ${RUBY_EXAMPLESDIR}/wsdl/googleSearch/sjissearch.sh
 ${RUBY_EXAMPLESDIR}/wsdl/googleSearch/wsdlDriver.rb
 @dirrm ${RUBY_EXAMPLESDIR}/wsdl/googleSearch
 ${RUBY_EXAMPLESDIR}/wsdl/raa/raa.wsdl
 ${RUBY_EXAMPLESDIR}/wsdl/raa/soap4r.rb
 @dirrm ${RUBY_EXAMPLESDIR}/wsdl/raa
+${RUBY_EXAMPLESDIR}/wsdl/raa2.4/raa.rb
+${RUBY_EXAMPLESDIR}/wsdl/raa2.4/wsdlDriver.rb
+@dirrm ${RUBY_EXAMPLESDIR}/wsdl/raa2.4
 @dirrm ${RUBY_EXAMPLESDIR}/wsdl
 @dirrm ${RUBY_EXAMPLESDIR}
 lib/libruby${RUBY_VER}-static.a
@@ -360,6 +470,7 @@ ${RUBY_LIBDIR}/rdoc/generators/template/html/hefss.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/html/html.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/html/kilmer.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/html/old_html.rb
+${RUBY_LIBDIR}/rdoc/generators/template/html/one_page_html.rb
 @dirrm ${RUBY_LIBDIR}/rdoc/generators/template/html
 ${RUBY_LIBDIR}/rdoc/generators/template/xml/rdf.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/xml/xml.rb
@@ -394,6 +505,8 @@ ${RUBY_LIBDIR}/rdoc/parsers/parserfactory.rb
 ${RUBY_LIBDIR}/rdoc/rdoc.rb
 ${RUBY_LIBDIR}/rdoc/ri/ri_cache.rb
 ${RUBY_LIBDIR}/rdoc/ri/ri_descriptions.rb
+${RUBY_LIBDIR}/rdoc/ri/ri_display.rb
+${RUBY_LIBDIR}/rdoc/ri/ri_driver.rb
 ${RUBY_LIBDIR}/rdoc/ri/ri_formatter.rb
 ${RUBY_LIBDIR}/rdoc/ri/ri_options.rb
 ${RUBY_LIBDIR}/rdoc/ri/ri_paths.rb
@@ -403,6 +516,7 @@ ${RUBY_LIBDIR}/rdoc/ri/ri_writer.rb
 @dirrm ${RUBY_LIBDIR}/rdoc/ri
 ${RUBY_LIBDIR}/rdoc/template.rb
 ${RUBY_LIBDIR}/rdoc/tokenstream.rb
+${RUBY_LIBDIR}/rdoc/usage.rb
 @dirrm ${RUBY_LIBDIR}/rdoc
 ${RUBY_LIBDIR}/readbytes.rb
 ${RUBY_LIBDIR}/resolv-replace.rb
@@ -422,9 +536,11 @@ ${RUBY_LIBDIR}/rexml/dtd/notationdecl.rb
 @dirrm ${RUBY_LIBDIR}/rexml/dtd
 ${RUBY_LIBDIR}/rexml/element.rb
 ${RUBY_LIBDIR}/rexml/encoding.rb
+${RUBY_LIBDIR}/rexml/encodings/CP-1252.rb
 ${RUBY_LIBDIR}/rexml/encodings/EUC-JP.rb
 ${RUBY_LIBDIR}/rexml/encodings/ICONV.rb
 ${RUBY_LIBDIR}/rexml/encodings/ISO-8859-1.rb
+${RUBY_LIBDIR}/rexml/encodings/ISO-8859-15.rb
 ${RUBY_LIBDIR}/rexml/encodings/SHIFT-JIS.rb
 ${RUBY_LIBDIR}/rexml/encodings/SHIFT_JIS.rb
 ${RUBY_LIBDIR}/rexml/encodings/UNILE.rb
@@ -447,6 +563,7 @@ ${RUBY_LIBDIR}/rexml/parsers/lightparser.rb
 ${RUBY_LIBDIR}/rexml/parsers/pullparser.rb
 ${RUBY_LIBDIR}/rexml/parsers/sax2parser.rb
 ${RUBY_LIBDIR}/rexml/parsers/streamparser.rb
+${RUBY_LIBDIR}/rexml/parsers/treeparser.rb
 ${RUBY_LIBDIR}/rexml/parsers/ultralightparser.rb
 ${RUBY_LIBDIR}/rexml/parsers/xpathparser.rb
 @dirrm ${RUBY_LIBDIR}/rexml/parsers
@@ -456,6 +573,10 @@ ${RUBY_LIBDIR}/rexml/sax2listener.rb
 ${RUBY_LIBDIR}/rexml/source.rb
 ${RUBY_LIBDIR}/rexml/streamlistener.rb
 ${RUBY_LIBDIR}/rexml/text.rb
+${RUBY_LIBDIR}/rexml/validation/relaxng.rb
+${RUBY_LIBDIR}/rexml/validation/validation.rb
+${RUBY_LIBDIR}/rexml/validation/validationexception.rb
+@dirrm ${RUBY_LIBDIR}/rexml/validation
 ${RUBY_LIBDIR}/rexml/xmldecl.rb
 ${RUBY_LIBDIR}/rexml/xmltokens.rb
 ${RUBY_LIBDIR}/rexml/xpath.rb
@@ -465,6 +586,33 @@ ${RUBY_LIBDIR}/rinda/rinda.rb
 ${RUBY_LIBDIR}/rinda/ring.rb
 ${RUBY_LIBDIR}/rinda/tuplespace.rb
 @dirrm ${RUBY_LIBDIR}/rinda
+${RUBY_LIBDIR}/rss/0.9.rb
+${RUBY_LIBDIR}/rss/1.0.rb
+${RUBY_LIBDIR}/rss/2.0.rb
+${RUBY_LIBDIR}/rss/content.rb
+${RUBY_LIBDIR}/rss/converter.rb
+${RUBY_LIBDIR}/rss/dublincore.rb
+${RUBY_LIBDIR}/rss/maker/0.9.rb
+${RUBY_LIBDIR}/rss/maker/1.0.rb
+${RUBY_LIBDIR}/rss/maker/2.0.rb
+${RUBY_LIBDIR}/rss/maker/base.rb
+${RUBY_LIBDIR}/rss/maker/content.rb
+${RUBY_LIBDIR}/rss/maker/dublincore.rb
+${RUBY_LIBDIR}/rss/maker/syndication.rb
+${RUBY_LIBDIR}/rss/maker/trackback.rb
+@dirrm ${RUBY_LIBDIR}/rss/maker
+${RUBY_LIBDIR}/rss/maker.rb
+${RUBY_LIBDIR}/rss/parser.rb
+${RUBY_LIBDIR}/rss/rexmlparser.rb
+${RUBY_LIBDIR}/rss/rss.rb
+${RUBY_LIBDIR}/rss/syndication.rb
+${RUBY_LIBDIR}/rss/taxonomy.rb
+${RUBY_LIBDIR}/rss/trackback.rb
+${RUBY_LIBDIR}/rss/utils.rb
+${RUBY_LIBDIR}/rss/xml-stylesheet.rb
+${RUBY_LIBDIR}/rss/xmlparser.rb
+${RUBY_LIBDIR}/rss/xmlscanner.rb
+@dirrm ${RUBY_LIBDIR}/rss
 ${RUBY_LIBDIR}/rubyunit.rb
 ${RUBY_LIBDIR}/runit/assert.rb
 ${RUBY_LIBDIR}/runit/cui/testrunner.rb
@@ -488,6 +636,7 @@ ${RUBY_LIBDIR}/shell/version.rb
 ${RUBY_LIBDIR}/shell.rb
 ${RUBY_LIBDIR}/shellwords.rb
 ${RUBY_LIBDIR}/singleton.rb
+${RUBY_LIBDIR}/soap/attachment.rb
 ${RUBY_LIBDIR}/soap/baseData.rb
 ${RUBY_LIBDIR}/soap/element.rb
 ${RUBY_LIBDIR}/soap/encodingstyle/aspDotNetHandler.rb
@@ -496,15 +645,22 @@ ${RUBY_LIBDIR}/soap/encodingstyle/literalHandler.rb
 ${RUBY_LIBDIR}/soap/encodingstyle/soapHandler.rb
 @dirrm ${RUBY_LIBDIR}/soap/encodingstyle
 ${RUBY_LIBDIR}/soap/generator.rb
+${RUBY_LIBDIR}/soap/header/handler.rb
+${RUBY_LIBDIR}/soap/header/handlerset.rb
+${RUBY_LIBDIR}/soap/header/simplehandler.rb
+@dirrm ${RUBY_LIBDIR}/soap/header
 ${RUBY_LIBDIR}/soap/mapping/factory.rb
 ${RUBY_LIBDIR}/soap/mapping/mapping.rb
 ${RUBY_LIBDIR}/soap/mapping/registry.rb
 ${RUBY_LIBDIR}/soap/mapping/rubytypeFactory.rb
 ${RUBY_LIBDIR}/soap/mapping/typeMap.rb
 ${RUBY_LIBDIR}/soap/mapping/wsdlRegistry.rb
+${RUBY_LIBDIR}/soap/mapping/wsdlencodedregistry.rb
+${RUBY_LIBDIR}/soap/mapping/wsdlliteralregistry.rb
 @dirrm ${RUBY_LIBDIR}/soap/mapping
 ${RUBY_LIBDIR}/soap/mapping.rb
 ${RUBY_LIBDIR}/soap/marshal.rb
+${RUBY_LIBDIR}/soap/mimemessage.rb
 ${RUBY_LIBDIR}/soap/netHttpClient.rb
 ${RUBY_LIBDIR}/soap/parser.rb
 ${RUBY_LIBDIR}/soap/processor.rb
@@ -512,6 +668,7 @@ ${RUBY_LIBDIR}/soap/property.rb
 ${RUBY_LIBDIR}/soap/rpc/cgistub.rb
 ${RUBY_LIBDIR}/soap/rpc/driver.rb
 ${RUBY_LIBDIR}/soap/rpc/element.rb
+${RUBY_LIBDIR}/soap/rpc/httpserver.rb
 ${RUBY_LIBDIR}/soap/rpc/proxy.rb
 ${RUBY_LIBDIR}/soap/rpc/router.rb
 ${RUBY_LIBDIR}/soap/rpc/rpc.rb
@@ -631,13 +788,23 @@ ${RUBY_LIBDIR}/wsdl/service.rb
 ${RUBY_LIBDIR}/wsdl/soap/address.rb
 ${RUBY_LIBDIR}/wsdl/soap/binding.rb
 ${RUBY_LIBDIR}/wsdl/soap/body.rb
+${RUBY_LIBDIR}/wsdl/soap/cgiStubCreator.rb
+${RUBY_LIBDIR}/wsdl/soap/classDefCreator.rb
+${RUBY_LIBDIR}/wsdl/soap/classDefCreatorSupport.rb
+${RUBY_LIBDIR}/wsdl/soap/clientSkeltonCreator.rb
 ${RUBY_LIBDIR}/wsdl/soap/complexType.rb
 ${RUBY_LIBDIR}/wsdl/soap/data.rb
 ${RUBY_LIBDIR}/wsdl/soap/definitions.rb
+${RUBY_LIBDIR}/wsdl/soap/driverCreator.rb
+${RUBY_LIBDIR}/wsdl/soap/element.rb
 ${RUBY_LIBDIR}/wsdl/soap/fault.rb
 ${RUBY_LIBDIR}/wsdl/soap/header.rb
 ${RUBY_LIBDIR}/wsdl/soap/headerfault.rb
+${RUBY_LIBDIR}/wsdl/soap/mappingRegistryCreator.rb
+${RUBY_LIBDIR}/wsdl/soap/methodDefCreator.rb
 ${RUBY_LIBDIR}/wsdl/soap/operation.rb
+${RUBY_LIBDIR}/wsdl/soap/servantSkeltonCreator.rb
+${RUBY_LIBDIR}/wsdl/soap/standaloneServerStubCreator.rb
 @dirrm ${RUBY_LIBDIR}/wsdl/soap
 ${RUBY_LIBDIR}/wsdl/types.rb
 ${RUBY_LIBDIR}/wsdl/wsdl.rb
@@ -650,10 +817,14 @@ ${RUBY_LIBDIR}/wsdl/xmlSchema/complexType.rb
 ${RUBY_LIBDIR}/wsdl/xmlSchema/content.rb
 ${RUBY_LIBDIR}/wsdl/xmlSchema/data.rb
 ${RUBY_LIBDIR}/wsdl/xmlSchema/element.rb
+${RUBY_LIBDIR}/wsdl/xmlSchema/enumeration.rb
 ${RUBY_LIBDIR}/wsdl/xmlSchema/import.rb
 ${RUBY_LIBDIR}/wsdl/xmlSchema/parser.rb
 ${RUBY_LIBDIR}/wsdl/xmlSchema/schema.rb
 ${RUBY_LIBDIR}/wsdl/xmlSchema/sequence.rb
+${RUBY_LIBDIR}/wsdl/xmlSchema/simpleContent.rb
+${RUBY_LIBDIR}/wsdl/xmlSchema/simpleRestriction.rb
+${RUBY_LIBDIR}/wsdl/xmlSchema/simpleType.rb
 ${RUBY_LIBDIR}/wsdl/xmlSchema/unique.rb
 @dirrm ${RUBY_LIBDIR}/wsdl/xmlSchema
 @dirrm ${RUBY_LIBDIR}/wsdl
@@ -669,6 +840,13 @@ ${RUBY_LIBDIR}/xmlrpc/server.rb
 ${RUBY_LIBDIR}/xmlrpc/utils.rb
 @dirrm ${RUBY_LIBDIR}/xmlrpc
 ${RUBY_LIBDIR}/xsd/charset.rb
+${RUBY_LIBDIR}/xsd/codegen.rb
+${RUBY_LIBDIR}/xsd/codegen/classdef.rb
+${RUBY_LIBDIR}/xsd/codegen/commentdef.rb
+${RUBY_LIBDIR}/xsd/codegen/gensupport.rb
+${RUBY_LIBDIR}/xsd/codegen/methoddef.rb
+${RUBY_LIBDIR}/xsd/codegen/moduledef.rb
+@dirrm ${RUBY_LIBDIR}/xsd/codegen
 ${RUBY_LIBDIR}/xsd/datatypes.rb
 ${RUBY_LIBDIR}/xsd/datatypes1999.rb
 ${RUBY_LIBDIR}/xsd/iconvcharset.rb
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index d4dfb25221e..5f5f38e9432 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.6 2005/01/21 12:49:36 tv Exp $
+$NetBSD: distinfo,v 1.7 2005/01/23 17:33:19 taca Exp $
 
-SHA1 (ruby/ruby-1.8.1.tar.gz) = 894cb1e7624b74e699d127344ce5600fc3a7d515
-Size (ruby/ruby-1.8.1.tar.gz) = 2671875 bytes
-SHA1 (patch-aa) = 696d4854798196e7c3f4986399271a3d2ac1e33d
-SHA1 (patch-ab) = 55d7e26f15aa472470974d69a3916ea2750ed6a4
-SHA1 (patch-ac) = ad9da65c2b09f0ee4b368989cb7b03fe3217c077
-SHA1 (patch-ad) = a9561d30dd9ba8506a2943d50e8e5abdfe359db2
-SHA1 (patch-af) = 163dbcb44bd8784ac3e90df1e39ec927f927300f
-SHA1 (patch-ag) = ad1e2085077401bd3bff796932e15fa8e98376c8
-SHA1 (patch-ah) = 4f94e8f116938b8d8b065c5b25a0cf8da80bdc85
-SHA1 (patch-ai) = 908f89deccf0ad45fb5fc7602c747769a0dcba43
-SHA1 (patch-aj) = 96ea3de0019d724d17cf51285638b88c494d93e2
-SHA1 (patch-ak) = a8e40a029677f487d1f6256e5e8364e13a0cd40a
+SHA1 (ruby/ruby-1.8.2.tar.gz) = 409a917d3a0aba41f45bd053b767c85b2bc35ffa
+Size (ruby/ruby-1.8.2.tar.gz) = 3627349 bytes
+SHA1 (patch-aa) = 5d000eaeac3d5166073863f002b1d7eb551405fa
+SHA1 (patch-ab) = 0b419b2948409e6375eb605bb33623f97bf0d91d
+SHA1 (patch-al) = a62c126e971a0d45b00e873802bc9ee67786c47e
+SHA1 (patch-am) = fe000acf64e20245058c83319030e11606e75004
+SHA1 (patch-an) = aa56ea179d9b7bf6ece22b4d8bba0c9137a0e342
+SHA1 (patch-ao) = a8ee52e4f93111dccf98f52d8626ccc5c2c02f1a
+SHA1 (patch-ap) = 7e581015de4968553ee7664ada1936cd639efc1d
+SHA1 (patch-aq) = be270544464ad51bbc1e2deb238dec16ab7308d7
+SHA1 (patch-ar) = b9743d012e1c70573b590973a68e1d640ebab1c5
+SHA1 (patch-as) = 19acb0f24b0e24c6253ea5df8592a39b38223b91
+SHA1 (patch-at) = ee6b178f5fe31616253e5b47a979c31d18db2a6c
diff --git a/lang/ruby18/patches/patch-aa b/lang/ruby18/patches/patch-aa
index 240ab92c278..ec13d083ee8 100644
--- a/lang/ruby18/patches/patch-aa
+++ b/lang/ruby18/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/01/21 12:49:37 tv Exp $
+$NetBSD: patch-aa,v 1.5 2005/01/23 17:33:19 taca Exp $
 
---- configure.in.orig	2003-12-24 14:19:12.000000000 -0500
+--- configure.in.orig	2004-12-23 00:16:55.000000000 +0900
 +++ configure.in
-@@ -314,6 +314,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
+@@ -321,6 +321,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
  		ac_cv_func_getpgrp_void=yes
  		ac_cv_func_setitimer=no
  		;;
@@ -12,34 +12,17 @@ $NetBSD: patch-aa,v 1.4 2005/01/21 12:49:37 tv Exp $
  freebsd*)	LIBS="-lm $LIBS"
  		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
  		  rb_cv_lib_xpg4_needed,
-@@ -824,6 +827,7 @@ if test "$with_dln_a_out" != yes; then
-     mingw*)	;;
-     aix*)	;;
-     netbsd*) CCDLFLAGS="$CCDLFLAGS -fPIC";;
-+    interix3*)	;;
+@@ -813,7 +816,7 @@ if test "$with_dln_a_out" != yes; then
+     openstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+     rhapsody*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+     darwin*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+-    human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
++    human*|interix3*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
      *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
      esac
    else
-@@ -864,6 +868,12 @@ if test "$with_dln_a_out" != yes; then
- 	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
- 			rb_cv_dlopen=yes ;;
- 	linux*) 	: ${LDSHARED="$CC -shared"}
-+			if test "$rb_cv_binary_elf" = yes; then
-+			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-+			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
-+			    LIBPATHFLAG=' -L%1$-s'
-+			    RPATHFLAG=' -Wl,-R%1$-s'
-+			fi
- 			rb_cv_dlopen=yes ;;
- 	gnu*)   	: ${LDSHARED="$CC -shared"}
- 			rb_cv_dlopen=yes
-@@ -879,10 +889,18 @@ if test "$with_dln_a_out" != yes; then
- 	netbsd*)	: ${LDSHARED='${CC} -shared'}
- 			if test "$rb_cv_binary_elf" = yes; then
- 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-+			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
- 			    LIBPATHFLAG=' -L%1$-s'
- 			    RPATHFLAG=' -Wl,-R%1$-s'
+@@ -875,6 +878,13 @@ if test "$with_dln_a_out" != yes; then
+ 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
  			fi
  			rb_cv_dlopen=yes ;;
 +	interix3*)	: ${LDSHARED='${CC} -shared'}
@@ -52,15 +35,7 @@ $NetBSD: patch-aa,v 1.4 2005/01/21 12:49:37 tv Exp $
  	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -1157,6 +1175,7 @@ if test "$enable_shared" = 'yes'; then
- 	;;
-     linux*)
- 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
-+	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
- 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
- 	;;
-     gnu*)
-@@ -1182,11 +1201,26 @@ if test "$enable_shared" = 'yes'; then
+@@ -1172,6 +1182,14 @@ if test "$enable_shared" = 'yes'; then
  	   LIBRUBY_ALIASES=""
  	fi
   	;;
@@ -75,15 +50,3 @@ $NetBSD: patch-aa,v 1.4 2005/01/21 12:49:37 tv Exp $
      openbsd*)
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
- 	;;
-     solaris*)
-+	SOLIBS='$(LIBS)'
-+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
-+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
-+	if test "$GCC" = yes; then
-+	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET)'
-+	    LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
-+	fi
- 	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
-  	;;
-     hpux*)
diff --git a/lang/ruby18/patches/patch-ab b/lang/ruby18/patches/patch-ab
index 7647a0f3c88..9671f2fd56c 100644
--- a/lang/ruby18/patches/patch-ab
+++ b/lang/ruby18/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2005/01/21 12:49:37 tv Exp $
+$NetBSD: patch-ab,v 1.5 2005/01/23 17:33:19 taca Exp $
 
---- configure.orig	2003-12-24 14:21:24.000000000 -0500
+--- configure.orig	2004-12-25 19:58:38.000000000 +0900
 +++ configure
-@@ -8602,6 +8602,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
+@@ -8993,6 +8993,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
  		ac_cv_func_getpgrp_void=yes
  		ac_cv_func_setitimer=no
  		;;
@@ -12,34 +12,17 @@ $NetBSD: patch-ab,v 1.4 2005/01/21 12:49:37 tv 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
-@@ -13689,6 +13692,7 @@ echo $ECHO_N "checking whether OS depend
-     mingw*)	;;
-     aix*)	;;
-     netbsd*) CCDLFLAGS="$CCDLFLAGS -fPIC";;
-+    interix3*)	;;
+@@ -13953,7 +13956,7 @@ echo $ECHO_N "checking whether OS depend
+     openstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+     rhapsody*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+     darwin*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+-    human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
++    human*|interix3*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
      *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
      esac
    else
-@@ -13729,6 +13733,12 @@ echo $ECHO_N "checking whether OS depend
- 	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
- 			rb_cv_dlopen=yes ;;
- 	linux*) 	: ${LDSHARED="$CC -shared"}
-+			if test "$rb_cv_binary_elf" = yes; then
-+			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-+			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
-+			    LIBPATHFLAG=' -L%1$-s'
-+			    RPATHFLAG=' -Wl,-R%1$-s'
-+			fi
- 			rb_cv_dlopen=yes ;;
- 	gnu*)   	: ${LDSHARED="$CC -shared"}
- 			rb_cv_dlopen=yes
-@@ -13744,10 +13754,18 @@ echo $ECHO_N "checking whether OS depend
- 	netbsd*)	: ${LDSHARED='${CC} -shared'}
- 			if test "$rb_cv_binary_elf" = yes; then
- 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-+			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
- 			    LIBPATHFLAG=' -L%1$-s'
- 			    RPATHFLAG=' -Wl,-R%1$-s'
+@@ -14015,6 +14018,13 @@ echo $ECHO_N "checking whether OS depend
+ 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
  			fi
  			rb_cv_dlopen=yes ;;
 +	interix3*)	: ${LDSHARED='${CC} -shared'}
@@ -52,15 +35,7 @@ $NetBSD: patch-ab,v 1.4 2005/01/21 12:49:37 tv Exp $
  	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -14438,6 +14456,7 @@ if test "$enable_shared" = 'yes'; then
- 	;;
-     linux*)
- 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
-+	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
- 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
- 	;;
-     gnu*)
-@@ -14463,11 +14482,26 @@ if test "$enable_shared" = 'yes'; then
+@@ -14732,6 +14742,14 @@ if test "$enable_shared" = 'yes'; then
  	   LIBRUBY_ALIASES=""
  	fi
   	;;
@@ -75,15 +50,3 @@ $NetBSD: patch-ab,v 1.4 2005/01/21 12:49:37 tv Exp $
      openbsd*)
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
- 	;;
-     solaris*)
-+	SOLIBS='$(LIBS)'
-+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
-+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
-+	if test "$GCC" = yes; then
-+	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET)'
-+	    LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
-+	fi
- 	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
-  	;;
-     hpux*)
diff --git a/lang/ruby18/patches/patch-ac b/lang/ruby18/patches/patch-ac
deleted file mode 100644
index 6a664b754e8..00000000000
--- a/lang/ruby18/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $
-
---- dln.c.orig	2003-12-21 01:59:09.000000000 +0900
-+++ dln.c
-@@ -1115,7 +1115,7 @@ dln_sym(name)
- #endif /* USE_DLN_A_OUT */
- 
- #ifdef USE_DLN_DLOPEN
--# ifdef __NetBSD__
-+# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
- #  include <nlist.h>
- #  include <link.h>
- # else
diff --git a/lang/ruby18/patches/patch-ad b/lang/ruby18/patches/patch-ad
deleted file mode 100644
index a30678fa1f2..00000000000
--- a/lang/ruby18/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $
-
---- eval.c.orig	2003-12-25 04:38:15.000000000 +0900
-+++ eval.c
-@@ -5141,7 +5141,7 @@ rb_call0(klass, recv, id, oid, argc, arg
- 			rb_raise(rb_eArgError, "wrong number of arguments(%d for %d)",
- 				 argc, i);
- 		    }
--		    if (node->nd_rest == -1) {
-+		    if ((long)node->nd_rest == -1) {
- 			int opt = i;
- 			NODE *optnode = node->nd_opt;
- 
-@@ -5176,7 +5176,7 @@ rb_call0(klass, recv, id, oid, argc, arg
- 			    }
- 			}
- 			local_vars = ruby_scope->local_vars;
--			if (node->nd_rest >= 0) {
-+			if ((long)node->nd_rest >= 0) {
- 			    VALUE v;
- 
- 			    if (argc > 0)
diff --git a/lang/ruby18/patches/patch-af b/lang/ruby18/patches/patch-af
deleted file mode 100644
index 617fead07f7..00000000000
--- a/lang/ruby18/patches/patch-af
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $
-
---- ext/socket/socket.c.orig	2003-12-16 00:54:07.000000000 +0900
-+++ ext/socket/socket.c
-@@ -650,6 +650,23 @@ sock_addrinfo(host, port, socktype, flag
- 	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
-     }
- 
-+#if defined(__APPLE__) && defined(__MACH__)
-+    {
-+       struct addrinfo *r;
-+       r = res;
-+       while (r) {
-+	    if (! r->ai_socktype) r->ai_socktype = hints.ai_socktype;
-+	    if (! r->ai_protocol) {
-+		if (r->ai_socktype == SOCK_DGRAM) {
-+		    r->ai_protocol = IPPROTO_UDP;
-+		} else if (r->ai_socktype == SOCK_STREAM) {
-+		    r->ai_protocol = IPPROTO_TCP;
-+		}
-+	    }
-+	    r = r->ai_next;
-+       }
-+    }
-+#endif
-     return res;
- }
- 
diff --git a/lang/ruby18/patches/patch-ag b/lang/ruby18/patches/patch-ag
deleted file mode 100644
index fceeea554a7..00000000000
--- a/lang/ruby18/patches/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $
-
---- lib/cgi.rb.orig	2003-12-22 22:16:33.000000000 +0900
-+++ lib/cgi.rb
-@@ -923,7 +923,7 @@ class CGI
- 
-     %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
-       define_method(env.sub(/^HTTP_/n, '').downcase) do
--        val = env_table[env] && Integer(val)
-+        (val = env_table[env]) && Integer(val)
-       end
-     end
- 
-@@ -1012,10 +1012,13 @@ class CGI
-           end
- 
-           c = if bufsize < content_length
--                stdinput.read(bufsize) or ''
-+                stdinput.read(bufsize)
-               else
--                stdinput.read(content_length) or ''
-+                stdinput.read(content_length)
-               end
-+          if c.nil?
-+            raise EOFError, "bad content body"
-+          end
-           buf.concat(c)
-           content_length -= c.size
-         end
diff --git a/lang/ruby18/patches/patch-ah b/lang/ruby18/patches/patch-ah
deleted file mode 100644
index 1178416f37a..00000000000
--- a/lang/ruby18/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $
-
---- lib/cgi/session.rb.orig	2003-08-29 22:38:31.000000000 +0900
-+++ lib/cgi/session.rb
-@@ -372,7 +372,7 @@ class CGI
- 	begin
- 	  @f = open(path, "r+")
- 	rescue Errno::ENOENT
--	  @f = open(path, "w+")
-+	  @f = File.open(path, File::CREAT|File::RDWR, 0600)
- 	end
-       end
- 
diff --git a/lang/ruby18/patches/patch-ai b/lang/ruby18/patches/patch-ai
deleted file mode 100644
index ff130f5dd52..00000000000
--- a/lang/ruby18/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/11/27 14:11:15 taca Exp $
-
---- lib/delegate.rb.orig	2003-12-16 16:33:25.000000000 +0900
-+++ lib/delegate.rb
-@@ -37,7 +37,7 @@ class Delegator
- 	    rescue Exception
- 	      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
- 	      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
--	      raise
-+	      Kernel::raise
- 	    end
- 	  end
- 	EOS
diff --git a/lang/ruby18/patches/patch-aj b/lang/ruby18/patches/patch-aj
deleted file mode 100644
index 89b4b3329ca..00000000000
--- a/lang/ruby18/patches/patch-aj
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/12/05 17:25:53 taca Exp $
-
---- lib/rexml/encodings/SHIFT-JIS.rb.orig	2003-12-13 09:31:22.000000000 +0900
-+++ lib/rexml/encodings/SHIFT-JIS.rb
-@@ -5,11 +5,11 @@ begin
-     module Encoding
-       @@__REXML_encoding_methods =<<-EOL
-       def decode(str)
--        return Iconv::iconv("utf-8", "shift-jis", str)[0]
-+        return Iconv::iconv("utf-8", "shift_jis", str)[0]
-       end
- 
-       def encode content
--        return Iconv::iconv("shift-jis", "utf-8", content)[0]
-+        return Iconv::iconv("shift_jis", "utf-8", content)[0]
-       end
-       EOL
-     end
-@@ -21,11 +21,11 @@ rescue LoadError
-     module REXML
-       module Encoding
-         @@__REXML_encoding_methods =<<-EOL
--        def to_shift_jis content
-+        def encode content
-           Uconv::u8tosjis(content)
-         end
- 
--        def from_shift_jis(str)
-+        def decode(str)
-           Uconv::sjistou8(str)
-         end
-         EOL
diff --git a/lang/ruby18/patches/patch-ak b/lang/ruby18/patches/patch-ak
deleted file mode 100644
index 22f5906bda0..00000000000
--- a/lang/ruby18/patches/patch-ak
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/12/05 17:25:53 taca Exp $
-
---- lib/rexml/encodings/SHIFT_JIS.rb.orig	2003-07-17 09:22:41.000000000 +0900
-+++ lib/rexml/encodings/SHIFT_JIS.rb
-@@ -1,33 +1 @@
--begin
--	require 'uconv'
--
--	module REXML
--		module Encoding
--			def to_shift_jis content
--				Uconv::u8tosjis(content)
--			end
--
--			def from_shift_jis(str)
--				Uconv::sjistou8(str)
--			end
--		end
--	end
--rescue LoadError
--  begin
--	require 'iconv'
--	module REXML
--		module Encoding
--			def from_shift_jis(str)
--				return Iconv::iconv("utf-8", "shift_jis", str).join('')
--			end
--
--			def to_shift_jis content
--				return Iconv::iconv("shift_jis", "utf-8", content).join('')
--			end
--		end
--	end
--  rescue LoadError
--	raise "uconv or iconv is required for Japanese encoding support."
--  end
--
--end
-+load 'rexml/encodings/SHIFT-JIS.rb'
diff --git a/lang/ruby18/patches/patch-al b/lang/ruby18/patches/patch-al
new file mode 100644
index 00000000000..15806987351
--- /dev/null
+++ b/lang/ruby18/patches/patch-al
@@ -0,0 +1,36 @@
+$NetBSD: patch-al,v 1.1 2005/01/23 17:33:19 taca Exp $
+
+--- ext/nkf/nkf-utf8/nkf.c.orig	2004-12-04 03:04:38.000000000 +0900
++++ ext/nkf/nkf-utf8/nkf.c
+@@ -256,6 +256,10 @@ extern POINT _BufferSize;
+ 
+ /*      function prototype  */
+ 
++#ifdef CHECK_OPTION
++static int (*iconv_for_check)() = 0;
++#endif
++
+ #ifdef ANSI_C_PROTOTYPE
+ #define PROTO(x)  x 
+ #define STATIC static
+@@ -1311,9 +1315,6 @@ void set_iconv(f, iconv_func)
+      int (*iconv_func)();
+ #endif
+ {
+-#ifdef CHECK_OPTION
+-    static int (*iconv_for_check)() = 0;
+-#endif
+ #ifdef INPUT_CODE_FIX
+     if (f || !input_f)
+ #endif
+@@ -4292,7 +4293,9 @@ reinit()
+     broken_counter = 0;
+     broken_last = 0;
+     z_prev2=0,z_prev1=0;
+-
++#ifdef CHECK_OPTION
++    iconv_for_check = 0;
++#endif
+ }
+ #endif
+ 
diff --git a/lang/ruby18/patches/patch-am b/lang/ruby18/patches/patch-am
new file mode 100644
index 00000000000..f4fac59cb6b
--- /dev/null
+++ b/lang/ruby18/patches/patch-am
@@ -0,0 +1,46 @@
+$NetBSD: patch-am,v 1.1 2005/01/23 17:33:19 taca Exp $
+
+--- ext/nkf/lib/kconv.rb.orig	2004-11-03 16:30:41.000000000 +0900
++++ ext/nkf/lib/kconv.rb
+@@ -74,8 +74,8 @@ module Kconv
+   RegexpEucjp = /\A(?:
+ 		    [\x00-\x7f]                         |
+ 		    \x8e        [\xa1-\xdf]             |
+-		    \x8f        [\xa1-\xdf] [\xa1-\xdf] |
+-		    [\xa1-\xdf] [\xa1-\xdf]
++		    \x8f        [\xa1-\xdf] [\xa1-\xfe] |
++		    [\xa1-\xdf] [\xa1-\xfe]
+ 		   )*\z/nx
+   RegexpUtf8  = /\A(?:
+ 		    [\x00-\x7f]                                     |
+@@ -101,8 +101,9 @@ module Kconv
+     when ::NKF::SJIS
+       opt << 'S'
+     when ::NKF::UTF8
+-    when ::NKF::UTF16
+       opt << 'W'
++    when ::NKF::UTF16
++      opt << 'W16'
+     end
+ 
+     case out_code
+@@ -113,8 +114,9 @@ module Kconv
+     when ::NKF::SJIS
+       opt << 's'
+     when ::NKF::UTF8
+-    when ::NKF::UTF16
+       opt << 'w'
++    when ::NKF::UTF16
++      opt << 'w16'
+     when ::NKF::NOCONV
+       return str
+     end
+@@ -164,7 +166,7 @@ module Kconv
+   module_function :guess
+ 
+   def guess_old(str)
+-    ::NKF::guess_old(str)
++    ::NKF::guess1(str)
+   end
+   module_function :guess_old
+ 
diff --git a/lang/ruby18/patches/patch-an b/lang/ruby18/patches/patch-an
new file mode 100644
index 00000000000..b93b1ceaacf
--- /dev/null
+++ b/lang/ruby18/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2005/01/23 17:33:19 taca Exp $
+
+--- lib/net/imap.rb.orig	2004-10-03 21:21:35.000000000 +0900
++++ lib/net/imap.rb
+@@ -1266,7 +1266,7 @@ module Net
+           buf.concat(c)
+           i += 1
+         elsif (c & 0xe0) == 0xc0 &&
+-            inlen >= 2 &&
++            len >= 2 &&
+             (s[i + 1] & 0xc0) == 0x80
+           if c == 0xc0 || c == 0xc1
+             raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
diff --git a/lang/ruby18/patches/patch-ao b/lang/ruby18/patches/patch-ao
new file mode 100644
index 00000000000..d3e7e71069e
--- /dev/null
+++ b/lang/ruby18/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2005/01/23 17:33:19 taca Exp $
+
+--- lib/webrick/httpauth.rb.orig	2004-12-18 15:17:33.000000000 +0900
++++ lib/webrick/httpauth.rb
+@@ -22,7 +22,7 @@ module WEBrick
+       user = pass = nil
+       if /^Basic\s+(.*)/o =~ req[req_field]
+         userpass = $1
+-        user, pass = decode64(userpass).split(":", 2)
++        user, pass = userpass.unpack("m*")[0].split(":", 2)
+       end
+       if block.call(user, pass)
+         req.user = user
diff --git a/lang/ruby18/patches/patch-ap b/lang/ruby18/patches/patch-ap
new file mode 100644
index 00000000000..a0f40db0fd9
--- /dev/null
+++ b/lang/ruby18/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2005/01/23 17:33:19 taca Exp $
+
+--- lib/webrick/httpauth/basicauth.rb.orig	2004-12-18 15:17:33.000000000 +0900
++++ lib/webrick/httpauth/basicauth.rb
+@@ -34,7 +34,7 @@ module WEBrick
+         unless basic_credentials = check_scheme(req)
+           challenge(req, res)
+         end
+-        userid, password = decode64(basic_credentials).split(":", 2) 
++        userid, password = basic_credentials.unpack("m*")[0].split(":", 2)
+         password ||= ""
+         if userid.empty?
+           error("user id was not given.")
diff --git a/lang/ruby18/patches/patch-aq b/lang/ruby18/patches/patch-aq
new file mode 100644
index 00000000000..360f74e476c
--- /dev/null
+++ b/lang/ruby18/patches/patch-aq
@@ -0,0 +1,28 @@
+$NetBSD: patch-aq,v 1.1 2005/01/23 17:33:19 taca Exp $
+
+--- lib/webrick/httpauth/digestauth.rb.orig	2004-12-18 16:19:46.000000000 +0900
++++ lib/webrick/httpauth/digestauth.rb
+@@ -174,11 +174,11 @@ module WEBrick
+ 
+         if auth_req['qop'] == "auth" || auth_req['qop'] == nil
+           ha2 = hexdigest(req.request_method, auth_req['uri'])
+-          ha2_res = digest("", auth_req['uri'])
++          ha2_res = hexdigest("", auth_req['uri'])
+         elsif auth_req['qop'] == "auth-int"
+           ha2 = hexdigest(req.request_method, auth_req['uri'],
+                           hexdigest(req.body))
+-          ha2_res = digest("", auth_req['uri'], hexdigest(req.body))
++          ha2_res = hexdigest("", auth_req['uri'], hexdigest(res.body))
+         end
+ 
+         if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
+@@ -331,9 +331,6 @@ module WEBrick
+         @h.hexdigest(args.join(":"))
+       end
+ 
+-      def digest(*args)
+-        @h.digest(args.join(":"))
+-      end
+     end
+ 
+     class ProxyDigestAuth < DigestAuth
diff --git a/lang/ruby18/patches/patch-ar b/lang/ruby18/patches/patch-ar
new file mode 100644
index 00000000000..a8ef7a5229c
--- /dev/null
+++ b/lang/ruby18/patches/patch-ar
@@ -0,0 +1,21 @@
+$NetBSD: patch-ar,v 1.1 2005/01/23 17:33:19 taca Exp $
+
+--- lib/webrick/httpauth/htpasswd.rb.orig	2003-07-24 01:51:36.000000000 +0900
++++ lib/webrick/httpauth/htpasswd.rb
+@@ -32,7 +32,15 @@ module WEBrick
+           open(@path){|io|
+             while line = io.gets
+               line.chomp!
+-              user, pass = line.split(":")
++              case line
++              when %r!\A[^:]+:[a-zA-Z0-9./]{13}\z!
++                user, pass = line.split(":")
++              when /:\$/, /:\{SHA\}/
++                raise NotImplementedError,
++                      'MD5, SHA1 .htpasswd file not supported'
++              else
++                raise StandardError, 'bad .htpasswd file'
++              end
+               @passwd[user] = pass
+             end
+           }
diff --git a/lang/ruby18/patches/patch-as b/lang/ruby18/patches/patch-as
new file mode 100644
index 00000000000..7e7028f6034
--- /dev/null
+++ b/lang/ruby18/patches/patch-as
@@ -0,0 +1,24 @@
+$NetBSD: patch-as,v 1.1 2005/01/23 17:33:19 taca Exp $
+
+--- lib/webrick/httpproxy.rb.orig	2004-08-22 01:16:18.000000000 +0900
++++ lib/webrick/httpproxy.rb
+@@ -110,7 +110,8 @@ module WEBrick
+         proxy_host = proxy.host
+         proxy_port = proxy.port
+         if proxy.userinfo
+-          credentials = "Basic " + encode64(proxy.userinfo)
++          credentials = "Basic " + [proxy.userinfo].pack("m*")
++          credentials.chomp!
+           header['proxy-authorization'] = credentials
+         end
+       end
+@@ -170,7 +171,8 @@ module WEBrick
+       if proxy = proxy_uri(req, res)
+         proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0"
+         if proxy.userinfo
+-          credentials = "Basic " + encode64(proxy.userinfo)
++          credentials = "Basic " + [proxy.userinfo].pack("m*")
++          credentials.chomp!
+         end
+         host, port = proxy.host, proxy.port
+       end
diff --git a/lang/ruby18/patches/patch-at b/lang/ruby18/patches/patch-at
new file mode 100644
index 00000000000..2f748653252
--- /dev/null
+++ b/lang/ruby18/patches/patch-at
@@ -0,0 +1,12 @@
+$NetBSD: patch-at,v 1.1 2005/01/23 17:33:19 taca Exp $
+
+--- variable.c.orig	2004-10-02 12:50:48.000000000 +0900
++++ variable.c
+@@ -1290,6 +1290,7 @@ rb_autoload(mod, id, file)
+     }
+     else {
+ 	av = Data_Wrap_Struct(rb_cData, rb_mark_tbl, st_free_table, 0);
++	RBASIC(av)->klass = 0;
+ 	st_add_direct(tbl, autoload, av);
+ 	DATA_PTR(av) = tbl = st_init_numtable();
+     }