From owner-freebsd-ruby@FreeBSD.ORG Sun Aug 28 10:03:32 2011 Return-Path: Delivered-To: ruby@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6278106566B; Sun, 28 Aug 2011 10:03:32 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from mx0.deglitch.com (cl-414.sto-01.se.sixxs.net [IPv6:2001:16d8:ff00:19d::2]) by mx1.freebsd.org (Postfix) with ESMTP id DD6658FC16; Sun, 28 Aug 2011 10:03:31 +0000 (UTC) Received: from orion.SpringDaemons.com (c-98-234-217-95.hsd1.ca.comcast.net [98.234.217.95]) by mx0.deglitch.com (Postfix) with ESMTPA id 973E98FC2D; Sun, 28 Aug 2011 14:03:29 +0400 (MSD) Received: from orion (localhost [127.0.0.1]) by orion.SpringDaemons.com (Postfix) with SMTP id 474683A12E; Sun, 28 Aug 2011 03:04:01 -0700 (PDT) Date: Sun, 28 Aug 2011 03:03:54 -0700 From: Stanislav Sedov To: Steve Wills Message-Id: <20110828030354.a53bf2ed.stas@FreeBSD.org> Organization: The FreeBSD Project X-Mailer: carrier-pigeon Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Sun__28_Aug_2011_03_03_54_-0700_PZLOTXLg3SuwrDyj" Cc: ruby@FreeBSD.org Subject: ruby-gems update X-BeenThere: freebsd-ruby@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Ruby discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 10:03:33 -0000 --Signature=_Sun__28_Aug_2011_03_03_54_-0700_PZLOTXLg3SuwrDyj Content-Type: multipart/mixed; boundary="Multipart=_Sun__28_Aug_2011_03_03_54_-0700_SM+H/kLo.Q6fGsZR" --Multipart=_Sun__28_Aug_2011_03_03_54_-0700_SM+H/kLo.Q6fGsZR Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi! I'd like to update our ruby-gems versio to 1.8.7. Are there any objections? It seems that everything is working fine with this version, and it includes a lot of bugfixes, including better behaviour with ruby 1.9.2. I'm attaching the patch I'm planning to commit. If there's no objection, I will commit it tomorrow. The patch also fixes the issue when rdocs were not installed due to unexsisting directory (it also produced a broken plist when you already had this directory, because it would not include those files). Thanks! --=20 Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail=20 /\ www.asciiribbon.org - against proprietary attachments --Multipart=_Sun__28_Aug_2011_03_03_54_-0700_SM+H/kLo.Q6fGsZR Content-Type: text/x-diff; name="ruby-gems.diff" Content-Disposition: attachment; filename="ruby-gems.diff" Content-Transfer-Encoding: quoted-printable Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/devel/ruby-gems/Makefile,v retrieving revision 1.43 diff -u -r1.43 Makefile --- Makefile 23 Aug 2011 03:47:28 -0000 1.43 +++ Makefile 28 Aug 2011 09:59:21 -0000 @@ -6,7 +6,7 @@ # =20 PORTNAME=3D gems -PORTVERSION=3D 1.7.2 +PORTVERSION=3D 1.8.7 CATEGORIES=3D devel ruby MASTER_SITES=3D RF MASTER_SITE_SUBDIR=3D ruby${PORTNAME} @@ -20,14 +20,14 @@ =20 USE_RUBY=3D yes RUBY_SETUP=3D setup.rb -RUBY_VER=3D 1.8 =20 NO_BUILD=3D yes =20 -PLIST_SUB+=3D DISTNAME=3D"${DISTNAME}" +PLIST_SUB+=3D DISTNAME=3D"${DISTNAME}" \ + RUBY_VER_SHORT=3D"${RUBY_VER_SHORT}" =20 .if !defined(NOPORTDOCS) -RUBY_SETUP_OPTIONS=3D +RUBY_SETUP_OPTIONS=3D --ri --rdoc .else RUBY_SETUP_OPTIONS=3D --no-ri --no-rdoc .endif @@ -40,6 +40,7 @@ GEMS_DOC_BASE_DIR_P=3D ${GEMS_VER_DIR_P}/doc GEMS_DOC_DIR=3D ${GEMS_DOC_BASE_DIR}/${DISTNAME} GEMS_DOC_DIR_P=3D ${GEMS_DOC_BASE_DIR_P}/%%DISTNAME%% +RUBY_VER_SHORT=3D ${RUBY_VER:S/.//} =20 .include =20 @@ -48,13 +49,24 @@ .endif =20 do-install: + @${MKDIR} ${PREFIX}/${GEMS_DOC_BASE_DIR}/ + @${TOUCH} ${PREFIX}/${GEMS_DOC_BASE_DIR}/.keep_this cd ${WRKSRC}; ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS} =20 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 =20 + @${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 || t= rue" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir %D/lib/ruby/gems 2>/dev/null || true" >> ${TM= PPLIST} @@ -63,11 +75,8 @@ # 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-pli= st.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,${RU= BY_SITELIBDIR},%%RUBY_SITELIBDIR%%,' >> pkg-plist.new @@ -77,11 +86,10 @@ ${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,${P= REFIX}/${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 Index: distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/devel/ruby-gems/distinfo,v retrieving revision 1.25 diff -u -r1.25 distinfo --- distinfo 8 Apr 2011 04:08:48 -0000 1.25 +++ distinfo 28 Aug 2011 09:59:21 -0000 @@ -1,2 +1,2 @@ -SHA256 (ruby/rubygems-1.7.2.tgz) =3D 28c6969d48e2ec0d9df6ccd7c73d46d9b0c11= 5ca6acb34f091b39a3e9049692c -SIZE (ruby/rubygems-1.7.2.tgz) =3D 245606 +SHA256 (ruby/rubygems-1.8.7.tgz) =3D cc3ff80c9250defe173a7c315804828be88b8= 0561251d5a90c554072f8df5c1e +SIZE (ruby/rubygems-1.8.7.tgz) =3D 248796 Index: pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/devel/ruby-gems/pkg-plist,v retrieving revision 1.27 diff -u -r1.27 pkg-plist --- pkg-plist 23 Aug 2011 03:47:28 -0000 1.27 +++ pkg-plist 28 Aug 2011 09:59:21 -0000 @@ -1,12 +1,7 @@ -@comment $FreeBSD: ports/devel/ruby-gems/pkg-plist,v 1.27 2011/08/23 03:47= :28 swills Exp $ 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 @@ %%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 @@ %%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 @@ %%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 @@ @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 Index: files/patch-lib__rubygems__commands__setup_command.rb =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: files/patch-lib__rubygems__commands__setup_command.rb diff -N files/patch-lib__rubygems__commands__setup_command.rb --- files/patch-lib__rubygems__commands__setup_command.rb 21 Feb 2011 04:02= :51 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,44 +0,0 @@ ---- lib/rubygems/commands/setup_command.rb.orig 2011-02-10 14:01:36.000000= 000 +0000 -+++ lib/rubygems/commands/setup_command.rb 2011-02-10 14:01:45.000000000 += 0000 -@@ -112,6 +112,8 @@ -=20 - install_rdoc -=20 -+ install_sources -+ - say - if @verbose then - say "-" * 78 -@@ -147,6 +149,23 @@ - end - end -=20 -+ 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 =3D Gem.sources_spec -+ gem_file =3D Gem::Builder.new(spec).build -+ Gem::Installer.new(gem_file).install -+ end -+ end -+ - def install_executables(bin_dir) - say "Installing gem executable" if @verbose -=20 -@@ -155,8 +174,6 @@ - Dir.chdir 'bin' do - bin_files =3D Dir['*'] -=20 -- bin_files.delete 'update_rubygems' -- - bin_files.each do |bin_file| - bin_file_formatted =3D if options[:format_executable] then - Gem.default_exec_format % bin_file Index: files/patch-lib__rubygems__installer.rb =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: files/patch-lib__rubygems__installer.rb diff -N files/patch-lib__rubygems__installer.rb --- files/patch-lib__rubygems__installer.rb 21 Feb 2011 04:02:51 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 -=20 -- write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE -+ # write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE -=20 - # HACK remove? Isn't this done in multiple places? - cached_gem =3D File.join @gem_home, "cache", @gem.split(/\//).pop --Multipart=_Sun__28_Aug_2011_03_03_54_-0700_SM+H/kLo.Q6fGsZR-- --Signature=_Sun__28_Aug_2011_03_03_54_-0700_PZLOTXLg3SuwrDyj Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- iQIcBAEBAgAGBQJOWhKQAAoJEL8lojEJL9nwDOAP/1WbnO/sXk6jVYcYYglZzvzY FIT2BY3UIm+DUrNWIjGen+r/I0vMboyUUmylez7/e9CChsUwWeIGDgZ7G4MaM7g7 xhWJTAlgCvNRheJaprsfC++VDrfKk6YQmxTqx+2BSIHWTHSYferrKDQCdFWy4t8W I34xIw1nevGsQGWUeMx2YUTOO1tcUF5K/EU8QhEQ7x20Avdm2eUJbqj+SZymsf3R P3KVslGui1dK9rikQ7YspXYZkqEmstDdPHjZ8nrmHybgLi5UuRSe2Iw/FlCY8cAE CjZwfEdi+L2okpZJFmS9tdX4CY9JPF1TLmfxJylBpj35BP4xjwvw3AKFsR27JwjJ 3UrfbKXHtfGC9gUz8wOwAhM71jq0r6BCYhvRfWtq05rFD+DpmYHuOlnrplhYOYjQ wv6KeHXsVzWZMk+URh0ni9/zuo5RcOrB1NSmOFP/1QB5N7fI4U9prW1eGTur7Uoe f3QhsyOUGIXP8RIO/f3MJzU/SntxxAjirvfO3tJVowRxKXfVog2fh6LwaD5l+3wP HdYM3zhCZ++M2VXEVR6RM03mtQt21oFYr5CsfPstLWuUpWFWiWjYxmYdXuNvZzgP nWMLgiP8xz5sDQUwkmtgwj7rTFqr7MDNc3iIgbt5MVht0XC1ggYLmseGl418+8ig EH+KEPHVM4qKF3WBL5X2 =94qH -----END PGP SIGNATURE----- --Signature=_Sun__28_Aug_2011_03_03_54_-0700_PZLOTXLg3SuwrDyj--