5 files changed, 59 insertions, 37 deletions

diff --git a/lang/ruby16-shim-ruby18/Makefile b/lang/ruby16-shim-ruby18/Makefile
index 2d0c6685a327..de3c3d253b00 100644
--- a/lang/ruby16-shim-ruby18/Makefile
+++ b/lang/ruby16-shim-ruby18/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	shim-ruby18
-PORTVERSION=	1.8.1.p2
+PORTVERSION=	1.8.1.p3
 CATEGORIES=	lang devel ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	shim
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	shim-ruby16_18-1.8.1-preview2
+DISTNAME=	shim-ruby16_18-1.8.1-preview3
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -39,7 +39,8 @@ IF_DEFAULT=	"@comment "
 .endif
 
 INSTALLED_SCRIPTS=	${PREFIX}/bin/erb \
-			${PREFIX}/bin/h2rb
+			${PREFIX}/bin/h2rb \
+			${PREFIX}/bin/rdoc
 
 PLIST_SUB+=	IF_DEFAULT=${IF_DEFAULT} \
 
diff --git a/lang/ruby16-shim-ruby18/distinfo b/lang/ruby16-shim-ruby18/distinfo
index fe4fdce33b3a..e9d4b6f04c22 100644
--- a/lang/ruby16-shim-ruby18/distinfo
+++ b/lang/ruby16-shim-ruby18/distinfo
@@ -1 +1 @@
-MD5 (ruby/shim-ruby16_18-1.8.1-preview2.tar.bz2) = 8ca549e31eb526686ae89bc976a11d82
+MD5 (ruby/shim-ruby16_18-1.8.1-preview3.tar.bz2) = 5226e1abc45b167c6b508c692355f38f
diff --git a/lang/ruby16-shim-ruby18/files/patch-wait.c b/lang/ruby16-shim-ruby18/files/patch-wait.c
deleted file mode 100644
index 06686ee2cbea..000000000000
--- a/lang/ruby16-shim-ruby18/files/patch-wait.c
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: ext/io/wait/wait.c
-===================================================================
-RCS file: /src/shim/ruby16/ext/io/wait/wait.c,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -r1.1 -r1.2
---- ext/io/wait/wait.c	19 Oct 2003 20:40:52 -0000	1.1
-+++ ext/io/wait/wait.c	1 Nov 2003 09:09:35 -0000	1.2
-@@ -3,7 +3,7 @@
-   io/wait.c -
- 
-   $Author: knu $
--  $Date: 2003/10/19 20:40:52 $
-+  $Date: 2003/11/01 09:09:35 $
-   created at: Tue Aug 28 09:08:06 JST 2001
- 
-   All the files in this distribution are covered under the Ruby's
-@@ -14,6 +14,7 @@
- #include "ruby.h"
- #include "rubyio.h"
- 
-+#include <sys/time.h>
- #include <sys/types.h>
- #include FIONREAD_HEADER
- 
diff --git a/lang/ruby16-shim-ruby18/pkg-install b/lang/ruby16-shim-ruby18/pkg-install
index 0c8896c2d3dd..ff6264190e0c 100644
--- a/lang/ruby16-shim-ruby18/pkg-install
+++ b/lang/ruby16-shim-ruby18/pkg-install
@@ -23,6 +23,7 @@ delete_modules () {
 	openssl
 	optparse
 	racc-runtime
+	rdoc
 	rexml
 	soap
 	strscan
diff --git a/lang/ruby16-shim-ruby18/pkg-plist b/lang/ruby16-shim-ruby18/pkg-plist
index 51f765ca3b2b..8f9e1edbe966 100644
--- a/lang/ruby16-shim-ruby18/pkg-plist
+++ b/lang/ruby16-shim-ruby18/pkg-plist
@@ -2,6 +2,8 @@
 bin/erb%%_RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/h2rb%%RUBY_R%%
 bin/h2rb%%_RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/rdoc%%RUBY_R%%
+bin/rdoc%%_RUBY_SUFFIX%%
 @comment features/ruby18
 %%RUBY_SITEARCHLIBDIR%%/features/ruby18/file_ruby18.so
 %%RUBY_SITEARCHLIBDIR%%/features/ruby18/io_ruby18.so
@@ -90,6 +92,53 @@ bin/h2rb%%_RUBY_SUFFIX%%
 @dirrm %%RUBY_SITEARCHLIBDIR%%/racc
 %%RUBY_SITELIBDIR%%/racc/parser.rb
 @dirrm %%RUBY_SITELIBDIR%%/racc
+@comment rdoc
+%%RUBY_SITELIBDIR%%/rdoc/code_objects.rb
+%%RUBY_SITELIBDIR%%/rdoc/diagram.rb
+%%RUBY_SITELIBDIR%%/rdoc/dot/dot.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/chm_generator.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/html_generator.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/template/chm/chm.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/template/html/css2.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/template/html/hefss.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/template/html/html.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/template/html/kilmer.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/template/xml/rdf.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/template/xml/xml.rb
+%%RUBY_SITELIBDIR%%/rdoc/generators/xml_generator.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/sample/rdoc2latex.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/sample/sample.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/simple_markup.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/simple_markup/fragments.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/simple_markup/inline.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/simple_markup/lines.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/simple_markup/preprocess.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/simple_markup/to_html.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/simple_markup/to_latex.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/test/AllTests.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/test/TestInline.rb
+%%RUBY_SITELIBDIR%%/rdoc/markup/test/TestParse.rb
+%%RUBY_SITELIBDIR%%/rdoc/options.rb
+%%RUBY_SITELIBDIR%%/rdoc/parsers/parse_c.rb
+%%RUBY_SITELIBDIR%%/rdoc/parsers/parse_f95.rb
+%%RUBY_SITELIBDIR%%/rdoc/parsers/parse_rb.rb
+%%RUBY_SITELIBDIR%%/rdoc/parsers/parse_simple.rb
+%%RUBY_SITELIBDIR%%/rdoc/parsers/parserfactory.rb
+%%RUBY_SITELIBDIR%%/rdoc/rdoc.rb
+%%RUBY_SITELIBDIR%%/rdoc/template.rb
+%%RUBY_SITELIBDIR%%/rdoc/tokenstream.rb
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/parsers
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/markup/test
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/markup/simple_markup
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/markup/sample
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/markup
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/generators/template/xml
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/generators/template/html
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/generators/template/chm
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/generators/template
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/generators
+@dirrm %%RUBY_SITELIBDIR%%/rdoc/dot
+@dirrm %%RUBY_SITELIBDIR%%/rdoc
 @comment rexml
 %%RUBY_SITELIBDIR%%/rexml/attlistdecl.rb
 %%RUBY_SITELIBDIR%%/rexml/attribute.rb
@@ -106,18 +155,14 @@ bin/h2rb%%_RUBY_SUFFIX%%
 %%RUBY_SITELIBDIR%%/rexml/element.rb
 %%RUBY_SITELIBDIR%%/rexml/encoding.rb
 %%RUBY_SITELIBDIR%%/rexml/encodings/EUC-JP.rb
-%%RUBY_SITELIBDIR%%/rexml/encodings/EUC-JP_decl.rb
+%%RUBY_SITELIBDIR%%/rexml/encodings/ICONV.rb
 %%RUBY_SITELIBDIR%%/rexml/encodings/ISO-8859-1.rb
-%%RUBY_SITELIBDIR%%/rexml/encodings/ISO-8859-1_decl.rb
-%%RUBY_SITELIBDIR%%/rexml/encodings/Shift-JIS.rb
-%%RUBY_SITELIBDIR%%/rexml/encodings/Shift-JIS_decl.rb
-%%RUBY_SITELIBDIR%%/rexml/encodings/Shift_JIS.rb
+%%RUBY_SITELIBDIR%%/rexml/encodings/SHIFT-JIS.rb
+%%RUBY_SITELIBDIR%%/rexml/encodings/SHIFT_JIS.rb
 %%RUBY_SITELIBDIR%%/rexml/encodings/UNILE.rb
-%%RUBY_SITELIBDIR%%/rexml/encodings/UNILE_decl.rb
 %%RUBY_SITELIBDIR%%/rexml/encodings/US-ASCII.rb
-%%RUBY_SITELIBDIR%%/rexml/encodings/US-ASCII_decl.rb
 %%RUBY_SITELIBDIR%%/rexml/encodings/UTF-16.rb
-%%RUBY_SITELIBDIR%%/rexml/encodings/UTF-16_decl.rb
+%%RUBY_SITELIBDIR%%/rexml/encodings/UTF-8.rb
 %%RUBY_SITELIBDIR%%/rexml/entity.rb
 %%RUBY_SITELIBDIR%%/rexml/functions.rb
 %%RUBY_SITELIBDIR%%/rexml/instruction.rb