Index: head/sysutils/rubygem-r10k/Makefile =================================================================== --- head/sysutils/rubygem-r10k/Makefile (revision 523394) +++ head/sysutils/rubygem-r10k/Makefile (revision 523395) @@ -1,35 +1,35 @@ # $FreeBSD$ PORTNAME= r10k -PORTVERSION= 3.3.3 +PORTVERSION= 3.4.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-colored>=1.2:textproc/rubygem-colored \ - rubygem-cri>=2.6.1:devel/rubygem-cri \ - rubygem-gettext-setup>=0.5:devel/rubygem-gettext-setup \ +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.2.8:sysutils/rubygem-puppet_forge + rubygem-puppet_forge>=2.3.0:sysutils/rubygem-puppet_forge USES= gem shebangfix USE_RUBY= yes NO_ARCH= yes PLIST_FILES= bin/r10k SHEBANG_FILES= integration/*/*.sh post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/lib/r10k/settings.rb \ ${WRKSRC}/lib/r10k/settings/loader.rb .include Index: head/sysutils/rubygem-r10k/distinfo =================================================================== --- head/sysutils/rubygem-r10k/distinfo (revision 523394) +++ head/sysutils/rubygem-r10k/distinfo (revision 523395) @@ -1,3 +1,3 @@ -TIMESTAMP = 1571759388 -SHA256 (rubygem/r10k-3.3.3.gem) = 4306e4e230aa3e18e6248b9d11fe776f84d1c5dd727fba74cd804c9213899f94 -SIZE (rubygem/r10k-3.3.3.gem) = 208384 +TIMESTAMP = 1578880329 +SHA256 (rubygem/r10k-3.4.0.gem) = a330299192ac7f30e93c8a54b1fb90b249ba67d510214cbf78db424d9025dcc6 +SIZE (rubygem/r10k-3.4.0.gem) = 211968 Index: head/sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb =================================================================== --- head/sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb (revision 523394) +++ head/sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb (nonexistent) @@ -1,11 +0,0 @@ ---- 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? - Property changes on: head/sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/rubygem-r10k/files/patch-r10k.gemspec =================================================================== --- head/sysutils/rubygem-r10k/files/patch-r10k.gemspec (revision 523394) +++ head/sysutils/rubygem-r10k/files/patch-r10k.gemspec (revision 523395) @@ -1,29 +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, ["= 3.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"]) + s.add_runtime_dependency(%q.freeze, ["~> 2.3.0"]) @@ -35,7 +35,7 @@ - s.add_development_dependency(%q.freeze, ["~> 0.6.1"]) + s.add_development_dependency(%q.freeze, ["~> 0.9.0"]) else - s.add_dependency(%q.freeze, ["= 1.2"]) + s.add_dependency(%q.freeze, ["= 3.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"]) + s.add_dependency(%q.freeze, ["~> 2.3.0"]) @@ -47,7 +47,7 @@ end else - s.add_dependency(%q.freeze, ["= 1.2"]) + s.add_dependency(%q.freeze, ["= 3.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"]) + s.add_dependency(%q.freeze, ["~> 2.3.0"])