From 6a5b30426d686a79adf7ee6dd2594cc2b6accab2 Mon Sep 17 00:00:00 2001 From: taca Date: Thu, 19 Jun 2008 14:52:11 +0000 Subject: - Switch to use vendor_dir with Ruby 1.8.7. Bump PKGREVISION. --- misc/ruby-progressbar/Makefile | 11 ++- misc/ruby-progressbar/PLIST | 10 +-- misc/rubygems/Makefile | 5 +- misc/rubygems/PLIST | 194 ++++++++++++++++++++--------------------- misc/rubygems/distinfo | 9 +- misc/rubygems/patches/patch-ae | 13 ++- misc/rubygems/patches/patch-ah | 36 +++++++- misc/rubygems/patches/patch-ai | 13 +++ misc/rubygems/patches/patch-aj | 13 +++ misc/rubygems/patches/patch-ak | 24 +++++ 10 files changed, 212 insertions(+), 116 deletions(-) create mode 100644 misc/rubygems/patches/patch-ai create mode 100644 misc/rubygems/patches/patch-aj create mode 100644 misc/rubygems/patches/patch-ak (limited to 'misc') diff --git a/misc/ruby-progressbar/Makefile b/misc/ruby-progressbar/Makefile index 75cf44c2963..191da778fc8 100644 --- a/misc/ruby-progressbar/Makefile +++ b/misc/ruby-progressbar/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/03/01 07:17:23 obache Exp $ +# $NetBSD: Makefile,v 1.2 2008/06/19 14:52:11 taca Exp $ # DISTNAME= ruby-progressbar-0.9 PKGNAME= ${DISTNAME:S/ruby-/${RUBY_PKGPREFIX}-/} +PKGREVISION= 1 CATEGORIES= misc ruby MASTER_SITES= http://0xcc.net/ruby-progressbar/ @@ -16,15 +17,17 @@ USE_LANGUAGES= # none NO_BUILD= yes -INSTALLATION_DIRS= ${RUBY_DOCDIR}/progressbar ${RUBY_SITELIBDIR} +INSTALLATION_DIRS= ${RUBY_DOC}/progressbar ${RUBY_VENDORLIB} do-test: ${RUN} cd ${WRKSRC}; ${RUBY} test.rb do-install: - ${INSTALL_DATA} ${WRKSRC}/progressbar.rb ${DESTDIR}${RUBY_SITELIBDIR} + ${INSTALL_DATA} ${WRKSRC}/progressbar.rb \ + ${DESTDIR}${PREFIX}/${RUBY_VENDORLIB} .for d in progressbar.en.rd progressbar.ja.rd - ${INSTALL_DATA} ${WRKSRC}/${d} ${DESTDIR}${RUBY_DOCDIR}/progressbar + ${INSTALL_DATA} ${WRKSRC}/${d} \ + ${DESTDIR}${PREFIX}/${RUBY_DOC}/progressbar .endfor .include "../../lang/ruby/modules.mk" diff --git a/misc/ruby-progressbar/PLIST b/misc/ruby-progressbar/PLIST index ba075d35688..d04cd94f445 100644 --- a/misc/ruby-progressbar/PLIST +++ b/misc/ruby-progressbar/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/01 07:17:23 obache Exp $ -${RUBY_SITELIBDIR}/progressbar.rb -${RUBY_DOCDIR}/progressbar/progressbar.en.rd -${RUBY_DOCDIR}/progressbar/progressbar.ja.rd -@dirrm ${RUBY_DOCDIR}/progressbar +@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:52:11 taca Exp $ +${RUBY_VENDORLIB}/progressbar.rb +${RUBY_DOC}/progressbar/progressbar.en.rd +${RUBY_DOC}/progressbar/progressbar.ja.rd +@dirrm ${RUBY_DOC}/progressbar diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile index 2b93952dd33..a35a98637fc 100644 --- a/misc/rubygems/Makefile +++ b/misc/rubygems/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2008/04/13 06:01:59 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2008/06/19 14:52:36 taca Exp $ DISTNAME= rubygems-1.1.1 +PKGREVISION= 2 CATEGORIES= misc ruby MASTER_SITES= http://rubyforge.org/frs/download.php/35283/ EXTRACT_SUFX= .tgz @@ -15,7 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir NO_CONFIGURE= yes NO_BUILD= yes -RUBY_REQD= 1.8.3 +RUBY_REQD= 1.8.7 REPLACE_RUBY_DIRS= bin REPLACE_RUBY_PAT= [a-z]* diff --git a/misc/rubygems/PLIST b/misc/rubygems/PLIST index 9b9721ae03d..4e3c4ea7e60 100644 --- a/misc/rubygems/PLIST +++ b/misc/rubygems/PLIST @@ -1,98 +1,98 @@ -@comment $NetBSD: PLIST,v 1.8 2008/03/31 15:40:43 jlam Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/06/19 14:52:36 taca Exp $ bin/gem -${RUBY_SITELIBDIR}/rbconfig/datadir.rb -${RUBY_SITELIBDIR}/rubygems.rb -${RUBY_SITELIBDIR}/rubygems/builder.rb -${RUBY_SITELIBDIR}/rubygems/command.rb -${RUBY_SITELIBDIR}/rubygems/command_manager.rb -${RUBY_SITELIBDIR}/rubygems/commands/build_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/cert_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/check_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/cleanup_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/contents_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/dependency_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/environment_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/fetch_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/generate_index_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/help_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/install_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/list_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/lock_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/mirror_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/outdated_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/pristine_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/query_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/rdoc_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/search_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/server_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/sources_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/specification_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/uninstall_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/unpack_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/update_command.rb -${RUBY_SITELIBDIR}/rubygems/commands/which_command.rb -${RUBY_SITELIBDIR}/rubygems/config_file.rb -${RUBY_SITELIBDIR}/rubygems/custom_require.rb -${RUBY_SITELIBDIR}/rubygems/defaults.rb -${RUBY_SITELIBDIR}/rubygems/dependency.rb -${RUBY_SITELIBDIR}/rubygems/dependency_installer.rb -${RUBY_SITELIBDIR}/rubygems/dependency_list.rb -${RUBY_SITELIBDIR}/rubygems/digest/digest_adapter.rb -${RUBY_SITELIBDIR}/rubygems/digest/md5.rb -${RUBY_SITELIBDIR}/rubygems/digest/sha1.rb -${RUBY_SITELIBDIR}/rubygems/digest/sha2.rb -${RUBY_SITELIBDIR}/rubygems/doc_manager.rb -${RUBY_SITELIBDIR}/rubygems/exceptions.rb -${RUBY_SITELIBDIR}/rubygems/ext.rb -${RUBY_SITELIBDIR}/rubygems/ext/builder.rb -${RUBY_SITELIBDIR}/rubygems/ext/configure_builder.rb -${RUBY_SITELIBDIR}/rubygems/ext/ext_conf_builder.rb -${RUBY_SITELIBDIR}/rubygems/ext/rake_builder.rb -${RUBY_SITELIBDIR}/rubygems/format.rb -${RUBY_SITELIBDIR}/rubygems/gem_openssl.rb -${RUBY_SITELIBDIR}/rubygems/gem_path_searcher.rb -${RUBY_SITELIBDIR}/rubygems/gem_runner.rb -${RUBY_SITELIBDIR}/rubygems/indexer.rb -${RUBY_SITELIBDIR}/rubygems/indexer/abstract_index_builder.rb -${RUBY_SITELIBDIR}/rubygems/indexer/latest_index_builder.rb -${RUBY_SITELIBDIR}/rubygems/indexer/marshal_index_builder.rb -${RUBY_SITELIBDIR}/rubygems/indexer/master_index_builder.rb -${RUBY_SITELIBDIR}/rubygems/indexer/quick_index_builder.rb -${RUBY_SITELIBDIR}/rubygems/install_update_options.rb -${RUBY_SITELIBDIR}/rubygems/installer.rb -${RUBY_SITELIBDIR}/rubygems/local_remote_options.rb -${RUBY_SITELIBDIR}/rubygems/old_format.rb -${RUBY_SITELIBDIR}/rubygems/package.rb -${RUBY_SITELIBDIR}/rubygems/package/f_sync_dir.rb -${RUBY_SITELIBDIR}/rubygems/package/tar_header.rb -${RUBY_SITELIBDIR}/rubygems/package/tar_input.rb -${RUBY_SITELIBDIR}/rubygems/package/tar_output.rb -${RUBY_SITELIBDIR}/rubygems/package/tar_reader.rb -${RUBY_SITELIBDIR}/rubygems/package/tar_reader/entry.rb -${RUBY_SITELIBDIR}/rubygems/package/tar_writer.rb -${RUBY_SITELIBDIR}/rubygems/platform.rb -${RUBY_SITELIBDIR}/rubygems/remote_fetcher.rb -${RUBY_SITELIBDIR}/rubygems/require_paths_builder.rb -${RUBY_SITELIBDIR}/rubygems/requirement.rb -${RUBY_SITELIBDIR}/rubygems/rubygems_version.rb -${RUBY_SITELIBDIR}/rubygems/security.rb -${RUBY_SITELIBDIR}/rubygems/server.rb -${RUBY_SITELIBDIR}/rubygems/source_index.rb -${RUBY_SITELIBDIR}/rubygems/source_info_cache.rb -${RUBY_SITELIBDIR}/rubygems/source_info_cache_entry.rb -${RUBY_SITELIBDIR}/rubygems/specification.rb -${RUBY_SITELIBDIR}/rubygems/timer.rb -${RUBY_SITELIBDIR}/rubygems/uninstaller.rb -${RUBY_SITELIBDIR}/rubygems/user_interaction.rb -${RUBY_SITELIBDIR}/rubygems/validator.rb -${RUBY_SITELIBDIR}/rubygems/version.rb -${RUBY_SITELIBDIR}/rubygems/version_option.rb -${RUBY_SITELIBDIR}/ubygems.rb -@dirrm ${RUBY_SITELIBDIR}/rubygems/package/tar_reader -@dirrm ${RUBY_SITELIBDIR}/rubygems/package -@dirrm ${RUBY_SITELIBDIR}/rubygems/indexer -@dirrm ${RUBY_SITELIBDIR}/rubygems/ext -@dirrm ${RUBY_SITELIBDIR}/rubygems/digest -@dirrm ${RUBY_SITELIBDIR}/rubygems/commands -@dirrm ${RUBY_SITELIBDIR}/rubygems -@dirrm ${RUBY_SITELIBDIR}/rbconfig +${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/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/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_writer.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/specification.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}/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 diff --git a/misc/rubygems/distinfo b/misc/rubygems/distinfo index f09d576ab50..17e0d2b74c6 100644 --- a/misc/rubygems/distinfo +++ b/misc/rubygems/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2008/04/13 06:01:59 jlam Exp $ +$NetBSD: distinfo,v 1.17 2008/06/19 14:52:36 taca Exp $ SHA1 (rubygems-1.1.1.tgz) = e1ead11fa2928fb4b7871c17fd1186198c97c11a RMD160 (rubygems-1.1.1.tgz) = 264b6c2667fd74c111b6886da13b324bc391eaa8 @@ -7,7 +7,10 @@ SHA1 (patch-aa) = 43d31663301d537f4fb25df61f499e59efefc60c SHA1 (patch-ab) = e5c3bcdb1220067b7fb6f45bd0311894e683c8b9 SHA1 (patch-ac) = e007358881509523f2c2821ced208f5bd9b5a232 SHA1 (patch-ad) = b7e9a459ccb0305591db97ab7214ddc5befa24f0 -SHA1 (patch-ae) = 5aea3680a24b444b9eb6bf8ae6af24ac89ce695e +SHA1 (patch-ae) = 109d5e590aacbbde0af8666ca086b65357113afa SHA1 (patch-af) = c18ecbbf52cdd68543cd1e11742045f0295dc337 SHA1 (patch-ag) = 699d5830c20f0f026b074e5ef4546853df022136 -SHA1 (patch-ah) = a28e462e368a02194006fe2e5fb7855f97164661 +SHA1 (patch-ah) = 1183501773758b14104d5111c0e1c1090dde99d4 +SHA1 (patch-ai) = 5f2e1945617c7a9c0066d9cd6b73f217c45661f2 +SHA1 (patch-aj) = 0fbb15871804e4b212df8cde3ef34f0d4a5172cb +SHA1 (patch-ak) = d4c8de917c4aff3ce69bdaea198e6a53f22f36df diff --git a/misc/rubygems/patches/patch-ae b/misc/rubygems/patches/patch-ae index b9275957b62..8ede85f765c 100644 --- a/misc/rubygems/patches/patch-ae +++ b/misc/rubygems/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.3 2008/04/13 06:01:59 jlam Exp $ +$NetBSD: patch-ae,v 1.4 2008/06/19 14:52:36 taca Exp $ ---- setup.rb.orig 2008-04-01 19:22:20.000000000 -0400 +--- setup.rb.orig 2008-04-02 08:22:20.000000000 +0900 +++ setup.rb @@ -37,6 +37,9 @@ if ARGV.include? '--help' or ARGV.includ puts " --prefix=DIR Prefix path for installing RubyGems" @@ -12,6 +12,15 @@ $NetBSD: patch-ae,v 1.3 2008/04/13 06:01:59 jlam Exp $ puts " --no-format-executable Force installation as `gem`" puts puts " --no-rdoc Don't build RDoc for RubyGems" +@@ -67,7 +70,7 @@ lib_dir = nil + bin_dir = nil + + if ARGV.grep(/^--prefix/).empty? then +- lib_dir = Gem::ConfigMap[:sitelibdir] ++ lib_dir = Gem::ConfigMap[:vendorlibdir] + bin_dir = Gem::ConfigMap[:bindir] + else + prefix = nil @@ -96,11 +99,30 @@ else else lib_dir = File.join prefix, 'lib' diff --git a/misc/rubygems/patches/patch-ah b/misc/rubygems/patches/patch-ah index 1680a11e7d5..129b7c7afa4 100644 --- a/misc/rubygems/patches/patch-ah +++ b/misc/rubygems/patches/patch-ah @@ -1,8 +1,19 @@ -$NetBSD: patch-ah,v 1.2 2008/04/13 06:01:59 jlam Exp $ +$NetBSD: patch-ah,v 1.3 2008/06/19 14:52:36 taca Exp $ ---- lib/rubygems.rb.orig 2008-04-09 17:18:31.000000000 -0400 +--- lib/rubygems.rb.orig 2008-04-10 06:18:31.000000000 +0900 +++ lib/rubygems.rb -@@ -213,7 +213,13 @@ module Gem +@@ -71,7 +71,9 @@ 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. @@ -17,3 +28,22 @@ $NetBSD: patch-ah,v 1.2 2008/04/13 06:01:59 jlam Exp $ return File.join(install_dir, 'bin') unless install_dir.to_s == Gem.default_dir Gem.default_bindir +@@ -389,7 +397,7 @@ module Gem + # 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 + 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 diff --git a/misc/rubygems/patches/patch-ai b/misc/rubygems/patches/patch-ai new file mode 100644 index 00000000000..524d9c7de49 --- /dev/null +++ b/misc/rubygems/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2008/06/19 14:52:36 taca Exp $ + +--- Rakefile.orig 2008-04-02 09:46:17.000000000 +0900 ++++ Rakefile +@@ -338,7 +338,7 @@ task :install do + unless svnversion.empty? then + current_version = Gem::RubyGemsVersion.split '.', 4 + rubygems_version = (current_version[0, 3] << svnversion).join '.' +- rubygems_version_file = File.join Gem::ConfigMap[:sitelibdir], 'rubygems', ++ rubygems_version_file = File.join Gem::ConfigMap[:vendorlibdir], 'rubygems', + 'rubygems_version.rb' + + generate_rubygems_version rubygems_version_file, rubygems_version diff --git a/misc/rubygems/patches/patch-aj b/misc/rubygems/patches/patch-aj new file mode 100644 index 00000000000..a9eb782a682 --- /dev/null +++ b/misc/rubygems/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2008/06/19 14:52:36 taca Exp $ + +--- lib/rubygems/defaults.rb.orig 2008-03-09 12:42:07.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', diff --git a/misc/rubygems/patches/patch-ak b/misc/rubygems/patches/patch-ak new file mode 100644 index 00000000000..aa6198d57bb --- /dev/null +++ b/misc/rubygems/patches/patch-ak @@ -0,0 +1,24 @@ +$NetBSD: patch-ak,v 1.1 2008/06/19 14:52:36 taca Exp $ + +--- test/test_gem.rb.orig 2008-04-10 06:17:44.000000000 +0900 ++++ test/test_gem.rb +@@ -326,16 +326,16 @@ class TestGem < RubyGemTestCase + end + + def test_self_prefix_sitelibdir +- orig_sitelibdir = Gem::ConfigMap[:sitelibdir] ++ orig_sitelibdir = 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 + end + + def test_self_refresh -- cgit v1.2.3