diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile index dc5d93b4b283..8e0eb79a5b18 100644 --- a/sysutils/rubygem-r10k/Makefile +++ b/sysutils/rubygem-r10k/Makefile @@ -1,31 +1,31 @@ PORTNAME= r10k -PORTVERSION= 3.8.0 +PORTVERSION= 3.9.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-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 583c63292456..77198bc4e080 100644 --- a/sysutils/rubygem-r10k/distinfo +++ b/sysutils/rubygem-r10k/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613634087 -SHA256 (rubygem/r10k-3.8.0.gem) = c6866d24d8baa4ed34fbc9f7d0d1ea3ff4aa8d39d9a03e05839f39aeaa99b86e -SIZE (rubygem/r10k-3.8.0.gem) = 221184 +TIMESTAMP = 1619809156 +SHA256 (rubygem/r10k-3.9.0.gem) = 855a183b8392a40d0c5856e0f79be3c5aa2d72880c0baedcfb94b36ab7a37b01 +SIZE (rubygem/r10k-3.9.0.gem) = 224768 diff --git a/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb b/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb index a06f2a4cc07c..45512186c151 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 +--- lib/r10k/settings.rb.orig 2021-04-30 19:31:49 UTC +++ lib/r10k/settings.rb -@@ -123,8 +123,8 @@ +@@ -141,8 +141,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 84928235f7a2..94479378fc88 100644 --- a/sysutils/rubygem-r10k/files/patch-r10k.gemspec +++ b/sysutils/rubygem-r10k/files/patch-r10k.gemspec @@ -1,51 +1,35 @@ ---- r10k.gemspec.orig +--- r10k.gemspec.orig 2021-04-30 19:31:50 UTC +++ r10k.gemspec -@@ -24,26 +24,26 @@ - - 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", "< 3.0.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 2.15.9", "< 3.0.0"]) - s.add_runtime_dependency(%q.freeze, ["= 1.1.10"]) +@@ -29,8 +29,8 @@ Gem::Specification.new do |s| 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_development_dependency(%q.freeze, ["~> 3.1"]) s.add_development_dependency(%q.freeze, [">= 0"]) s.add_development_dependency(%q.freeze, ["~> 0.9.11"]) - 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", "< 3.0.0"]) -+ s.add_dependency(%q.freeze, [">= 2.15.9", "< 3.0.0"]) - s.add_dependency(%q.freeze, ["= 1.1.10"]) +@@ -42,8 +42,8 @@ Gem::Specification.new do |s| 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, ["~> 3.1"]) s.add_dependency(%q.freeze, [">= 0"]) s.add_dependency(%q.freeze, ["~> 0.9.11"]) -@@ -51,13 +51,13 @@ - end - else - s.add_dependency(%q.freeze, ["= 3.1.2"]) -- s.add_dependency(%q.freeze, [">= 2.15.10", "< 3.0.0"]) -+ s.add_dependency(%q.freeze, [">= 2.15.9", "< 3.0.0"]) - s.add_dependency(%q.freeze, ["= 1.1.10"]) +@@ -56,8 +56,8 @@ Gem::Specification.new do |s| 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, ["~> 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, ["~> 3.1"]) s.add_dependency(%q.freeze, [">= 0"]) s.add_dependency(%q.freeze, ["~> 0.9.11"])