Update capistrano to 3.4.0.

Changes are too many to write here, please refer CHANGELOG.md.

3 files changed, 25 insertions, 18 deletions

diff --git a/sysutils/capistrano/Makefile b/sysutils/capistrano/Makefile
index aeb7cd00f42..971dec30304 100644
--- a/sysutils/capistrano/Makefile
+++ b/sysutils/capistrano/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2014/03/26 13:29:09 taca Exp $
+# $NetBSD: Makefile,v 1.20 2015/03/14 08:03:55 taca Exp $
 
-DISTNAME=	capistrano-3.1.0
+DISTNAME=	capistrano-3.4.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,10 +10,11 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-sshkit>=1.3:../../security/ruby-sshkit
 DEPENDS+=	${RUBY_PKGPREFIX}-i18n>=0:../../devel/ruby-i18n
+DEPENDS+=	${RUBY_PKGPREFIX}-capistrano-stats>=1.1.0<1.2:../../sysutils/ruby-capistrano-stats
 
 USE_RAKE=	YES
 
-CONFLICTS+=	ruby[1-9][0-9]-capistrano-[0-9]* capistrano-[0-9]*
+RUBYGEM_OPTIONS+=	--format-executable
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/capistrano/PLIST b/sysutils/capistrano/PLIST
index 3992c435e22..2d294d2fb8f 100644
--- a/sysutils/capistrano/PLIST
+++ b/sysutils/capistrano/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.13 2014/03/14 18:01:03 taca Exp $
-bin/cap
-bin/capify
+@comment $NetBSD: PLIST,v 1.14 2015/03/14 08:03:55 taca Exp $
+bin/cap${RUBY_SUFFIX}
+bin/capify${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.gitignore
 ${GEM_LIBDIR}/.travis.yml
@@ -12,28 +12,28 @@ ${GEM_LIBDIR}/README.md
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/bin/cap
 ${GEM_LIBDIR}/bin/capify
-${GEM_LIBDIR}/capistrano-public_cert.pem
 ${GEM_LIBDIR}/capistrano.gemspec
 ${GEM_LIBDIR}/features/configuration.feature
 ${GEM_LIBDIR}/features/deploy.feature
 ${GEM_LIBDIR}/features/deploy_failure.feature
 ${GEM_LIBDIR}/features/installation.feature
 ${GEM_LIBDIR}/features/remote_file_task.feature
+${GEM_LIBDIR}/features/sshconnect.feature
 ${GEM_LIBDIR}/features/step_definitions/assertions.rb
 ${GEM_LIBDIR}/features/step_definitions/cap_commands.rb
 ${GEM_LIBDIR}/features/step_definitions/setup.rb
 ${GEM_LIBDIR}/features/support/env.rb
 ${GEM_LIBDIR}/features/support/remote_command_helpers.rb
+${GEM_LIBDIR}/features/support/vagrant_helpers.rb
 ${GEM_LIBDIR}/lib/Capfile
 ${GEM_LIBDIR}/lib/capistrano.rb
 ${GEM_LIBDIR}/lib/capistrano/all.rb
 ${GEM_LIBDIR}/lib/capistrano/application.rb
 ${GEM_LIBDIR}/lib/capistrano/configuration.rb
+${GEM_LIBDIR}/lib/capistrano/configuration/filter.rb
 ${GEM_LIBDIR}/lib/capistrano/configuration/question.rb
 ${GEM_LIBDIR}/lib/capistrano/configuration/server.rb
 ${GEM_LIBDIR}/lib/capistrano/configuration/servers.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/servers/host_filter.rb
-${GEM_LIBDIR}/lib/capistrano/configuration/servers/role_filter.rb
 ${GEM_LIBDIR}/lib/capistrano/console.rb
 ${GEM_LIBDIR}/lib/capistrano/defaults.rb
 ${GEM_LIBDIR}/lib/capistrano/deploy.rb
@@ -50,39 +50,45 @@ ${GEM_LIBDIR}/lib/capistrano/i18n.rb
 ${GEM_LIBDIR}/lib/capistrano/install.rb
 ${GEM_LIBDIR}/lib/capistrano/scm.rb
 ${GEM_LIBDIR}/lib/capistrano/setup.rb
+${GEM_LIBDIR}/lib/capistrano/svn.rb
 ${GEM_LIBDIR}/lib/capistrano/tasks/console.rake
 ${GEM_LIBDIR}/lib/capistrano/tasks/deploy.rake
 ${GEM_LIBDIR}/lib/capistrano/tasks/framework.rake
 ${GEM_LIBDIR}/lib/capistrano/tasks/git.rake
 ${GEM_LIBDIR}/lib/capistrano/tasks/hg.rake
 ${GEM_LIBDIR}/lib/capistrano/tasks/install.rake
+${GEM_LIBDIR}/lib/capistrano/tasks/svn.rake
 ${GEM_LIBDIR}/lib/capistrano/templates/Capfile
 ${GEM_LIBDIR}/lib/capistrano/templates/deploy.rb.erb
 ${GEM_LIBDIR}/lib/capistrano/templates/stage.rb.erb
+${GEM_LIBDIR}/lib/capistrano/upload_task.rb
 ${GEM_LIBDIR}/lib/capistrano/version.rb
 ${GEM_LIBDIR}/lib/capistrano/version_validator.rb
 ${GEM_LIBDIR}/spec/integration/dsl_spec.rb
 ${GEM_LIBDIR}/spec/integration_spec_helper.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/application_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/configuration/filter_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/configuration/question_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/configuration/server_spec.rb
-${GEM_LIBDIR}/spec/lib/capistrano/configuration/servers/host_filter_spec.rb
-${GEM_LIBDIR}/spec/lib/capistrano/configuration/servers/role_filter_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/configuration/servers_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/configuration_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/dsl/paths_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/dsl/task_enhancements_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/dsl_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/git_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/hg_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/scm_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/svn_spec.rb
+${GEM_LIBDIR}/spec/lib/capistrano/upload_task_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano/version_validator_spec.rb
 ${GEM_LIBDIR}/spec/lib/capistrano_spec.rb
 ${GEM_LIBDIR}/spec/spec_helper.rb
 ${GEM_LIBDIR}/spec/support/.gitignore
 ${GEM_LIBDIR}/spec/support/Vagrantfile
 ${GEM_LIBDIR}/spec/support/matchers.rb
-${GEM_LIBDIR}/spec/support/tasks/database.cap
-${GEM_LIBDIR}/spec/support/tasks/fail.cap
-${GEM_LIBDIR}/spec/support/tasks/failed.cap
+${GEM_LIBDIR}/spec/support/tasks/database.rake
+${GEM_LIBDIR}/spec/support/tasks/fail.rake
+${GEM_LIBDIR}/spec/support/tasks/failed.rake
+${GEM_LIBDIR}/spec/support/tasks/root.rake
 ${GEM_LIBDIR}/spec/support/test_app.rb
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/sysutils/capistrano/distinfo b/sysutils/capistrano/distinfo
index 276f6843297..b87b8278e31 100644
--- a/sysutils/capistrano/distinfo
+++ b/sysutils/capistrano/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2014/03/14 18:01:03 taca Exp $
+$NetBSD: distinfo,v 1.15 2015/03/14 08:03:55 taca Exp $
 
-SHA1 (capistrano-3.1.0.gem) = ec183fb162c638c62d1f742a21291dd094001003
-RMD160 (capistrano-3.1.0.gem) = 13726c093a4796ad533dbb9d6f9d279bdb8d29ef
-Size (capistrano-3.1.0.gem) = 38400 bytes
+SHA1 (capistrano-3.4.0.gem) = a2935425e76fc40d395119b9ab8cb0cc420c7830
+RMD160 (capistrano-3.4.0.gem) = 56ecca0ab368dd71e60b76c8148c6372cb756d77
+Size (capistrano-3.4.0.gem) = 46080 bytes