Update lang/ruby-devel to 1.8.0-preview2.

6 files changed, 230 insertions, 168 deletions

diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index 2681751fbffc..6cfa182d6174 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -10,7 +10,8 @@ PORTVERSION=	${RUBY_PORTVERSION}
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
-DISTFILES=		${RUBY_DISTNAME}${EXTRACT_SUFX}
+DISTFILES=		${RUBY_DISTNAME}${EXTRACT_SUFX} \
+			${RUBY_DISTNAME}-missing${EXTRACT_SUFX}
 DIST_SUBDIR=	ruby
 
 PATCH_SITES=	${MASTER_SITE_RUBY}
@@ -100,7 +101,6 @@ OBSOLETED_MODULES=	dl \
 			uri
 
 post-extract:
-	${RMDIR} ${WRKSRC}/doc/net
 	${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/
 
 post-patch:
diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo
index 058a8dc770e2..6b0f4fed8df4 100644
--- a/lang/ruby-devel/distinfo
+++ b/lang/ruby-devel/distinfo
@@ -1,3 +1,2 @@
-MD5 (ruby/ruby-1.8.0-preview1.tar.gz) = 1c37ec680b91cbea7a343252e4bd1e8d
-MD5 (ruby/ruby-1.8.0-preview1-2003.01.11.diff.bz2) = 3264264760b657920a3540152c062f19
-MD5 (ruby/ruby-1.8.0-preview1-2003.01.11-2003.01.28.diff.bz2) = 1ba36daed1d951bd9d3f718253118f17
+MD5 (ruby/ruby-1.8.0-preview2.tar.gz) = 27d00977204a5892d385fd30809d119c
+MD5 (ruby/ruby-1.8.0-preview2-missing.tar.gz) = 3bad9284ad0bdcf1159df9f3448e6a35
diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist
index 0aad68f2ce1a..e411c73ba2bd 100644
--- a/lang/ruby-devel/pkg-plist
+++ b/lang/ruby-devel/pkg-plist
@@ -14,6 +14,10 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/dbm.so
 %%RUBY_ARCHLIBDIR%%/defines.h
 %%RUBY_ARCHLIBDIR%%/digest.so
+%%RUBY_ARCHLIBDIR%%/digest/md5.so
+%%RUBY_ARCHLIBDIR%%/digest/rmd160.so
+%%RUBY_ARCHLIBDIR%%/digest/sha1.so
+%%RUBY_ARCHLIBDIR%%/digest/sha2.so
 %%RUBY_ARCHLIBDIR%%/dl.h
 %%RUBY_ARCHLIBDIR%%/dl.so
 %%RUBY_ARCHLIBDIR%%/dlconfig.h
@@ -26,6 +30,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/nkf.so
 %%RUBY_ARCHLIBDIR%%/node.h
 %%RUBY_ARCHLIBDIR%%/pty.so
+%%RUBY_ARCHLIBDIR%%/racc/cparse.so
 %%RUBY_ARCHLIBDIR%%/rbconfig.rb
 %%RUBY_ARCHLIBDIR%%/re.h
 %%RUBY_ARCHLIBDIR%%/readline.so
@@ -42,11 +47,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/syslog.so
 %%RUBY_ARCHLIBDIR%%/util.h
 %%RUBY_ARCHLIBDIR%%/version.h
-%%RUBY_ARCHLIBDIR%%/digest/md5.so
-%%RUBY_ARCHLIBDIR%%/digest/rmd160.so
-%%RUBY_ARCHLIBDIR%%/digest/sha1.so
-%%RUBY_ARCHLIBDIR%%/digest/sha2.so
-%%RUBY_ARCHLIBDIR%%/racc/cparse.so
 @dirrm %%RUBY_ARCHLIBDIR%%/digest
 @dirrm %%RUBY_ARCHLIBDIR%%/racc
 %%RUBYLIB%%%%RUBY_LIBDIR%%/English.rb
@@ -55,11 +55,17 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/benchmark.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi-lib.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/complex.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/date.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/date/format.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/date2.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/debug.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/delegate.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/import.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/struct.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/types.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/win32.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/e2mmap.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/erb.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/eregex.rb
@@ -74,6 +80,39 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/importenv.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/ipaddr.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/irb.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/chws.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/fork.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/load.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/nop.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/pushws.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/subirb.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/completion.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/context.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/change-ws.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/history.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/loader.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/math-mode.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/multi-irb.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/tracer.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/use-loader.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/workspaces.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/extend-command.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/frame.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/help.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/init.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/input-method.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/help-message
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/ja/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/ja/help-message
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/locale.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-lex.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-token.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/slex.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/version.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/workspace.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/xmp.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/jcode.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/kconv.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mailread.rb
@@ -83,10 +122,20 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mkmf.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/monitor.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mutex_m.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/ftp.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/http.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/imap.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/pop.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/protocol.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/smtp.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/telnet.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/observer.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/open-uri.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/open3.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/optparse.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/shellwords.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/time.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/uri.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/ostruct.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsearg.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsedate.rb
@@ -96,17 +145,48 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/profile.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/profiler.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/pstore.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/racc/parser.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/rational.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/readbytes.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv-replace.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rubyunit.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/assert.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/cui/testrunner.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/testcase.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/testresult.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/testsuite.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/topublic.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/set.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/sha1.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/shell.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/builtin-command.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/command-processor.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/filter.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/process-controller.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/system-command.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/version.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/shellwords.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/singleton.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/sync.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/tempfile.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/assertionfailederror.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/assertions.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/failure.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/testcase.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/testresult.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/testsuite.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/console/testrunner.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/fox/testrunner.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/gtk/testrunner.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/testrunnermediator.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/testrunnerutilities.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/util/observable.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/util/procwrapper.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/thread.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/thwait.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/time.rb
@@ -114,64 +194,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/tracer.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/tsort.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/weakref.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/date/format.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/import.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/struct.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/types.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/win32.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/completion.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/context.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/extend-command.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/frame.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/help.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/init.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/input-method.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/locale.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-lex.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-token.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/slex.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/version.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/workspace.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/xmp.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/chws.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/fork.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/load.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/nop.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/pushws.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/subirb.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/change-ws.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/history.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/loader.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/math-mode.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/multi-irb.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/tracer.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/use-loader.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/workspaces.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/error.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/help-message
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/ja/error.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/ja/help-message
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/ftp.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/http.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/imap.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/pop.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/protocol.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/smtp.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/telnet.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/shellwords.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/time.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/uri.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/racc/parser.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/builtin-command.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/command-processor.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/error.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/filter.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/process-controller.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/system-command.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/version.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/common.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/ftp.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/generic.rb
@@ -179,24 +201,34 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/https.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/ldap.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/mailto.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/weakref.rb
 @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITEARCHLIBDIR%%
 %%RUBYLIB%%@dirrm %%RUBY_SITELIBDIR%%
 @unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
 @dirrm %%RUBY_ARCHLIBDIR%%
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/cgi
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/date
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/dl
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/uri
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/util
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/gtk
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/fox
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/console
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/runit/cui
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/runit
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/racc
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/optparse
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/net
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc/ja
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/ext
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/cmd
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/net
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/optparse
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/racc
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/uri
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/dl
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/date
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/cgi
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%
 @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
 %%RUBY_ELISPDIR%%/.keep_me
@@ -230,13 +262,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
 %%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
@@ -301,8 +333,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/expect_sample.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/script.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dl
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dl
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%RUBY_EXAMPLESDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 2681751fbffc..6cfa182d6174 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -10,7 +10,8 @@ PORTVERSION=	${RUBY_PORTVERSION}
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
-DISTFILES=		${RUBY_DISTNAME}${EXTRACT_SUFX}
+DISTFILES=		${RUBY_DISTNAME}${EXTRACT_SUFX} \
+			${RUBY_DISTNAME}-missing${EXTRACT_SUFX}
 DIST_SUBDIR=	ruby
 
 PATCH_SITES=	${MASTER_SITE_RUBY}
@@ -100,7 +101,6 @@ OBSOLETED_MODULES=	dl \
 			uri
 
 post-extract:
-	${RMDIR} ${WRKSRC}/doc/net
 	${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/
 
 post-patch:
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 058a8dc770e2..6b0f4fed8df4 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,3 +1,2 @@
-MD5 (ruby/ruby-1.8.0-preview1.tar.gz) = 1c37ec680b91cbea7a343252e4bd1e8d
-MD5 (ruby/ruby-1.8.0-preview1-2003.01.11.diff.bz2) = 3264264760b657920a3540152c062f19
-MD5 (ruby/ruby-1.8.0-preview1-2003.01.11-2003.01.28.diff.bz2) = 1ba36daed1d951bd9d3f718253118f17
+MD5 (ruby/ruby-1.8.0-preview2.tar.gz) = 27d00977204a5892d385fd30809d119c
+MD5 (ruby/ruby-1.8.0-preview2-missing.tar.gz) = 3bad9284ad0bdcf1159df9f3448e6a35
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 0aad68f2ce1a..e411c73ba2bd 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -14,6 +14,10 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/dbm.so
 %%RUBY_ARCHLIBDIR%%/defines.h
 %%RUBY_ARCHLIBDIR%%/digest.so
+%%RUBY_ARCHLIBDIR%%/digest/md5.so
+%%RUBY_ARCHLIBDIR%%/digest/rmd160.so
+%%RUBY_ARCHLIBDIR%%/digest/sha1.so
+%%RUBY_ARCHLIBDIR%%/digest/sha2.so
 %%RUBY_ARCHLIBDIR%%/dl.h
 %%RUBY_ARCHLIBDIR%%/dl.so
 %%RUBY_ARCHLIBDIR%%/dlconfig.h
@@ -26,6 +30,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/nkf.so
 %%RUBY_ARCHLIBDIR%%/node.h
 %%RUBY_ARCHLIBDIR%%/pty.so
+%%RUBY_ARCHLIBDIR%%/racc/cparse.so
 %%RUBY_ARCHLIBDIR%%/rbconfig.rb
 %%RUBY_ARCHLIBDIR%%/re.h
 %%RUBY_ARCHLIBDIR%%/readline.so
@@ -42,11 +47,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/syslog.so
 %%RUBY_ARCHLIBDIR%%/util.h
 %%RUBY_ARCHLIBDIR%%/version.h
-%%RUBY_ARCHLIBDIR%%/digest/md5.so
-%%RUBY_ARCHLIBDIR%%/digest/rmd160.so
-%%RUBY_ARCHLIBDIR%%/digest/sha1.so
-%%RUBY_ARCHLIBDIR%%/digest/sha2.so
-%%RUBY_ARCHLIBDIR%%/racc/cparse.so
 @dirrm %%RUBY_ARCHLIBDIR%%/digest
 @dirrm %%RUBY_ARCHLIBDIR%%/racc
 %%RUBYLIB%%%%RUBY_LIBDIR%%/English.rb
@@ -55,11 +55,17 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/benchmark.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi-lib.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/complex.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/date.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/date/format.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/date2.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/debug.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/delegate.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/import.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/struct.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/types.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/win32.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/e2mmap.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/erb.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/eregex.rb
@@ -74,6 +80,39 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/importenv.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/ipaddr.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/irb.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/chws.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/fork.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/load.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/nop.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/pushws.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/subirb.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/completion.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/context.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/change-ws.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/history.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/loader.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/math-mode.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/multi-irb.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/tracer.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/use-loader.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/workspaces.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/extend-command.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/frame.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/help.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/init.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/input-method.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/help-message
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/ja/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/ja/help-message
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/locale.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-lex.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-token.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/slex.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/version.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/workspace.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/xmp.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/jcode.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/kconv.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mailread.rb
@@ -83,10 +122,20 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mkmf.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/monitor.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mutex_m.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/ftp.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/http.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/imap.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/pop.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/protocol.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/smtp.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/net/telnet.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/observer.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/open-uri.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/open3.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/optparse.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/shellwords.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/time.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/uri.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/ostruct.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsearg.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsedate.rb
@@ -96,17 +145,48 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/profile.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/profiler.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/pstore.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/racc/parser.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/rational.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/readbytes.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv-replace.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rubyunit.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/assert.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/cui/testrunner.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/testcase.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/testresult.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/testsuite.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/runit/topublic.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/set.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/sha1.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/shell.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/builtin-command.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/command-processor.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/filter.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/process-controller.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/system-command.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/version.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/shellwords.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/singleton.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/sync.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/tempfile.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/assertionfailederror.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/assertions.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/error.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/failure.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/testcase.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/testresult.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/testsuite.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/console/testrunner.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/fox/testrunner.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/gtk/testrunner.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/testrunnermediator.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/testrunnerutilities.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/util/observable.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/util/procwrapper.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/thread.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/thwait.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/time.rb
@@ -114,64 +194,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/tracer.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/tsort.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/weakref.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/date/format.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/import.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/struct.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/types.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/win32.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/completion.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/context.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/extend-command.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/frame.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/help.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/init.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/input-method.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/locale.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-lex.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-token.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/slex.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/version.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/workspace.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/xmp.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/chws.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/fork.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/load.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/nop.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/pushws.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/cmd/subirb.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/change-ws.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/history.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/loader.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/math-mode.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/multi-irb.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/tracer.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/use-loader.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ext/workspaces.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/error.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/help-message
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/ja/error.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/lc/ja/help-message
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/ftp.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/http.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/imap.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/pop.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/protocol.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/smtp.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/net/telnet.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/shellwords.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/time.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/uri.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/racc/parser.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/builtin-command.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/command-processor.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/error.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/filter.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/process-controller.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/system-command.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/shell/version.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/common.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/ftp.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/generic.rb
@@ -179,24 +201,34 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/https.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/ldap.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/uri/mailto.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/weakref.rb
 @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITEARCHLIBDIR%%
 %%RUBYLIB%%@dirrm %%RUBY_SITELIBDIR%%
 @unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
 @dirrm %%RUBY_ARCHLIBDIR%%
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/cgi
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/date
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/dl
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/uri
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/util
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/gtk
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/fox
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/console
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/runit/cui
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/runit
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/racc
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/optparse
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/net
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc/ja
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/ext
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/cmd
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/net
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/optparse
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/racc
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
-%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/uri
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/dl
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/date
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/cgi
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%
 @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
 %%RUBY_ELISPDIR%%/.keep_me
@@ -230,13 +262,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
 %%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
@@ -301,8 +333,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/expect_sample.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/script.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dl
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dl
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%RUBY_EXAMPLESDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true