3 files changed, 54 insertions, 37 deletions

diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile
index 2de0f2afe55c..054a823cd386 100644
--- a/sysutils/rubygem-chef/Makefile
+++ b/sysutils/rubygem-chef/Makefile
@@ -2,25 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	chef
-PORTVERSION=	11.6.0
-PORTREVISION=	2
+PORTVERSION=	11.10.4
 CATEGORIES=	sysutils
 MASTER_SITES=	RG
 
 MAINTAINER=	renchap@cocoa-x.com
 COMMENT=	Systems integration framework. Client part
 
-RUN_DEPENDS=	rubygem-erubis>=0:${PORTSDIR}/www/rubygem-erubis \
+RUN_DEPENDS=	rubygem-chef-zero>=0.0.0:${PORTSDIR}/sysutils/rubygem-chef-zero \
+		rubygem-diff-lcs>=0.0.0:${PORTSDIR}/textproc/rubygem-diff-lcs \
+		rubygem-erubis>=0:${PORTSDIR}/www/rubygem-erubis \
 		rubygem-highline>=1.6.9:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-json146>=1.4.4:${PORTSDIR}/devel/rubygem-json146 \
+		rubygem-json>=1.8.1:${PORTSDIR}/devel/rubygem-json \
 		rubygem-mixlib-authentication>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-authentication \
-		rubygem-mixlib-cli>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-cli \
-		rubygem-mixlib-config>=1.1.2:${PORTSDIR}/devel/rubygem-mixlib-config \
+		rubygem-mixlib-cli>=1.4.0:${PORTSDIR}/devel/rubygem-mixlib-cli \
+		rubygem-mixlib-config>=2.1.0:${PORTSDIR}/devel/rubygem-mixlib-config \
 		rubygem-mixlib-log>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-log \
-		rubygem-mixlib-shellout>=1.0.0:${PORTSDIR}/devel/rubygem-mixlib-shellout \
+		rubygem-mixlib-shellout>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-shellout \
 		rubygem-net-ssh>=2.6:${PORTSDIR}/security/rubygem-net-ssh \
 		rubygem-net-ssh-multi>=1.1.0:${PORTSDIR}/security/rubygem-net-ssh-multi \
-		rubygem-ohai>=0.6.0:${PORTSDIR}/sysutils/rubygem-ohai \
+		rubygem-ohai>=6.0.0:${PORTSDIR}/sysutils/rubygem-ohai \
+		rubygem-pry>=0.9.0:${PORTSDIR}/devel/rubygem-pry \
+		rubygem-puma16>=1.6.0:${PORTSDIR}/www/rubygem-puma16 \
 		rubygem-rest-client>=1.0.4:${PORTSDIR}/www/rubygem-rest-client \
 		rubygem-yajl-ruby>=1.1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
 
@@ -32,10 +35,17 @@ RUBYGEM_AUTOPLIST=	yes
 SUB_LIST=	RUBY=${RUBY}
 USE_RC_SUBR=	chef_client
 
-NO_STAGE=	yes
 post-install:
-.for n in 1 8
-	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/distro/common/man/man${n}/* ${STAGEDIR}${PREFIX}/man/man${n}/
+.for M1 in chef-shell.1 knife-bootstrap.1 knife-client.1 knife-configure.1 knife-cookbook-site.1 \
+	knife-cookbook.1 knife-data-bag.1 knife-delete.1 knife-deps.1 knife-diff.1 \
+	knife-download.1 knife-edit.1 knife-environment.1 knife-exec.1 knife-index-rebuild.1 \
+	knife-list.1 knife-node.1 knife-raw.1 knife-recipe-list.1 knife-role.1 knife-search.1 \
+	knife-show.1 knife-ssh.1 knife-status.1 knife-tag.1 knife-upload.1 knife-user.1 \
+	knife-xargs.1 knife.1
+	@cd ${WRKSRC}/distro/common/man/man1 && ${INSTALL_MAN} ${M1} ${STAGEDIR}${MANPREFIX}/man/man1/
+.endfor
+.for M8 in chef-client.8 chef-solo.8
+	@cd ${WRKSRC}/distro/common/man/man8 && ${INSTALL_MAN} ${M8} ${STAGEDIR}${MANPREFIX}/man/man8/
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-chef/distinfo b/sysutils/rubygem-chef/distinfo
index 6c54bd7a61ee..df723814d268 100644
--- a/sysutils/rubygem-chef/distinfo
+++ b/sysutils/rubygem-chef/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/chef-11.6.0.gem) = 382662f36bcb34376c3a0ec7a4ef4bea4c1fefbf5ade702ce858dfae4ebc962e
-SIZE (rubygem/chef-11.6.0.gem) = 966144
+SHA256 (rubygem/chef-11.10.4.gem) = 9252d3635684bead38b6c4a2c78c2e928fbe669a8060d581f20381a5be531dfe
+SIZE (rubygem/chef-11.10.4.gem) = 1278976
diff --git a/sysutils/rubygem-chef/pkg-plist b/sysutils/rubygem-chef/pkg-plist
index 45423b3791dc..41d6b4e3ce9f 100644
--- a/sysutils/rubygem-chef/pkg-plist
+++ b/sysutils/rubygem-chef/pkg-plist
@@ -5,27 +5,34 @@ bin/chef-shell
 bin/chef-solo
 bin/knife
 bin/shef
-man/man1/chef-shell.1
-man/man1/knife-bootstrap.1
-man/man1/knife-client.1
-man/man1/knife-configure.1
-man/man1/knife-cookbook-site.1
-man/man1/knife-cookbook.1
-man/man1/knife-data-bag.1
-man/man1/knife-environment.1
-man/man1/knife-exec.1
-man/man1/knife-index.1
-man/man1/knife-node.1
-man/man1/knife-role.1
-man/man1/knife-search.1
-man/man1/knife-ssh.1
-man/man1/knife-status.1
-man/man1/knife-tag.1
-man/man1/knife.1
-man/man8/chef-client.8
-man/man8/chef-expander.8
-man/man8/chef-expanderctl.8
-man/man8/chef-server-webui.8
-man/man8/chef-server.8
-man/man8/chef-solo.8
-man/man8/chef-solr.8
+man/man1/chef-shell.1.gz
+man/man1/knife-bootstrap.1.gz
+man/man1/knife-client.1.gz
+man/man1/knife-configure.1.gz
+man/man1/knife-cookbook-site.1.gz
+man/man1/knife-cookbook.1.gz
+man/man1/knife-data-bag.1.gz
+man/man1/knife-delete.1.gz
+man/man1/knife-deps.1.gz
+man/man1/knife-diff.1.gz
+man/man1/knife-download.1.gz
+man/man1/knife-edit.1.gz
+man/man1/knife-environment.1.gz
+man/man1/knife-exec.1.gz
+man/man1/knife-index-rebuild.1.gz
+man/man1/knife-list.1.gz
+man/man1/knife-node.1.gz
+man/man1/knife-raw.1.gz
+man/man1/knife-recipe-list.1.gz
+man/man1/knife-role.1.gz
+man/man1/knife-search.1.gz
+man/man1/knife-show.1.gz
+man/man1/knife-ssh.1.gz
+man/man1/knife-status.1.gz
+man/man1/knife-tag.1.gz
+man/man1/knife-upload.1.gz
+man/man1/knife-user.1.gz
+man/man1/knife-xargs.1.gz
+man/man1/knife.1.gz
+man/man8/chef-client.8.gz
+man/man8/chef-solo.8.gz