diff options
| author | Nikolai Lifanov <lifanov@FreeBSD.org> | 2017-01-18 17:49:22 +0000 |
|---|---|---|
| committer | Nikolai Lifanov <lifanov@FreeBSD.org> | 2017-01-18 17:49:22 +0000 |
| commit | eeb47ebfaa7d93d3c1c6c40f553c3f78e6ea6f63 (patch) | |
| tree | a8cebb4354ee9452d355bc44c3ea17c33a952631 /sysutils/vagrant | |
| parent | ddaf098cbc6c8df15373adfab80e3ea4ffdc5140 (diff) | |
| download | ports-eeb47ebfaa7d93d3c1c6c40f553c3f78e6ea6f63.tar.gz ports-eeb47ebfaa7d93d3c1c6c40f553c3f78e6ea6f63.zip | |
fix sysutils/vagrant by relaxing ruby_dep requirement
PR: 215905
Submitted by: matthew
Reviewed by: matthew
Approved by: matthew (mentor), joe@thrallingpenguin.com (maintainer)
Differential Revision: https://reviews.freebsd.org/D9232
Notes
Notes:
svn path=/head/; revision=431819
Diffstat (limited to 'sysutils/vagrant')
| -rw-r--r-- | sysutils/vagrant/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/vagrant/files/patch-bin_vagrant | 4 | ||||
| -rw-r--r-- | sysutils/vagrant/files/patch-gemspec | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile index 4f811c467f8e..6487eaf2116e 100644 --- a/sysutils/vagrant/Makefile +++ b/sysutils/vagrant/Makefile @@ -3,6 +3,7 @@ PORTNAME= vagrant PORTVERSION= 1.8.7 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils rubygems devel diff --git a/sysutils/vagrant/files/patch-bin_vagrant b/sysutils/vagrant/files/patch-bin_vagrant index 47a803d9bb8d..600c7dbb12e5 100644 --- a/sysutils/vagrant/files/patch-bin_vagrant +++ b/sysutils/vagrant/files/patch-bin_vagrant @@ -1,11 +1,11 @@ ---- bin/vagrant.orig 2015-12-24 21:26:53 UTC +--- bin/vagrant.orig 2016-11-04 21:32:25 UTC +++ bin/vagrant @@ -5,6 +5,9 @@ # initializing which have historically resulted in stack traces. Signal.trap("INT") { abort } +ENV["VAGRANT_INSTALLER_ENV"] = 'true' -+ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"] = '/usr/local/share/vagrant/embedded' ++ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"] = '@PREFIX@/share/vagrant/embedded' + # Split arguments by "--" if its there, we'll recombine them later argv = ARGV.dup diff --git a/sysutils/vagrant/files/patch-gemspec b/sysutils/vagrant/files/patch-gemspec index 5e657428ac96..ed49bedeb40d 100644 --- a/sysutils/vagrant/files/patch-gemspec +++ b/sysutils/vagrant/files/patch-gemspec @@ -1,4 +1,4 @@ ---- vagrant.gemspec.orig 2016-07-19 03:39:08 UTC +--- vagrant.gemspec.orig 2016-11-04 21:32:25 UTC +++ vagrant.gemspec @@ -20,16 +20,16 @@ Gem::Specification.new do |s| # APIs, so even point releases can introduce breaking changes. These changes @@ -20,12 +20,19 @@ s.add_dependency "rb-kqueue", "~> 0.2.0" s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" s.add_dependency "wdm", "~> 0.1.0" -@@ -37,7 +37,7 @@ Gem::Specification.new do |s| +@@ -37,13 +37,13 @@ Gem::Specification.new do |s| s.add_dependency "winrm-fs", "~> 0.3.0" # We lock this down to avoid compilation issues. - s.add_dependency "nokogiri", "= 1.6.7.1" + s.add_dependency "nokogiri", ">= 1.6.7.1" + # NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions + # of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5). + # Explicit constraint is defined to provide required dependency to listen without imposing + # tighter restrictions on valid ruby versions +- s.add_dependency "ruby_dep", "<= 1.3.1" ++ s.add_dependency "ruby_dep" + s.add_development_dependency "rake" s.add_development_dependency "rspec", "~> 2.14.0" |