3 files changed, 15 insertions, 23 deletions

diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile
index f3aa4f007746..1b57e4a3a14a 100644
--- a/sysutils/rubygem-chef/Makefile
+++ b/sysutils/rubygem-chef/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	chef
-PORTVERSION=	17.10.0
+PORTVERSION=	18.2.7
 CATEGORIES=	sysutils
 MASTER_SITES=	RG
 
@@ -13,31 +13,34 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	rubygem-addressable>=0:www/rubygem-addressable \
 		rubygem-aws-sdk-s3>=1.91<2:devel/rubygem-aws-sdk-s3 \
 		rubygem-aws-sdk-secretsmanager>=1.46<2:devel/rubygem-aws-sdk-secretsmanager \
-		rubygem-chef-config17>=${PORTVERSION}<${PORTVERSION}_99:sysutils/rubygem-chef-config17 \
-		rubygem-chef-utils17>=${PORTVERSION}<${PORTVERSION}_99:sysutils/rubygem-chef-utils17 \
+		rubygem-chef-config>=${PORTVERSION}<${PORTVERSION}_99:sysutils/rubygem-chef-config \
+		rubygem-chef-utils>=${PORTVERSION}<${PORTVERSION}_99:sysutils/rubygem-chef-utils \
 		rubygem-chef-vault>=0:sysutils/rubygem-chef-vault \
 		rubygem-chef-zero>=14.0.11:sysutils/rubygem-chef-zero \
-		rubygem-corefoundation>=0.3.4:devel/rubygem-corefoundation \
+		rubygem-corefoundation>=0.3.4<0.4:devel/rubygem-corefoundation \
 		rubygem-diff-lcs>=1.2.4<1.6.0:textproc/rubygem-diff-lcs \
 		rubygem-erubis>=2.7<3:www/rubygem-erubis \
-		rubygem-ffi>=1.9.25:devel/rubygem-ffi \
+		rubygem-ffi>=1.15.5:devel/rubygem-ffi \
 		rubygem-ffi-libarchive>=1.0.3<2:devel/rubygem-ffi-libarchive \
 		rubygem-ffi-yajl>=2.2<3:devel/rubygem-ffi-yajl \
 		rubygem-iniparse>=1.4<2:devel/rubygem-iniparse \
-		rubygem-inspec-core>=4.23<5:devel/rubygem-inspec-core \
+		rubygem-inspec-core>=5:devel/rubygem-inspec-core \
 		rubygem-license-acceptance>=1.0.5<3:sysutils/rubygem-license-acceptance \
 		rubygem-mixlib-archive>=0.4<2.0:devel/rubygem-mixlib-archive \
 		rubygem-mixlib-authentication>=2.1<4:devel/rubygem-mixlib-authentication \
 		rubygem-mixlib-cli>=2.1.1<3.0:devel/rubygem-mixlib-cli \
 		rubygem-mixlib-log>=2.0.3<4.0:devel/rubygem-mixlib-log \
 		rubygem-mixlib-shellout>=3.1.1<4.0:devel/rubygem-mixlib-shellout \
+		rubygem-net-ftp>=0:ftp/rubygem-net-ftp \
 		rubygem-net-sftp>=2.1.2<5.0:security/rubygem-net-sftp \
-		rubygem-ohai>=17.0<18:sysutils/rubygem-ohai \
+		rubygem-ohai>=18.0<19:sysutils/rubygem-ohai \
 		rubygem-plist>=3.2<4:devel/rubygem-plist \
-		rubygem-proxifier>=1.0<2:net/rubygem-proxifier \
+		rubygem-proxifier2>=1.1<2:net/rubygem-proxifier2 \
 		rubygem-syslog-logger>=1.6<2:sysutils/rubygem-syslog-logger \
-		rubygem-train-core>=3.2.28<4:net/rubygem-train-core \
+		rubygem-train-core>=3.10<4:net/rubygem-train-core \
+		rubygem-train-rest>=0.4.1:net/rubygem-train-rest \
 		rubygem-train-winrm>=0.2.5:net/rubygem-train-winrm \
+		rubygem-unf_ext>=0.0.8.2:textproc/rubygem-unf_ext \
 		rubygem-uuidtools>=2.1.5<3.0:devel/rubygem-uuidtools \
 		rubygem-vault>=0.16<1:security/rubygem-vault
 
diff --git a/sysutils/rubygem-chef/distinfo b/sysutils/rubygem-chef/distinfo
index 83749258e477..2e51e65bff6d 100644
--- a/sysutils/rubygem-chef/distinfo
+++ b/sysutils/rubygem-chef/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1682150645
-SHA256 (rubygem/chef-17.10.0.gem) = 93218e17f46b9f7d40ce508cef5a61f679885313646f5ca2db04d35733347003
-SIZE (rubygem/chef-17.10.0.gem) = 1697792
+TIMESTAMP = 1685162512
+SHA256 (rubygem/chef-18.2.7.gem) = 8ee5c8e245d79a68e2e669ac3c3a6c0a854120e07ddc70864ae2b4e82514847a
+SIZE (rubygem/chef-18.2.7.gem) = 1734656
diff --git a/sysutils/rubygem-chef/files/patch-gemspec b/sysutils/rubygem-chef/files/patch-gemspec
deleted file mode 100644
index 800cf380e416..000000000000
--- a/sysutils/rubygem-chef/files/patch-gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- chef.gemspec.orig	2023-04-22 08:24:17 UTC
-+++ chef.gemspec
-@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
-   s.add_runtime_dependency(%q<inspec-core>.freeze, ["~> 4.23"])
-   s.add_runtime_dependency(%q<ffi>.freeze, [">= 1.5.0"])
-   s.add_runtime_dependency(%q<ffi-yajl>.freeze, ["~> 2.2"])
--  s.add_runtime_dependency(%q<net-sftp>.freeze, [">= 2.1.2", "< 4.0"])
-+  s.add_runtime_dependency(%q<net-sftp>.freeze, [">= 2.1.2", "< 5.0"])
-   s.add_runtime_dependency(%q<erubis>.freeze, ["~> 2.7"])
-   s.add_runtime_dependency(%q<diff-lcs>.freeze, [">= 1.2.4", "!= 1.4.0", "< 1.6.0"])
-   s.add_runtime_dependency(%q<ffi-libarchive>.freeze, ["~> 1.0", ">= 1.0.3"])