6 files changed, 10 insertions, 13 deletions

diff --git a/lang/ruby16-shim-ruby18/Makefile b/lang/ruby16-shim-ruby18/Makefile
index 93556aff1627..18d250c79fa0 100644
--- a/lang/ruby16-shim-ruby18/Makefile
+++ b/lang/ruby16-shim-ruby18/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	shim-ruby18
-PORTVERSION=	1.7.2.2002.05.21
+PORTVERSION=	1.7.2.2002.07.31
 CATEGORIES=	lang devel ruby
 MASTER_SITES=	http://www.ruby-lang.org/~knu/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/lang/ruby16-shim-ruby18/distinfo b/lang/ruby16-shim-ruby18/distinfo
index 78214522df90..2a2c4e68b78a 100644
--- a/lang/ruby16-shim-ruby18/distinfo
+++ b/lang/ruby16-shim-ruby18/distinfo
@@ -1 +1 @@
-MD5 (ruby/shim-ruby16_18-1.7.2.2002.05.21.tar.bz2) = 955c265409093481d634cd8064f12aaa
+MD5 (ruby/shim-ruby16_18-1.7.2.2002.07.31.tar.bz2) = dd1a4ff714af87b54ae222c45e3e2466
diff --git a/lang/ruby16-shim-ruby18/files/patch-install.rb b/lang/ruby16-shim-ruby18/files/patch-install.rb
deleted file mode 100644
index c1c025b23a6b..000000000000
--- a/lang/ruby16-shim-ruby18/files/patch-install.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- install.rb.orig	Mon Apr  8 22:09:31 2002
-+++ install.rb	Sun Jun  9 02:07:03 2002
-@@ -660,3 +660,7 @@
-   def install_dir_ext_main( rel )
--    install_files allext('.'), config('so-dir') + '/' + rel, 0555
-+    #install_files allext('.'), config('so-dir') + '/' + rel, 0555
-+    command sprintf('%s sitelibdir=%s sitearchdir=%s site-install',
-+		    config('make-prog'),
-+		    config('rb-dir'),
-+		    config('so-dir'))
-   end
diff --git a/lang/ruby16-shim-ruby18/pkg-descr b/lang/ruby16-shim-ruby18/pkg-descr
index 4a614437c5dc..0ff614f0adc2 100644
--- a/lang/ruby16-shim-ruby18/pkg-descr
+++ b/lang/ruby16-shim-ruby18/pkg-descr
@@ -10,5 +10,6 @@ Shim between 1.6 and 1.8 includes:
 	strscan		Fast string scanner
 	benchmark	Benchmark module
 	fileutils	File & directory manipulation
+	optparse	Advanced command line option parser
 	pp		Pretty printer (prettier version of `p')
 	tsort		Topological sorter
diff --git a/lang/ruby16-shim-ruby18/pkg-install b/lang/ruby16-shim-ruby18/pkg-install
index 246c2397b512..f751c04b0201 100644
--- a/lang/ruby16-shim-ruby18/pkg-install
+++ b/lang/ruby16-shim-ruby18/pkg-install
@@ -15,6 +15,7 @@ delete_modules () {
 	dl
 	fileutils
 	fnmatch
+	optparse
 	racc-runtime
 	strscan
     "
diff --git a/lang/ruby16-shim-ruby18/pkg-plist b/lang/ruby16-shim-ruby18/pkg-plist
index 86f3aeaea941..0c3d7afad603 100644
--- a/lang/ruby16-shim-ruby18/pkg-plist
+++ b/lang/ruby16-shim-ruby18/pkg-plist
@@ -33,6 +33,12 @@
 %%RUBY_SITELIBDIR%%/dl/types.rb
 %%RUBY_SITELIBDIR%%/dl/win32.rb
 @dirrm %%RUBY_SITELIBDIR%%/dl
+@comment optparse
+%%RUBY_SITELIBDIR%%/optparse.rb
+%%RUBY_SITELIBDIR%%/optparse/shellwords.rb
+%%RUBY_SITELIBDIR%%/optparse/time.rb
+%%RUBY_SITELIBDIR%%/optparse/uri.rb
+@dirrm %%RUBY_SITELIBDIR%%/optparse
 @comment racc-runtime
 %%RUBY_SITEARCHLIBDIR%%/racc/cparse.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/racc