Index: head/sysutils/rubygem-bolt/Makefile
===================================================================
--- head/sysutils/rubygem-bolt/Makefile	(revision 557086)
+++ head/sysutils/rubygem-bolt/Makefile	(revision 557087)
@@ -1,43 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	bolt
-PORTVERSION=	2.35.0
+PORTVERSION=	2.36.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Execute commands remotely over SSH and WinRM
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	puppet:sysutils/puppet6 \
-		r10k:sysutils/rubygem-r10k \
+RUN_DEPENDS=	r10k:sysutils/rubygem-r10k \
 		rubygem-addressable>=2.5:www/rubygem-addressable \
 		rubygem-aws-sdk-ec2>1:devel/rubygem-aws-sdk-ec2 \
 		rubygem-CFPropertyList>=2.2:devel/rubygem-CFPropertyList \
 		rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \
 		rubygem-hiera-eyaml>=3:sysutils/rubygem-hiera-eyaml \
 		rubygem-jwt>=2.2:www/rubygem-jwt \
 		rubygem-logging>=2.2:devel/rubygem-logging \
 		rubygem-net-scp>=1.2:security/rubygem-net-scp \
 		rubygem-net-ssh>=4.0:security/rubygem-net-ssh \
 		rubygem-net-ssh-krb>=0.5:security/rubygem-net-ssh-krb \
 		rubygem-orchestrator_client>=0.4:net/rubygem-orchestrator_client \
 		rubygem-paint>=2.2:devel/rubygem-paint \
 		rubygem-puppet-resource_api>=1.8.1:devel/rubygem-puppet-resource_api \
 		rubygem-puppet-strings>=2.3:textproc/rubygem-puppet-strings \
 		rubygem-puppetfile-resolver>=0.1:sysutils/rubygem-puppetfile-resolver \
 		rubygem-ruby_smb>=1.0:net/rubygem-ruby_smb \
 		rubygem-terminal-table>=1.8:textproc/rubygem-terminal-table \
 		rubygem-winrm-fs>=1.3:sysutils/rubygem-winrm-fs \
 		rubygem-winrm>=2.0:sysutils/rubygem-winrm
 
 USES=		gem shebangfix
 USE_RUBY=	yes
 
 ruby_OLD_CMD+=	/opt/puppetlabs/puppet/bin/ruby
 SHEBANG_FILES=	libexec/*
 
 PLIST_FILES=	bin/bolt
+
+OPTIONS_SINGLE= PUPPET
+OPTIONS_SINGLE_PUPPET=PUPPET5 PUPPET6 PUPPET7
+OPTIONS_DEFAULT=PUPPET6
+
+PUPPET5_DESC=   Depend on sysutils/puppet5
+PUPPET6_DESC=   Depend on sysutils/puppet6
+PUPPET7_DESC=   Depend on sysutils/puppet7
+
+PUPPET5_RUN_DEPENDS=puppet:sysutils/puppet5
+PUPPET6_RUN_DEPENDS=puppet:sysutils/puppet6
+PUPPET7_RUN_DEPENDS=puppet:sysutils/puppet7
 
 .include <bsd.port.mk>
Index: head/sysutils/rubygem-bolt/distinfo
===================================================================
--- head/sysutils/rubygem-bolt/distinfo	(revision 557086)
+++ head/sysutils/rubygem-bolt/distinfo	(revision 557087)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605678052
-SHA256 (rubygem/bolt-2.35.0.gem) = 6d335c09104b13dd294d6023c1b456169bb4abe868b92adf852d93c5ba7ffd82
-SIZE (rubygem/bolt-2.35.0.gem) = 199680
+TIMESTAMP = 1607115029
+SHA256 (rubygem/bolt-2.36.0.gem) = a998ceff38bfecd45c809d30a58a6a267e0b45e7b8282b9e60bb284840e77a90
+SIZE (rubygem/bolt-2.36.0.gem) = 203264
Index: head/sysutils/rubygem-bolt/files/patch-bolt.gemspec
===================================================================
--- head/sysutils/rubygem-bolt/files/patch-bolt.gemspec	(revision 557086)
+++ head/sysutils/rubygem-bolt/files/patch-bolt.gemspec	(revision 557087)
@@ -1,71 +1,71 @@
---- bolt.gemspec.orig	2020-11-06 22:18:50 UTC
+--- bolt.gemspec.orig	2020-12-04 20:50:32 UTC
 +++ bolt.gemspec
 @@ -26,7 +26,7 @@ Gem::Specification.new do |s|
      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
        s.add_runtime_dependency(%q<addressable>.freeze, ["~> 2.5"])
        s.add_runtime_dependency(%q<aws-sdk-ec2>.freeze, ["~> 1"])
 -      s.add_runtime_dependency(%q<CFPropertyList>.freeze, ["~> 2.2"])
 +      s.add_runtime_dependency(%q<CFPropertyList>.freeze, [">= 2.2"])
        s.add_runtime_dependency(%q<concurrent-ruby>.freeze, ["~> 1.0"])
        s.add_runtime_dependency(%q<hiera-eyaml>.freeze, ["~> 3"])
        s.add_runtime_dependency(%q<jwt>.freeze, ["~> 2.2"])
 @@ -37,11 +37,11 @@ Gem::Specification.new do |s|
        s.add_runtime_dependency(%q<net-ssh-krb>.freeze, ["~> 0.5"])
        s.add_runtime_dependency(%q<orchestrator_client>.freeze, ["~> 0.4"])
-       s.add_runtime_dependency(%q<puppet>.freeze, [">= 6.18.0", "< 6.20"])
+       s.add_runtime_dependency(%q<puppet>.freeze, [">= 6.18.0"])
 -      s.add_runtime_dependency(%q<puppetfile-resolver>.freeze, ["~> 0.4"])
 +      s.add_runtime_dependency(%q<puppetfile-resolver>.freeze, [">= 0.4"])
        s.add_runtime_dependency(%q<puppet-resource_api>.freeze, [">= 1.8.1"])
        s.add_runtime_dependency(%q<puppet-strings>.freeze, ["~> 2.3"])
        s.add_runtime_dependency(%q<r10k>.freeze, ["~> 3.1"])
 -      s.add_runtime_dependency(%q<ruby_smb>.freeze, ["~> 1.0"])
 +      s.add_runtime_dependency(%q<ruby_smb>.freeze, [">= 1.0"])
        s.add_runtime_dependency(%q<terminal-table>.freeze, ["~> 1.8"])
        s.add_runtime_dependency(%q<winrm>.freeze, ["~> 2.0"])
        s.add_runtime_dependency(%q<winrm-fs>.freeze, ["~> 1.3"])
 @@ -53,7 +53,7 @@ Gem::Specification.new do |s|
      else
        s.add_dependency(%q<addressable>.freeze, ["~> 2.5"])
        s.add_dependency(%q<aws-sdk-ec2>.freeze, ["~> 1"])
 -      s.add_dependency(%q<CFPropertyList>.freeze, ["~> 2.2"])
 +      s.add_dependency(%q<CFPropertyList>.freeze, [">= 2.2"])
        s.add_dependency(%q<concurrent-ruby>.freeze, ["~> 1.0"])
        s.add_dependency(%q<hiera-eyaml>.freeze, ["~> 3"])
        s.add_dependency(%q<jwt>.freeze, ["~> 2.2"])
 @@ -64,11 +64,11 @@ Gem::Specification.new do |s|
        s.add_dependency(%q<net-ssh-krb>.freeze, ["~> 0.5"])
        s.add_dependency(%q<orchestrator_client>.freeze, ["~> 0.4"])
-       s.add_dependency(%q<puppet>.freeze, [">= 6.18.0", "< 6.20"])
+       s.add_dependency(%q<puppet>.freeze, [">= 6.18.0"])
 -      s.add_dependency(%q<puppetfile-resolver>.freeze, ["~> 0.4"])
 +      s.add_dependency(%q<puppetfile-resolver>.freeze, [">= 0.4"])
        s.add_dependency(%q<puppet-resource_api>.freeze, [">= 1.8.1"])
        s.add_dependency(%q<puppet-strings>.freeze, ["~> 2.3"])
        s.add_dependency(%q<r10k>.freeze, ["~> 3.1"])
 -      s.add_dependency(%q<ruby_smb>.freeze, ["~> 1.0"])
 +      s.add_dependency(%q<ruby_smb>.freeze, [">= 1.0"])
        s.add_dependency(%q<terminal-table>.freeze, ["~> 1.8"])
        s.add_dependency(%q<winrm>.freeze, ["~> 2.0"])
        s.add_dependency(%q<winrm-fs>.freeze, ["~> 1.3"])
 @@ -81,7 +81,7 @@ Gem::Specification.new do |s|
    else
      s.add_dependency(%q<addressable>.freeze, ["~> 2.5"])
      s.add_dependency(%q<aws-sdk-ec2>.freeze, ["~> 1"])
 -    s.add_dependency(%q<CFPropertyList>.freeze, ["~> 2.2"])
 +    s.add_dependency(%q<CFPropertyList>.freeze, [">= 2.2"])
      s.add_dependency(%q<concurrent-ruby>.freeze, ["~> 1.0"])
      s.add_dependency(%q<hiera-eyaml>.freeze, ["~> 3"])
      s.add_dependency(%q<jwt>.freeze, ["~> 2.2"])
 @@ -92,11 +92,11 @@ Gem::Specification.new do |s|
      s.add_dependency(%q<net-ssh-krb>.freeze, ["~> 0.5"])
      s.add_dependency(%q<orchestrator_client>.freeze, ["~> 0.4"])
-     s.add_dependency(%q<puppet>.freeze, [">= 6.18.0", "< 6.20"])
+     s.add_dependency(%q<puppet>.freeze, [">= 6.18.0"])
 -    s.add_dependency(%q<puppetfile-resolver>.freeze, ["~> 0.4"])
 +    s.add_dependency(%q<puppetfile-resolver>.freeze, [">= 0.4"])
      s.add_dependency(%q<puppet-resource_api>.freeze, [">= 1.8.1"])
      s.add_dependency(%q<puppet-strings>.freeze, ["~> 2.3"])
      s.add_dependency(%q<r10k>.freeze, ["~> 3.1"])
 -    s.add_dependency(%q<ruby_smb>.freeze, ["~> 1.0"])
 +    s.add_dependency(%q<ruby_smb>.freeze, [">= 1.0"])
      s.add_dependency(%q<terminal-table>.freeze, ["~> 1.8"])
      s.add_dependency(%q<winrm>.freeze, ["~> 2.0"])
      s.add_dependency(%q<winrm-fs>.freeze, ["~> 1.3"])