Index: head/sysutils/vagrant/Makefile =================================================================== --- head/sysutils/vagrant/Makefile (revision 431818) +++ head/sysutils/vagrant/Makefile (revision 431819) @@ -1,75 +1,76 @@ # Created by: Joseph Benden # $FreeBSD$ PORTNAME= vagrant PORTVERSION= 1.8.7 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils rubygems devel MAINTAINER= joe@thrallingpenguin.com COMMENT= Vagrant Virtual Machine Manager LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rubygem-builder32>=2.1.2:devel/rubygem-builder32 \ rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \ rubygem-main>=1.0:devel/rubygem-main RUN_DEPENDS= rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \ rubygem-childprocess>=0.5.1:devel/rubygem-childprocess \ rubygem-erubis>=2.7.0:www/rubygem-erubis \ rubygem-hashicorp-checkpoint>=0.1.4:www/rubygem-hashicorp-checkpoint \ rubygem-i18n>=0.6.9:devel/rubygem-i18n \ rubygem-listen>=3.1.5:devel/rubygem-listen \ rubygem-log4r>=1.1.10:sysutils/rubygem-log4r \ rubygem-net-scp>=1.1.0:security/rubygem-net-scp \ rubygem-net-sftp>=2.1:security/rubygem-net-sftp \ rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \ rubygem-nokogiri>=1.6.3.1:textproc/rubygem-nokogiri \ rubygem-rb-kqueue>=0.2.2:devel/rubygem-rb-kqueue \ rubygem-rest-client>=1.6.0:www/rubygem-rest-client \ rubygem-wdm>=0.1.0:devel/rubygem-wdm \ rubygem-winrm>=1.6.0:sysutils/rubygem-winrm \ rubygem-winrm-fs>=0.3.0:sysutils/rubygem-winrm-fs \ rubygem-ruby_dep>=0:devel/rubygem-ruby_dep USE_GITHUB= yes GH_ACCOUNT= mitchellh USES= shebangfix SHEBANG_FILES= scripts/website_push_docs.sh \ scripts/website_push_www.sh USE_RUBY= yes GEMFILES= vagrant-${PORTVERSION}.gem RUBYGEMBIN= gem${RUBY_SUFFIX} PLIST_SUB+= GEMS_DIR="lib/ruby/gems/${RUBY_VER}/" \ GEM_BASE_DIR="lib/ruby/gems/${RUBY_VER}/gems" \ DOC_DIR="lib/ruby/gems/${RUBY_VER}/doc" \ PORTVERSION="${PORTVERSION}" NO_ARCH= yes RUBYGEM_ARGS= --no-ri --no-rdoc -l --no-update-sources \ --install-dir ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} \ --ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin GEM_ENV+= RB_USER_INSTALL=yes post-patch: @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' ${WRKSRC}/bin/vagrant do-build: (cd ${WRKSRC}; (${ECHO_CMD} -e "install:\n\techo\n") > Makefile) (cd ${WRKSRC}; ${SETENV} VAGRANT_INSTALLER_ENV=yes \ ${GEM_ENV} ${RUBYGEMBIN} build vagrant.gemspec) (cd ${WRKSRC}; ${SETENV} VAGRANT_INSTALLER_ENV=yes \ ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} \ ${GEMFILES} -- --build-args ${CONFIGURE_ARGS}) ${MKDIR} ${STAGEDIR}${DATADIR}/embedded/rgloader ${INSTALL_DATA} ${FILESDIR}/cacert.pem \ ${STAGEDIR}${DATADIR}/embedded/cacert.pem ${INSTALL_SCRIPT} ${FILESDIR}/loader.rb \ ${STAGEDIR}${DATADIR}/embedded/rgloader/loader.rb post-install: ${RMDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/doc .include Index: head/sysutils/vagrant/files/patch-bin_vagrant =================================================================== --- head/sysutils/vagrant/files/patch-bin_vagrant (revision 431818) +++ head/sysutils/vagrant/files/patch-bin_vagrant (revision 431819) @@ -1,12 +1,12 @@ ---- 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 argv_extra = [] Index: head/sysutils/vagrant/files/patch-gemspec =================================================================== --- head/sysutils/vagrant/files/patch-gemspec (revision 431818) +++ head/sysutils/vagrant/files/patch-gemspec (revision 431819) @@ -1,31 +1,38 @@ ---- 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 # are *untestable* until after a release is made because there is no way for # Bundler to exec into itself. Please do not update the Bundler constraint. - s.add_dependency "bundler", "= 1.12.5" + s.add_dependency "bundler", ">= 1.12.5" s.add_dependency "childprocess", "~> 0.5.0" s.add_dependency "erubis", "~> 2.7.0" s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0" s.add_dependency "listen", "~> 3.1.5" s.add_dependency "hashicorp-checkpoint", "~> 0.1.1" s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" - s.add_dependency "net-ssh", "~> 3.0.1" + s.add_dependency "net-ssh", ">= 3.0.1" s.add_dependency "net-sftp", "~> 2.1" - s.add_dependency "net-scp", "~> 1.1.0" + s.add_dependency "net-scp", ">= 1.1.0" 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"