View | Details | Raw Unified | Return to bug 261748 | Differences between
and this patch

Collapse All | Expand All

(-)b/sysutils/rundeck3/Makefile (-1 / +9 lines)
Lines 32-37 SUB_LIST+= JAVA_HOME=${JAVA_HOME} \ Link Here
32
		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
32
		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
33
		RUNDECK_USER=${RUNDECK_USER}
33
		RUNDECK_USER=${RUNDECK_USER}
34
34
35
.include <bsd.port.pre.mk>
36
37
.if ${OSVERSION} < 1203000
38
SUB_LIST+=	DAEMON_H_FLAG=""
39
.else
40
SUB_LIST+=	DAEMON_H_FLAG="-H "
41
.endif
42
35
RUNDECK_HOME=		${PREFIX}/rundeck
43
RUNDECK_HOME=		${PREFIX}/rundeck
36
RUNDECK_USER?=		rundeck
44
RUNDECK_USER?=		rundeck
37
RUNDECK_GROUP?=		rundeck
45
RUNDECK_GROUP?=		rundeck
Lines 64-67 post-install: Link Here
64
		${WRKDIR}/${RUNDECK_LOG4J} \
72
		${WRKDIR}/${RUNDECK_LOG4J} \
65
		${STAGEDIR}${RUNDECK_CONFIG_DIR}/${RUNDECK_LOG4J}
73
		${STAGEDIR}${RUNDECK_CONFIG_DIR}/${RUNDECK_LOG4J}
66
74
67
.include <bsd.port.mk>
75
.include <bsd.port.post.mk>
(-)b/sysutils/rundeck3/files/rundeck.in (-1 / +1 lines)
Lines 58-64 pidfile="/var/run/rundeck/rundeck.pid" Link Here
58
command="/usr/sbin/daemon"
58
command="/usr/sbin/daemon"
59
java_cmd="${rundeck_java_home}/bin/java"
59
java_cmd="${rundeck_java_home}/bin/java"
60
procname="${java_cmd}"
60
procname="${java_cmd}"
61
command_args="-p ${pidfile} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args} > ${rundeck_log_file} 2>&1"
61
command_args="-p ${pidfile} %%DAEMON_H_FLAG%%-o ${rundeck_log_file} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args} 
62
required_files="${java_cmd}"
62
required_files="${java_cmd}"
63
63
64
start_precmd="rundeck_prestart"
64
start_precmd="rundeck_prestart"

Return to bug 261748