- Update ruby-gems to 1.8.7.

5 files changed, 38 insertions, 88 deletions

diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index 9fd968df17c0..b8133c841de9 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gems
-PORTVERSION=	1.7.2
+PORTVERSION=	1.8.7
 CATEGORIES=	devel ruby
 MASTER_SITES=	RF
 MASTER_SITE_SUBDIR=	ruby${PORTNAME}
@@ -20,14 +20,14 @@ COMMENT=	Package management framework for the Ruby language
 
 USE_RUBY=	yes
 RUBY_SETUP=	setup.rb
-RUBY_VER=	1.8
 
 NO_BUILD=	yes
 
-PLIST_SUB+=	DISTNAME="${DISTNAME}"
+PLIST_SUB+=	DISTNAME="${DISTNAME}" \
+		RUBY_VER_SHORT="${RUBY_VER_SHORT}"
 
 .if !defined(NOPORTDOCS)
-RUBY_SETUP_OPTIONS=
+RUBY_SETUP_OPTIONS=	--ri --rdoc
 .else
 RUBY_SETUP_OPTIONS=	--no-ri --no-rdoc
 .endif
@@ -40,6 +40,7 @@ GEMS_DOC_BASE_DIR=	${GEMS_VER_DIR}/doc
 GEMS_DOC_BASE_DIR_P=	${GEMS_VER_DIR_P}/doc
 GEMS_DOC_DIR=		${GEMS_DOC_BASE_DIR}/${DISTNAME}
 GEMS_DOC_DIR_P=		${GEMS_DOC_BASE_DIR_P}/%%DISTNAME%%
+RUBY_VER_SHORT=		${RUBY_VER:S/.//}
 
 .include <bsd.port.pre.mk>
 
@@ -48,13 +49,24 @@ IGNORE=	already included in this ruby distribution
 .endif
 
 do-install:
+	@${MKDIR} ${PREFIX}/${GEMS_DOC_BASE_DIR}/
+	@${TOUCH} ${PREFIX}/${GEMS_DOC_BASE_DIR}/.keep_this
 	cd ${WRKSRC}; ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS}
 
 post-install:
-	@${MKDIR} ${PREFIX}/${GEMS_DOC_BASE_DIR}/
-	@${TOUCH} ${PREFIX}/${GEMS_DOC_BASE_DIR}/.keep_this
-	@${LN} -sf ${PREFIX}/bin/gem18 ${PREFIX}/bin/gem
+	@${LN} -sf ${PREFIX}/bin/gem${RUBY_VER_SHORT} ${PREFIX}/bin/gem
+
+#
+# Find all RDOC and RI files
+#
+.if !defined(NOPORTDOCS)
+	@${FIND} -ds ${PREFIX}/${GEMS_DOC_DIR}/ ! -type d | \
+	    ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} -ds ${PREFIX}/${GEMS_DOC_DIR}/ -type d -mindepth 1 | \
+	    ${SED} -E -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.endif
 
+	@${ECHO_CMD} "@dirrm ${GEMS_DOC_DIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec rmdir %D/lib/ruby/gems/${RUBY_VER}/doc 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec rmdir %D/lib/ruby/gems/${RUBY_VER} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec rmdir %D/lib/ruby/gems 2>/dev/null || true" >> ${TMPPLIST}
@@ -63,11 +75,8 @@ post-install:
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	${ECHO} bin/gem > pkg-plist.new
-	${ECHO} bin/gem18 >> pkg-plist.new
-	${ECHO} bin/update_rubygems18 >> pkg-plist.new
-	${ECHO} ${GEMS_VER_DIR_P}/cache/sources-0.0.2.gem >> pkg-plist.new
-	${FIND} ${PREFIX}/${GEMS_VER_DIR}/gems/sources-0.0.2 -type f | ${SORT} | ${SED} -e 's,${PREFIX}/${GEMS_VER_DIR},${GEMS_VER_DIR_P},' >> pkg-plist.new
-	${ECHO} ${GEMS_VER_DIR_P}/specifications/sources-0.0.2.gemspec >> pkg-plist.new
+	${ECHO} bin/gem%%RUBY_VER_SHORT%% >> pkg-plist.new
+	${ECHO} %%RUBY_SITELIBDIR%%/gauntlet_rubygems.rb >> pkg-plist.new
 	${ECHO} %%RUBY_SITELIBDIR%%/rbconfig/datadir.rb >> pkg-plist.new
 	${ECHO} %%RUBY_SITELIBDIR%%/rubygems.rb >> pkg-plist.new
 	${FIND} ${RUBY_SITELIBDIR}/rubygems -type f | ${SORT} | ${SED} -e 's,${RUBY_SITELIBDIR},%%RUBY_SITELIBDIR%%,' >> pkg-plist.new
@@ -77,11 +86,10 @@ x-generate-plist:
 	${FIND} ${RUBY_SITELIBDIR}/rubygems -type d | ${SORT} -r | ${SED} -e 's,${RUBY_SITELIBDIR},@dirrm %%RUBY_SITELIBDIR%%,' >> pkg-plist.new
 	${ECHO} @dirrm %%RUBY_SITELIBDIR%%/rbconfig >> pkg-plist.new
 	${ECHO} @dirrmtry ${GEMS_VER_DIR_P}/specifications >> pkg-plist.new
-	${FIND} ${PREFIX}/${GEMS_VER_DIR}/gems/sources-0.0.2 -type d | ${SORT} -r | ${SED} -e 's,${PREFIX}/${GEMS_VER_DIR},@dirrm ${GEMS_VER_DIR_P},' >> pkg-plist.new
 	${ECHO} @dirrmtry ${GEMS_VER_DIR_P}/gems >> pkg-plist.new
 	${ECHO} @dirrmtry ${GEMS_VER_DIR_P}/cache >> pkg-plist.new
 	${FIND} ${PREFIX}/${GEMS_DOC_DIR} -type d | ${SORT} -r | ${SED} -e 's,${PREFIX}/${GEMS_DOC_DIR},%%PORTDOCS%%@dirrm ${GEMS_DOC_DIR_P},' >> pkg-plist.new
-	${ECHO} ${PREFIX}/${GEMS_DOC_BASE_DIR}/.keep_this  >> pkg-plist.new
+	${ECHO} ${GEMS_DOC_BASE_DIR_P}/.keep_this  >> pkg-plist.new
 	${ECHO} @dirrmtry ${GEMS_DOC_BASE_DIR_P} >> pkg-plist.new
 	${ECHO} @dirrmtry ${GEMS_VER_DIR_P} >> pkg-plist.new
 	${ECHO} @dirrmtry ${GEMS_BASE_DIR_P} >> pkg-plist.new
diff --git a/devel/ruby-gems/distinfo b/devel/ruby-gems/distinfo
index d77209d66ca5..2824e06bdca1 100644
--- a/devel/ruby-gems/distinfo
+++ b/devel/ruby-gems/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ruby/rubygems-1.7.2.tgz) = 28c6969d48e2ec0d9df6ccd7c73d46d9b0c115ca6acb34f091b39a3e9049692c
-SIZE (ruby/rubygems-1.7.2.tgz) = 245606
+SHA256 (ruby/rubygems-1.8.7.tgz) = cc3ff80c9250defe173a7c315804828be88b80561251d5a90c554072f8df5c1e
+SIZE (ruby/rubygems-1.8.7.tgz) = 248796
diff --git a/devel/ruby-gems/files/patch-lib__rubygems__commands__setup_command.rb b/devel/ruby-gems/files/patch-lib__rubygems__commands__setup_command.rb
deleted file mode 100644
index 31151a43c8f5..000000000000
--- a/devel/ruby-gems/files/patch-lib__rubygems__commands__setup_command.rb
+++ /dev/null
@@ -1,44 +0,0 @@
---- lib/rubygems/commands/setup_command.rb.orig	2011-02-10 14:01:36.000000000 +0000
-+++ lib/rubygems/commands/setup_command.rb	2011-02-10 14:01:45.000000000 +0000
-@@ -112,6 +112,8 @@
- 
-     install_rdoc
- 
-+    install_sources
-+
-     say
-     if @verbose then
-       say "-" * 78
-@@ -147,6 +149,23 @@
-     end
-   end
- 
-+  def install_sources
-+    say "Installing sources"
-+
-+    $: << "lib"
-+   require 'rubygems'
-+   require 'rubygems/builder'
-+   require 'rubygems/installer'
-+   require 'rubygems/config_file'
-+
-+    Dir.chdir("pkgs/sources") do
-+        load "sources.gemspec"
-+        spec = Gem.sources_spec
-+        gem_file = Gem::Builder.new(spec).build
-+        Gem::Installer.new(gem_file).install
-+    end
-+  end
-+
-   def install_executables(bin_dir)
-     say "Installing gem executable" if @verbose
- 
-@@ -155,8 +174,6 @@
-     Dir.chdir 'bin' do
-       bin_files = Dir['*']
- 
--      bin_files.delete 'update_rubygems'
--
-       bin_files.each do |bin_file|
-         bin_file_formatted = if options[:format_executable] then
-                                Gem.default_exec_format % bin_file
diff --git a/devel/ruby-gems/files/patch-lib__rubygems__installer.rb b/devel/ruby-gems/files/patch-lib__rubygems__installer.rb
deleted file mode 100644
index 00e6a95bd09a..000000000000
--- a/devel/ruby-gems/files/patch-lib__rubygems__installer.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/rubygems/installer.rb.orig	2011-02-10 14:03:04.000000000 +0000
-+++ lib/rubygems/installer.rb	2011-02-10 14:05:02.000000000 +0000
-@@ -171,7 +171,7 @@
-     generate_bin
-     write_spec
- 
--    write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE
-+    # write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE
- 
-     # HACK remove?  Isn't this done in multiple places?
-     cached_gem = File.join @gem_home, "cache", @gem.split(/\//).pop
diff --git a/devel/ruby-gems/pkg-plist b/devel/ruby-gems/pkg-plist
index 4e653dd9dbd8..4f68d1f48b37 100644
--- a/devel/ruby-gems/pkg-plist
+++ b/devel/ruby-gems/pkg-plist
@@ -1,12 +1,7 @@
-@comment $FreeBSD$
 bin/gem
-bin/gem18
-bin/update_rubygems18
-lib/ruby/gems/%%RUBY_VER%%/cache/sources-0.0.2.gem
-lib/ruby/gems/%%RUBY_VER%%/gems/sources-0.0.2/lib/sources.rb
-lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec
-%%RUBY_SITELIBDIR%%/rbconfig/datadir.rb
+bin/gem%%RUBY_VER_SHORT%%
 %%RUBY_SITELIBDIR%%/gauntlet_rubygems.rb
+%%RUBY_SITELIBDIR%%/rbconfig/datadir.rb
 %%RUBY_SITELIBDIR%%/rubygems.rb
 %%RUBY_SITELIBDIR%%/rubygems/builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/command.rb
@@ -24,15 +19,15 @@ lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec
 %%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/owner_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/outdated_command.rb
+%%RUBY_SITELIBDIR%%/rubygems/commands/owner_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/pristine_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/push_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/setup_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/server_command.rb
+%%RUBY_SITELIBDIR%%/rubygems/commands/setup_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/sources_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/specification_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/commands/stale_command.rb
@@ -56,19 +51,18 @@ lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec
 %%RUBY_SITELIBDIR%%/rubygems/ext/ext_conf_builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/rake_builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/format.rb
-%%RUBY_SITELIBDIR%%/rubygems/gemcutter_utilities.rb
 %%RUBY_SITELIBDIR%%/rubygems/gem_openssl.rb
 %%RUBY_SITELIBDIR%%/rubygems/gem_path_searcher.rb
 %%RUBY_SITELIBDIR%%/rubygems/gem_runner.rb
+%%RUBY_SITELIBDIR%%/rubygems/gemcutter_utilities.rb
 %%RUBY_SITELIBDIR%%/rubygems/indexer.rb
 %%RUBY_SITELIBDIR%%/rubygems/install_update_options.rb
-%%RUBY_SITELIBDIR%%/rubygems/installer_test_case.rb
 %%RUBY_SITELIBDIR%%/rubygems/installer.rb
+%%RUBY_SITELIBDIR%%/rubygems/installer_test_case.rb
 %%RUBY_SITELIBDIR%%/rubygems/local_remote_options.rb
 %%RUBY_SITELIBDIR%%/rubygems/mock_gem_ui.rb
 %%RUBY_SITELIBDIR%%/rubygems/old_format.rb
 %%RUBY_SITELIBDIR%%/rubygems/package.rb
-%%RUBY_SITELIBDIR%%/rubygems/package_task.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/f_sync_dir.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_header.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_input.rb
@@ -77,6 +71,8 @@ lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_reader/entry.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_test_case.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_writer.rb
+%%RUBY_SITELIBDIR%%/rubygems/package_task.rb
+%%RUBY_SITELIBDIR%%/rubygems/path_support.rb
 %%RUBY_SITELIBDIR%%/rubygems/platform.rb
 %%RUBY_SITELIBDIR%%/rubygems/remote_fetcher.rb
 %%RUBY_SITELIBDIR%%/rubygems/require_paths_builder.rb
@@ -102,8 +98,9 @@ lib/ruby/gems/%%RUBY_VER%%/doc/.keep_this
 @dirrm %%RUBY_SITELIBDIR%%/rubygems/commands
 @dirrm %%RUBY_SITELIBDIR%%/rubygems
 @dirrm %%RUBY_SITELIBDIR%%/rbconfig
-@dirrmtry lib/ruby/gems/%%RUBY_VER%%/specifications
-@dirrm lib/ruby/gems/%%RUBY_VER%%/gems/sources-0.0.2/lib
-@dirrm lib/ruby/gems/%%RUBY_VER%%/gems/sources-0.0.2
-@dirrmtry lib/ruby/gems/%%RUBY_VER%%/gems
-@dirrmtry lib/ruby/gems/%%RUBY_VER%%/cache
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby/gems/%%RUBY_VER%%/doc
+@dirrmtry lib/ruby/gems/%%RUBY_VER%%
+@dirrmtry lib/ruby/gems
+@dirrmtry lib/ruby