 @@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.21 2008/06/19 14:52:36 taca Exp $
+# $NetBSD: Makefile,v 1.22 2008/09/15 08:43:44 taca Exp $
-DISTNAME=	rubygems-1.1.1
+DISTNAME=	rubygems-1.2.0
 PKGREVISION=	2
 CATEGORIES=	misc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/35283/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/38646/
 EXTRACT_SUFX=	.tgz
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.rubygems.org/
 COMMENT=	Ruby standard for publishing and managing third party libraries
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/bsd.prefs.mk"
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 RUBY_REQD=	1.8.7
 @@ -21,43 +20,51 @@ RUBY_REQD=	1.8.7
 REPLACE_RUBY_DIRS=	bin
 REPLACE_RUBY_PAT=	[a-z]*
 GEM_HOME=	${PREFIX}/lib/ruby/gems/${RUBY_VER_DIR}
 GEM_DOCDIR=	${GEM_HOME}/doc/${DISTNAME}
 REQD_DIRS=	${GEM_HOME:H}
 REQD_DIRS+=	${GEM_HOME}
 REQD_DIRS+=	${GEM_HOME}/cache
 REQD_DIRS+=	${GEM_HOME}/doc
 REQD_DIRS+=	${GEM_HOME}/gems
 REQD_DIRS+=	${GEM_HOME}/specifications
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-install
 SUBST_FILES.conf=	lib/rubygems/config_file.rb
 SUBST_SED.conf=		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.conf=	Fixing configuration files.
 # Generate a dynamic PLIST for the rubygems documentation directory.
 GENERATE_PLIST+=	\
 	${ECHO} "@comment The following lines are automatically generated." && \
 	( cd ${DESTDIR}${PREFIX} && \
 	  ${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} \! -type d -print | \
 		${SORT} && \
 	  ${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} -type d -print | \
 		${SORT} -r | ${SED} -e "s,^,@dirrm ," );
 .include "../../lang/ruby/modules.mk"
 # Force the Gem repository to be under ${DESTDIR}.  This is harmless
 # because this packages depends on no other gems.
+#
 INSTALL_ENV+=		GEM_HOME=${DESTDIR}${GEM_HOME}
 INSTALL_TARGET=		install
 INSTALL_TARGET+=	--vendor
 INSTALL_TARGET+=	--no-format-executable	# "bin/gem", not "bin/gem18"
 .if ${_USE_DESTDIR} != "no"
-INSTALL_TARGET+=	--install-root=${DESTDIR:Q}
+INSTALL_TARGET+=	--destdir=${DESTDIR:Q}
 .endif
 # rubygem's setup.rb is not the typical setup.rb -- manually run the
 # command to install.
+#
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
 		${RUBY} setup.rb ${INSTALL_TARGET}
 .include "../../mk/bsd.pkg.mk"

 @@ -1,98 +1,95 @@
-@comment $NetBSD: PLIST,v 1.9 2008/06/19 14:52:36 taca Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/09/15 08:43:44 taca Exp $
 bin/gem
 ${RUBY_VENDORLIB}/rbconfig/datadir.rb
 ${RUBY_VENDORLIB}/rubygems.rb
 ${RUBY_VENDORLIB}/rubygems/builder.rb
 ${RUBY_VENDORLIB}/rubygems/command.rb
 ${RUBY_VENDORLIB}/rubygems/command_manager.rb
 ${RUBY_VENDORLIB}/rubygems/commands/build_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/cert_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/check_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/cleanup_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/contents_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/dependency_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/environment_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/fetch_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/generate_index_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/help_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/install_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/list_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/lock_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/mirror_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/outdated_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/pristine_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/query_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/rdoc_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/search_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/server_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/sources_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/specification_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/stale_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/uninstall_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/unpack_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/update_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/which_command.rb
 ${RUBY_VENDORLIB}/rubygems/config_file.rb
 ${RUBY_VENDORLIB}/rubygems/custom_require.rb
 ${RUBY_VENDORLIB}/rubygems/defaults.rb
 ${RUBY_VENDORLIB}/rubygems/dependency.rb
 ${RUBY_VENDORLIB}/rubygems/dependency_installer.rb
 ${RUBY_VENDORLIB}/rubygems/dependency_list.rb
 ${RUBY_VENDORLIB}/rubygems/digest/digest_adapter.rb
 ${RUBY_VENDORLIB}/rubygems/digest/md5.rb
 ${RUBY_VENDORLIB}/rubygems/digest/sha1.rb
 ${RUBY_VENDORLIB}/rubygems/digest/sha2.rb
 ${RUBY_VENDORLIB}/rubygems/doc_manager.rb
 ${RUBY_VENDORLIB}/rubygems/exceptions.rb
 ${RUBY_VENDORLIB}/rubygems/ext.rb
 ${RUBY_VENDORLIB}/rubygems/ext/builder.rb
 ${RUBY_VENDORLIB}/rubygems/ext/configure_builder.rb
 ${RUBY_VENDORLIB}/rubygems/ext/ext_conf_builder.rb
 ${RUBY_VENDORLIB}/rubygems/ext/rake_builder.rb
 ${RUBY_VENDORLIB}/rubygems/ext.rb
 ${RUBY_VENDORLIB}/rubygems/format.rb
 ${RUBY_VENDORLIB}/rubygems/gem_openssl.rb
 ${RUBY_VENDORLIB}/rubygems/gem_path_searcher.rb
 ${RUBY_VENDORLIB}/rubygems/gem_runner.rb
 ${RUBY_VENDORLIB}/rubygems/indexer.rb
 ${RUBY_VENDORLIB}/rubygems/indexer/abstract_index_builder.rb
 ${RUBY_VENDORLIB}/rubygems/indexer/latest_index_builder.rb
 ${RUBY_VENDORLIB}/rubygems/indexer/marshal_index_builder.rb
 ${RUBY_VENDORLIB}/rubygems/indexer/master_index_builder.rb
 ${RUBY_VENDORLIB}/rubygems/indexer/quick_index_builder.rb
 ${RUBY_VENDORLIB}/rubygems/install_update_options.rb
 ${RUBY_VENDORLIB}/rubygems/installer.rb
 ${RUBY_VENDORLIB}/rubygems/local_remote_options.rb
 ${RUBY_VENDORLIB}/rubygems/old_format.rb
 ${RUBY_VENDORLIB}/rubygems/package.rb
 ${RUBY_VENDORLIB}/rubygems/package/f_sync_dir.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_header.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_input.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_output.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_reader.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_reader/entry.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_reader.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_writer.rb
 ${RUBY_VENDORLIB}/rubygems/package.rb
 ${RUBY_VENDORLIB}/rubygems/platform.rb
 ${RUBY_VENDORLIB}/rubygems/remote_fetcher.rb
 ${RUBY_VENDORLIB}/rubygems/require_paths_builder.rb
 ${RUBY_VENDORLIB}/rubygems/requirement.rb
 ${RUBY_VENDORLIB}/rubygems/rubygems_version.rb
 ${RUBY_VENDORLIB}/rubygems/security.rb
 ${RUBY_VENDORLIB}/rubygems/server.rb
 ${RUBY_VENDORLIB}/rubygems/source_index.rb
 ${RUBY_VENDORLIB}/rubygems/source_info_cache.rb
 ${RUBY_VENDORLIB}/rubygems/source_info_cache_entry.rb
 ${RUBY_VENDORLIB}/rubygems/spec_fetcher.rb
 ${RUBY_VENDORLIB}/rubygems/specification.rb
 ${RUBY_VENDORLIB}/rubygems/test_utilities.rb
 ${RUBY_VENDORLIB}/rubygems/timer.rb
 ${RUBY_VENDORLIB}/rubygems/uninstaller.rb
 ${RUBY_VENDORLIB}/rubygems/user_interaction.rb
 ${RUBY_VENDORLIB}/rubygems/validator.rb
 ${RUBY_VENDORLIB}/rubygems/version.rb
 ${RUBY_VENDORLIB}/rubygems/version_option.rb
 ${RUBY_VENDORLIB}/rubygems.rb
 ${RUBY_VENDORLIB}/ubygems.rb
 @dirrm ${RUBY_VENDORLIB}/rubygems/package/tar_reader
 @dirrm ${RUBY_VENDORLIB}/rubygems/package
 @dirrm ${RUBY_VENDORLIB}/rubygems/indexer
 @dirrm ${RUBY_VENDORLIB}/rubygems/ext
 @dirrm ${RUBY_VENDORLIB}/rubygems/digest
 @dirrm ${RUBY_VENDORLIB}/rubygems/commands
 @dirrm ${RUBY_VENDORLIB}/rubygems
 @dirrm ${RUBY_VENDORLIB}/rbconfig

 @@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.17 2008/06/19 14:52:36 taca Exp $
+$NetBSD: distinfo,v 1.18 2008/09/15 08:43:44 taca Exp $
-SHA1 (rubygems-1.1.1.tgz) = e1ead11fa2928fb4b7871c17fd1186198c97c11a
+SHA1 (rubygems-1.2.0.tgz) = 89f8e35f03e1e8057cc8e237f2df025642653dde
-RMD160 (rubygems-1.1.1.tgz) = 264b6c2667fd74c111b6886da13b324bc391eaa8
+RMD160 (rubygems-1.2.0.tgz) = c66444cc3f372f7170ba1d8ef3c456052acb2bde
-Size (rubygems-1.1.1.tgz) = 423308 bytes
+Size (rubygems-1.2.0.tgz) = 246920 bytes
-SHA1 (patch-aa) = 43d31663301d537f4fb25df61f499e59efefc60c
+SHA1 (patch-aa) = c504f63e6279a99ddc76a03c0978b89ae2e81024
-SHA1 (patch-ab) = e5c3bcdb1220067b7fb6f45bd0311894e683c8b9
+SHA1 (patch-ab) = 6eb8c453aab58a708dba04944cc0d4b8880014f8
-SHA1 (patch-ac) = e007358881509523f2c2821ced208f5bd9b5a232
+SHA1 (patch-ac) = 5f744d9556855f7a430401c855e288b42669c808
-SHA1 (patch-ad) = b7e9a459ccb0305591db97ab7214ddc5befa24f0
+SHA1 (patch-ad) = 5f11cff48cbafc4c210a514f50356742b74943ae
-SHA1 (patch-ae) = 109d5e590aacbbde0af8666ca086b65357113afa
+SHA1 (patch-af) = 75f7fe5c777c4eef652e537ba91c2977ee2cfdd6
-SHA1 (patch-af) = c18ecbbf52cdd68543cd1e11742045f0295dc337
+SHA1 (patch-ag) = e9c72c6d6af55fa60d3da96a56ffde3dc002f164
-SHA1 (patch-ag) = 699d5830c20f0f026b074e5ef4546853df022136
+SHA1 (patch-ah) = 0dcf44dfaaa1ae5d2b4165c8b1431ddbe46b4b24
-SHA1 (patch-ah) = 1183501773758b14104d5111c0e1c1090dde99d4
+SHA1 (patch-aj) = b19778ff6f12216f0a29f93c596492602809359e
-SHA1 (patch-ai) = 5f2e1945617c7a9c0066d9cd6b73f217c45661f2
+SHA1 (patch-ak) = 6230bb570f10b7b81f61ccd8f970128450520f52
-SHA1 (patch-aj) = 0fbb15871804e4b212df8cde3ef34f0d4a5172cb
+SHA1 (patch-al) = be02021fad82392bfb42c22ae5336700d62ff37e
 SHA1 (patch-ak) = d4c8de917c4aff3ce69bdaea198e6a53f22f36df

 @@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.4 2008/03/31 15:40:43 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2008/09/15 08:43:44 taca Exp $
---- lib/rubygems/commands/install_command.rb.orig	2008-03-28 17:29:50.000000000 -0400
+--- lib/rubygems/commands/install_command.rb.orig	2008-06-21 05:05:41.000000000 +0900
 +++ lib/rubygems/commands/install_command.rb
-@@ -60,6 +60,7 @@ class Gem::Commands::InstallCommand < Ge
+@@ -59,6 +59,7 @@ class Gem::Commands::InstallCommand < Ge
        :format_executable => options[:format_executable],
        :ignore_dependencies => options[:ignore_dependencies],
        :install_dir => options[:install_dir],
 +      :install_root => options[:install_root],
        :security_policy => options[:security_policy],
        :wrappers => options[:wrappers],
-       :bin_dir => options[:bin_dir]
+       :bin_dir => options[:bin_dir],

 @@ -1,51 +1,38 @@
-$NetBSD: patch-ab,v 1.7 2008/04/13 06:01:59 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2008/09/15 08:43:44 taca Exp $
---- lib/rubygems/dependency_installer.rb.orig	2008-04-04 21:10:11.000000000 -0400
+--- lib/rubygems/dependency_installer.rb.orig	2008-06-21 04:55:40.000000000 +0900
 +++ lib/rubygems/dependency_installer.rb
-@@ -33,6 +33,7 @@ class Gem::DependencyInstaller
+@@ -37,6 +37,7 @@ class Gem::DependencyInstaller
    # :format_executable:: See Gem::Installer#initialize.
-   # :ignore_dependencies: Don't install any dependencies.
+   # :ignore_dependencies:: Don't install any dependencies.
-   # :install_dir: See Gem::Installer#install.
+   # :install_dir:: See Gem::Installer#install.
 +  # :install_root: See Gem::Installer#install.
-   # :security_policy: See Gem::Installer::new and Gem::Security.
+   # :security_policy:: See Gem::Installer::new and Gem::Security.
-   # :wrappers: See Gem::Installer::new
+   # :wrappers:: See Gem::Installer::new
    def initialize(options = {})
@@ -43,6 +44,7 @@ class Gem::DependencyInstaller
      @format_executable = options[:format_executable]
      @ignore_dependencies = options[:ignore_dependencies]
      @install_dir = options[:install_dir] || Gem.dir
 +    @install_root = options[:install_root]
      @security_policy = options[:security_policy]
      @wrappers = options[:wrappers]
      @bin_dir = options[:bin_dir]
@@ -177,7 +179,12 @@ class Gem::DependencyInstaller
-     gather_dependencies
+@@ -56,10 +57,15 @@ class Gem::DependencyInstaller
      @installed_gems = []
--    spec_dir = File.join @install_dir, 'specifications'
+     @install_dir = options[:install_dir] || Gem.dir
 -    @cache_dir = options[:cache_dir] || @install_dir
 +    @install_root = options[:install_root]
 +    install_dir = @install_dir
 +    unless @install_root.nil? or @install_root == ""
 +      install_dir = File.join(@install_root, @install_dir)
 +    end
 +    @cache_dir = options[:cache_dir] || install_dir
 +    spec_dir = File.join install_dir, 'specifications'
      source_index = Gem::SourceIndex.from_gems_in spec_dir
-     @gems_to_install.each do |spec|
+     if options[:install_dir] then
-@@ -191,7 +198,7 @@ class Gem::DependencyInstaller
+-      spec_dir = File.join @install_dir, 'specifications'
-       _, source_uri = @specs_and_sources.assoc spec
++      spec_dir = File.join install_dir, 'specifications'
-       begin
+       @source_index = Gem::SourceIndex.from_gems_in spec_dir
-         local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri,
+     else
--                                                             @install_dir
+       @source_index = Gem.source_index
-+                                                             install_dir
+@@ -237,6 +243,7 @@ class Gem::DependencyInstaller
        rescue Gem::RemoteFetcher::FetchError
          next if @force
          raise
@@ -203,6 +210,7 @@ class Gem::DependencyInstaller
                                  :format_executable => @format_executable,
                                  :ignore_dependencies => @ignore_dependencies,
                                  :install_dir => @install_dir,
 +                                :install_root => @install_root,
                                  :security_policy => @security_policy,
                                  :wrappers => @wrappers,
-                                 :bin_dir => @bin_dir
+                                 :bin_dir => @bin_dir,

 @@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2008/03/31 15:40:43 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2008/09/15 08:43:44 taca Exp $
---- lib/rubygems/install_update_options.rb.orig	2008-02-20 14:27:40.000000000 -0500
+--- lib/rubygems/install_update_options.rb.orig	2008-05-07 11:15:51.000000000 +0900
 +++ lib/rubygems/install_update_options.rb
 @@ -31,6 +31,11 @@ module Gem::InstallUpdateOptions
        options[:bin_dir] = File.expand_path(value)
      end
 +    add_option(:"Install", '-B', '--install-root DIR',
 +               'Root directory for gem files on install') do |value, options|
 +      options[:install_root] = File.expand_path(value)
 +    end
++
      add_option(:"Install/Update", '-d', '--[no-]rdoc',
                 'Generate RDoc documentation for the gem on',
                 'install') do |value, options|

 @@ -1,54 +1,47 @@
-$NetBSD: patch-ad,v 1.2 2008/03/31 15:40:43 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2008/09/15 08:43:44 taca Exp $
---- lib/rubygems/installer.rb.orig	2008-03-28 21:10:33.000000000 -0400
+--- lib/rubygems/installer.rb.orig	2008-06-07 09:15:11.000000000 +0900
 +++ lib/rubygems/installer.rb
 @@ -51,6 +51,9 @@ class Gem::Installer
    #          for a signed-gems-only policy.
    # :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.
    # :format_executable:: Format the executable the same as the ruby executable.
    #                      If your ruby is ruby18, foo_exec will be installed as
    #                      foo_exec18.
-@@ -62,6 +65,7 @@ class Gem::Installer
+@@ -63,6 +66,7 @@ class Gem::Installer
      options = {
        :force => false,
        :install_dir => Gem.dir,
 +      :install_root => nil,
        :exec_format => false,
        :env_shebang => false,
        :bin_dir => nil
-@@ -70,12 +74,17 @@ class Gem::Installer
+@@ -78,6 +82,11 @@ class Gem::Installer
      @env_shebang = options[:env_shebang]
      @force = options[:force]
      gem_home = options[:install_dir]
 -    @gem_home = Pathname.new(gem_home).expand_path
 +    @gem_home = File.expand_path gem_home
      @ignore_dependencies = options[:ignore_dependencies]
      @format_executable = options[:format_executable]
      @security_policy = options[:security_policy]
      @wrappers = options[:wrappers]
      @bin_dir = options[:bin_dir]
      @development = options[:development]
 +    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
      begin
        @format = Gem::Format.from_file_by_path @gem, @security_policy
-@@ -227,7 +236,11 @@ class Gem::Installer
+@@ -234,7 +243,11 @@ class Gem::Installer
      # 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.
--    bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home)
+-    bindir = @bin_dir ? @bin_dir : Gem.bindir(@gem_home)
 +    bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home, @install_root)
++
 +    unless @install_root.nil? or @install_root == ""
 +      bindir = File.join(@install_root, bindir)
 +    end
      Dir.mkdir bindir unless File.exist? bindir
      raise Gem::FilePermissionError.new(bindir) unless File.writable? bindir

 @@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.1 2008/03/31 15:40:43 jlam Exp $
+$NetBSD: patch-af,v 1.2 2008/09/15 08:43:44 taca Exp $
---- lib/rubygems/commands/uninstall_command.rb.orig	2008-02-23 21:26:47.000000000 -0500
+--- lib/rubygems/commands/uninstall_command.rb.orig	2008-02-24 11:26:47.000000000 +0900
 +++ lib/rubygems/commands/uninstall_command.rb
 @@ -40,6 +40,11 @@ module Gem
            options[:bin_dir] = File.expand_path(value)
          end
 +        add_option('-B', '--install-root DIR',
 +                   'Root directory for gem files') do |value, options|
 +          options[:install_root] = File.expand_path(value)
 +        end
++
          add_version_option
          add_platform_option
        end

 @@ -1,21 +1,21 @@
-$NetBSD: patch-ag,v 1.1 2008/03/31 15:40:43 jlam Exp $
+$NetBSD: patch-ag,v 1.2 2008/09/15 08:43:44 taca Exp $
---- lib/rubygems/uninstaller.rb.orig	2008-02-23 22:05:54.000000000 -0500
+--- lib/rubygems/uninstaller.rb.orig	2008-06-21 03:34:46.000000000 +0900
 +++ lib/rubygems/uninstaller.rb
 @@ -31,6 +31,11 @@ class Gem::Uninstaller
      @force_all = options[:all]
      @force_ignore = options[:ignore]
      @bin_dir = options[:bin_dir]
 +    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
    end
    ##
 @@ -74,7 +79,11 @@ class Gem::Uninstaller
      return if gemspec.nil?
      if gemspec.executables.size > 0 then
 -      bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home)

 @@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2008/06/19 14:52:36 taca Exp $
+$NetBSD: patch-aj,v 1.2 2008/09/15 08:43:44 taca Exp $
---- lib/rubygems/defaults.rb.orig	2008-03-09 12:42:07.000000000 +0900
+--- lib/rubygems/defaults.rb.orig	2008-06-05 11:34:47.000000000 +0900
 +++ lib/rubygems/defaults.rb
 @@ -9,7 +9,7 @@ module Gem
    # specified in the environment.
    def self.default_dir
      if defined? RUBY_FRAMEWORK_VERSION then
 -      File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
 +      File.join File.dirname(ConfigMap[:vendordir]), 'Gems',
                  ConfigMap[:ruby_version]
      elsif defined? RUBY_ENGINE then
        File.join ConfigMap[:libdir], RUBY_ENGINE, 'gems',

 @@ -1,24 +1,26 @@
-$NetBSD: patch-ak,v 1.1 2008/06/19 14:52:36 taca Exp $
+$NetBSD: patch-ak,v 1.2 2008/09/15 08:43:44 taca Exp $
---- test/test_gem.rb.orig	2008-04-10 06:17:44.000000000 +0900
+--- test/test_gem.rb.orig	2008-06-19 06:27:03.000000000 +0900
 +++ test/test_gem.rb
-@@ -326,16 +326,16 @@ class TestGem < RubyGemTestCase
+@@ -345,17 +345,17 @@ class TestGem < RubyGemTestCase
      Gem::ConfigMap[:libdir] = orig_libdir
    end
-   def test_self_prefix_sitelibdir
+-  def test_self_prefix_sitelibdir
 -    orig_sitelibdir = Gem::ConfigMap[:sitelibdir]
-+    orig_sitelibdir = Gem::ConfigMap[:vendorlibdir]
++  def test_self_prefix_vendorlibdir
 +    orig_vendorlibdir = Gem::ConfigMap[:vendorlibdir]
      file_name = File.expand_path __FILE__
      prefix = File.dirname File.dirname(file_name)
 -    Gem::ConfigMap[:sitelibdir] = prefix
 +    Gem::ConfigMap[:vendorlibdir] = prefix
      assert_nil Gem.prefix
    ensure
 -    Gem::ConfigMap[:sitelibdir] = orig_sitelibdir
-+    Gem::ConfigMap[:vendorlibdir] = orig_sitelibdir
++    Gem::ConfigMap[:vendorlibdir] = orig_vendorlibdir
    end
    def test_self_refresh

 @@ -1,49 +1,44 @@
-$NetBSD: patch-ah,v 1.3 2008/06/19 14:52:36 taca Exp $
+$NetBSD: patch-ah,v 1.4 2008/09/15 08:43:44 taca Exp $
---- lib/rubygems.rb.orig	2008-04-10 06:18:31.000000000 +0900
+--- lib/rubygems.rb.orig	2008-06-21 04:54:57.000000000 +0900
 +++ lib/rubygems.rb
-@@ -71,7 +71,9 @@ module Gem
+@@ -230,7 +230,13 @@ module Gem
      :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
      :ruby_version => RbConfig::CONFIG["ruby_version"],
      :sitedir => RbConfig::CONFIG["sitedir"],
 -    :sitelibdir => RbConfig::CONFIG["sitelibdir"]
 +    :sitelibdir => RbConfig::CONFIG["sitelibdir"],
 +    :vendordir => RbConfig::CONFIG["vendordir"],
 +    :vendorlibdir => RbConfig::CONFIG["vendorlibdir"]
    DIRECTORIES = %w[cache doc gems specifications] unless defined?(DIRECTORIES)
@@ -213,7 +215,13 @@ 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_root_path = Pathname.new install_root
 +      install_dir_path = Pathname.new install_dir
 +      install_dir_path = install_dir_path.relative_path_from install_root_path
 +      install_dir = install_dir_path.expand_path File::SEPARATOR
 +    end
      return File.join(install_dir, 'bin') unless
        install_dir.to_s == Gem.default_dir
      Gem.default_bindir
-@@ -389,7 +397,7 @@ module Gem
+@@ -435,12 +441,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]
      $LOAD_PATH.each_with_index do |path, i|
        if path.instance_variables.include?(:@gem_prelude_index) or
-@@ -474,7 +482,8 @@ module Gem
+@@ -529,7 +535,8 @@ module Gem
    def self.prefix
      prefix = File.dirname File.expand_path(__FILE__)
 -    if File.dirname(prefix) == File.expand_path(ConfigMap[:sitelibdir]) or
 +    if File.dirname(prefix) == File.expand_path(ConfigMap[:vendorlibdir]) or
 +       File.dirname(prefix) == File.expand_path(ConfigMap[:sitelibdir]) or
         File.dirname(prefix) == File.expand_path(ConfigMap[:libdir]) or
         'lib' != File.basename(prefix) then
        nil