- Update to 1.5.3

PR:		ports/188674
Submitted by:	Joseph Benden <joe@thrallingpenguin.com> (maintainer)

5 files changed, 17 insertions, 25 deletions

diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile
index aaebfbff89e8..6597a14d10c8 100644
--- a/sysutils/vagrant/Makefile
+++ b/sysutils/vagrant/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vagrant
-PORTVERSION=	1.5.2
+PORTVERSION=	1.5.3
 CATEGORIES=	sysutils rubygems devel
 MASTER_SITES=	LOCAL/swills https://codeload.github.com/mitchellh/vagrant/legacy.tar.gz/v${PORTVERSION}?dummy=/
 
@@ -30,7 +30,7 @@ RUN_DEPENDS=	rubygem-main>=1.0:${PORTSDIR}/devel/rubygem-main \
 		rubygem-rb-kqueue>=0.2.2:${PORTSDIR}/devel/rubygem-rb-kqueue \
 		rubygem-wdm>=0.1.0:${PORTSDIR}/devel/rubygem-wdm
 
-WRKSRC=		${WRKDIR}/mitchellh-vagrant-5b360d0
+WRKSRC=		${WRKDIR}/mitchellh-vagrant-8c05b08
 USE_RUBY=	yes
 GEMFILES=	vagrant-${PORTVERSION}.gem
 RUBYGEMBIN=	gem${RUBY_SUFFIX}
@@ -44,7 +44,6 @@ GEM_ENV+=	RB_USER_INSTALL=yes
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/vagrant.orig
-	@${RM} ${WRKSRC}/vagrant.gemspec.orig
 
 do-build:
 	@(cd ${WRKSRC}; (${ECHO_CMD} -e "install:\n\techo\n") > Makefile)
diff --git a/sysutils/vagrant/distinfo b/sysutils/vagrant/distinfo
index 0ae5aed4ea22..fb09f04f5e48 100644
--- a/sysutils/vagrant/distinfo
+++ b/sysutils/vagrant/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vagrant-1.5.2.tar.gz) = 6fd52cec74253e7bcbc4a847a9f5524b27f29dcca9bf6e5c2736b9cfc9c617f7
-SIZE (vagrant-1.5.2.tar.gz) = 2671799
+SHA256 (vagrant-1.5.3.tar.gz) = d48fb86566c9fa75d80437445c654f0376dda3a7e14bf4ba9a53fd961b17d9d3
+SIZE (vagrant-1.5.3.tar.gz) = 2683655
diff --git a/sysutils/vagrant/files/patch-is-vagrant-installer.patch b/sysutils/vagrant/files/patch-vagrant-is-vagrant-installer.patch
index 8a885423daa1..546340aa4df6 100644
--- a/sysutils/vagrant/files/patch-is-vagrant-installer.patch
+++ b/sysutils/vagrant/files/patch-vagrant-is-vagrant-installer.patch
@@ -1,5 +1,5 @@
---- bin/vagrant.orig	2014-03-14 10:26:06.000000000 -0700
-+++ bin/vagrant	2014-03-14 10:27:05.000000000 -0700
+--- bin/vagrant.orig	2014-04-15 12:11:54.000000000 -0700
++++ bin/vagrant	2014-04-15 12:11:16.000000000 -0700
 @@ -5,6 +5,8 @@
  # initializing which have historically resulted in stack traces.
  Signal.trap("INT") { abort }
diff --git a/sysutils/vagrant/files/patch-vagrant.gemspec b/sysutils/vagrant/files/patch-vagrant.gemspec
deleted file mode 100644
index eb856da7aa7c..000000000000
--- a/sysutils/vagrant/files/patch-vagrant.gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vagrant.gemspec.orig	2014-03-21 01:53:27.910407727 +0000
-+++ ./vagrant.gemspec	2014-03-21 01:53:45.557406276 +0000
-@@ -18,7 +18,7 @@
-   s.add_dependency "childprocess", "~> 0.5.0"
-   s.add_dependency "erubis", "~> 2.7.0"
-   s.add_dependency "i18n", "~> 0.6.0"
--  s.add_dependency "listen", "~> 2.4.0"
-+  s.add_dependency "listen", "~> 2.7.1"
-   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
-   s.add_dependency "net-ssh", ">= 2.6.6", "< 2.8.0"
-   s.add_dependency "net-scp", "~> 1.1.0"
diff --git a/sysutils/vagrant/pkg-plist b/sysutils/vagrant/pkg-plist
index a4aab91544ee..ebe14f48e2d1 100644
--- a/sysutils/vagrant/pkg-plist
+++ b/sysutils/vagrant/pkg-plist
@@ -737,6 +737,14 @@ bin/vagrant
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/halt_test.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/mount_nfs_test.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/rsync_test.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/coreos/cap/docker.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/fedora/cap/change_host_name.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/action/check_enabled.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/scripts/check_hyperv.ps1
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/linux/docker_daemon_running.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/ansible/config_test.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/support/shared/config.rb
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/util
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/plugin/v2
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/plugin/v1
@@ -759,6 +767,9 @@ bin/vagrant
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/docker
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/chef/provisioner
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/chef
+@dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/support/shared
+@dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/support
+@dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/ansible
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/virtualbox/support/shared
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/virtualbox/support
@@ -989,10 +1000,3 @@ bin/vagrant
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/contrib
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/bin
 @dirrm %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%
-@unexec rmdir %D/%%GEMS_DIR%%/doc 2>/dev/null || true
-@unexec rmdir %D/%%GEMS_DIR%%/specifications 2>/dev/null || true
-@unexec rmdir %D/%%GEMS_DIR%%/gems 2>/dev/null || true
-@unexec rmdir %D/%%GEMS_DIR%%/cache 2>/dev/null || true
-@unexec rmdir %D/lib/ruby/gems/%%RUBY_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/ruby/gems 2>/dev/null || true
-@unexec rmdir %D/lib/ruby 2>/dev/null || true