4 files changed, 40 insertions, 2 deletions

diff --git a/lang/ruby16-shim-ruby18/Makefile b/lang/ruby16-shim-ruby18/Makefile
index 87c22fd2a703..22700d110717 100644
--- a/lang/ruby16-shim-ruby18/Makefile
+++ b/lang/ruby16-shim-ruby18/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	shim-ruby18
-PORTVERSION=	1.8.0.p1
+PORTVERSION=	1.8.0.p2
 CATEGORIES=	lang devel ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	shim
@@ -44,6 +44,8 @@ PLIST_SUB+=	IF_DEFAULT=${IF_DEFAULT} \
 
 pre-install:
 	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	# Make reinstall work
+	${RM} -f ${WRKSRC}/InstalledFiles
 
 post-install:
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
diff --git a/lang/ruby16-shim-ruby18/distinfo b/lang/ruby16-shim-ruby18/distinfo
index dc2d999cc2f3..2c8fb805a4e5 100644
--- a/lang/ruby16-shim-ruby18/distinfo
+++ b/lang/ruby16-shim-ruby18/distinfo
@@ -1 +1 @@
-MD5 (ruby/shim-ruby16_18-1.8.0-preview1.tar.bz2) = 10ecf43f6f6283895e899ba787443900
+MD5 (ruby/shim-ruby16_18-1.8.0-preview2.tar.bz2) = 9ca8eea15f924e17bcd5c542c8b4571c
diff --git a/lang/ruby16-shim-ruby18/pkg-install b/lang/ruby16-shim-ruby18/pkg-install
index c23c029ceba3..afb63e9ed94b 100644
--- a/lang/ruby16-shim-ruby18/pkg-install
+++ b/lang/ruby16-shim-ruby18/pkg-install
@@ -19,6 +19,7 @@ delete_modules () {
 	optparse
 	racc-runtime
 	strscan
+	testunit
     "
 
     echo "Deinstalling modules being replaced by $PKGNAME..."
diff --git a/lang/ruby16-shim-ruby18/pkg-plist b/lang/ruby16-shim-ruby18/pkg-plist
index 831c61ddbc2b..e369cbce73f8 100644
--- a/lang/ruby16-shim-ruby18/pkg-plist
+++ b/lang/ruby16-shim-ruby18/pkg-plist
@@ -5,6 +5,7 @@ bin/h2rb%%_RUBY_SUFFIX%%
 @comment features/ruby18
 %%RUBY_SITEARCHLIBDIR%%/features/ruby18/file_ruby18.so
 %%RUBY_SITEARCHLIBDIR%%/features/ruby18/io_ruby18.so
+%%RUBY_SITEARCHLIBDIR%%/features/ruby18/math_ruby18.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/features/ruby18
 @dirrm %%RUBY_SITEARCHLIBDIR%%/features
 %%RUBY_SITELIBDIR%%/features/ruby18.rb
@@ -17,6 +18,7 @@ bin/h2rb%%_RUBY_SUFFIX%%
 %%RUBY_SITELIBDIR%%/features/ruby18/io.rb
 %%RUBY_SITELIBDIR%%/features/ruby18/kernel.rb
 %%RUBY_SITELIBDIR%%/features/ruby18/marshal.rb
+%%RUBY_SITELIBDIR%%/features/ruby18/math.rb
 %%RUBY_SITELIBDIR%%/features/ruby18/module.rb
 %%RUBY_SITELIBDIR%%/features/ruby18/numeric.rb
 %%RUBY_SITELIBDIR%%/features/ruby18/object.rb
@@ -56,6 +58,39 @@ bin/h2rb%%_RUBY_SUFFIX%%
 %%RUBY_SITEARCHLIBDIR%%/stringio.so
 @comment strscan
 %%RUBY_SITEARCHLIBDIR%%/strscan.so
+@comment testunit
+%%RUBY_SITELIBDIR%%/rubyunit.rb
+%%RUBY_SITELIBDIR%%/runit/assert.rb
+%%RUBY_SITELIBDIR%%/runit/cui/testrunner.rb
+%%RUBY_SITELIBDIR%%/runit/error.rb
+%%RUBY_SITELIBDIR%%/runit/testcase.rb
+%%RUBY_SITELIBDIR%%/runit/testresult.rb
+%%RUBY_SITELIBDIR%%/runit/testsuite.rb
+%%RUBY_SITELIBDIR%%/runit/topublic.rb
+%%RUBY_SITELIBDIR%%/test/unit.rb
+%%RUBY_SITELIBDIR%%/test/unit/assertionfailederror.rb
+%%RUBY_SITELIBDIR%%/test/unit/assertions.rb
+%%RUBY_SITELIBDIR%%/test/unit/error.rb
+%%RUBY_SITELIBDIR%%/test/unit/failure.rb
+%%RUBY_SITELIBDIR%%/test/unit/testcase.rb
+%%RUBY_SITELIBDIR%%/test/unit/testresult.rb
+%%RUBY_SITELIBDIR%%/test/unit/testsuite.rb
+%%RUBY_SITELIBDIR%%/test/unit/ui/console/testrunner.rb
+%%RUBY_SITELIBDIR%%/test/unit/ui/fox/testrunner.rb
+%%RUBY_SITELIBDIR%%/test/unit/ui/gtk/testrunner.rb
+%%RUBY_SITELIBDIR%%/test/unit/ui/testrunnermediator.rb
+%%RUBY_SITELIBDIR%%/test/unit/ui/testrunnerutilities.rb
+%%RUBY_SITELIBDIR%%/test/unit/util/observable.rb
+%%RUBY_SITELIBDIR%%/test/unit/util/procwrapper.rb
+@dirrm %%RUBY_SITELIBDIR%%/test/unit/util
+@dirrm %%RUBY_SITELIBDIR%%/test/unit/ui/gtk
+@dirrm %%RUBY_SITELIBDIR%%/test/unit/ui/fox
+@dirrm %%RUBY_SITELIBDIR%%/test/unit/ui/console
+@dirrm %%RUBY_SITELIBDIR%%/test/unit/ui
+@dirrm %%RUBY_SITELIBDIR%%/test/unit
+@dirrm %%RUBY_SITELIBDIR%%/test
+@dirrm %%RUBY_SITELIBDIR%%/runit/cui
+@dirrm %%RUBY_SITELIBDIR%%/runit
 @comment others
 %%RUBY_SITELIBDIR%%/benchmark.rb
 %%RUBY_SITELIBDIR%%/erb.rb