diff --git a/devel/rubygem-pdk/Makefile b/devel/rubygem-pdk/Makefile index 34406bd83999..ba473fbb6147 100644 --- a/devel/rubygem-pdk/Makefile +++ b/devel/rubygem-pdk/Makefile @@ -1,38 +1,38 @@ PORTNAME= pdk -PORTVERSION= 3.1.0 +PORTVERSION= 3.2.0 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= puppet@FreeBSD.org COMMENT= CLI for development of Puppet modules WWW= https://github.com/puppetlabs/pdk LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-bundler>=2.1.0,1<3.0.0,1:sysutils/rubygem-bundler \ rubygem-childprocess41>=4.1.0:devel/rubygem-childprocess41 \ rubygem-concurrent-ruby11>=1.1.10<1.2:devel/rubygem-concurrent-ruby11 \ rubygem-cri>=2.15.11<3:devel/rubygem-cri \ rubygem-deep_merge>=1.2.2<2:devel/rubygem-deep_merge \ rubygem-diff-lcs>=1.5.0:textproc/rubygem-diff-lcs \ rubygem-facter>=4.0.0<5.0.0:sysutils/rubygem-facter \ rubygem-ffi>=1.15.5<2.0.0:devel/rubygem-ffi \ rubygem-hitimes>=2.0.0:devel/rubygem-hitimes \ rubygem-httpclient>=2.8.3<2.9:www/rubygem-httpclient \ rubygem-json_pure>=2.6.3:devel/rubygem-json_pure \ rubygem-json-schema>=4.0:devel/rubygem-json-schema \ rubygem-locale>=2.1.0:devel/rubygem-locale \ rubygem-minitar>=0.8<1:archivers/rubygem-minitar \ rubygem-pathspec>=1.1:devel/rubygem-pathspec \ rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \ rubygem-tty-spinner>=0.9<1:devel/rubygem-tty-spinner \ rubygem-tty-which>=0.5<1:devel/rubygem-tty-which USES= gem NO_ARCH= yes PLIST_FILES= bin/pdk .include diff --git a/devel/rubygem-pdk/distinfo b/devel/rubygem-pdk/distinfo index 6fa1f24728a2..ed73cb352604 100644 --- a/devel/rubygem-pdk/distinfo +++ b/devel/rubygem-pdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713552350 -SHA256 (rubygem/pdk-3.1.0.gem) = 3b79965e39582ca7dc1365dca2535dfcbe9d762cc483b4f8d0a9c0a646e3cba3 -SIZE (rubygem/pdk-3.1.0.gem) = 139776 +TIMESTAMP = 1715359034 +SHA256 (rubygem/pdk-3.2.0.gem) = f0705af2c53e5d817770070d330a01fd4209d25133b354553734c5c65e136cab +SIZE (rubygem/pdk-3.2.0.gem) = 135680 diff --git a/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb b/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb deleted file mode 100644 index 12f5515fd640..000000000000 --- a/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/pdk/util/bundler.rb.orig 2022-06-29 05:24:26 UTC -+++ lib/pdk/util/bundler.rb -@@ -21,12 +21,7 @@ module PDK - return - end - -- unless bundle.locked? -- # Generate initial default Gemfile.lock, either from package cache or -- # by invoking `bundle lock` -- bundle.lock! -- end -- -+ if bundle.locked? - # Check if all dependencies will be available once we update the lockfile. - begin - original_lockfile = bundle.gemfile_lock -@@ -40,6 +35,7 @@ module PDK - end - - bundle.update_lock!(with: gem_overrides, local: all_deps_available) -+ end - - # If there are missing dependencies after updating the lockfile, let `bundle install` - # go out and get them. If the specified puppet gem version points to a remote location diff --git a/devel/rubygem-pdk/files/patch-pdk.gemspec b/devel/rubygem-pdk/files/patch-pdk.gemspec index ed99d8fffc14..5f500a405553 100644 --- a/devel/rubygem-pdk/files/patch-pdk.gemspec +++ b/devel/rubygem-pdk/files/patch-pdk.gemspec @@ -1,15 +1,17 @@ ---- pdk.gemspec.orig 2024-04-19 18:46:02 UTC +--- pdk.gemspec.orig 2024-06-12 01:08:10 UTC +++ pdk.gemspec -@@ -28,10 +28,10 @@ Gem::Specification.new do |s| +@@ -27,11 +27,11 @@ Gem::Specification.new do |s| + s.add_runtime_dependency(%q.freeze, ["~> 2.15.11".freeze]) s.add_runtime_dependency(%q.freeze, [">= 1.5.0".freeze]) s.add_runtime_dependency(%q.freeze, [">= 1.15.5".freeze, "< 2.0.0".freeze]) - s.add_runtime_dependency(%q.freeze, ["= 2.0.0".freeze]) +- s.add_runtime_dependency(%q.freeze, ["= 2.0.0".freeze]) - s.add_runtime_dependency(%q.freeze, ["~> 2.6.3".freeze]) ++ s.add_runtime_dependency(%q.freeze, [">= 2.0.0".freeze, "< 4.0.0".freeze]) + s.add_runtime_dependency(%q.freeze, [">= 2.6.3".freeze]) s.add_runtime_dependency(%q.freeze, ["~> 4.0".freeze]) s.add_runtime_dependency(%q.freeze, ["~> 0.8".freeze]) - s.add_runtime_dependency(%q.freeze, ["~> 1.1".freeze]) + s.add_runtime_dependency(%q.freeze, [">= 1.1".freeze]) s.add_runtime_dependency(%q.freeze, ["~> 0.23".freeze]) s.add_runtime_dependency(%q.freeze, ["~> 0.9".freeze]) s.add_runtime_dependency(%q.freeze, ["~> 0.5".freeze])