Index: head/sysutils/rubygem-r10k/Makefile =================================================================== --- head/sysutils/rubygem-r10k/Makefile (revision 528990) +++ head/sysutils/rubygem-r10k/Makefile (revision 528991) @@ -1,35 +1,33 @@ # $FreeBSD$ PORTNAME= r10k -PORTVERSION= 3.4.0 +PORTVERSION= 3.4.1 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 shebangfix +USES= gem 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 528990) +++ head/sysutils/rubygem-r10k/distinfo (revision 528991) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578880329 -SHA256 (rubygem/r10k-3.4.0.gem) = a330299192ac7f30e93c8a54b1fb90b249ba67d510214cbf78db424d9025dcc6 -SIZE (rubygem/r10k-3.4.0.gem) = 211968 +TIMESTAMP = 1584437811 +SHA256 (rubygem/r10k-3.4.1.gem) = 262a669f479d65385e0375daa906c43fd75f56d37401982209f08aec099f8c5a +SIZE (rubygem/r10k-3.4.1.gem) = 210944 Index: head/sysutils/rubygem-r10k/files/patch-r10k.gemspec =================================================================== --- head/sysutils/rubygem-r10k/files/patch-r10k.gemspec (revision 528990) +++ head/sysutils/rubygem-r10k/files/patch-r10k.gemspec (revision 528991) @@ -1,29 +1,51 @@ --- r10k.gemspec.orig +++ r10k.gemspec -@@ -24,7 +24,7 @@ +@@ -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.6"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 2.15.6"]) +- 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"]) s.add_runtime_dependency(%q.freeze, ["~> 1.10"]) s.add_runtime_dependency(%q.freeze, ["~> 2.3.0"]) -@@ -35,7 +35,7 @@ + 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.6"]) -+ s.add_dependency(%q.freeze, ["~> 2.15.6"]) +- 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"]) s.add_dependency(%q.freeze, ["~> 1.10"]) s.add_dependency(%q.freeze, ["~> 2.3.0"]) -@@ -47,7 +47,7 @@ + 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.6"]) -+ s.add_dependency(%q.freeze, ["~> 2.15.6"]) +- 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"]) 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, [">= 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"])