Index: head/sysutils/vagrant/Makefile =================================================================== --- head/sysutils/vagrant/Makefile (revision 411510) +++ head/sysutils/vagrant/Makefile (revision 411511) @@ -1,75 +1,76 @@ # Created by: Joseph Benden # $FreeBSD$ PORTNAME= vagrant PORTVERSION= 1.8.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 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:${PORTSDIR}/devel/rubygem-builder32 \ rubygem-bundler>=1.5.3:${PORTSDIR}/sysutils/rubygem-bundler \ rubygem-main>=1.0:${PORTSDIR}/devel/rubygem-main RUN_DEPENDS= rubygem-bundler>=1.5.3:${PORTSDIR}/sysutils/rubygem-bundler \ rubygem-childprocess>=0.5.1:${PORTSDIR}/devel/rubygem-childprocess \ rubygem-erubis>=2.7.0:${PORTSDIR}/www/rubygem-erubis \ rubygem-hashicorp-checkpoint>=0.1.4:${PORTSDIR}/www/rubygem-hashicorp-checkpoint \ rubygem-i18n>=0.6.9:${PORTSDIR}/devel/rubygem-i18n \ rubygem-listen>=3.0.2:${PORTSDIR}/devel/rubygem-listen \ rubygem-log4r>=1.1.10:${PORTSDIR}/sysutils/rubygem-log4r \ rubygem-net-scp>=1.1.0:${PORTSDIR}/security/rubygem-net-scp \ rubygem-net-sftp>=2.1:${PORTSDIR}/security/rubygem-net-sftp \ rubygem-net-ssh>=3.0.1:${PORTSDIR}/security/rubygem-net-ssh \ rubygem-nokogiri>=1.6.3.1:${PORTSDIR}/textproc/rubygem-nokogiri \ rubygem-rb-kqueue>=0.2.2:${PORTSDIR}/devel/rubygem-rb-kqueue \ rubygem-rest-client>=1.6.0:${PORTSDIR}/www/rubygem-rest-client \ rubygem-wdm>=0.1.0:${PORTSDIR}/devel/rubygem-wdm \ rubygem-winrm>=1.3.0:${PORTSDIR}/sysutils/rubygem-winrm \ rubygem-winrm-fs>=0.2.0:${PORTSDIR}/sysutils/rubygem-winrm-fs USE_GITHUB= yes GH_ACCOUNT= mitchellh USES= shebangfix SHEBANG_FILES= scripts/bintray_upload.sh \ 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-vagrant.gemspec =================================================================== --- head/sysutils/vagrant/files/patch-vagrant.gemspec (revision 411510) +++ head/sysutils/vagrant/files/patch-vagrant.gemspec (revision 411511) @@ -1,29 +1,31 @@ --- vagrant.gemspec.orig 2015-12-24 21:26:53 UTC +++ vagrant.gemspec -@@ -15,7 +15,7 @@ Gem::Specification.new do |s| +@@ -15,16 +15,16 @@ Gem::Specification.new do |s| s.required_rubygems_version = ">= 1.3.6" s.rubyforge_project = "vagrant" - s.add_dependency "bundler", ">= 1.5.2", "<= 1.10.6" + s.add_dependency "bundler", ">= 1.5.2" s.add_dependency "childprocess", "~> 0.5.0" s.add_dependency "erubis", "~> 2.7.0" s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0" -@@ -24,7 +24,7 @@ Gem::Specification.new do |s| + s.add_dependency "listen", "~> 3.0.2" + 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-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", "< 2.0" s.add_dependency "wdm", "~> 0.1.0" @@ -32,7 +32,7 @@ Gem::Specification.new do |s| s.add_dependency "winrm-fs", "~> 0.2.2" # We lock this down to avoid compilation issues. - s.add_dependency "nokogiri", "= 1.6.3.1" + s.add_dependency "nokogiri", ">= 1.6.3.1" s.add_development_dependency "rake" s.add_development_dependency "rspec", "~> 2.14.0"