diff --git a/devel/rubygem-pdk/Makefile b/devel/rubygem-pdk/Makefile index fd3143800479..34406bd83999 100644 --- a/devel/rubygem-pdk/Makefile +++ b/devel/rubygem-pdk/Makefile @@ -1,37 +1,38 @@ PORTNAME= pdk -PORTVERSION= 3.0.0 +PORTVERSION= 3.1.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-childprocess>=4.1.0:devel/rubygem-childprocess \ + 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 c461aa41edeb..6fa1f24728a2 100644 --- a/devel/rubygem-pdk/distinfo +++ b/devel/rubygem-pdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688748772 -SHA256 (rubygem/pdk-3.0.0.gem) = b1b6764133f3fd1f371aa894394bcd8dd24c744f022a08d660ef813d1f107971 -SIZE (rubygem/pdk-3.0.0.gem) = 138752 +TIMESTAMP = 1713552350 +SHA256 (rubygem/pdk-3.1.0.gem) = 3b79965e39582ca7dc1365dca2535dfcbe9d762cc483b4f8d0a9c0a646e3cba3 +SIZE (rubygem/pdk-3.1.0.gem) = 139776 diff --git a/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb b/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb index 1a81102aa9c0..fad9941292d5 100644 --- a/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb +++ b/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb @@ -1,11 +1,11 @@ ---- lib/pdk/cli/exec/command.rb.orig 2023-03-24 21:05:48 UTC +--- lib/pdk/cli/exec/command.rb.orig 2024-04-19 18:46:02 UTC +++ lib/pdk/cli/exec/command.rb -@@ -185,7 +185,7 @@ module PDK +@@ -179,7 +179,7 @@ module PDK resolved_env['GEM_HOME'] = PDK::Util::RubyVersion.gem_home gem_path = PDK::Util::RubyVersion.gem_path - resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path + # resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path # Make sure invocation of Ruby prefers our private installation. package_binpath = PDK::Util.package_install? ? File.join(PDK::Util.pdk_package_basedir, 'bin') : nil diff --git a/devel/rubygem-pdk/files/patch-pdk.gemspec b/devel/rubygem-pdk/files/patch-pdk.gemspec new file mode 100644 index 000000000000..ed99d8fffc14 --- /dev/null +++ b/devel/rubygem-pdk/files/patch-pdk.gemspec @@ -0,0 +1,15 @@ +--- pdk.gemspec.orig 2024-04-19 18:46:02 UTC ++++ pdk.gemspec +@@ -28,10 +28,10 @@ Gem::Specification.new do |s| + 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.6.3".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])