freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix sysutils/vagrant by relaxing ruby_dep requirement

Browse Source 
PR:		215905
Submitted by:	matthew
Reviewed by:	matthew
Approved by:	matthew (mentor), joe@thrallingpenguin.com (maintainer)
Differential Revision:	https://reviews.freebsd.org/D9232
This commit is contained in:
Nikolai Lifanov
2017-01-18 17:49:22 +00:00
parent ddaf098cbc
commit eeb47ebfaa
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/vagrant/Makefile
View File

@@ -3,6 +3,7 @@
PORTNAME= vagrant
PORTVERSION= 1.8.7
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= sysutils rubygems devel

4
sysutils/vagrant/files/patch-bin_vagrant
View File

@@ -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

11
sysutils/vagrant/files/patch-gemspec
View File

@@ -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"