From 0c4affe2e9b273573bedd4484a1a91f73af7aecf Mon Sep 17 00:00:00 2001 From: romain Date: Sat, 27 Jul 2019 00:31:31 +0000 Subject: [PATCH] Update to 3.3.0 With hat: puppet --- sysutils/rubygem-r10k/Makefile | 3 +- sysutils/rubygem-r10k/distinfo | 6 ++-- .../files/patch-lib_r10k_action_runner.rb | 11 +++++++ .../files/patch-lib_r10k_settings.rb | 13 +++++++++ .../rubygem-r10k/files/patch-r10k.gemspec | 29 +++++++++++++++++++ 5 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb create mode 100644 sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb create mode 100644 sysutils/rubygem-r10k/files/patch-r10k.gemspec diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile index 6ee2b053bb9c..9f4605a40648 100644 --- a/sysutils/rubygem-r10k/Makefile +++ b/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 diff --git a/sysutils/rubygem-r10k/distinfo b/sysutils/rubygem-r10k/distinfo index 811bd2b63f5f..e937f68a5e56 100644 --- a/sysutils/rubygem-r10k/distinfo +++ b/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 diff --git a/sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb b/sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb new file mode 100644 index 000000000000..5fd36639e8b3 --- /dev/null +++ b/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? + diff --git a/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb b/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb new file mode 100644 index 000000000000..a06f2a4cc07c --- /dev/null +++ b/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" diff --git a/sysutils/rubygem-r10k/files/patch-r10k.gemspec b/sysutils/rubygem-r10k/files/patch-r10k.gemspec new file mode 100644 index 000000000000..8ea78786454f --- /dev/null +++ b/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.freeze, ["= 1.2"]) +- s.add_runtime_dependency(%q.freeze, ["= 2.15.6"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 2.15.6"]) + s.add_runtime_dependency(%q.freeze, ["= 1.1.10"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.10"]) + s.add_runtime_dependency(%q.freeze, ["~> 2.2.8"]) +@@ -35,7 +35,7 @@ + s.add_development_dependency(%q.freeze, ["~> 0.6.1"]) + else + s.add_dependency(%q.freeze, ["= 1.2"]) +- s.add_dependency(%q.freeze, ["= 2.15.6"]) ++ s.add_dependency(%q.freeze, ["~> 2.15.6"]) + s.add_dependency(%q.freeze, ["= 1.1.10"]) + s.add_dependency(%q.freeze, ["~> 1.10"]) + s.add_dependency(%q.freeze, ["~> 2.2.8"]) +@@ -47,7 +47,7 @@ + end + else + s.add_dependency(%q.freeze, ["= 1.2"]) +- s.add_dependency(%q.freeze, ["= 2.15.6"]) ++ s.add_dependency(%q.freeze, ["~> 2.15.6"]) + s.add_dependency(%q.freeze, ["= 1.1.10"]) + s.add_dependency(%q.freeze, ["~> 1.10"]) + s.add_dependency(%q.freeze, ["~> 2.2.8"])