Sun Dec 1 11:47:59 2013 UTC ()

Pullup ticket #4261 - requested by taca
lang/ruby200-base: security update

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.106
- lang/ruby200-base/Makefile                                    1.5
- lang/ruby200-base/PLIST                                       1.2
- lang/ruby200-base/distinfo                                    1.7
- lang/ruby200-base/patches/patch-configure                     1.4
- lang/ruby200-base/patches/patch-ext_tk_extconf.rb             deleted
- lang/ruby200-base/patches/patch-lib_rubygems.rb               1.2
- lang/ruby200-base/patches/patch-lib_rubygems_commands_setup__command.rb 1.2
- lang/ruby200-base/patches/patch-lib_rubygems_config__file.rb  1.2
- lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb 1.2
- lang/ruby200-base/patches/patch-lib_rubygems_ext_ext__conf__builder.rb deleted
- lang/ruby200-base/patches/patch-lib_rubygems_installer.rb     1.2
- lang/ruby200-base/patches/patch-lib_rubygems_specification.rb 1.2
- lang/ruby200-base/patches/patch-lib_rubygems_version.rb       deleted
- lang/ruby200-base/patches/patch-man_ri.1                      1.2
- lang/ruby200-base/patches/patch-tool_rbinstall.rb             1.2

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Nov 24 14:22:03 UTC 2013

   Modified Files:
   	pkgsrc/lang/ruby: rubyversion.mk
   	pkgsrc/lang/ruby200-base: Makefile PLIST distinfo
   	pkgsrc/lang/ruby200-base/patches: patch-configure patch-lib_rubygems.rb
   	    patch-lib_rubygems_commands_setup__command.rb
   	    patch-lib_rubygems_config__file.rb
   	    patch-lib_rubygems_dependency__installer.rb
   	    patch-lib_rubygems_installer.rb patch-lib_rubygems_specification.rb
   	    patch-man_ri.1 patch-tool_rbinstall.rb
   Removed Files:
   	pkgsrc/lang/ruby200-base/patches: patch-ext_tk_extconf.rb
   	    patch-lib_rubygems_ext_ext__conf__builder.rb
   	    patch-lib_rubygems_version.rb

   Log Message:
   Update ruby200-base, ruby200 and ruby-mode package to 2.00-p353.

   Ruby 2.0.0-p353 is released

   Now Ruby 2.0.0-p353 is released.

   This release includes a security fix about floating point parsing.

       Heap Overflow in Floating Point Parsing (CVE-2013-4164)

   And some bugfixes are also included. See tickets and ChangeLog for details.


(tron)

--- pkgsrc/lang/ruby/rubyversion.mk 2013/12/01 11:34:00 1.101.2.3
+++ pkgsrc/lang/ruby/rubyversion.mk 2013/12/01 11:47:59 1.101.2.4

 @@ -1,14 +1,14 @@
-# $NetBSD: rubyversion.mk,v 1.101.2.3 2013/12/01 11:34:00 tron Exp $
+# $NetBSD: rubyversion.mk,v 1.101.2.4 2013/12/01 11:47:59 tron Exp $
+#
 # This file determines which Ruby version is used as a dependency for
 # a package.
+#
+#
 # === User-settable variables ===
+#
 # RUBY_VERSION_DEFAULT
 #	The preferered Ruby version to use.
+#
 #		Possible values: 18 193 200
 #		Default: 193
 @@ -198,27 +198,27 @@
 .if !defined(_RUBYVERSION_MK)
 _RUBYVERSION_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 # current supported Ruby's version
 RUBY18_VERSION=		1.8.7
 RUBY193_VERSION=	1.9.3
 RUBY200_VERSION=	2.0.0
 # patch
 RUBY18_PATCHLEVEL=	pl374
 RUBY193_PATCHLEVEL=	p484
-RUBY200_PATCHLEVEL=	p247
+RUBY200_PATCHLEVEL=	p353
 # current API compatible version; used for version of shared library
 RUBY18_API_VERSION=	1.8.7
 RUBY193_API_VERSION=	1.9.1
 RUBY200_API_VERSION=	2.0.0
+#
 RUBY_VERSION_DEFAULT?=	193
 RUBY_VERSION_SUPPORTED?= 200 193 18
 .if defined(RUBY_VERSION_REQD)
 . for rv in ${RUBY_VERSION_SUPPORTED}

--- pkgsrc/lang/ruby200-base/Attic/Makefile 2013/09/30 08:31:00 1.4
+++ pkgsrc/lang/ruby200-base/Attic/Makefile 2013/12/01 11:47:59 1.4.2.1

 @@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2013/09/30 08:31:00 taca Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2013/12/01 11:47:59 tron Exp $
+#
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
 PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby ${RUBY_VERSION} release minimum base package
 LICENSE=	${RUBY_LICENSE}
 RUBY_VERSION_SUPPORTED=	200
 MAKE_JOBS_SAFE=		no
 USE_LANGUAGES=		c
 USE_TOOLS+=		pax yacc

--- pkgsrc/lang/ruby200-base/Attic/PLIST 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/Attic/PLIST 2013/12/01 11:47:59 1.1.2.1

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/21 02:32:58 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
 bin/erb${RUBY_VER}
 bin/gem${RUBY_VER}
 bin/irb${RUBY_VER}
 bin/rake${RUBY_VER}
 bin/rdoc${RUBY_VER}
 bin/ri${RUBY_VER}
 bin/${RUBY_NAME}
 ${PLIST.win32}bin/rubyw${RUBY_VER}
 bin/testrb${RUBY_VER}
 ${RUBY_INC}/ruby.h
 ${RUBY_INC}/ruby/backward/classext.h
 ${RUBY_INC}/ruby/backward/rubyio.h
 ${RUBY_INC}/ruby/backward/rubysig.h
 @@ -653,31 +653,30 @@ ${RUBY_LIB}/rubygems/request_set.rb
 ${RUBY_LIB}/rubygems/requirement.rb
 ${RUBY_LIB}/rubygems/security.rb
 ${RUBY_LIB}/rubygems/security/policies.rb
 ${RUBY_LIB}/rubygems/security/policy.rb
 ${RUBY_LIB}/rubygems/security/signer.rb
 ${RUBY_LIB}/rubygems/security/trust_dir.rb
 ${RUBY_LIB}/rubygems/server.rb
 ${RUBY_LIB}/rubygems/source.rb
 ${RUBY_LIB}/rubygems/source_list.rb
 ${RUBY_LIB}/rubygems/source_local.rb
 ${RUBY_LIB}/rubygems/source_specific_file.rb
 ${RUBY_LIB}/rubygems/spec_fetcher.rb
 ${RUBY_LIB}/rubygems/specification.rb
-${RUBY_LIB}/rubygems/ssl_certs/AddTrustExternalCARoot.pem
+${RUBY_LIB}/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
-${RUBY_LIB}/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem
+${RUBY_LIB}/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
-${RUBY_LIB}/rubygems/ssl_certs/GeoTrust_Global_CA.pem
+${RUBY_LIB}/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
-${RUBY_LIB}/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
+${RUBY_LIB}/rubygems/ssl_certs/GeoTrustGlobalCA.pem
 ${RUBY_LIB}/rubygems/ssl_certs/ca-bundle.pem
 ${RUBY_LIB}/rubygems/syck_hack.rb
 ${RUBY_LIB}/rubygems/test_case.rb
 ${RUBY_LIB}/rubygems/test_utilities.rb
 ${RUBY_LIB}/rubygems/text.rb
 ${RUBY_LIB}/rubygems/uninstaller.rb
 ${RUBY_LIB}/rubygems/user_interaction.rb
 ${RUBY_LIB}/rubygems/validator.rb
 ${RUBY_LIB}/rubygems/version.rb
 ${RUBY_LIB}/rubygems/version_option.rb
 ${RUBY_LIB}/scanf.rb
 ${RUBY_LIB}/securerandom.rb
 ${RUBY_LIB}/set.rb
 ${RUBY_LIB}/shell.rb

--- pkgsrc/lang/ruby200-base/Attic/distinfo 2013/11/10 08:52:53 1.4.2.1
+++ pkgsrc/lang/ruby200-base/Attic/distinfo 2013/12/01 11:47:59 1.4.2.2

 @@ -1,28 +1,25 @@
-$NetBSD: distinfo,v 1.4.2.1 2013/11/10 08:52:53 spz Exp $
+$NetBSD: distinfo,v 1.4.2.2 2013/12/01 11:47:59 tron Exp $
-SHA1 (ruby-2.0.0-p247.tar.bz2) = 9d3e5758c87a2c8016aec246f278b7551f8cb675
+SHA1 (ruby-2.0.0-p353.tar.bz2) = 0be863f1c39d7764c52cbb79ca06105743e27c42
-RMD160 (ruby-2.0.0-p247.tar.bz2) = 4a3b6653f17c145c6938c538022c199f830a0dee
+RMD160 (ruby-2.0.0-p353.tar.bz2) = e12445ef618953c89d1c198899b6a3a959fc55f2
-Size (ruby-2.0.0-p247.tar.bz2) = 10804581 bytes
+Size (ruby-2.0.0-p353.tar.bz2) = 10730412 bytes
-SHA1 (patch-configure) = f8d9591dacfb8723c0c1dd8eb37309fe80905061
+SHA1 (patch-configure) = 5e0897ef60a14073e87427911b45c2b238bbe2a3
 SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec
 SHA1 (patch-ext_tk_extconf.rb) = 537db204c7a766602529ce48ef89a2fc7cbda19f
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc
-SHA1 (patch-lib_rubygems.rb) = ebb230dbfdeecaf764fd089d2aa1baaac1dbd34b
+SHA1 (patch-lib_rubygems.rb) = 589ca26a32579f87c2d3d0e8e7f03348760f4b4e
-SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 266f1059d3d180637eec4fa3f1ea127a29b4aff8
+SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
 SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = f39435fbdbbfcc8c756e54fcbec89a4ff796ee2d
 SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 58af5f0d1a185183ff9a4b4828ef1ca9fc074e05
-SHA1 (patch-lib_rubygems_config__file.rb) = cb7e22fa912d7043aabde8c916c45108b51e5361
+SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc
 SHA1 (patch-lib_rubygems_defaults.rb) = 1af4161a83c0bf5b894c4ab3f4a77d4ee4183985
-SHA1 (patch-lib_rubygems_dependency__installer.rb) = 501860ee30861b5a1e4cf75502334145ce57f575
+SHA1 (patch-lib_rubygems_dependency__installer.rb) = a2f0d03924a70e8e6cb30736e0f3807e5baa520d
 SHA1 (patch-lib_rubygems_ext_ext__conf__builder.rb) = 63b6b67116073fa2fc11ece20dc9a232b322604a
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 22cfafe090db72211253b8528937e5be0e677ebf
-SHA1 (patch-lib_rubygems_installer.rb) = ef2ab9f965fc7946e68c8d751d3c21a2c676f343
+SHA1 (patch-lib_rubygems_installer.rb) = 2dbcb3fc03c9a02112f196351fca77d766d6c6f6
-SHA1 (patch-lib_rubygems_specification.rb) = 4ffe57953051f2e091ae94e022b40146f8bec7aa
+SHA1 (patch-lib_rubygems_specification.rb) = 3e9e95178127da862add4141665b80d965874f21
 SHA1 (patch-lib_rubygems_uninstaller.rb) = bf525fc55e9bf94e1561a7cac76e09873d3aaca2
 SHA1 (patch-lib_rubygems_version.rb) = fd5fd3bfad7e66f44d2829b31e1db2417d3010e4
 SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116
 SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7
-SHA1 (patch-man_ri.1) = 7314829a437e3c4625188a818e18751997eda1ce
+SHA1 (patch-man_ri.1) = af855135020f18c361cc55af676adc75e26bf4d3
 SHA1 (patch-man_ruby.1) = 5bc1e2e7c4c640659e33d0131d0982ce4e0d9fe0
 SHA1 (patch-test_rubygems_test__gem.rb) = 32ba1a7a2e9f6174297de969fc0b7cdcd083c764
-SHA1 (patch-tool_rbinstall.rb) = 3921235e77c9a75e19ad08434f055422ffdf3f2a
+SHA1 (patch-tool_rbinstall.rb) = 287064ed2bc90e92cdc1b38fc4031d65819d3843

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-configure 2013/11/10 08:52:53 1.2.2.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-configure 2013/12/01 11:47:59 1.2.2.2

 @@ -1,148 +1,148 @@
-$NetBSD: patch-configure,v 1.2.2.1 2013/11/10 08:52:53 spz Exp $
+$NetBSD: patch-configure,v 1.2.2.2 2013/12/01 11:47:59 tron Exp $
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
---- configure.orig	2013-06-27 11:16:17.000000000 +0000
+--- configure.orig	2013-11-22 04:23:39.000000000 +0000
 +++ configure
-@@ -8259,6 +8259,10 @@ esac
+@@ -8260,6 +8260,10 @@ esac
    superux*) :
      	ac_cv_func_setitimer=no
  		 ;; #(
 +  interix*) :
 +	LIBS="-lm $LIBS"
 +	ac_cv_func_getpgrp_void=yes
 +		 ;; #(
    nacl) :
    LIBS="-lm $LIBS"
-@@ -14793,7 +14797,7 @@ _ACEOF
+@@ -14794,7 +14798,7 @@ _ACEOF
  fi
  case "$target_os" in #(
 -  openbsd*) :
 +  openbsd*|mirbsd*) :
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for heap align log on openbsd" >&5
  $as_echo_n "checking for heap align log on openbsd... " >&6; }
-@@ -15067,6 +15071,8 @@ else
+@@ -15068,6 +15072,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
 +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
 +#   include <stdlib.h>
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -17061,7 +17067,7 @@ done
+@@ -17074,7 +17080,7 @@ done
      MAINLIBS="-pthread $MAINLIBS" ;; #(
    *) :
      case "$target_os" in #(
 -  openbsd*) :
 +  openbsd*|mirbsd*) :
      LIBS="-pthread $LIBS" ;; #(
    *) :
      LIBS="-l$pthread_lib $LIBS" ;;
-@@ -17434,7 +17440,9 @@ esac ;; #(
+@@ -17447,7 +17453,9 @@ esac ;; #(
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
 +			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
  			LIBPATHFLAG=" -L%1\$-s"
 +			RPATHFLAG=' -Wl,-R%1$-s'
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
-@@ -18254,7 +18262,7 @@ esac
+@@ -18270,7 +18278,7 @@ esac
    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=''
-@@ -18271,7 +18279,7 @@ esac
+@@ -18287,7 +18295,7 @@ esac
  	   LIBRUBY_ALIASES=""
  	fi
  	 ;; #(
 -  openbsd*) :
 +  openbsd*|mirbsd*) :
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-@@ -18332,7 +18340,12 @@ esac
+@@ -18348,7 +18356,12 @@ esac
  	 ;; #(
    interix*) :
 -	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
 +	SOLIBS='$(LIBS)'
 +	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
 +	# link explicitly to 0x48000000
 +	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
 +	LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
 +	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
  	 ;; #(
    mingw*|cygwin*|mswin*) :
-@@ -18490,7 +18503,7 @@ esac
+@@ -18506,7 +18519,7 @@ esac
  esac
  if test "$enable_rpath" = yes; then
      test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
 -    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)"
 +    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${PREFIX}/lib -L\$(libdir)"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
      LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
  fi
-@@ -18655,11 +18668,7 @@ if test "$install_doc" != no; then
+@@ -18677,11 +18690,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi
 -    if test "$install_capi" != no -a -n "$DOXYGEN"; then
 -	CAPITARGET="capi"
 -    else
 -	CAPITARGET="nodoc"
 -    fi
 +    CAPITARGET="nodoc"
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -19210,9 +19219,13 @@ unexpand_shvar() {
+@@ -19232,9 +19241,13 @@ unexpand_shvar() {
      test "$#" -eq 0 && return
      for n do
          eval v='"$'$n'"'
 -	v="`echo \"$v\" | sed -e 's/${[^${}\"]*}/\"&\"/g' -e 's/[][$|.\\?*]/\\\\&/g'`"
 +	v="`echo \"$v\" | sed -e 's/\${[^${}\"]*}/\"&\"/g' -e 's/[][$|.\\?*]/\\\\&/g'`"
  	if test -n "$v"; then
 -	    expr="${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g"
 +	    if test -n "$expr"; then
 +	        expr="${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g"
 +	    else
 +	        expr="s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g"
 +	    fi
  	    case "$v" in #(
    *'${'*'}'*) :
      expr="$expr;s|$v|\"\${$n}\"|g" ;; #(
-@@ -19221,7 +19234,7 @@ unexpand_shvar() {
+@@ -19243,7 +19256,7 @@ unexpand_shvar() {
  esac
  	fi
      done
 -    expr='s/${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g'
 +    expr='s/\${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g'
      eval $var='"`echo \"\\\"${'$var'}\\\"\" | sed \"$expr;s/\\\"//g\"`"'
+ }
-@@ -20884,17 +20897,7 @@ which seems to be undefined.  Please mak
+@@ -20906,17 +20919,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
+     {
 -	if test ${VCS+set}; then
 -	    :
 -	elif svn info "$srcdir" > /dev/null 2>&1; then
 -	    VCS='svn'
 -	elif test -d "$srcdir/.git/svn"; then
 -	    VCS='git svn'
 -	elif test -d "$srcdir/.git"; then
 -	    VCS='git'
 -	else
 -	    VCS='echo cannot'

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems.rb 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems.rb 2013/12/01 11:47:59 1.1.2.1

 @@ -1,41 +1,41 @@
-$NetBSD: patch-lib_rubygems.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
+$NetBSD: patch-lib_rubygems.rb,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
 * Add install_root option for pkgsrc's rubygems support.
---- lib/rubygems.rb.orig	2013-06-21 16:16:31.000000000 +0000
+--- lib/rubygems.rb.orig	2013-11-13 02:59:08.000000000 +0000
 +++ lib/rubygems.rb
-@@ -286,7 +286,10 @@ module Gem
+@@ -291,7 +291,10 @@ module Gem
    ##
    # The path where gem executables are to be installed.
 -  def self.bindir(install_dir=Gem.dir)
 +  def self.bindir(install_dir=Gem.dir, install_root=nil)
 +    unless install_root.nil?
 +      install_dir = install_dir.sub(install_root, "")
 +    end
      # TODO: move to Gem::Dirs
      return File.join install_dir, 'bin' unless
        install_dir.to_s == Gem.default_dir.to_s
-@@ -546,12 +549,12 @@ module Gem
+@@ -551,12 +554,12 @@ module Gem
    ##
    # The index to insert activated gem paths into the $LOAD_PATH.
+   #
 -  # Defaults to the site lib directory unless gem_prelude.rb has loaded paths,
 +  # Defaults to the vendor lib directory unless gem_prelude.rb has loaded paths,
    # then it inserts the activated gem's paths before the gem_prelude.rb paths
    # so you can override the gem_prelude.rb default $LOAD_PATH paths.
    def self.load_path_insert_index
 -    index = $LOAD_PATH.index ConfigMap[:sitelibdir]
 +    index = $LOAD_PATH.index ConfigMap[:vendorlibdir]
      index
    end
-@@ -724,6 +727,7 @@ module Gem
+@@ -729,6 +732,7 @@ module Gem
      prefix = File.dirname RUBYGEMS_DIR
      if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
 +       prefix != File.expand_path(ConfigMap[:vendorlibdir]) and
         prefix != File.expand_path(ConfigMap[:libdir]) and
         'lib' == File.basename(RUBYGEMS_DIR) then
        prefix

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_commands_setup__command.rb 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_commands_setup__command.rb 2013/12/01 11:47:59 1.1.2.1

 @@ -1,41 +1,41 @@
-$NetBSD: patch-lib_rubygems_commands_setup__command.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
+$NetBSD: patch-lib_rubygems_commands_setup__command.rb,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
 * Make sure to setup under DESTDIR.
---- lib/rubygems/commands/setup_command.rb.orig	2013-03-17 15:13:08.000000000 +0000
+--- lib/rubygems/commands/setup_command.rb.orig	2013-07-22 16:33:18.000000000 +0000
 +++ lib/rubygems/commands/setup_command.rb
 @@ -145,7 +145,7 @@ By default, this RubyGems will install g
      uninstall_old_gemcutter
 -    documentation_success = install_rdoc
 +    documentation_success = install_rdoc install_destdir
      say
      if @verbose then
-@@ -306,11 +306,15 @@ TEXT
+@@ -284,11 +284,15 @@ TEXT
      end
    end
 -  def install_rdoc
 +  def install_rdoc(install_destdir)
      gem_doc_dir = File.join Gem.dir, 'doc'
      rubygems_name = "rubygems-#{Gem::VERSION}"
      rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
 +    unless install_destdir.empty?
 +      FileUtils.mkdir_p gem_doc_dir unless File.exist?(gem_doc_dir)
 +    end
++
      begin
        Gem.ensure_gem_subdirectories Gem.dir
      rescue SystemCallError
-@@ -321,7 +325,7 @@ TEXT
+@@ -299,7 +303,7 @@ TEXT
         (not File.exist? rubygems_doc_dir or
          File.writable? rubygems_doc_dir) then
        say "Removing old RubyGems RDoc and ri" if @verbose
 -      Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
 +      Dir[File.join(gem_doc_dir, 'rubygems-[0-9]*')].each do |dir|
          rm_rf dir
        end

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_config__file.rb 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_config__file.rb 2013/12/01 11:47:59 1.1.2.1

 @@ -1,20 +1,20 @@
-$NetBSD: patch-lib_rubygems_config__file.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
+$NetBSD: patch-lib_rubygems_config__file.rb,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
 * Don't hard code config file's path for gem.
---- lib/rubygems/config_file.rb.orig	2013-05-14 11:23:11.000000000 +0000
+--- lib/rubygems/config_file.rb.orig	2013-10-24 14:31:17.000000000 +0000
 +++ lib/rubygems/config_file.rb
-@@ -56,32 +56,7 @@ class Gem::ConfigFile
+@@ -57,32 +57,7 @@ class Gem::ConfigFile
    # :stopdoc:
 -  system_config_path =
 -    begin
 -      require "etc"
 -      Etc.sysconfdir
 -    rescue LoadError, NoMethodError
 -      begin
 -        # TODO: remove after we drop 1.8.7 and 1.9.1
 -        require 'Win32API'
+-
 -        CSIDL_COMMON_APPDATA = 0x0023

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_dependency__installer.rb 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_dependency__installer.rb 2013/12/01 11:47:59 1.1.2.1

 @@ -1,53 +1,53 @@
-$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
+$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
 * Add install_root option for pkgsrc's rubygems support.
---- lib/rubygems/dependency_installer.rb.orig	2013-03-17 14:51:53.000000000 +0000
+--- lib/rubygems/dependency_installer.rb.orig	2013-11-13 02:59:08.000000000 +0000
 +++ lib/rubygems/dependency_installer.rb
 @@ -50,6 +50,7 @@ class Gem::DependencyInstaller
    # :format_executable:: See Gem::Installer#initialize.
    # :ignore_dependencies:: Don't install any dependencies.
    # :install_dir:: See Gem::Installer#install.
 +  # :install_root:: See Gem::Installer#install.
    # :prerelease:: Allow prerelease versions.  See #install.
    # :security_policy:: See Gem::Installer::new and Gem::Security.
    # :user_install:: See Gem::Installer.new
-@@ -57,13 +58,14 @@ class Gem::DependencyInstaller
+@@ -57,12 +58,14 @@ class Gem::DependencyInstaller
    # :build_args:: See Gem::Installer::new
    def initialize(options = {})
 -    @install_dir = options[:install_dir] || Gem.dir
+-
      if options[:install_dir] then
 +      @install_dir = options[:install_dir]
++
        # HACK shouldn't change the global settings, needed for -i behavior
        # maybe move to the install command?  See also github #442
        Gem::Specification.dirs = @install_dir
        Gem.ensure_gem_subdirectories @install_dir
 +    else
 +      @install_dir = Gem.dir
      end
      options = DEFAULT_OPTIONS.merge options
-@@ -92,7 +94,12 @@ class Gem::DependencyInstaller
+@@ -91,7 +94,12 @@ class Gem::DependencyInstaller
      @installed_gems = []
      @toplevel_specs = nil
 -    @cache_dir = options[:cache_dir] || @install_dir
 +    @install_root = options[:install_root] || ""
 +    install_dir = @install_dir
 +    if not @install_root.empty?
 +      install_dir = File.join(@install_root, install_dir)
 +    end
 +    @cache_dir = options[:cache_dir] || install_dir
      # Set with any errors that SpecFetcher finds while search through
      # gemspecs for a dep
-@@ -364,6 +371,7 @@ class Gem::DependencyInstaller
+@@ -371,6 +379,7 @@ class Gem::DependencyInstaller
                                  :format_executable   => @format_executable,
                                  :ignore_dependencies => @ignore_dependencies,
                                  :install_dir         => @install_dir,
 +                                :install_root        => @install_root,
                                  :security_policy     => @security_policy,
                                  :user_install        => @user_install,
                                  :wrappers            => @wrappers,

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_installer.rb 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_installer.rb 2013/12/01 11:47:59 1.1.2.1

 @@ -1,52 +1,49 @@
-$NetBSD: patch-lib_rubygems_installer.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
+$NetBSD: patch-lib_rubygems_installer.rb,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
 * Add install_root option for pkgsrc's rubygems support.
 * Tweak build_info directory with destdir to store build_args.
---- lib/rubygems/installer.rb.orig	2013-03-17 14:51:53.000000000 +0000
+--- lib/rubygems/installer.rb.orig	2013-08-16 15:35:06.000000000 +0000
 +++ lib/rubygems/installer.rb
-@@ -89,6 +89,9 @@ class Gem::Installer
+@@ -98,6 +98,9 @@ class Gem::Installer
    #                      foo_exec18.
    # :ignore_dependencies:: Don't raise if a dependency is missing.
    # :install_dir:: The directory to install the gem into.
 +  # :install_root:: The directory to use as a buildroot for "destdir"-style
 +  #		  installation.  All paths during installation are relative
 +  #               to the buildroot.
    # :security_policy:: Use the specified security policy.  See Gem::Security
    # :user_install:: Indicate that the gem should be unpacked into the users
    #                 personal gem directory.
-@@ -548,12 +551,20 @@ class Gem::Installer
+@@ -558,12 +561,20 @@ class Gem::Installer
      @format_executable   = options[:format_executable]
      @security_policy     = options[:security_policy]
      @wrappers            = options[:wrappers]
 +    install_root         = options[:install_root]
 +    unless install_root.nil? or install_root == ""
 +      @install_root = File.expand_path install_root
 +      @gem_home = File.join(@install_root, @gem_home)
 +    end
      @only_install_dir    = options[:only_install_dir]
      # If the user has asked for the gem to be installed in a directory that is
      # the system gem directory, then use the system bin directory, else create
      # (or use) a new bin dir under the gem_home.
 -    @bin_dir             = options[:bin_dir] || Gem.bindir(gem_home)
 +    @bin_dir             = options[:bin_dir] || Gem.bindir(gem_home, @install_root)
 +    if not @install_root.empty?
 +      @bin_dir = File.join(@install_root, @bin_dir)
 +    end
      @development         = options[:development]
      @build_args          = options[:build_args] || Gem::Command.build_args
-@@ -773,7 +784,11 @@ EOF
+@@ -786,6 +797,9 @@ EOF
    def write_build_info_file
      return if @build_args.empty?
--    open spec.build_info_file, 'w' do |io|
+     build_info_dir = File.join gem_home, 'build_info'
 +    build_info_file = spec.build_info_file
 +    unless @install_root.nil?
-+      build_info_file = File.join @gem_home, "build_info", "#{spec.full_name}.info"
++      build_info_dir = File.join @gem_home, "build_info"
 +    end
 +    open build_info_file, 'w' do |io|
-       @build_args.each do |arg|
+     FileUtils.mkdir_p build_info_dir
          io.puts arg
        end

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_specification.rb 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-lib_rubygems_specification.rb 2013/12/01 11:47:59 1.1.2.1

 @@ -1,65 +1,65 @@
-$NetBSD: patch-lib_rubygems_specification.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
+$NetBSD: patch-lib_rubygems_specification.rb,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
 * Changes for pkgsrc environment:
   -  Allow some attributes to nil.
   -  Relax date/time format.
 And allow multiple conditions for requirement from Ruby 2.0.0 and
 Rubygem 1.8.25.
---- lib/rubygems/specification.rb.orig	2013-03-17 14:18:23.000000000 +0000
+--- lib/rubygems/specification.rb.orig	2013-11-13 02:59:08.000000000 +0000
 +++ lib/rubygems/specification.rb
-@@ -164,6 +164,12 @@ class Gem::Specification
+@@ -162,6 +162,12 @@ class Gem::Specification
      @@default_value[k].nil?
+   }
 +  # under pkgsrc environment
 +  @@pkgsrc_nil_attributes = {}
 +  [:authors, :cert_chain, :executables, :extensions, :extra_rdoc_files, :licenses, :required_rubygems_version, :test_files].each do |k|
 +    @@pkgsrc_nil_attributes[k] = true
 +  end
++
    ######################################################################
    # :section: Required gemspec attributes
-@@ -2317,7 +2323,24 @@ class Gem::Specification
+@@ -2334,7 +2340,24 @@ class Gem::Specification
      normalize
      nil_attributes = self.class.non_nil_attributes.find_all do |name|
 -      instance_variable_get("@#{name}").nil?
 +      val = instance_variable_get("@#{name}")
 +      if val.nil?
 +        if @@pkgsrc_nil_attributes.key?(name)
 +          case name
 +          when :required_rubygems_version
 +            val = Gem::Requirement.default
 +          else
 +            val = []
 +          end
 +          instance_variable_set("@#{name}", val)
 +          false
 +        end
 +      end
 +      if name == :authors and val.empty?
 +        val = ['not specified']
 +        self.authors = val
 +        false
 +      end
      end
      unless nil_attributes.empty? then
-@@ -2455,10 +2478,15 @@ class Gem::Specification
+@@ -2472,10 +2495,15 @@ class Gem::Specification
        raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
      end
 -    if homepage and not homepage.empty? and
 -       homepage !~ /\A[a-z][a-z\d+.-]*:/i then
 -      raise Gem::InvalidSpecificationException,
 -            "\"#{homepage}\" is not a URI"
 +    if homepage and not homepage.empty?
 +      if @homepage =~ /\A[a-z][a-z\d+.-]*/i and
 +          @homepage !~ /\A[a-z][a-z\d+.-]*:/i
 +        @homepage = "http://" + @homepage
 +      end
 +      if homepage !~ /\A[a-z][a-z\d+.-]*:/i then

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-man_ri.1 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-man_ri.1 2013/12/01 11:47:59 1.1.2.1

 @@ -1,20 +1,20 @@
-$NetBSD: patch-man_ri.1,v 1.1 2013/07/21 02:32:58 taca Exp $
+$NetBSD: patch-man_ri.1,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
 * Fix mdoc markup.
---- man/ri.1.orig	2012-11-15 04:22:44.000000000 +0000
+--- man/ri.1.orig	2013-07-13 15:17:18.000000000 +0000
 +++ man/ri.1
-@@ -165,12 +165,12 @@ Searches user-wide documents here.
+@@ -166,12 +166,12 @@ Searches user-wide documents here.
  .Pp
  .Sh REPORTING BUGS
  .Bl -bullet
 -.Li Security vulnerabilities should be reported via an email to
 -.Aq security@ruby-lang.org Ns
 -.Li .
 +.It
 +Security vulnerabilities should be reported via an email to
 +.Aq security@ruby-lang.org .
  Reported problems will be published after being fixed.
 -.Pp
 -.Li And you can report other bugs and feature requests via the
 +.It

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-tool_rbinstall.rb 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-tool_rbinstall.rb 2013/12/01 11:47:59 1.1.2.1

 @@ -1,15 +1,15 @@
-$NetBSD: patch-tool_rbinstall.rb,v 1.1 2013/07/21 02:32:58 taca Exp $
+$NetBSD: patch-tool_rbinstall.rb,v 1.1.2.1 2013/12/01 11:47:59 tron Exp $
 * Don't install which has already ${RUBY_VER} suffix.
---- tool/rbinstall.rb.orig	2013-02-07 08:02:31.000000000 +0000
+--- tool/rbinstall.rb.orig	2013-11-12 14:35:13.000000000 +0000
 +++ tool/rbinstall.rb
-@@ -213,7 +213,7 @@ def install_recursive(srcdir, dest, opti
+@@ -220,7 +220,7 @@ def install_recursive(srcdir, dest, opti
        end
      end
    end
 -  skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core"
 +  skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core *200"
    prune = path_matcher(prune)
    skip = path_matcher(skip)
    File.directory?(srcdir) or return rescue return