4 files changed, 28 insertions, 24 deletions

diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile
index 84be20340da8..9cb5874694e4 100644
--- a/sysutils/rubygem-chef/Makefile
+++ b/sysutils/rubygem-chef/Makefile
@@ -1,8 +1,8 @@
 # Created by: Renaud Chaput <renchap@cocoa-x.com>
-# $FreeBSD$
+# $FreeBSD: head/sysutils/rubygem-chef/Makefile 561021 2021-01-10 08:26:44Z sunpoet $
 
 PORTNAME=	chef
-PORTVERSION=	15.15.0
+PORTVERSION=	16.11.7
 CATEGORIES=	sysutils
 MASTER_SITES=	RG
 
@@ -13,35 +13,39 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-addressable>=0:www/rubygem-addressable \
-		rubygem-bcrypt_pbkdf>=1.0.1<2:security/rubygem-bcrypt_pbkdf \
+		rubygem-bcrypt_pbkdf>=1.1<2:security/rubygem-bcrypt_pbkdf \
 		rubygem-bundler>=1.10:sysutils/rubygem-bundler \
 		rubygem-chef-config>=${PORTVERSION}<${PORTVERSION}_99:sysutils/rubygem-chef-config \
-		rubygem-chef-utils15>=${PORTVERSION}<${PORTVERSION}_99:sysutils/rubygem-chef-utils15 \
+		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-diff-lcs>=1.2.4<2:textproc/rubygem-diff-lcs \
+		rubygem-diff-lcs>=1.2.4:textproc/rubygem-diff-lcs \
 		rubygem-ed25519>=1.2<2:security/rubygem-ed25519 \
 		rubygem-erubis>=2.7<3:www/rubygem-erubis \
 		rubygem-ffi>=1.9.25: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-highline1>=1.6.9<2:devel/rubygem-highline1 \
+		rubygem-highline>=1.6.9<3:devel/rubygem-highline \
 		rubygem-iniparse>=1.4<2:devel/rubygem-iniparse \
-		rubygem-license-acceptance>=1.0.5:sysutils/rubygem-license-acceptance \
+		rubygem-inspec-core>=4.23<5:devel/rubygem-inspec-core \
+		rubygem-license-acceptance>=1.0.5<3:sysutils/rubygem-license-acceptance \
 		rubygem-mixlib-archive>=0.4<2:devel/rubygem-mixlib-archive \
 		rubygem-mixlib-authentication>=2.1<4:devel/rubygem-mixlib-authentication \
 		rubygem-mixlib-cli>=2.1.1<3:devel/rubygem-mixlib-cli \
 		rubygem-mixlib-log>=2.0.3<4:devel/rubygem-mixlib-log \
-		rubygem-mixlib-shellout>=3.0.3<4:devel/rubygem-mixlib-shellout \
+		rubygem-mixlib-shellout>=3.1.1<4:devel/rubygem-mixlib-shellout \
 		rubygem-net-sftp>=2.1.2<4:security/rubygem-net-sftp \
-		rubygem-net-ssh>=4.2,2<7,2:security/rubygem-net-ssh \
+		rubygem-net-ssh5>=5.1,2<7,2:security/rubygem-net-ssh5 \
 		rubygem-net-ssh-multi>=1.2.1<2:security/rubygem-net-ssh-multi \
-		rubygem-ohai>=15.0<16:sysutils/rubygem-ohai \
+		rubygem-ohai>=16.0<17:sysutils/rubygem-ohai \
 		rubygem-plist>=3.2<4:devel/rubygem-plist \
 		rubygem-proxifier>=1.0<2:net/rubygem-proxifier \
 		rubygem-syslog-logger>=1.6<2:sysutils/rubygem-syslog-logger \
 		rubygem-train-core>=3.2.28<4:net/rubygem-train-core \
 		rubygem-train-winrm>=0.2.5:net/rubygem-train-winrm \
+		rubygem-tty-prompt>=0.21<1:devel/rubygem-tty-prompt \
 		rubygem-tty-screen>=0.6<1:devel/rubygem-tty-screen \
+		rubygem-tty-table>=0.11<1:devel/rubygem-tty-table \
 		rubygem-uuidtools>=2.1.5<2.2:devel/rubygem-uuidtools
 
 USES=		gem shebangfix
diff --git a/sysutils/rubygem-chef/distinfo b/sysutils/rubygem-chef/distinfo
index da5462288205..e56eacacc7dc 100644
--- a/sysutils/rubygem-chef/distinfo
+++ b/sysutils/rubygem-chef/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610174239
-SHA256 (rubygem/chef-15.15.0.gem) = 16780ebfec3c8c0e7977cac93ab3004204701bdf6c8762ff5d1c907712ff1219
-SIZE (rubygem/chef-15.15.0.gem) = 1807360
+TIMESTAMP = 1616604518
+SHA256 (rubygem/chef-16.11.7.gem) = 125d1f4cdfebdabc9836364862c87ff68019388c6c6ef263f69011d27efd29f8
+SIZE (rubygem/chef-16.11.7.gem) = 1902080
diff --git a/sysutils/rubygem-chef/files/chef_client.in b/sysutils/rubygem-chef/files/chef_client.in
index 160df79ad076..6eb78575e951 100644
--- a/sysutils/rubygem-chef/files/chef_client.in
+++ b/sysutils/rubygem-chef/files/chef_client.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: head/sysutils/rubygem-chef/files/chef_client.in 340872 2014-01-24 00:14:07Z mat $
 #
 
 # PROVIDE: chef_client
diff --git a/sysutils/rubygem-chef/files/patch-gemspec b/sysutils/rubygem-chef/files/patch-gemspec
index 8970621f06b2..8bb0fa7a5c82 100644
--- a/sysutils/rubygem-chef/files/patch-gemspec
+++ b/sysutils/rubygem-chef/files/patch-gemspec
@@ -1,11 +1,11 @@
---- chef.gemspec.orig	2021-01-08 18:31:25 UTC
+--- chef.gemspec.orig	2021-03-25 07:46:34 UTC
 +++ chef.gemspec
-@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
-       s.add_runtime_dependency(%q<chef-utils>.freeze, ["= 15.15.0"])
-       s.add_runtime_dependency(%q<train-core>.freeze, ["~> 3.2", ">= 3.2.28"])
-       s.add_runtime_dependency(%q<train-winrm>.freeze, [">= 0.2.5"])
--      s.add_runtime_dependency(%q<license-acceptance>.freeze, ["~> 1.0", ">= 1.0.5"])
-+      s.add_runtime_dependency(%q<license-acceptance>.freeze, ["~> 2.0", ">= 1.0.5"])
-       s.add_runtime_dependency(%q<mixlib-cli>.freeze, [">= 2.1.1", "< 3.0"])
-       s.add_runtime_dependency(%q<mixlib-log>.freeze, [">= 2.0.3", "< 4.0"])
-       s.add_runtime_dependency(%q<mixlib-authentication>.freeze, [">= 2.1", "< 4"])
+@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<tty-table>.freeze, ["~> 0.11"])
+       s.add_runtime_dependency(%q<pastel>.freeze, [">= 0"])
+       s.add_runtime_dependency(%q<erubis>.freeze, ["~> 2.7"])
+-      s.add_runtime_dependency(%q<diff-lcs>.freeze, [">= 1.2.4", "< 1.4.0"])
++      s.add_runtime_dependency(%q<diff-lcs>.freeze, [">= 1.2.4", "< 1.5.0"])
+       s.add_runtime_dependency(%q<ffi-libarchive>.freeze, ["~> 1.0", ">= 1.0.3"])
+       s.add_runtime_dependency(%q<chef-zero>.freeze, [">= 14.0.11"])
+       s.add_runtime_dependency(%q<chef-vault>.freeze, [">= 0"])