6 files changed, 165 insertions, 129 deletions

diff --git a/lang/ruby19/Makefile b/lang/ruby19/Makefile
index f8e9a3686ae8..9df2fe1ecebf 100644
--- a/lang/ruby19/Makefile
+++ b/lang/ruby19/Makefile
@@ -23,7 +23,10 @@ WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--enable-shared \
 		--enable-pthread \
-		--with-openssl-include=${OPENSSLINC}
+		--with-openssl-include=${OPENSSLINC} \
+		--with-ruby-version=minor \
+		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
+		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
@@ -102,7 +105,8 @@ EXTDOCS=	bigdecimal/bigdecimal_*.html	\
 		syslog/syslog.txt		\
 		zlib/doc/zlib.rd
 
-MAN1=		${RUBY_NAME}.1
+MAN1=		${RUBY_NAME}.1 erb${RUBY_SUFFIX}.1  irb${RUBY_SUFFIX}.1 \
+		rake${RUBY_SUFFIX}.1 ri${RUBY_SUFFIX}.1
 
 # Macros to change variables in rbconfig.rb
 RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' --
@@ -223,9 +227,9 @@ plist::
 # Includes
 #
 	@${FIND} -ds ${PREFIX}/include/ruby-${RUBY_VER} ! -type d | \
-		${SED} 's,^${PREFIX},,' >> pkg-plist
+		${SED} 's,^${PREFIX}/*,,' >> pkg-plist
 	@${FIND} -ds ${PREFIX}/include/ruby-${RUBY_VER} -type d | \
-		${SED} 's,^${PREFIX},@dirrm ,' >> pkg-plist
+		${SED} 's,^${PREFIX}/*,@dirrm ,' >> pkg-plist
 
 #
 # Vendor and site libs
diff --git a/lang/ruby19/distinfo b/lang/ruby19/distinfo
index 429349a3a7a5..e52d595adc72 100644
--- a/lang/ruby19/distinfo
+++ b/lang/ruby19/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-1.9.0-1.tar.bz2) = 4344e18188bbdf3e5f19cdd3ade902bb
-SHA256 (ruby/ruby-1.9.0-1.tar.bz2) = 88427424d6249c7544ddc53b31d871f1a6dce1dbded402cacc6306feb8d97f3b
-SIZE (ruby/ruby-1.9.0-1.tar.bz2) = 5231193
+MD5 (ruby/ruby-1.9.1-p0.tar.bz2) = 0278610ec3f895ece688de703d99143e
+SHA256 (ruby/ruby-1.9.1-p0.tar.bz2) = de7d33aeabdba123404c21230142299ac1de88c944c9f3215b816e824dd33321
+SIZE (ruby/ruby-1.9.1-p0.tar.bz2) = 7190271
diff --git a/lang/ruby19/files/patch-configure b/lang/ruby19/files/patch-configure
index f7d79075f0d5..8b4cc2b922c0 100644
--- a/lang/ruby19/files/patch-configure
+++ b/lang/ruby19/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Thu Jan 17 15:14:30 2008
-+++ configure	Thu Jan 17 15:15:00 2008
-@@ -18065,7 +18065,7 @@
+--- configure.orig	2009-01-30 18:26:04.000000000 +0300
++++ configure	2009-02-09 19:17:18.000000000 +0300
+@@ -20418,7 +20418,7 @@
  
  
  if test x"$enable_pthread" = xyes; then
--    for pthread_lib in thr pthread pthreads c c_r; do
-+    for pthread_lib in pthread thr pthreads c c_r; do
-  	as_ac_Lib=`echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for pthread_kill in -l$pthread_lib" >&5
- echo $ECHO_N "checking for pthread_kill in -l$pthread_lib... $ECHO_C" >&6; }
+-    for pthread_lib in thr pthread pthreads c c_r root; do
++    for pthread_lib in pthread thr pthreads c c_r root; do
+ 	as_ac_Lib=`$as_echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for pthread_kill in -l$pthread_lib" >&5
+ $as_echo_n "checking for pthread_kill in -l$pthread_lib... " >&6; }
diff --git a/lang/ruby19/files/patch-io.c b/lang/ruby19/files/patch-io.c
index 8765d8119090..ede6b16da783 100644
--- a/lang/ruby19/files/patch-io.c
+++ b/lang/ruby19/files/patch-io.c
@@ -1,18 +1,18 @@
---- io.c.orig	2007-12-28 02:17:32.000000000 +0300
-+++ io.c	2007-12-28 02:17:58.000000000 +0300
-@@ -5324,7 +5324,7 @@
+--- io.c.orig	2009-01-28 12:20:46.000000000 +0300
++++ io.c	2009-02-09 19:18:58.000000000 +0300
+@@ -6685,7 +6685,7 @@
+ }
  
- #if !defined(MSDOS) && !defined(__human68k__)
  static int
 -io_cntl(int fd, int cmd, long narg, int io_p)
 +io_cntl(int fd, unsigned long cmd, long narg, int io_p)
  {
      int retval;
  
-@@ -5352,7 +5352,7 @@
+@@ -6707,7 +6707,7 @@
+ static VALUE
  rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
  {
- #if !defined(MSDOS) && !defined(__human68k__)
 -    int cmd = NUM2ULONG(req);
 +    unsigned long cmd = NUM2ULONG(req);
      rb_io_t *fptr;
diff --git a/lang/ruby19/files/patch-mkconfig.rb b/lang/ruby19/files/patch-mkconfig.rb
index fade6d89e2ab..c95d111ff95f 100644
--- a/lang/ruby19/files/patch-mkconfig.rb
+++ b/lang/ruby19/files/patch-mkconfig.rb
@@ -1,11 +1,11 @@
---- mkconfig.rb.orig	2007-12-28 02:40:14.000000000 +0300
-+++ mkconfig.rb	2007-12-28 02:40:25.000000000 +0300
-@@ -138,7 +138,7 @@
+--- mkconfig.rb.orig	2009-02-09 19:56:48.000000000 +0300
++++ mkconfig.rb	2009-02-09 19:59:30.000000000 +0300
+@@ -140,7 +140,7 @@
  print(*v_fast)
  print(*v_others)
  print <<EOS
--  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR).$(TEENY)"
-+  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-   CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
+-  CONFIG["rubylibdir"] = "$(libdir)/$(ruby_install_name)/$(ruby_version)"
++  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
    CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
    CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
+   CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
diff --git a/lang/ruby19/pkg-plist b/lang/ruby19/pkg-plist
index 5b406d40b689..bff1741ae7a0 100644
--- a/lang/ruby19/pkg-plist
+++ b/lang/ruby19/pkg-plist
@@ -18,6 +18,10 @@ lib/lib%%RUBY_NAME%%-static.a
 lib/lib%%RUBY_NAME%%.so
 lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 include/ruby-1.9/%%RUBY_ARCH%%/ruby/config.h
+include/ruby-1.9/ruby/backward/rubyio.h
+include/ruby-1.9/ruby/backward/rubysig.h
+include/ruby-1.9/ruby/backward/st.h
+include/ruby-1.9/ruby/backward/util.h
 include/ruby-1.9/ruby/defines.h
 include/ruby-1.9/ruby/digest.h
 include/ruby-1.9/ruby/dl.h
@@ -25,28 +29,26 @@ include/ruby-1.9/ruby/encoding.h
 include/ruby-1.9/ruby/intern.h
 include/ruby-1.9/ruby/io.h
 include/ruby-1.9/ruby/missing.h
-include/ruby-1.9/ruby/node.h
 include/ruby-1.9/ruby/oniguruma.h
 include/ruby-1.9/ruby/re.h
 include/ruby-1.9/ruby/regex.h
 include/ruby-1.9/ruby/ruby.h
-include/ruby-1.9/ruby/signal.h
 include/ruby-1.9/ruby/st.h
 include/ruby-1.9/ruby/util.h
+include/ruby-1.9/ruby/vm.h
 include/ruby-1.9/ruby.h
-include/ruby-1.9/rubyio.h
-include/ruby-1.9/rubysig.h
-@dirrm /include/ruby-1.9/%%RUBY_ARCH%%/ruby
-@dirrm /include/ruby-1.9/%%RUBY_ARCH%%
-@dirrm /include/ruby-1.9/ruby
-@dirrm /include/ruby-1.9
+@dirrm include/ruby-1.9/%%RUBY_ARCH%%/ruby
+@dirrm include/ruby-1.9/%%RUBY_ARCH%%
+@dirrm include/ruby-1.9/ruby/backward
+@dirrm include/ruby-1.9/ruby
+@dirrm include/ruby-1.9
 %%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING
 %%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog-1.8.0
 %%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog-YARV
 %%PORTDOCS%%%%RUBY_DOCDIR%%/LEGAL
-%%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS
+%%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS-1.8.7
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.ja
@@ -89,6 +91,7 @@ include/ruby-1.9/rubysig.h
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cal.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cbreak.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/clnt.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/coverage.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/hello.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/rain.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/view.rb
@@ -240,58 +243,9 @@ include/ruby-1.9/rubysig.h
 @exec /bin/mkdir -p %D/%%RUBY_SITERIDIR%%
 @exec env LC_TIME=C /bin/date > %D/%%RUBY_SITERIDIR%%/created.rid
 @unexec /bin/rm -f %D/%%RUBY_SITERIDIR%%/created.rid
-%%RUBY_LIBDIR%%/English.rb
-%%RUBY_LIBDIR%%/abbrev.rb
-%%RUBY_LIBDIR%%/benchmark.rb
-%%RUBY_LIBDIR%%/bigdecimal/jacobian.rb
-%%RUBY_LIBDIR%%/bigdecimal/ludcmp.rb
-%%RUBY_LIBDIR%%/bigdecimal/math.rb
-%%RUBY_LIBDIR%%/bigdecimal/newton.rb
-%%RUBY_LIBDIR%%/bigdecimal/util.rb
-%%RUBY_LIBDIR%%/cgi/session/pstore.rb
-%%RUBY_LIBDIR%%/cgi/session.rb
-%%RUBY_LIBDIR%%/cgi.rb
-%%RUBY_LIBDIR%%/complex.rb
-%%RUBY_LIBDIR%%/csv.rb
-%%RUBY_LIBDIR%%/date/format.rb
-%%RUBY_LIBDIR%%/date.rb
-%%RUBY_LIBDIR%%/debug.rb
-%%RUBY_LIBDIR%%/delegate.rb
-%%RUBY_LIBDIR%%/digest/hmac.rb
-%%RUBY_LIBDIR%%/digest/sha2.rb
-%%RUBY_LIBDIR%%/digest.rb
-%%RUBY_LIBDIR%%/dl/callback.rb
-%%RUBY_LIBDIR%%/dl/cparser.rb
-%%RUBY_LIBDIR%%/dl/func.rb
-%%RUBY_LIBDIR%%/dl/import.rb
-%%RUBY_LIBDIR%%/dl/pack.rb
-%%RUBY_LIBDIR%%/dl/stack.rb
-%%RUBY_LIBDIR%%/dl/struct.rb
-%%RUBY_LIBDIR%%/dl/types.rb
-%%RUBY_LIBDIR%%/dl/value.rb
-%%RUBY_LIBDIR%%/drb/acl.rb
-%%RUBY_LIBDIR%%/drb/drb.rb
-%%RUBY_LIBDIR%%/drb/eq.rb
-%%RUBY_LIBDIR%%/drb/extserv.rb
-%%RUBY_LIBDIR%%/drb/extservm.rb
-%%RUBY_LIBDIR%%/drb/gw.rb
-%%RUBY_LIBDIR%%/drb/invokemethod.rb
-%%RUBY_LIBDIR%%/drb/observer.rb
-%%RUBY_LIBDIR%%/drb/ssl.rb
-%%RUBY_LIBDIR%%/drb/timeridconv.rb
-%%RUBY_LIBDIR%%/drb/unix.rb
-%%RUBY_LIBDIR%%/drb.rb
-%%RUBY_LIBDIR%%/e2mmap.rb
-%%RUBY_LIBDIR%%/erb.rb
-%%RUBY_LIBDIR%%/expect.rb
-%%RUBY_LIBDIR%%/fileutils.rb
-%%RUBY_LIBDIR%%/find.rb
-%%RUBY_LIBDIR%%/forwardable.rb
-%%RUBY_LIBDIR%%/generator.rb
-%%RUBY_LIBDIR%%/getoptlong.rb
-%%RUBY_LIBDIR%%/gserver.rb
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/bigdecimal.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/continuation.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/coverage.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/curses.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dbm.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/bubblebabble.so
@@ -303,6 +257,8 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dl.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/big5.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/cp949.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/emacs_mule.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/encdb.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/euc_jp.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/euc_kr.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/euc_tw.so
@@ -327,9 +283,18 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/koi8_r.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/koi8_u.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/shift_jis.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/big5.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/chinese.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/escape.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/gb18030.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/gbk.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/iso2022.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/japanese.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/japanese_euc.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/japanese_sjis.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/korean.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/single_byte.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/transdb.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/utf_16_32.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/utf_16be.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/utf_16le.so
@@ -342,6 +307,8 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/io/wait.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json/ext/generator.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json/ext/parser.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/mathn/complex.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/mathn/rational.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/nkf.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/openssl.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/pty.so
@@ -356,6 +323,61 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/syck.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/syslog.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/zlib.so
+%%RUBY_LIBDIR%%/English.rb
+%%RUBY_LIBDIR%%/abbrev.rb
+%%RUBY_LIBDIR%%/base64.rb
+%%RUBY_LIBDIR%%/benchmark.rb
+%%RUBY_LIBDIR%%/bigdecimal/jacobian.rb
+%%RUBY_LIBDIR%%/bigdecimal/ludcmp.rb
+%%RUBY_LIBDIR%%/bigdecimal/math.rb
+%%RUBY_LIBDIR%%/bigdecimal/newton.rb
+%%RUBY_LIBDIR%%/bigdecimal/util.rb
+%%RUBY_LIBDIR%%/cgi/cookie.rb
+%%RUBY_LIBDIR%%/cgi/core.rb
+%%RUBY_LIBDIR%%/cgi/html.rb
+%%RUBY_LIBDIR%%/cgi/session/pstore.rb
+%%RUBY_LIBDIR%%/cgi/session.rb
+%%RUBY_LIBDIR%%/cgi/util.rb
+%%RUBY_LIBDIR%%/cgi.rb
+%%RUBY_LIBDIR%%/cmath.rb
+%%RUBY_LIBDIR%%/complex.rb
+%%RUBY_LIBDIR%%/csv.rb
+%%RUBY_LIBDIR%%/date/format.rb
+%%RUBY_LIBDIR%%/date.rb
+%%RUBY_LIBDIR%%/debug.rb
+%%RUBY_LIBDIR%%/delegate.rb
+%%RUBY_LIBDIR%%/digest/hmac.rb
+%%RUBY_LIBDIR%%/digest/sha2.rb
+%%RUBY_LIBDIR%%/digest.rb
+%%RUBY_LIBDIR%%/dl/callback.rb
+%%RUBY_LIBDIR%%/dl/cparser.rb
+%%RUBY_LIBDIR%%/dl/func.rb
+%%RUBY_LIBDIR%%/dl/import.rb
+%%RUBY_LIBDIR%%/dl/pack.rb
+%%RUBY_LIBDIR%%/dl/stack.rb
+%%RUBY_LIBDIR%%/dl/struct.rb
+%%RUBY_LIBDIR%%/dl/types.rb
+%%RUBY_LIBDIR%%/dl/value.rb
+%%RUBY_LIBDIR%%/drb/acl.rb
+%%RUBY_LIBDIR%%/drb/drb.rb
+%%RUBY_LIBDIR%%/drb/eq.rb
+%%RUBY_LIBDIR%%/drb/extserv.rb
+%%RUBY_LIBDIR%%/drb/extservm.rb
+%%RUBY_LIBDIR%%/drb/gw.rb
+%%RUBY_LIBDIR%%/drb/invokemethod.rb
+%%RUBY_LIBDIR%%/drb/observer.rb
+%%RUBY_LIBDIR%%/drb/ssl.rb
+%%RUBY_LIBDIR%%/drb/timeridconv.rb
+%%RUBY_LIBDIR%%/drb/unix.rb
+%%RUBY_LIBDIR%%/drb.rb
+%%RUBY_LIBDIR%%/e2mmap.rb
+%%RUBY_LIBDIR%%/erb.rb
+%%RUBY_LIBDIR%%/expect.rb
+%%RUBY_LIBDIR%%/fileutils.rb
+%%RUBY_LIBDIR%%/find.rb
+%%RUBY_LIBDIR%%/forwardable.rb
+%%RUBY_LIBDIR%%/getoptlong.rb
+%%RUBY_LIBDIR%%/gserver.rb
 %%RUBY_LIBDIR%%/io/nonblock.rb
 %%RUBY_LIBDIR%%/ipaddr.rb
 %%RUBY_LIBDIR%%/irb/cmd/chws.rb
@@ -383,14 +405,17 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/irb/input-method.rb
 %%RUBY_LIBDIR%%/irb/lc/error.rb
 %%RUBY_LIBDIR%%/irb/lc/help-message
+%%RUBY_LIBDIR%%/irb/lc/ja/encoding_aliases.rb
 %%RUBY_LIBDIR%%/irb/lc/ja/error.rb
 %%RUBY_LIBDIR%%/irb/lc/ja/help-message
 %%RUBY_LIBDIR%%/irb/locale.rb
+%%RUBY_LIBDIR%%/irb/magic-file.rb
 %%RUBY_LIBDIR%%/irb/notifier.rb
 %%RUBY_LIBDIR%%/irb/output-method.rb
 %%RUBY_LIBDIR%%/irb/ruby-lex.rb
 %%RUBY_LIBDIR%%/irb/ruby-token.rb
 %%RUBY_LIBDIR%%/irb/slex.rb
+%%RUBY_LIBDIR%%/irb/src_encoding.rb
 %%RUBY_LIBDIR%%/irb/version.rb
 %%RUBY_LIBDIR%%/irb/workspace.rb
 %%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
@@ -410,7 +435,12 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/logger.rb
 %%RUBY_LIBDIR%%/mathn.rb
 %%RUBY_LIBDIR%%/matrix.rb
+%%RUBY_LIBDIR%%/minitest/autorun.rb
+%%RUBY_LIBDIR%%/minitest/mock.rb
+%%RUBY_LIBDIR%%/minitest/spec.rb
+%%RUBY_LIBDIR%%/minitest/unit.rb
 %%RUBY_LIBDIR%%/mkmf.rb
+%%RUBY_LIBDIR%%/mkmf.rb.orig
 %%RUBY_LIBDIR%%/monitor.rb
 %%RUBY_LIBDIR%%/mutex_m.rb
 %%RUBY_LIBDIR%%/net/ftp.rb
@@ -441,6 +471,7 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/pathname.rb
 %%RUBY_LIBDIR%%/pp.rb
 %%RUBY_LIBDIR%%/prettyprint.rb
+%%RUBY_LIBDIR%%/prime.rb
 %%RUBY_LIBDIR%%/profile.rb
 %%RUBY_LIBDIR%%/profiler.rb
 %%RUBY_LIBDIR%%/pstore.rb
@@ -455,6 +486,7 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/rake/runtest.rb
 %%RUBY_LIBDIR%%/rake/tasklib.rb
 %%RUBY_LIBDIR%%/rake/testtask.rb
+%%RUBY_LIBDIR%%/rake/win32.rb
 %%RUBY_LIBDIR%%/rake.rb
 %%RUBY_LIBDIR%%/rational.rb
 %%RUBY_LIBDIR%%/rbconfig/datadir.rb
@@ -463,16 +495,26 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/rdoc/dot.rb
 %%RUBY_LIBDIR%%/rdoc/generator/chm/chm.rb
 %%RUBY_LIBDIR%%/rdoc/generator/chm.rb
+%%RUBY_LIBDIR%%/rdoc/generator/html/common.rb
+%%RUBY_LIBDIR%%/rdoc/generator/html/frameless.rb
 %%RUBY_LIBDIR%%/rdoc/generator/html/hefss.rb
 %%RUBY_LIBDIR%%/rdoc/generator/html/html.rb
 %%RUBY_LIBDIR%%/rdoc/generator/html/kilmer.rb
+%%RUBY_LIBDIR%%/rdoc/generator/html/kilmerfactory.rb
 %%RUBY_LIBDIR%%/rdoc/generator/html/one_page_html.rb
 %%RUBY_LIBDIR%%/rdoc/generator/html.rb
 %%RUBY_LIBDIR%%/rdoc/generator/ri.rb
+%%RUBY_LIBDIR%%/rdoc/generator/texinfo/class.texinfo.erb
+%%RUBY_LIBDIR%%/rdoc/generator/texinfo/file.texinfo.erb
+%%RUBY_LIBDIR%%/rdoc/generator/texinfo/method.texinfo.erb
+%%RUBY_LIBDIR%%/rdoc/generator/texinfo/texinfo.erb
+%%RUBY_LIBDIR%%/rdoc/generator/texinfo.rb
 %%RUBY_LIBDIR%%/rdoc/generator/xml/rdf.rb
 %%RUBY_LIBDIR%%/rdoc/generator/xml/xml.rb
 %%RUBY_LIBDIR%%/rdoc/generator/xml.rb
 %%RUBY_LIBDIR%%/rdoc/generator.rb
+%%RUBY_LIBDIR%%/rdoc/known_classes.rb
+%%RUBY_LIBDIR%%/rdoc/markup/attribute_manager.rb
 %%RUBY_LIBDIR%%/rdoc/markup/formatter.rb
 %%RUBY_LIBDIR%%/rdoc/markup/fragments.rb
 %%RUBY_LIBDIR%%/rdoc/markup/inline.rb
@@ -483,13 +525,15 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/rdoc/markup/to_html_crossref.rb
 %%RUBY_LIBDIR%%/rdoc/markup/to_latex.rb
 %%RUBY_LIBDIR%%/rdoc/markup/to_test.rb
+%%RUBY_LIBDIR%%/rdoc/markup/to_texinfo.rb
 %%RUBY_LIBDIR%%/rdoc/markup.rb
 %%RUBY_LIBDIR%%/rdoc/options.rb
-%%RUBY_LIBDIR%%/rdoc/parsers/parse_c.rb
-%%RUBY_LIBDIR%%/rdoc/parsers/parse_f95.rb
-%%RUBY_LIBDIR%%/rdoc/parsers/parse_rb.rb
-%%RUBY_LIBDIR%%/rdoc/parsers/parse_simple.rb
-%%RUBY_LIBDIR%%/rdoc/parsers/parserfactory.rb
+%%RUBY_LIBDIR%%/rdoc/parser/c.rb
+%%RUBY_LIBDIR%%/rdoc/parser/f95.rb
+%%RUBY_LIBDIR%%/rdoc/parser/perl.rb
+%%RUBY_LIBDIR%%/rdoc/parser/ruby.rb
+%%RUBY_LIBDIR%%/rdoc/parser/simple.rb
+%%RUBY_LIBDIR%%/rdoc/parser.rb
 %%RUBY_LIBDIR%%/rdoc/rdoc.rb
 %%RUBY_LIBDIR%%/rdoc/ri/cache.rb
 %%RUBY_LIBDIR%%/rdoc/ri/descriptions.rb
@@ -505,7 +549,6 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/rdoc/template.rb
 %%RUBY_LIBDIR%%/rdoc/tokenstream.rb
 %%RUBY_LIBDIR%%/rdoc.rb
-%%RUBY_LIBDIR%%/require_relative.rb
 %%RUBY_LIBDIR%%/resolv-replace.rb
 %%RUBY_LIBDIR%%/resolv.rb
 %%RUBY_LIBDIR%%/rexml/attlistdecl.rb
@@ -644,6 +687,7 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/rubygems/commands/server_command.rb
 %%RUBY_LIBDIR%%/rubygems/commands/sources_command.rb
 %%RUBY_LIBDIR%%/rubygems/commands/specification_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/stale_command.rb
 %%RUBY_LIBDIR%%/rubygems/commands/uninstall_command.rb
 %%RUBY_LIBDIR%%/rubygems/commands/unpack_command.rb
 %%RUBY_LIBDIR%%/rubygems/commands/update_command.rb
@@ -666,11 +710,11 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/rubygems/ext/rake_builder.rb
 %%RUBY_LIBDIR%%/rubygems/ext.rb
 %%RUBY_LIBDIR%%/rubygems/format.rb
-%%RUBY_LIBDIR%%/rubygems/gem_open_uri.rb
 %%RUBY_LIBDIR%%/rubygems/gem_openssl.rb
 %%RUBY_LIBDIR%%/rubygems/gem_path_searcher.rb
 %%RUBY_LIBDIR%%/rubygems/gem_runner.rb
 %%RUBY_LIBDIR%%/rubygems/indexer/abstract_index_builder.rb
+%%RUBY_LIBDIR%%/rubygems/indexer/latest_index_builder.rb
 %%RUBY_LIBDIR%%/rubygems/indexer/marshal_index_builder.rb
 %%RUBY_LIBDIR%%/rubygems/indexer/master_index_builder.rb
 %%RUBY_LIBDIR%%/rubygems/indexer/quick_index_builder.rb
@@ -679,7 +723,13 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/rubygems/installer.rb
 %%RUBY_LIBDIR%%/rubygems/local_remote_options.rb
 %%RUBY_LIBDIR%%/rubygems/old_format.rb
-%%RUBY_LIBDIR%%/rubygems/open-uri.rb
+%%RUBY_LIBDIR%%/rubygems/package/f_sync_dir.rb
+%%RUBY_LIBDIR%%/rubygems/package/tar_header.rb
+%%RUBY_LIBDIR%%/rubygems/package/tar_input.rb
+%%RUBY_LIBDIR%%/rubygems/package/tar_output.rb
+%%RUBY_LIBDIR%%/rubygems/package/tar_reader/entry.rb
+%%RUBY_LIBDIR%%/rubygems/package/tar_reader.rb
+%%RUBY_LIBDIR%%/rubygems/package/tar_writer.rb
 %%RUBY_LIBDIR%%/rubygems/package.rb
 %%RUBY_LIBDIR%%/rubygems/platform.rb
 %%RUBY_LIBDIR%%/rubygems/remote_fetcher.rb
@@ -691,7 +741,9 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/rubygems/source_index.rb
 %%RUBY_LIBDIR%%/rubygems/source_info_cache.rb
 %%RUBY_LIBDIR%%/rubygems/source_info_cache_entry.rb
+%%RUBY_LIBDIR%%/rubygems/spec_fetcher.rb
 %%RUBY_LIBDIR%%/rubygems/specification.rb
+%%RUBY_LIBDIR%%/rubygems/test_utilities.rb
 %%RUBY_LIBDIR%%/rubygems/timer.rb
 %%RUBY_LIBDIR%%/rubygems/uninstaller.rb
 %%RUBY_LIBDIR%%/rubygems/user_interaction.rb
@@ -714,27 +766,8 @@ include/ruby-1.9/rubysig.h
 %%RUBY_LIBDIR%%/singleton.rb
 %%RUBY_LIBDIR%%/sync.rb
 %%RUBY_LIBDIR%%/tempfile.rb
-%%RUBY_LIBDIR%%/test/unit/assertionfailederror.rb
 %%RUBY_LIBDIR%%/test/unit/assertions.rb
-%%RUBY_LIBDIR%%/test/unit/autorunner.rb
-%%RUBY_LIBDIR%%/test/unit/collector/dir.rb
-%%RUBY_LIBDIR%%/test/unit/collector/objectspace.rb
-%%RUBY_LIBDIR%%/test/unit/collector.rb
-%%RUBY_LIBDIR%%/test/unit/error.rb
-%%RUBY_LIBDIR%%/test/unit/failure.rb
 %%RUBY_LIBDIR%%/test/unit/testcase.rb
-%%RUBY_LIBDIR%%/test/unit/testresult.rb
-%%RUBY_LIBDIR%%/test/unit/testsuite.rb
-%%RUBY_LIBDIR%%/test/unit/ui/console/testrunner.rb
-%%RUBY_LIBDIR%%/test/unit/ui/fox/testrunner.rb
-%%RUBY_LIBDIR%%/test/unit/ui/gtk/testrunner.rb
-%%RUBY_LIBDIR%%/test/unit/ui/gtk2/testrunner.rb
-%%RUBY_LIBDIR%%/test/unit/ui/testrunnermediator.rb
-%%RUBY_LIBDIR%%/test/unit/ui/testrunnerutilities.rb
-%%RUBY_LIBDIR%%/test/unit/ui/tk/testrunner.rb
-%%RUBY_LIBDIR%%/test/unit/util/backtracefilter.rb
-%%RUBY_LIBDIR%%/test/unit/util/observable.rb
-%%RUBY_LIBDIR%%/test/unit/util/procwrapper.rb
 %%RUBY_LIBDIR%%/test/unit.rb
 %%RUBY_LIBDIR%%/thread.rb
 %%RUBY_LIBDIR%%/thwait.rb
@@ -823,17 +856,11 @@ include/ruby-1.9/rubysig.h
 @dirrm %%RUBY_LIBDIR%%/webrick/httpauth
 @dirrm %%RUBY_LIBDIR%%/webrick
 @dirrm %%RUBY_LIBDIR%%/uri
-@dirrm %%RUBY_LIBDIR%%/test/unit/util
-@dirrm %%RUBY_LIBDIR%%/test/unit/ui/tk
-@dirrm %%RUBY_LIBDIR%%/test/unit/ui/gtk2
-@dirrm %%RUBY_LIBDIR%%/test/unit/ui/gtk
-@dirrm %%RUBY_LIBDIR%%/test/unit/ui/fox
-@dirrm %%RUBY_LIBDIR%%/test/unit/ui/console
-@dirrm %%RUBY_LIBDIR%%/test/unit/ui
-@dirrm %%RUBY_LIBDIR%%/test/unit/collector
 @dirrm %%RUBY_LIBDIR%%/test/unit
 @dirrm %%RUBY_LIBDIR%%/test
 @dirrm %%RUBY_LIBDIR%%/shell
+@dirrm %%RUBY_LIBDIR%%/rubygems/package/tar_reader
+@dirrm %%RUBY_LIBDIR%%/rubygems/package
 @dirrm %%RUBY_LIBDIR%%/rubygems/indexer
 @dirrm %%RUBY_LIBDIR%%/rubygems/ext
 @dirrm %%RUBY_LIBDIR%%/rubygems/digest
@@ -853,9 +880,12 @@ include/ruby-1.9/rubysig.h
 @dirrm %%RUBY_LIBDIR%%/rexml/dtd
 @dirrm %%RUBY_LIBDIR%%/rexml
 @dirrm %%RUBY_LIBDIR%%/rdoc/ri
-@dirrm %%RUBY_LIBDIR%%/rdoc/parsers
+@dirrm %%RUBY_LIBDIR%%/rdoc/parser
+@dirrm %%RUBY_LIBDIR%%/rdoc/markup/simple_markup
 @dirrm %%RUBY_LIBDIR%%/rdoc/markup
 @dirrm %%RUBY_LIBDIR%%/rdoc/generator/xml
+@dirrm %%RUBY_LIBDIR%%/rdoc/generator/texinfo
+@dirrm %%RUBY_LIBDIR%%/rdoc/generator/template
 @dirrm %%RUBY_LIBDIR%%/rdoc/generator/html
 @dirrm %%RUBY_LIBDIR%%/rdoc/generator/chm
 @dirrm %%RUBY_LIBDIR%%/rdoc/generator
@@ -867,6 +897,7 @@ include/ruby-1.9/rubysig.h
 @dirrm %%RUBY_LIBDIR%%/optparse
 @dirrm %%RUBY_LIBDIR%%/openssl
 @dirrm %%RUBY_LIBDIR%%/net
+@dirrm %%RUBY_LIBDIR%%/minitest
 @dirrm %%RUBY_LIBDIR%%/json/pure
 @dirrm %%RUBY_LIBDIR%%/json/add
 @dirrm %%RUBY_LIBDIR%%/json
@@ -876,7 +907,15 @@ include/ruby-1.9/rubysig.h
 @dirrm %%RUBY_LIBDIR%%/irb/cmd
 @dirrm %%RUBY_LIBDIR%%/irb
 @dirrm %%RUBY_LIBDIR%%/io
+@dirrm %%RUBY_LIBDIR%%/drb
+@dirrm %%RUBY_LIBDIR%%/dl
+@dirrm %%RUBY_LIBDIR%%/digest
+@dirrm %%RUBY_LIBDIR%%/date
+@dirrm %%RUBY_LIBDIR%%/cgi/session
+@dirrm %%RUBY_LIBDIR%%/cgi
+@dirrm %%RUBY_LIBDIR%%/bigdecimal
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/racc
+@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/mathn
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json/ext
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/io
@@ -884,13 +923,6 @@ include/ruby-1.9/rubysig.h
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%
-@dirrm %%RUBY_LIBDIR%%/drb
-@dirrm %%RUBY_LIBDIR%%/dl
-@dirrm %%RUBY_LIBDIR%%/digest
-@dirrm %%RUBY_LIBDIR%%/date
-@dirrm %%RUBY_LIBDIR%%/cgi/session
-@dirrm %%RUBY_LIBDIR%%/cgi
-@dirrm %%RUBY_LIBDIR%%/bigdecimal
 @dirrm %%RUBY_LIBDIR%%/
 %%RUBY_SITEARCHLIBDIR%%/.keep_me
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%