Date: Wed, 18 Jan 2017 17:49:22 +0000 (UTC) From: Nikolai Lifanov <lifanov@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431819 - in head/sysutils/vagrant: . files Message-ID: <201701181749.v0IHnMrS055868@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lifanov Date: Wed Jan 18 17:49:22 2017 New Revision: 431819 URL: https://svnweb.freebsd.org/changeset/ports/431819 Log: 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 Modified: head/sysutils/vagrant/Makefile head/sysutils/vagrant/files/patch-bin_vagrant head/sysutils/vagrant/files/patch-gemspec Modified: head/sysutils/vagrant/Makefile ============================================================================== --- head/sysutils/vagrant/Makefile Wed Jan 18 17:46:54 2017 (r431818) +++ head/sysutils/vagrant/Makefile Wed Jan 18 17:49:22 2017 (r431819) @@ -3,6 +3,7 @@ PORTNAME= vagrant PORTVERSION= 1.8.7 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils rubygems devel Modified: head/sysutils/vagrant/files/patch-bin_vagrant ============================================================================== --- head/sysutils/vagrant/files/patch-bin_vagrant Wed Jan 18 17:46:54 2017 (r431818) +++ head/sysutils/vagrant/files/patch-bin_vagrant Wed Jan 18 17:49:22 2017 (r431819) @@ -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 Modified: head/sysutils/vagrant/files/patch-gemspec ============================================================================== --- head/sysutils/vagrant/files/patch-gemspec Wed Jan 18 17:46:54 2017 (r431818) +++ head/sysutils/vagrant/files/patch-gemspec Wed Jan 18 17:49:22 2017 (r431819) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701181749.v0IHnMrS055868>