diff options
-rw-r--r-- | lang/ruby/rubyversion.mk | 4 | ||||
-rw-r--r-- | lang/ruby193-base/Makefile | 6 | ||||
-rw-r--r-- | lang/ruby193-base/PLIST | 7 | ||||
-rw-r--r-- | lang/ruby193-base/distinfo | 17 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-configure | 100 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-configure.in | 22 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-lib_rubygems.rb | 10 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-random.c | 27 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-test_rubygems_test__gem.rb | 6 |
9 files changed, 84 insertions, 115 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index a3e324ab2ac..77f51959a71 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.92 2012/11/10 14:34:27 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.93 2013/01/31 15:56:13 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -206,7 +206,7 @@ RUBY193_VERSION= 1.9.3 # patch RUBY18_PATCHLEVEL= pl371 -RUBY193_PATCHLEVEL= p327 +RUBY193_PATCHLEVEL= p374 # current API compatible version; used for version of shared library RUBY18_API_VERSION= 1.8.7 diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile index ca9c57b5b15..643e78eb5c6 100644 --- a/lang/ruby193-base/Makefile +++ b/lang/ruby193-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/12 14:51:31 taca Exp $ +# $NetBSD: Makefile,v 1.21 2013/01/31 15:56:14 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -102,7 +102,9 @@ CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} DOCS= COPYING COPYING.ja ChangeLog NEWS README \ README.EXT README.EXT.ja README.ja ToDo \ - doc/ChangeLog-1.8.0 doc/ChangeLog-YARV doc/NEWS-1.8.7 \ + doc/ChangeLog-1.8.0 doc/ChangeLog-1.9.3 doc/ChangeLog-YARV \ + doc/NEWS-1.8.7 doc/NEWS-1.9.1 doc/NEWS-1.9.2 \ + doc/etc.rd doc/etc.rd.ja \ doc/forwardable.rd doc/forwardable.rd.ja \ doc/irb/irb-tools.rd.ja doc/irb/irb.rd doc/irb/irb.rd.ja \ doc/shell.rd doc/shell.rd.ja diff --git a/lang/ruby193-base/PLIST b/lang/ruby193-base/PLIST index fdd4cbba492..edd39d020aa 100644 --- a/lang/ruby193-base/PLIST +++ b/lang/ruby193-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2012/10/12 14:51:31 taca Exp $ +@comment $NetBSD: PLIST,v 1.5 2013/01/31 15:56:14 taca Exp $ bin/erb${RUBY_VER} bin/gem${RUBY_VER} bin/irb${RUBY_VER} @@ -787,9 +787,12 @@ ${RUBY_DOC}/COPYING ${RUBY_DOC}/COPYING.ja ${RUBY_DOC}/ChangeLog ${RUBY_DOC}/ChangeLog-1.8.0 +${RUBY_DOC}/ChangeLog-1.9.3 ${RUBY_DOC}/ChangeLog-YARV ${RUBY_DOC}/NEWS ${RUBY_DOC}/NEWS-1.8.7 +${RUBY_DOC}/NEWS-1.9.1 +${RUBY_DOC}/NEWS-1.9.2 ${RUBY_DOC}/README ${RUBY_DOC}/README.EXT ${RUBY_DOC}/README.EXT.ja @@ -797,6 +800,8 @@ ${RUBY_DOC}/README.ja ${RUBY_DOC}/ToDo ${RUBY_DOC}/bigdecimal_en.html ${RUBY_DOC}/bigdecimal_ja.html +${RUBY_DOC}/etc.rd +${RUBY_DOC}/etc.rd.ja ${RUBY_DOC}/forwardable.rd ${RUBY_DOC}/forwardable.rd.ja ${RUBY_DOC}/irb/irb-tools.rd.ja diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo index 70601e5c4b0..ade575f1f60 100644 --- a/lang/ruby193-base/distinfo +++ b/lang/ruby193-base/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.13 2012/11/26 12:37:52 fhajny Exp $ +$NetBSD: distinfo,v 1.14 2013/01/31 15:56:14 taca Exp $ -SHA1 (ruby-1.9.3-p327.tar.bz2) = 7fbacfc960ef76d98c83f20eb31c71d6aaf9a5a6 -RMD160 (ruby-1.9.3-p327.tar.bz2) = 5cd8317a3bdfeb7d6faef4f2ae49193292a60031 -Size (ruby-1.9.3-p327.tar.bz2) = 9975835 bytes -SHA1 (patch-configure) = 7bb0cfd69781bf1a66378fe3b2f8a40a1235cc15 -SHA1 (patch-configure.in) = 0c6cb3a7ebe50111fd0a506b18e3a45a516ec751 +SHA1 (ruby-1.9.3-p374.tar.bz2) = fde7f6d286fcb27135d29963f04f5d0e066195f7 +RMD160 (ruby-1.9.3-p374.tar.bz2) = bb3beabef451d958a27a743aa138ce6704d5cab1 +Size (ruby-1.9.3-p374.tar.bz2) = 10017658 bytes +SHA1 (patch-configure) = 01575dd71bb555cde7241a13c588a01a6bd65c3d +SHA1 (patch-configure.in) = 0996411e3125a298c770f4eead0edbc530a0a584 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 -SHA1 (patch-lib_rubygems.rb) = cc02e3a296d88605ef8444d64ca805ddebb524c6 +SHA1 (patch-lib_rubygems.rb) = 2aed4990a868dc92668a78da7bcff2050ff3dd66 SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6 SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc @@ -24,7 +24,6 @@ SHA1 (patch-man_erb.1) = 210aa77328689868162566bf01e3ba261dec0c2b SHA1 (patch-man_irb.1) = 899fdd973bb2491cf7f606ee68ffa6cdbe42f725 SHA1 (patch-man_ri.1) = 3283b897b8ed36933ccecce158bcb3463d667aff SHA1 (patch-man_ruby.1) = 8c9edcdc72b674f8f4ef5b35e17aa0a6c38245e7 -SHA1 (patch-random.c) = 48ae24de7f1b73a115e0994dbd35890eb5f6b5fa -SHA1 (patch-test_rubygems_test__gem.rb) = bb6946eceed2112a7b3d8df84f59c793bdb73bb0 +SHA1 (patch-test_rubygems_test__gem.rb) = fe8b8e436b255595122d2a01462ba0a686575f24 SHA1 (patch-tool_rbinstall.rb) = f0497085a09b31145f57028b30e335b09acabcff SHA1 (patch-vsnprintf.c) = 7bb4ca07381536717518143ef7803634168ca9fa diff --git a/lang/ruby193-base/patches/patch-configure b/lang/ruby193-base/patches/patch-configure index e4b239e0238..d22c6955d28 100644 --- a/lang/ruby193-base/patches/patch-configure +++ b/lang/ruby193-base/patches/patch-configure @@ -1,83 +1,73 @@ -$NetBSD: patch-configure,v 1.4 2012/10/12 14:51:31 taca Exp $ +$NetBSD: patch-configure,v 1.5 2013/01/31 15:56:14 taca Exp $ * Adding Interix and MirBSD support. * Ignore doxygen. ---- configure.orig 2012-10-12 09:23:46.000000000 +0000 +--- configure.orig 2013-01-17 04:57:31.000000000 +0000 +++ configure -@@ -10654,6 +10654,9 @@ esac - superux*) : - ac_cv_func_setitimer=no - ;; #( +@@ -20419,6 +20419,9 @@ _ACEOF + ;; + superux*) ac_cv_func_setitimer=no + ;; + interix*) LIBS="-lm $LIBS" + ac_cv_func_getpgrp_void=yes -+ ;; #( - *) : - LIBS="-lm $LIBS" ;; ++ ;; + *) LIBS="-lm $LIBS" ;; esac -@@ -11980,6 +11983,9 @@ fi - ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H - #include <time.h> - #endif -+#ifdef HAVE_SYS_TIME_H -+# include <sys/time.h> -+#endif - " - if test "x$ac_cv_type_struct_timespec" = xyes; then : -@@ -15790,7 +15796,7 @@ done - MAINLIBS="-pthread $MAINLIBS" ;; #( - *) : - case "$target_os" in #( -- openbsd*) : -+ openbsd*|mirbsd*) : - LIBS="-pthread $LIBS" ;; #( - *) : - LIBS="-l$pthread_lib $LIBS" ;; -@@ -16239,8 +16245,12 @@ esac ;; #( - rb_cv_dlopen=yes ;; #( - interix*) : - : ${LDSHARED='$(CC) -shared'} +@@ -37835,7 +37838,7 @@ done + root) : ;; + c_r) MAINLIBS="-pthread $MAINLIBS" ;; + *) case "$target_os" in +- openbsd*) LIBS="-pthread $LIBS" ;; ++ openbsd*|mirbsd*) LIBS="-pthread $LIBS" ;; + *) LIBS="-l$pthread_lib $LIBS" ;; + esac + ;; +@@ -38856,8 +38859,12 @@ esac + fi + rb_cv_dlopen=yes ;; + interix*) : ${LDSHARED='$(CC) -shared'} + LDFLAGS="$LDFLAGS -Wl,-E" XLDFLAGS="$XLDFLAGS -Wl,-E" + # use special random-slot linkage in 0x[56]XXXXXXX LIBPATHFLAG=" -L%1\$-s" + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' + RPATHFLAG=' -Wl,-R%1$-s' - rb_cv_dlopen=yes ;; #( - freebsd*|dragonfly*) : - -@@ -16252,7 +16262,7 @@ esac ;; #( + rb_cv_dlopen=yes ;; + freebsd*|dragonfly*) + : ${LDSHARED='$(CC) -shared'} +@@ -38868,7 +38875,7 @@ esac test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi - rb_cv_dlopen=yes ;; #( -- openbsd*) : -+ openbsd*|mirbsd*) : - : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} + rb_cv_dlopen=yes ;; +- openbsd*) : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} ++ openbsd*|mirbsd*) : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" -@@ -16781,7 +16791,7 @@ _ACEOF - freebsd*|dragonfly*) : - + fi +@@ -39463,7 +39470,7 @@ _ACEOF + ;; + freebsd*|dragonfly*) SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' if test "$rb_cv_binary_elf" != "yes" ; then LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' -@@ -16798,7 +16808,7 @@ _ACEOF +@@ -39479,7 +39486,7 @@ _ACEOF LIBRUBY_ALIASES="" fi - ;; #( -- openbsd*) : -+ openbsd*|mirbsd*) : - + ;; +- openbsd*) ++ openbsd*|mirbsd*) SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` -@@ -16859,7 +16869,12 @@ esac - ;; #( - interix*) : - + ;; +@@ -39531,7 +39538,12 @@ esac + LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib' + ;; + interix*) - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' @@ -85,10 +75,10 @@ $NetBSD: patch-configure,v 1.4 2012/10/12 14:51:31 taca Exp $ + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' + LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' - ;; #( - *) : - ;; -@@ -16922,11 +16937,7 @@ if test "$install_doc" != no; then + ;; + esac + +@@ -39593,11 +39605,7 @@ if test "$install_doc" != no; then else RDOCTARGET="nodoc" fi diff --git a/lang/ruby193-base/patches/patch-configure.in b/lang/ruby193-base/patches/patch-configure.in index 1c6d7f95157..91e43d73ddd 100644 --- a/lang/ruby193-base/patches/patch-configure.in +++ b/lang/ruby193-base/patches/patch-configure.in @@ -1,11 +1,11 @@ -$NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $ +$NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $ * Adding Interix and MirBSD support. * Ignore doxygen. ---- configure.in.orig 2012-10-12 07:24:42.000000000 +0000 +--- configure.in.orig 2012-11-13 10:02:45.000000000 +0000 +++ configure.in -@@ -1120,6 +1120,8 @@ main() +@@ -1128,6 +1128,8 @@ main() ], [superux*], [ ac_cv_func_setitimer=no ], @@ -14,7 +14,7 @@ $NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $ [ LIBS="-lm $LIBS"]) AC_CHECK_LIB(crypt, crypt) AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV -@@ -1186,6 +1188,9 @@ AC_CHECK_MEMBERS([struct stat.st_ctimens +@@ -1194,6 +1196,9 @@ AC_CHECK_MEMBERS([struct stat.st_ctimens AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H @%:@include <time.h> @@ -24,7 +24,7 @@ $NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $ @%:@endif]) AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H -@@ -1835,7 +1840,7 @@ if test x"$enable_pthread" = xyes; then +@@ -1786,7 +1791,7 @@ if test x"$enable_pthread" = xyes; then [root], [], [c_r], [MAINLIBS="-pthread $MAINLIBS"], [AS_CASE(["$target_os"], @@ -33,7 +33,7 @@ $NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $ [LIBS="-l$pthread_lib $LIBS"])]) else AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled") -@@ -2066,7 +2071,9 @@ if test "$with_dln_a_out" != yes; then +@@ -2017,7 +2022,9 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes], [interix*], [ : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" @@ -43,7 +43,7 @@ $NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $ rb_cv_dlopen=yes], [freebsd*|dragonfly*], [ : ${LDSHARED='$(CC) -shared'} -@@ -2077,7 +2084,7 @@ if test "$with_dln_a_out" != yes; then +@@ -2028,7 +2035,7 @@ if test "$with_dln_a_out" != yes; then test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi rb_cv_dlopen=yes], @@ -52,7 +52,7 @@ $NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $ if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" fi -@@ -2376,7 +2383,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -2327,7 +2334,7 @@ AS_CASE("$enable_shared", [yes], [ ], [freebsd*|dragonfly*], [ SOLIBS='$(LIBS)' @@ -61,7 +61,7 @@ $NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $ if test "$rb_cv_binary_elf" != "yes" ; then LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' -@@ -2392,7 +2399,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -2343,7 +2350,7 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBY_ALIASES="" fi ], @@ -70,7 +70,7 @@ $NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $ SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` ], -@@ -2442,7 +2449,12 @@ AS_CASE("$enable_shared", [yes], [ +@@ -2393,7 +2400,12 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib' ], [interix*], [ @@ -84,7 +84,7 @@ $NetBSD: patch-configure.in,v 1.4 2012/10/12 14:51:31 taca Exp $ ]) ], [ LIBRUBYARG_SHARED= -@@ -2487,11 +2499,7 @@ if test "$install_doc" != no; then +@@ -2438,11 +2450,7 @@ if test "$install_doc" != no; then else RDOCTARGET="nodoc" fi diff --git a/lang/ruby193-base/patches/patch-lib_rubygems.rb b/lang/ruby193-base/patches/patch-lib_rubygems.rb index 4905407a753..7c3a8fb25a9 100644 --- a/lang/ruby193-base/patches/patch-lib_rubygems.rb +++ b/lang/ruby193-base/patches/patch-lib_rubygems.rb @@ -1,10 +1,10 @@ -$NetBSD: patch-lib_rubygems.rb,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $ +$NetBSD: patch-lib_rubygems.rb,v 1.2 2013/01/31 15:56:14 taca Exp $ Add install_root option for pkgsrc's rubygems support. ---- lib/rubygems.rb.orig 2011-08-26 01:12:57.000000000 +0000 +--- lib/rubygems.rb.orig 2012-04-19 23:38:41.000000000 +0000 +++ lib/rubygems.rb -@@ -327,7 +327,10 @@ module Gem +@@ -330,7 +330,10 @@ module Gem ## # The path where gem executables are to be installed. @@ -16,7 +16,7 @@ Add install_root option for pkgsrc's rubygems support. # TODO: move to Gem::Dirs return File.join install_dir, 'bin' unless install_dir.to_s == Gem.default_dir.to_s -@@ -619,12 +622,12 @@ module Gem +@@ -622,12 +625,12 @@ module Gem ## # The index to insert activated gem paths into the $LOAD_PATH. # @@ -31,7 +31,7 @@ Add install_root option for pkgsrc's rubygems support. if QUICKLOADER_SUCKAGE then $LOAD_PATH.each_with_index do |path, i| -@@ -799,6 +802,7 @@ module Gem +@@ -821,6 +824,7 @@ module Gem prefix = File.dirname RUBYGEMS_DIR if prefix != File.expand_path(ConfigMap[:sitelibdir]) and diff --git a/lang/ruby193-base/patches/patch-random.c b/lang/ruby193-base/patches/patch-random.c deleted file mode 100644 index c5384a35160..00000000000 --- a/lang/ruby193-base/patches/patch-random.c +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-random.c,v 1.1 2012/11/26 12:37:53 fhajny Exp $ - -Fix build on SunOS by making sure endianness is known. -http://bugs.ruby-lang.org/projects/ruby-193/repository/revisions/37653 - ---- random.c.orig 2012-11-09 15:38:38.000000000 +0000 -+++ random.c -@@ -1261,6 +1261,19 @@ random_s_rand(int argc, VALUE *argv, VAL - - #define SIP_HASH_STREAMING 0 - #define sip_hash24 ruby_sip_hash24 -+#if !defined _WIN32 && !defined BYTE_ORDER -+# ifdef WORDS_BIGENDIAN -+# define BYTE_ORDER BIG_ENDIAN -+# else -+# define BYTE_ORDER LITTLE_ENDIAN -+# endif -+# ifndef LITTLE_ENDIAN -+# define LITTLE_ENDIAN 1234 -+# endif -+# ifndef BIG_ENDIAN -+# define BIG_ENDIAN 4321 -+# endif -+#endif - #include "siphash.c" - - static st_index_t hashseed; diff --git a/lang/ruby193-base/patches/patch-test_rubygems_test__gem.rb b/lang/ruby193-base/patches/patch-test_rubygems_test__gem.rb index 84e56ec2a29..da4f0f145ae 100644 --- a/lang/ruby193-base/patches/patch-test_rubygems_test__gem.rb +++ b/lang/ruby193-base/patches/patch-test_rubygems_test__gem.rb @@ -1,10 +1,10 @@ -$NetBSD: patch-test_rubygems_test__gem.rb,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $ +$NetBSD: patch-test_rubygems_test__gem.rb,v 1.2 2013/01/31 15:56:14 taca Exp $ Use vendordir instead of sitedir. ---- test/rubygems/test_gem.rb.orig 2011-08-26 01:12:57.000000000 +0000 +--- test/rubygems/test_gem.rb.orig 2012-04-19 22:43:16.000000000 +0000 +++ test/rubygems/test_gem.rb -@@ -821,12 +821,12 @@ class TestGem < Gem::TestCase +@@ -844,12 +844,12 @@ class TestGem < Gem::TestCase end def test_self_prefix_sitelibdir |