- update security/rubygem-net-ssh to 2.2.2,2 [1]

- update devel/rubygem-mixlib-authentication to 1.3.0 [2]
- update devel/rubygem-highline to 1.6.15 [3]
- update sysutils/rubygem-chef to 10.16.4 [4]

PR:		171010 [1]
PR:		173646 [2]
PR:		173647 [3]
PR:		171005 [4]
Submitted by: nickdewing@gmail.com [1,4]
Submitted by: maintainer, renchap@cocoa-x.com [2,4], renchap@cocoa-x.com [3]

3 files changed, 41 insertions, 22 deletions

diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile
index 095e7567180d..ea97089a17ba 100644
--- a/sysutils/rubygem-chef/Makefile
+++ b/sysutils/rubygem-chef/Makefile
@@ -1,34 +1,31 @@
-# Ports collection makefile for:	rubygem-chef
-# Date created:				19 Mar 2010
-# Whom:					Renaud Chaput <renchap@cocoa-x.com>
-#
+# Created by: Renaud Chaput <renchap@cocoa-x.com>
 # $FreeBSD$
-#
 
 PORTNAME=	chef
-PORTVERSION=	0.10.8
-PORTREVISION=	1
+PORTVERSION=	10.16.4
 CATEGORIES=	sysutils
 MASTER_SITES=	RG
 
 MAINTAINER=	renchap@cocoa-x.com
 COMMENT=	A systems integration framework. Client part
 
-RUN_DEPENDS=	rubygem-mixlib-log>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-log \
-		rubygem-mixlib-config>=1.1.2:${PORTSDIR}/devel/rubygem-mixlib-config \
-		rubygem-mixlib-cli>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-cli \
-		rubygem-mixlib-authentication>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-authentication \
+RUN_DEPENDS=	rubygem-bunny>=0.6.0:${PORTSDIR}/net/rubygem-bunny \
+		rubygem-erubis>=0:${PORTSDIR}/www/rubygem-erubis \
+		rubygem-highline>=1.6.9:${PORTSDIR}/devel/rubygem-highline \
 		rubygem-json>=1.4.4:${PORTSDIR}/devel/rubygem-json146 \
-		rubygem-uuidtools>=0:${PORTSDIR}/devel/rubygem-uuidtools \
-		rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline \
+		rubygem-mixlib-authentication>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-authentication \
+		rubygem-mixlib-cli>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-cli \
+		rubygem-mixlib-config>=1.1.2:${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-moneta>=0:${PORTSDIR}/devel/rubygem-moneta \
-		rubygem-erubis>=0:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-rest-client>=1.0.4:${PORTSDIR}/www/rubygem-rest-client \
-		rubygem-bunny>=0.6.0:${PORTSDIR}/net/rubygem-bunny \
-		rubygem-ohai>=0.6.0:${PORTSDIR}/sysutils/rubygem-ohai \
-		rubygem-net-ssh>=2.1.3:${PORTSDIR}/security/rubygem-net-ssh \
+		rubygem-net-ssh>=2.2.2:${PORTSDIR}/security/rubygem-net-ssh \
 		rubygem-net-ssh-multi>=1.1.0:${PORTSDIR}/security/rubygem-net-ssh-multi \
-		rubygem-treetop>=1.4.9:${PORTSDIR}/devel/rubygem-treetop
+		rubygem-ohai>=0.6.0:${PORTSDIR}/sysutils/rubygem-ohai \
+		rubygem-rest-client>=1.0.4:${PORTSDIR}/www/rubygem-rest-client \
+		rubygem-treetop>=1.4.9:${PORTSDIR}/devel/rubygem-treetop \
+		rubygem-uuidtools>=0:${PORTSDIR}/devel/rubygem-uuidtools \
+		rubygem-yajl-ruby>=1.1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
 
 USE_RUBY=		yes
 USE_RUBYGEMS=		yes
@@ -40,7 +37,22 @@ PLIST_FILES=	bin/chef-client \
 		bin/shef \
 		bin/knife
 
+MAN1=		knife.1 knife-bootstrap.1 knife-client.1 knife-configure.1 knife-cookbook.1 \
+		knife-cookbook-site.1 knife-data-bag.1 knife-environment.1 knife-exec.1 \
+		knife-index.1 knife-node.1 knife-role.1 knife-search.1 knife-ssh.1 knife-status.1 \
+		knife-tag.1 shef.1
+MAN8=		chef-client.8 chef-solo.8
+
 SUB_LIST=	RUBY=${RUBY}
 USE_RC_SUBR=	chef_client
 
+post-install:
+.if !defined(NO_INSTALL_MANPAGES)
+.for n in 1 8
+.for f in ${MAN${n}}
+	${INSTALL_DATA} ${PREFIX}/${GEM_LIB_DIR}/distro/common/man/man${n}/${f} ${PREFIX}/man/man${n}
+.endfor
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-chef/distinfo b/sysutils/rubygem-chef/distinfo
index e7500d3a14db..371175a29737 100644
--- a/sysutils/rubygem-chef/distinfo
+++ b/sysutils/rubygem-chef/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/chef-0.10.8.gem) = 0a1ea2ee4b22a2933d2ab60164fec21b41425abb6bb4d36e558ae91c857e1a0c
-SIZE (rubygem/chef-0.10.8.gem) = 381952
+SHA256 (rubygem/chef-10.16.4.gem) = 42424ddbcbed716ffc1863d033a1e4f5446b3922f5cd31280423f9779f54bd7f
+SIZE (rubygem/chef-10.16.4.gem) = 811008
diff --git a/sysutils/rubygem-chef/files/chef_client.in b/sysutils/rubygem-chef/files/chef_client.in
index c8b3d476e49d..160df79ad076 100644
--- a/sysutils/rubygem-chef/files/chef_client.in
+++ b/sysutils/rubygem-chef/files/chef_client.in
@@ -25,7 +25,14 @@ load_rc_config $name
 : ${chef_client_splay="0"}
 : ${chef_client_logfile="/var/log/chef-client.log"}
 : ${chef_client_loglevel="info"}
-: ${chef_client_pidfile="/var/run/chef-client.pid"}
+
+if [ -f "$chef_client_configfile" ]
+	then
+		pidfile=`awk '/^[ \t]*pid_file[ \t]+/ { print $2 }' ${chef_client_configfile}`
+		: ${chef_client_pidfile=$pidfile}
+	else
+		: ${chef_client_pidfile="/var/run/chef-client.pid"}
+fi
 
 if [ -n "$chef_client_nodename" ]
 	then