5 files changed, 25 insertions, 3 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 9e615749091b..f91739a8bf07 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -130,9 +130,9 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 
 .if defined(RUBY_VER) && ${RUBY_VER} == 1.8
 RUBY_VERSION?=		1.8.1
-RUBY_DISTVERSION?=	${RUBY_VERSION}-preview3
+RUBY_DISTVERSION?=	${RUBY_VERSION}-preview4
 #RUBY_PATCHFILES?=	ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
-RUBY_PORTVERSION?=	${RUBY_VERSION}.p3
+RUBY_PORTVERSION?=	${RUBY_VERSION}.p4
 RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_VERSION}
 #MASTER_SITE_SUBDIR_RUBY=	snapshots
 .elif defined(RUBY_VER) && ${RUBY_VER} == 1.7
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index b0a37b60eddb..1cf10d36427d 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -84,6 +84,7 @@ INSTALLED_SCRIPTS=	${PREFIX}/bin/irb \
 			${PREFIX}/bin/erb \
 			${PREFIX}/bin/h2rb \
 			${PREFIX}/bin/rdoc \
+			${PREFIX}/bin/ri \
 			${PREFIX}/bin/testrb
 
 OBSOLETED_MODULES=	bigfloat \
@@ -98,6 +99,7 @@ OBSOLETED_MODULES=	bigfloat \
 			racc-runtime \
 			rdoc \
 			rexml \
+			ri \
 			sha1 \
 			shell \
 			soap \
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index aee7683ac52a..77f485c563f7 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.8.1-preview3.tar.gz) = b68032fc40688242f57f61a412e229f8
+MD5 (ruby/ruby-1.8.1-preview4.tar.gz) = 683e3452a7fc261d5ac339cd1f38670b
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 0355eaf27403..2e93c07826d7 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -6,6 +6,8 @@ bin/h2rb%%_RUBY_SUFFIX%%
 bin/irb%%_RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/rdoc%%RUBY_R%%
 bin/rdoc%%_RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/ri%%RUBY_R%%
+bin/ri%%_RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/ruby%%RUBY_R%%
 bin/ruby%%_RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/testrb%%RUBY_R%%
@@ -69,6 +71,17 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/bigdecimal/ludcmp.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/bigdecimal/math.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/bigdecimal/newton.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/generators/ri_generator.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/to_flow.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/ri/ri_cache.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/ri/ri_descriptions.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/ri/ri_formatter.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/ri/ri_options.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/ri/ri_paths.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/ri/ri_reader.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/ri/ri_util.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/rdoc/ri/ri_writer.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/webrick/cgi.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/bigdecimal/nlsolve.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/bigdecimal/util.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi-lib.rb
@@ -532,6 +545,7 @@ 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/ri
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/parsers
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/markup/test
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/rdoc/markup/simple_markup
diff --git a/x11-toolkits/ruby-tk/pkg-plist b/x11-toolkits/ruby-tk/pkg-plist
index c003a3cf7984..f1b2569445cb 100644
--- a/x11-toolkits/ruby-tk/pkg-plist
+++ b/x11-toolkits/ruby-tk/pkg-plist
@@ -23,9 +23,15 @@
 %%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/resource.en
 %%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/resource.ja
 %%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/safe-tk.rb
+%%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tkalignbox.rb
+%%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tkballoonhelp.rb
+%%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tkcombobox.rb
 %%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tkmenubutton.rb
+%%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tkmultilistbox.rb
+%%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tkmultilistframe.rb
 %%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tkoptdb-safeTk.rb
 %%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tkoptdb.rb
+%%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tktextframe.rb
 %%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tktimer2.rb
 %%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/tktimer3.rb
 %%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/demos-en/ChangeLog