diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile index 7f3f1eb4d919..c41878b2a7f6 100644 --- a/sysutils/rubygem-r10k/Makefile +++ b/sysutils/rubygem-r10k/Makefile @@ -1,31 +1,32 @@ PORTNAME= r10k -PORTVERSION= 3.10.0 +PORTVERSION= 3.11.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG MAINTAINER= puppet@FreeBSD.org COMMENT= Tool for deploying Puppet environments and modules LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-colored2>=3.1.2:textproc/rubygem-colored2 \ rubygem-cri>=2.15.6:devel/rubygem-cri \ rubygem-gettext-setup>=0.24:devel/rubygem-gettext-setup \ + rubygem-jwt>=2.2:www/rubygem-jwt \ rubygem-log4r>=1.1.10:sysutils/rubygem-log4r \ rubygem-multi_json>=1.10:devel/rubygem-multi_json \ rubygem-puppet_forge>=2.3.0:sysutils/rubygem-puppet_forge USES= gem USE_RUBY= yes NO_ARCH= yes PLIST_FILES= bin/r10k post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/lib/r10k/settings.rb \ ${WRKSRC}/lib/r10k/settings/loader.rb .include diff --git a/sysutils/rubygem-r10k/distinfo b/sysutils/rubygem-r10k/distinfo index 76ed6efc25b3..b685f26f4fa3 100644 --- a/sysutils/rubygem-r10k/distinfo +++ b/sysutils/rubygem-r10k/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626634105 -SHA256 (rubygem/r10k-3.10.0.gem) = 1f142ab0de42ce63e4b789d67dcec1bf7ce3a252906b3574fcfbcb6b0f0537f2 -SIZE (rubygem/r10k-3.10.0.gem) = 233984 +TIMESTAMP = 1629311525 +SHA256 (rubygem/r10k-3.11.0.gem) = af15ee9e4f676b3ddba0096b9faf2dd38ec2339c517a96ad1e830ff6a04d9f00 +SIZE (rubygem/r10k-3.11.0.gem) = 239616 diff --git a/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb b/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb index 45512186c151..cf55d5753a63 100644 --- a/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb +++ b/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb @@ -1,13 +1,13 @@ ---- lib/r10k/settings.rb.orig 2021-04-30 19:31:49 UTC +--- lib/r10k/settings.rb.orig 2021-08-18 18:36:31 UTC +++ lib/r10k/settings.rb -@@ -141,8 +141,8 @@ module R10K +@@ -178,8 +178,8 @@ module R10K }), 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" diff --git a/sysutils/rubygem-r10k/files/patch-r10k.gemspec b/sysutils/rubygem-r10k/files/patch-r10k.gemspec index 5259c27bac10..937b77e66aec 100644 --- a/sysutils/rubygem-r10k/files/patch-r10k.gemspec +++ b/sysutils/rubygem-r10k/files/patch-r10k.gemspec @@ -1,52 +1,53 @@ ---- r10k.gemspec.orig 2021-07-14 21:11:15 UTC +--- r10k.gemspec.orig 2021-08-18 18:36:32 UTC +++ r10k.gemspec -@@ -24,26 +24,26 @@ Gem::Specification.new do |s| +@@ -24,13 +24,13 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q.freeze, ["= 3.1.2"]) - s.add_runtime_dependency(%q.freeze, ["= 2.15.10"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 2.15.10"]) ++ s.add_runtime_dependency(%q.freeze, [">= 2.15.10"]) s.add_runtime_dependency(%q.freeze, ["= 1.1.10"]) s.add_runtime_dependency(%q.freeze, ["~> 1.10"]) s.add_runtime_dependency(%q.freeze, ["~> 2.3.0"]) s.add_runtime_dependency(%q.freeze, ["~> 0.24"]) - s.add_runtime_dependency(%q.freeze, ["~> 1.1.0"]) - s.add_runtime_dependency(%q.freeze, [">= 3.0.2", "< 3.3.0"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 1.1"]) -+ s.add_runtime_dependency(%q.freeze, [">= 3.0.2", "< 3.4.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 1.1.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 3.0.2"]) + s.add_runtime_dependency(%q.freeze, ["~> 2.2.3"]) s.add_development_dependency(%q.freeze, ["~> 3.1"]) s.add_development_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, ["~> 0.9.11"]) +@@ -38,13 +38,13 @@ Gem::Specification.new do |s| s.add_development_dependency(%q.freeze, ["~> 0.9.0"]) else s.add_dependency(%q.freeze, ["= 3.1.2"]) - s.add_dependency(%q.freeze, ["= 2.15.10"]) -+ s.add_dependency(%q.freeze, ["~> 2.15.10"]) ++ s.add_dependency(%q.freeze, [">= 2.15.10"]) s.add_dependency(%q.freeze, ["= 1.1.10"]) s.add_dependency(%q.freeze, ["~> 1.10"]) s.add_dependency(%q.freeze, ["~> 2.3.0"]) s.add_dependency(%q.freeze, ["~> 0.24"]) - s.add_dependency(%q.freeze, ["~> 1.1.0"]) - s.add_dependency(%q.freeze, [">= 3.0.2", "< 3.3.0"]) -+ s.add_dependency(%q.freeze, ["~> 1.1"]) -+ s.add_dependency(%q.freeze, [">= 3.0.2", "< 3.4.0"]) ++ s.add_dependency(%q.freeze, [">= 1.1.0"]) ++ s.add_dependency(%q.freeze, [">= 3.0.2"]) + s.add_dependency(%q.freeze, ["~> 2.2.3"]) s.add_dependency(%q.freeze, ["~> 3.1"]) s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, ["~> 0.9.11"]) -@@ -51,13 +51,13 @@ Gem::Specification.new do |s| +@@ -53,13 +53,13 @@ Gem::Specification.new do |s| end else s.add_dependency(%q.freeze, ["= 3.1.2"]) - s.add_dependency(%q.freeze, ["= 2.15.10"]) -+ s.add_dependency(%q.freeze, ["~> 2.15.10"]) ++ s.add_dependency(%q.freeze, [">= 2.15.10"]) s.add_dependency(%q.freeze, ["= 1.1.10"]) s.add_dependency(%q.freeze, ["~> 1.10"]) s.add_dependency(%q.freeze, ["~> 2.3.0"]) s.add_dependency(%q.freeze, ["~> 0.24"]) - s.add_dependency(%q.freeze, ["~> 1.1.0"]) - s.add_dependency(%q.freeze, [">= 3.0.2", "< 3.3.0"]) -+ s.add_dependency(%q.freeze, ["~> 1.1"]) -+ s.add_dependency(%q.freeze, [">= 3.0.2", "< 3.4.0"]) ++ s.add_dependency(%q.freeze, [">= 1.1.0"]) ++ s.add_dependency(%q.freeze, [">= 3.0.2"]) + s.add_dependency(%q.freeze, ["~> 2.2.3"]) s.add_dependency(%q.freeze, ["~> 3.1"]) s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, ["~> 0.9.11"])