5 files changed, 64 insertions, 26 deletions

diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index f4402733cfdd..b0a37b60eddb 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -82,7 +82,9 @@ PLIST_SUB+=	IF_DEFAULT=${IF_DEFAULT} \
 
 INSTALLED_SCRIPTS=	${PREFIX}/bin/irb \
 			${PREFIX}/bin/erb \
-			${PREFIX}/bin/h2rb
+			${PREFIX}/bin/h2rb \
+			${PREFIX}/bin/rdoc \
+			${PREFIX}/bin/testrb
 
 OBSOLETED_MODULES=	bigfloat \
 			csv \
@@ -94,6 +96,7 @@ OBSOLETED_MODULES=	bigfloat \
 			openssl \
 			optparse \
 			racc-runtime \
+			rdoc \
 			rexml \
 			sha1 \
 			shell \
@@ -163,6 +166,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ext/bigdecimal/bigdecimal_*.html ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/ext/dl/doc/dl.txt ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/enumerator/enumerator.txt ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}
 	${MKDIR} ${RUBY_DOCDIR}/pty
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 360bcbec5068..aee7683ac52a 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.8.1-preview2.tar.gz) = 067deb137b70d6ca046f6d7e9a84e198
+MD5 (ruby/ruby-1.8.1-preview3.tar.gz) = b68032fc40688242f57f61a412e229f8
diff --git a/lang/ruby18/files/patch-eval.c b/lang/ruby18/files/patch-eval.c
deleted file mode 100644
index 37762f730b9e..000000000000
--- a/lang/ruby18/files/patch-eval.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- eval.c.orig	Wed Nov 26 22:41:47 2003
-+++ eval.c	Wed Nov 26 22:40:38 2003
-@@ -7788,8 +7788,7 @@
- 
- #ifdef __ia64__
- #include <ucontext.h>
--#pragma weak __libc_ia64_register_backing_store_base
--extern unsigned long __libc_ia64_register_backing_store_base;
-+#define __libc_ia64_register_backing_store_base (4ULL<<61)
- #endif
- 
- /* Windows SEH refers data on the stack. */
diff --git a/lang/ruby18/files/patch-gc.c b/lang/ruby18/files/patch-gc.c
deleted file mode 100644
index 51aa70da715c..000000000000
--- a/lang/ruby18/files/patch-gc.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gc.c.orig	Wed Nov 26 22:42:01 2003
-+++ gc.c	Wed Nov 26 22:40:43 2003
-@@ -32,8 +32,7 @@
- 
- #ifdef __ia64__
- #include <ucontext.h>
--#pragma weak __libc_ia64_register_backing_store_base
--extern unsigned long __libc_ia64_register_backing_store_base;
-+#define __libc_ia64_register_backing_store_base (4ULL<<61)
- #endif
- 
- void re_free_registers _((struct re_registers*));
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 89e4df9ba488..0355eaf27403 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -4,8 +4,12 @@ bin/erb%%_RUBY_SUFFIX%%
 bin/h2rb%%_RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/irb%%RUBY_R%%
 bin/irb%%_RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/rdoc%%RUBY_R%%
+bin/rdoc%%_RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/ruby%%RUBY_R%%
 bin/ruby%%_RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/testrb%%RUBY_R%%
+bin/testrb%%_RUBY_SUFFIX%%
 lib/lib%%RUBY_NAME%%-static.a
 lib/lib%%RUBY_NAME%%.so
 lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@@ -193,6 +197,40 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/pstore.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/racc/parser.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/rational.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/code_objects.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/diagram.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/dot/dot.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/chm_generator.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/html_generator.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/template/chm/chm.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/template/html/css2.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/template/html/hefss.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/template/html/html.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/template/html/kilmer.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/template/xml/rdf.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/template/xml/xml.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/xml_generator.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/sample/rdoc2latex.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/sample/sample.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/simple_markup.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/fragments.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/inline.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/lines.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/preprocess.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/to_html.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/to_latex.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/test/AllTests.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/test/TestInline.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/test/TestParse.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/options.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/parsers/parse_c.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/parsers/parse_f95.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/parsers/parse_rb.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/parsers/parse_simple.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/parsers/parserfactory.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/rdoc.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/template.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/tokenstream.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/readbytes.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv-replace.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv.rb
@@ -287,6 +325,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/soap/netHttpClient.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/soap/parser.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/soap/processor.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/soap/property.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/soap/rpc/cgistub.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/soap/rpc/driver.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/soap/rpc/element.rb
@@ -315,8 +354,10 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%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/gtk2/testrunner.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/testrunnermediator.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/testrunnerutilities.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/ui/tk/testrunner.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/util/backtracefilter.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/util/observable.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/test/unit/util/procwrapper.rb
@@ -469,6 +510,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/webrick
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/uri
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/util
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/tk
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/gtk2
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/gtk
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/fox
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/test/unit/ui/console
@@ -489,6 +532,18 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rexml/encodings
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rexml/dtd
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rexml
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/parsers
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/markup/test
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/markup/simple_markup
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/markup/sample
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/markup
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/generators/template/xml
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/generators/template/html
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/generators/template/chm
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/generators/template
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/generators
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/dot
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/racc
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/optparse
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/openssl
@@ -528,6 +583,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/dl.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/enumerator.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
@@ -593,6 +649,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/smime_read.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/smime_write.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/wget.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/optparse/opttest.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/philos.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pi.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rcs.awk
@@ -621,6 +678,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/script.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/optparse
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/openssl
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dl
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses