Index: head/sysutils/vagrant/Makefile =================================================================== --- head/sysutils/vagrant/Makefile (revision 510275) +++ head/sysutils/vagrant/Makefile (revision 510276) @@ -1,83 +1,84 @@ # Created by: Joseph Benden # $FreeBSD$ PORTNAME= vagrant PORTVERSION= 2.2.5 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-builder>=2.1.2:devel/rubygem-builder \ rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \ rubygem-main>=1.0:devel/rubygem-main RUN_DEPENDS= rubygem-bcrypt_pbkdf>=1.0.0:security/rubygem-bcrypt_pbkdf \ rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \ rubygem-childprocess>=0.6.0:devel/rubygem-childprocess \ rubygem-ed25519>=1.2.4:security/rubygem-ed25519 \ rubygem-erubis>=2.7.0:www/rubygem-erubis \ rubygem-hashicorp-checkpoint>=0.1.5:www/rubygem-hashicorp-checkpoint \ rubygem-i18n>=1.1.1:devel/rubygem-i18n \ rubygem-listen>=3.1.5:devel/rubygem-listen \ rubygem-log4r>=1.1.9:sysutils/rubygem-log4r \ rubygem-net-scp>=1.2.0:security/rubygem-net-scp \ rubygem-net-sftp>=2.1:security/rubygem-net-sftp \ rubygem-net-ssh>=5.1.0:security/rubygem-net-ssh \ rubygem-rb-kqueue>=0.2.0:devel/rubygem-rb-kqueue \ rubygem-rest-client>=1.6.0:www/rubygem-rest-client \ rubygem-rubyzip>=1.2.2:archivers/rubygem-rubyzip \ rubygem-vagrant_cloud>=2.0.2:sysutils/rubygem-vagrant_cloud \ rubygem-wdm>=0.1.0:devel/rubygem-wdm \ rubygem-winrm>=2.1:sysutils/rubygem-winrm \ rubygem-winrm-elevated>=1.1:sysutils/rubygem-winrm-elevated \ rubygem-winrm-fs>=1.0:sysutils/rubygem-winrm-fs \ rubygem-ruby_dep>=0:devel/rubygem-ruby_dep \ ca_root_nss>=0:security/ca_root_nss \ curl:ftp/curl USE_GITHUB= yes GH_ACCOUNT= hashicorp USES= shebangfix SHEBANG_FILES= plugins/hosts/darwin/scripts/install_virtualbox.sh \ scripts/sign.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= -l --no-document --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} -- ${CONFIGURE_ARGS}) ${RMDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/build_info ${MKDIR} ${STAGEDIR}${DATADIR}/embedded/rgloader ${INSTALL_SCRIPT} ${FILESDIR}/loader.rb \ ${STAGEDIR}${DATADIR}/embedded/rgloader/loader.rb post-install: ${RMDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/doc ${RM} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/.runner.sh .include Index: head/sysutils/vagrant/files/patch-gemspec =================================================================== --- head/sysutils/vagrant/files/patch-gemspec (revision 510275) +++ head/sysutils/vagrant/files/patch-gemspec (revision 510276) @@ -1,31 +1,32 @@ ---- vagrant.gemspec.orig 2018-11-16 19:28:06 UTC +--- vagrant.gemspec.orig 2019-06-25 21:28:53 UTC +++ vagrant.gemspec @@ -17,16 +17,16 @@ Gem::Specification.new do |s| s.rubyforge_project = "vagrant" s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" - s.add_dependency "childprocess", "~> 0.6.0" + s.add_dependency "childprocess", ">= 0.6.0" s.add_dependency "ed25519", "~> 1.2.4" s.add_dependency "erubis", "~> 2.7.0" - s.add_dependency "i18n", "~> 1.1.1" + s.add_dependency "i18n", ">= 1.1.1" s.add_dependency "listen", "~> 3.1.5" s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" - s.add_dependency "net-ssh", "~> 5.1.0" +- s.add_dependency "net-ssh", "~> 5.1.0" ++ s.add_dependency "net-ssh", ">= 5.1.0" s.add_dependency "net-sftp", "~> 2.1" - s.add_dependency "net-scp", "~> 1.2.0" + s.add_dependency "net-scp", ">= 1.2.0" s.add_dependency "rb-kqueue", "~> 0.2.0" s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" s.add_dependency "rubyzip", "~> 1.2.2" @@ -40,7 +40,7 @@ Gem::Specification.new do |s| # 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" # Constraint rake to properly handle deprecated method usage # from within rspec