3 files changed, 40 insertions, 20 deletions

diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 472d589c3bad..20ce57673f21 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY} \
 			${ONIGURUMA_MASTER_SITES:S,$,:oniguruma,}
@@ -80,6 +79,7 @@ INSTALLED_SCRIPTS=	${PREFIX}/bin/irb \
 
 OBSOLETED_MODULES=	dl \
 			fileutils \
+			optparse \
 			racc-runtime \
 			sha1 \
 			shell \
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 3a8213c4b194..72c9af38f9a1 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,4 +1,2 @@
-MD5 (ruby/ruby-1.7-2002.05.03.tar.bz2) = fe1a844a8749da9baf0410caf17607df
-MD5 (ruby/ruby-1.7-2002.05.03-2002.05.05.diff.bz2) = 1a6963586ce1f8500c8be03bb60d18e7
-MD5 (ruby/ruby-1.7-2002.05.05-2002.05.23.diff.bz2) = 27e18354f13987510ab36c6b4d7fdc56
+MD5 (ruby/ruby-1.7-2002.07.15.tar.bz2) = a4274e739c25a503e2d1c651f3b26daa
 MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 19e93f1ed41e..c41b449c93bf 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -80,6 +80,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mutex_m.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/observer.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/open3.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/ostruct.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsearg.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsedate.rb
@@ -113,23 +114,35 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/dl/struct.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/dl/types.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/dl/win32.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/xmp.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/workspace.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/version.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/slex.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-token.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ruby-lex.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/multi-irb.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/locale.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/loader.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/input-method.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/init.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/help.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/frame.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/extend-command.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/context.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
@@ -141,6 +154,9 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%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
@@ -166,8 +182,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/dl
 %%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
@@ -196,6 +215,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/net/http.rd.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/net/smtp.rd.ja 
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
@@ -207,6 +228,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/net
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog