aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2012-08-30 11:08:13 +0800
committerswills <swills@FreeBSD.org>2012-08-30 11:08:13 +0800
commit57cfec8d18a14413d1bf4d0729bbf34e63598148 (patch)
treefeb4fbd44e511e1a12c69707cd66569d3a009975
parent018e35ef0c43290bf50b42d5955a7eb3025102ce (diff)
downloadfreebsd-ports-gnome-57cfec8d18a14413d1bf4d0729bbf34e63598148.tar.gz
freebsd-ports-gnome-57cfec8d18a14413d1bf4d0729bbf34e63598148.tar.zst
freebsd-ports-gnome-57cfec8d18a14413d1bf4d0729bbf34e63598148.zip
- Fix rc script status and restart/shutdown
PR: ports/170980 Reported by: Nicolas Szalay <nicolas.szalay@fotolia.com>
-rw-r--r--sysutils/mcollective/Makefile4
-rw-r--r--sysutils/mcollective/files/mcollectived.in2
2 files changed, 4 insertions, 2 deletions
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
index 23c519beea0e..e31d4c0c65a2 100644
--- a/sysutils/mcollective/Makefile
+++ b/sysutils/mcollective/Makefile
@@ -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 \
diff --git a/sysutils/mcollective/files/mcollectived.in b/sysutils/mcollective/files/mcollectived.in
index 057259d704ef..24abc8f8a168 100644
--- a/sysutils/mcollective/files/mcollectived.in
+++ b/sysutils/mcollective/files/mcollectived.in
@@ -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"