Update to 3.3.0

With hat:	puppet

sysutils/rubygem-r10k/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	r10k
-PORTVERSION=	3.2.0
+PORTVERSION=	3.3.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
@@ -29,6 +29,7 @@ SHEBANG_FILES=	integration/*/*.sh
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
+		${WRKSRC}/lib/r10k/settings.rb \
 		${WRKSRC}/lib/r10k/settings/loader.rb
 
 .include <bsd.port.mk>

sysutils/rubygem-r10k/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1555524600
-SHA256 (rubygem/r10k-3.2.0.gem) = 7296c8062ee2d9f3cd2840f2b8a5f64c98a9dbd70ac265de931cf4dd369d5b7a
-SIZE (rubygem/r10k-3.2.0.gem) = 206336
+TIMESTAMP = 1560015358
+SHA256 (rubygem/r10k-3.3.0.gem) = e50eb955be198fda25a1c3704793f8dbc9eb0caac25039727027dd80b8b97a9c
+SIZE (rubygem/r10k-3.3.0.gem) = 206848

sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb

@@ -0,0 +1,11 @@
+--- lib/r10k/action/runner.rb.orig
++++ lib/r10k/action/runner.rb
+@@ -44,7 +44,7 @@
+ 
+         overrides = {}
+         overrides[:cachedir] = @opts[:cachedir] unless @opts[:cachedir].nil?
+-        overrides[:deploy] = {} if @opts[:'puppet-path'] || @opts[:'generate-types']
++        overrides[:deploy] = {} if !@opts[:'puppet-path'].nil? || !@opts[:'generate-types'].nil?
+         overrides[:deploy][:puppet_path] = @opts[:'puppet-path'] unless @opts[:'puppet-path'].nil?
+         overrides[:deploy][:generate_types] = @opts[:'generate-types'] unless @opts[:'generate-types'].nil?
+ 

sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb

@@ -0,0 +1,13 @@
+--- lib/r10k/settings.rb.orig
++++ lib/r10k/settings.rb
+@@ -123,8 +123,8 @@
+         }),
+ 
+         Definition.new(:puppet_path, {
+-          :desc => "Path to puppet executable. Defaults to /opt/puppetlabs/bin/puppet.",
+-          :default => '/opt/puppetlabs/bin/puppet',
++          :desc => "Path to puppet executable. Defaults to %%PREFIX%%/bin/puppet.",
++          :default => '%%PREFIX%%/bin/puppet',
+           :validate => lambda do |value|
+             unless File.executable? value
+               raise ArgumentError, "The specified puppet executable #{value} is not executable"

sysutils/rubygem-r10k/files/patch-r10k.gemspec

@@ -0,0 +1,29 @@
+--- r10k.gemspec.orig
++++ r10k.gemspec
+@@ -24,7 +24,7 @@
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<colored>.freeze, ["= 1.2"])
+-      s.add_runtime_dependency(%q<cri>.freeze, ["= 2.15.6"])
++      s.add_runtime_dependency(%q<cri>.freeze, ["~> 2.15.6"])
+       s.add_runtime_dependency(%q<log4r>.freeze, ["= 1.1.10"])
+       s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.10"])
+       s.add_runtime_dependency(%q<puppet_forge>.freeze, ["~> 2.2.8"])
+@@ -35,7 +35,7 @@
+       s.add_development_dependency(%q<minitar>.freeze, ["~> 0.6.1"])
+     else
+       s.add_dependency(%q<colored>.freeze, ["= 1.2"])
+-      s.add_dependency(%q<cri>.freeze, ["= 2.15.6"])
++      s.add_dependency(%q<cri>.freeze, ["~> 2.15.6"])
+       s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"])
+       s.add_dependency(%q<multi_json>.freeze, ["~> 1.10"])
+       s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.2.8"])
+@@ -47,7 +47,7 @@
+     end
+   else
+     s.add_dependency(%q<colored>.freeze, ["= 1.2"])
+-    s.add_dependency(%q<cri>.freeze, ["= 2.15.6"])
++    s.add_dependency(%q<cri>.freeze, ["~> 2.15.6"])
+     s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"])
+     s.add_dependency(%q<multi_json>.freeze, ["~> 1.10"])
+     s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.2.8"])