From owner-svn-ports-all@FreeBSD.ORG  Thu Aug 30 03:08:14 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6C611106566C;
	Thu, 30 Aug 2012 03:08:14 +0000 (UTC)
	(envelope-from swills@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 575368FC18;
	Thu, 30 Aug 2012 03:08:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7U38ESf061305;
	Thu, 30 Aug 2012 03:08:14 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7U38ESV061301;
	Thu, 30 Aug 2012 03:08:14 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201208300308.q7U38ESV061301@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 30 Aug 2012 03:08:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303359 - in head/sysutils/mcollective: . files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2012 03:08:14 -0000

Author: swills
Date: Thu Aug 30 03:08:13 2012
New Revision: 303359
URL: http://svn.freebsd.org/changeset/ports/303359

Log:
  - Fix rc script status and restart/shutdown
  
  PR:		ports/170980
  Reported by:	Nicolas Szalay <nicolas.szalay@fotolia.com>

Modified:
  head/sysutils/mcollective/Makefile   (contents, props changed)
  head/sysutils/mcollective/files/mcollectived.in   (contents, props changed)

Modified: head/sysutils/mcollective/Makefile
==============================================================================
--- head/sysutils/mcollective/Makefile	Thu Aug 30 02:18:32 2012	(r303358)
+++ head/sysutils/mcollective/Makefile	Thu Aug 30 03:08:13 2012	(r303359)
@@ -7,7 +7,7 @@
 
 PORTNAME=	mcollective
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
@@ -28,6 +28,8 @@ REINPLACE_ARGS=	-i ""
 
 SCRIPTS=	mco mc-call-agent
 
+SUB_LIST+=	RUBY=${RUBY}
+
 do-patch:
 	@${REINPLACE_CMD} -e "s|/etc/mcollective|${ETCDIR}|" \
 	    ${WRKSRC}/bin/mcollectived \

Modified: head/sysutils/mcollective/files/mcollectived.in
==============================================================================
--- head/sysutils/mcollective/files/mcollectived.in	Thu Aug 30 02:18:32 2012	(r303358)
+++ head/sysutils/mcollective/files/mcollectived.in	Thu Aug 30 03:08:13 2012	(r303359)
@@ -25,6 +25,6 @@ load_rc_config "${name}"
 pidfile="/var/run/${name}.pid"
 command="%%PREFIX%%/sbin/${name}"
 command_args="-p $pidfile"
-procname="ruby"
+command_interpreter=%%RUBY%%
 
 run_rc_command "$1"