Index: head/sysutils/vagrant/Makefile =================================================================== --- head/sysutils/vagrant/Makefile (revision 422636) +++ head/sysutils/vagrant/Makefile (revision 422637) @@ -1,76 +1,76 @@ # Created by: Joseph Benden # $FreeBSD$ PORTNAME= vagrant PORTVERSION= 1.8.5 -PORTREVISION= 1 +PORTREVISION= 2 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-plugins_guests_bsd_cap_public__key.rb =================================================================== --- head/sysutils/vagrant/files/patch-plugins_guests_bsd_cap_public__key.rb (nonexistent) +++ head/sysutils/vagrant/files/patch-plugins_guests_bsd_cap_public__key.rb (revision 422637) @@ -0,0 +1,10 @@ +--- plugins/guests/bsd/cap/public_key.rb.orig 2016-09-16 14:28:57 UTC ++++ plugins/guests/bsd/cap/public_key.rb +@@ -54,6 +54,7 @@ module VagrantPlugins + if test -f ~/.ssh/authorized_keys; then + grep -v -x -f '#{remote_path}' ~/.ssh/authorized_keys > ~/.ssh/authorized_keys.tmp + mv ~/.ssh/authorized_keys.tmp ~/.ssh/authorized_keys ++ chmod 0600 ~/.ssh/authorized_keys + fi + + rm -f '#{remote_path}' Property changes on: head/sysutils/vagrant/files/patch-plugins_guests_bsd_cap_public__key.rb ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/vagrant/files/patch-plugins_guests_linux_cap_public__key.rb =================================================================== --- head/sysutils/vagrant/files/patch-plugins_guests_linux_cap_public__key.rb (nonexistent) +++ head/sysutils/vagrant/files/patch-plugins_guests_linux_cap_public__key.rb (revision 422637) @@ -0,0 +1,10 @@ +--- plugins/guests/linux/cap/public_key.rb.orig 2016-09-16 14:28:57 UTC ++++ plugins/guests/linux/cap/public_key.rb +@@ -54,6 +54,7 @@ module VagrantPlugins + if test -f ~/.ssh/authorized_keys; then + grep -v -x -f '#{remote_path}' ~/.ssh/authorized_keys > ~/.ssh/authorized_keys.tmp + mv ~/.ssh/authorized_keys.tmp ~/.ssh/authorized_keys ++ chmod 0600 ~/.ssh/authorized_keys + fi + + rm -f '#{remote_path}' Property changes on: head/sysutils/vagrant/files/patch-plugins_guests_linux_cap_public__key.rb ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property