Index: branches/2015Q2/devel/ruby-gems/Makefile
===================================================================
--- branches/2015Q2/devel/ruby-gems/Makefile	(revision 386697)
+++ branches/2015Q2/devel/ruby-gems/Makefile	(revision 386698)
@@ -1,75 +1,75 @@
 # Created by: Alexander Novitsky <alecn2002@yandex.ru>
 # $FreeBSD$
 
 PORTNAME=	gems
-PORTVERSION=	2.4.5
+PORTVERSION=	2.4.6
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://production.cf.rubygems.org/rubygems/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Package management framework for the Ruby language
 
 LICENSE=	MIT RUBY
 LICENSE_COMB=	dual
 
 USE_RUBY=	yes
 RUBY_SETUP=	setup.rb
 
 NO_BUILD=	yes
 USES=		tar:tgz
 
 GEMS_BASE_DIR=		lib/ruby/gems
 GEMS_BASE_DIR_P=	${GEMS_BASE_DIR}
 GEMS_VER_DIR=		${GEMS_BASE_DIR}/${RUBY_VER}
 GEMS_VER_DIR_P=		${GEMS_BASE_DIR_P}/%%RUBY_VER%%
 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/.//}
 
 GEMS_DIR=		${GEMS_VER_DIR}/gems
 DOC_DIR=		${GEMS_VER_DIR}/doc
 CACHE_DIR=		${GEMS_VER_DIR}/cache
 SPEC_DIR=		${GEMS_VER_DIR}/specifications
 EXT_DIR=		${GEMS_VER_DIR}/extensions
 
 PLIST_SUB+=	DISTNAME="${DISTNAME}" \
 		RUBY_VER_SHORT="${RUBY_VER_SHORT}" \
 		GEMS_DIR="${GEMS_DIR}" \
 		DOC_DIR="${DOC_DIR}" \
 		CACHE_DIR="${CACHE_DIR}" \
 		SPEC_DIR="${SPEC_DIR}" \
 		EXT_DIR="${EXT_DIR}"
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 RUBY_SETUP_OPTIONS=	--ri --rdoc --destdir=${STAGEDIR}
 GEM_ENV+=		GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}
 .else
 RUBY_SETUP_OPTIONS=	--no-ri --no-rdoc --destdir=${STAGEDIR}
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_DOC_BASE_DIR}/
 	@${TOUCH} ${STAGEDIR}${PREFIX}/${GEMS_DOC_BASE_DIR}/.keep_this
 	cd ${WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS}
 
 post-install:
 	@${LN} -sf gem${RUBY_VER_SHORT} ${STAGEDIR}${PREFIX}/bin/gem
 
 #
 # Find all RDOC and RI files
 #
 .if ${PORT_OPTIONS:MDOCS}
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${GEMS_DOC_DIR}/ ! -type d | \
 	    ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
Index: branches/2015Q2/devel/ruby-gems/distinfo
===================================================================
--- branches/2015Q2/devel/ruby-gems/distinfo	(revision 386697)
+++ branches/2015Q2/devel/ruby-gems/distinfo	(revision 386698)
@@ -1,2 +1,2 @@
-SHA256 (ruby/rubygems-2.4.5.tgz) = 47d182ba52da02d4400601efbf62f64c25ff83856f8e269f8289333f292566d9
-SIZE (ruby/rubygems-2.4.5.tgz) = 446665
+SHA256 (ruby/rubygems-2.4.6.tgz) = 76d3f3b10aa824d23a511f098ab777c6473b98ffa733f7be4222408897b68db9
+SIZE (ruby/rubygems-2.4.6.tgz) = 447588
Index: branches/2015Q2/devel/ruby-gems/pkg-plist
===================================================================
--- branches/2015Q2/devel/ruby-gems/pkg-plist	(revision 386697)
+++ branches/2015Q2/devel/ruby-gems/pkg-plist	(revision 386698)
@@ -1,166 +1,168 @@
 bin/gem
 bin/gem%%RUBY_VER_SHORT%%
 %%RUBY_SITELIBDIR%%/gauntlet_rubygems.rb
 %%RUBY_SITELIBDIR%%/rubygems.rb
 %%RUBY_SITELIBDIR%%/rubygems/available_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/basic_specification.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/open_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/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
 %%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/commands/yank_command.rb
 %%RUBY_SITELIBDIR%%/rubygems/compatibility.rb
 %%RUBY_SITELIBDIR%%/rubygems/config_file.rb
 %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_gem.rb
 %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_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/deprecate.rb
 %%RUBY_SITELIBDIR%%/rubygems/doctor.rb
 %%RUBY_SITELIBDIR%%/rubygems/errors.rb
 %%RUBY_SITELIBDIR%%/rubygems/exceptions.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/build_error.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/builder.rb
 %%RUBY_SITELIBDIR%%/rubygems/ext/cmake_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/gem_runner.rb
 %%RUBY_SITELIBDIR%%/rubygems/gemcutter_utilities.rb
 %%RUBY_SITELIBDIR%%/rubygems/indexer.rb
 %%RUBY_SITELIBDIR%%/rubygems/install_default_message.rb
 %%RUBY_SITELIBDIR%%/rubygems/install_message.rb
 %%RUBY_SITELIBDIR%%/rubygems/install_update_options.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/name_tuple.rb
 %%RUBY_SITELIBDIR%%/rubygems/package.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/digest_io.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/file_source.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/io_source.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/old.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/source.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_header.rb
 %%RUBY_SITELIBDIR%%/rubygems/package/tar_reader.rb
 %%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/psych_additions.rb
 %%RUBY_SITELIBDIR%%/rubygems/psych_tree.rb
 %%RUBY_SITELIBDIR%%/rubygems/rdoc.rb
 %%RUBY_SITELIBDIR%%/rubygems/remote_fetcher.rb
-%%RUBY_SITELIBDIR%%/rubygems/requirement.rb
 %%RUBY_SITELIBDIR%%/rubygems/request.rb
 %%RUBY_SITELIBDIR%%/rubygems/request/connection_pools.rb
 %%RUBY_SITELIBDIR%%/rubygems/request/http_pool.rb
 %%RUBY_SITELIBDIR%%/rubygems/request/https_pool.rb
+%%RUBY_SITELIBDIR%%/rubygems/request_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/request_set/gem_dependency_api.rb
 %%RUBY_SITELIBDIR%%/rubygems/request_set/lockfile.rb
-%%RUBY_SITELIBDIR%%/rubygems/request_set.rb
+%%RUBY_SITELIBDIR%%/rubygems/request_set/lockfile/parser.rb
+%%RUBY_SITELIBDIR%%/rubygems/request_set/lockfile/tokenizer.rb
+%%RUBY_SITELIBDIR%%/rubygems/requirement.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/activation_request.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/api_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/api_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/best_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/composed_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/conflict.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/current_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/dependency_request.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/git_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/git_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/index_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/index_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/installed_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/installer_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/local_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/requirement_list.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/spec_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/stats.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/vendor_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/vendor_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/security.rb
 %%RUBY_SITELIBDIR%%/rubygems/security/policies.rb
 %%RUBY_SITELIBDIR%%/rubygems/security/policy.rb
 %%RUBY_SITELIBDIR%%/rubygems/security/signer.rb
 %%RUBY_SITELIBDIR%%/rubygems/security/trust_dir.rb
 %%RUBY_SITELIBDIR%%/rubygems/server.rb
-%%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb
-%%RUBY_SITELIBDIR%%/rubygems/specification.rb
-%%RUBY_SITELIBDIR%%/rubygems/stub_specification.rb
+%%RUBY_SITELIBDIR%%/rubygems/source.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/git.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/installed.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/local.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/lock.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/specific_file.rb
 %%RUBY_SITELIBDIR%%/rubygems/source/vendor.rb
-%%RUBY_SITELIBDIR%%/rubygems/source.rb
 %%RUBY_SITELIBDIR%%/rubygems/source_list.rb
 %%RUBY_SITELIBDIR%%/rubygems/source_local.rb
 %%RUBY_SITELIBDIR%%/rubygems/source_specific_file.rb
+%%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb
+%%RUBY_SITELIBDIR%%/rubygems/specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem
 %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot.pem
 %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
 %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
 %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
 %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/GeoTrustGlobalCA.pem
+%%RUBY_SITELIBDIR%%/rubygems/stub_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/syck_hack.rb
 %%RUBY_SITELIBDIR%%/rubygems/test_case.rb
 %%RUBY_SITELIBDIR%%/rubygems/test_utilities.rb
 %%RUBY_SITELIBDIR%%/rubygems/text.rb
 %%RUBY_SITELIBDIR%%/rubygems/uninstaller.rb
 %%RUBY_SITELIBDIR%%/rubygems/uri_formatter.rb
+%%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb
 %%RUBY_SITELIBDIR%%/rubygems/util.rb
 %%RUBY_SITELIBDIR%%/rubygems/util/list.rb
 %%RUBY_SITELIBDIR%%/rubygems/util/stringio.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
 lib/ruby/gems/%%RUBY_VER%%/doc/.keep_this
 @dir lib/ruby/gems/%%RUBY_VER%%/build_info
 @dir %%EXT_DIR%%
 @dir %%CACHE_DIR%%
 @dir %%GEMS_DIR%%
 @dir %%SPEC_DIR%%
Index: branches/2015Q2
===================================================================
--- branches/2015Q2	(revision 386697)
+++ branches/2015Q2	(revision 386698)

Property changes on: branches/2015Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r383109