Attachment #165625 for bug #204988





PORTNAME=	riemann
PORTVERSION=	0.2.10
PORTREVISION=	1
CATEGORIES=	net-mgmt java
MASTER_SITES=	https://wintermute.skunkwerks.at/${PORTNAME}/releases/${PORTVERSION}/ \
		http://aphyr.com/${PORTNAME}/

SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
		RIEMANN_USER=${RIEMANN_USER} \
		RIEMANN_GROUP=${RIEMANN_GROUP} \
		RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
		RIEMANN_LOGDIR=${RIEMANN_LOGDIR}

PLIST_SUB=	JAVA_HOME=${JAVA_HOME} \
		RIEMANN_USER=${RIEMANN_USER} \
		RIEMANN_GROUP=${RIEMANN_GROUP} \
		RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
		RIEMANN_LOGDIR=${RIEMANN_LOGDIR}

RIEMANN_USER?=	${PORTNAME}

USE_RC_SUBR=	${PORTNAME}

RIEMANN_LOGDIR=	/var/log/${PORTNAME}/
RIEMANN_PIDFILE=	/var/run/${PORTNAME}.pid

do-install:
	${MKDIR} \
		${STAGEDIR}${JAVAJARDIR} \
		${STAGEDIR}${ETCDIR} \
		${STAGEDIR}${RIEMANN_PIDDIR} \
		${STAGEDIR}${RIEMANN_LOGDIR}
	${INSTALL_DATA} \
				${WRKSRC}/lib/${PORTNAME}.jar \




: ${riemann_min_mem:="256m"}
: ${riemann_max_mem:="1g"}
: ${riemann_java_opts:=" -server \
        -Dapp=${name} \
        -Xms${riemann_min_mem} \
        -Xmx${riemann_max_mem} \
        -Xss256k \

        -XX:+UseParNewGC \
        -XX:CMSInitiatingOccupancyFraction=75 "}

pidfile="%%RIEMANN_PIDFILE%%"
command="/usr/sbin/daemon"
command_args="-f -c -r -P ${pidfile} \
    ${riemann_java_home}/bin/java \
    ${riemann_java_opts} \
    -jar ${riemann_jarfile} ${riemann_config}"
required_files="${java_cmd} ${riemann_config}"

riemann_prestart()
{
    	install -o ${riemann_user} /dev/null ${pidfile}
}
start_precmd=${name}_prestart


Lines 1-4 Link Here

(-)b/net-mgmt/riemann/pkg-plist (-2 lines)
1	%%JAVAJARDIR%%/riemann.jar	1	%%JAVAJARDIR%%/riemann.jar
2	@sample %%ETCDIR%%/riemann.config.sample	2	@sample %%ETCDIR%%/riemann.config.sample
3	@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_LOGDIR%%	3	@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_LOGDIR%%
4	@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_PIDDIR%%
5	-

Return to bug 204988

Lines 36-41 load_rc_config $name Link Here

(-)b/net-mgmt/riemann/files/riemann.in (-4 / +6 lines)
36	: ${riemann_min_mem:="256m"}	36	: ${riemann_min_mem:="256m"}
37	: ${riemann_max_mem:="1g"}	37	: ${riemann_max_mem:="1g"}
38	: ${riemann_java_opts:=" -server \	38	: ${riemann_java_opts:=" -server \
		39	-Dapp=${name} \
39	-Xms${riemann_min_mem} \	40	-Xms${riemann_min_mem} \
40	-Xmx${riemann_max_mem} \	41	-Xmx${riemann_max_mem} \
41	-Xss256k \	42	-Xss256k \
Lines 53-68 load_rc_config $name Link Here
53	-XX:+UseParNewGC \	54	-XX:+UseParNewGC \
54	-XX:CMSInitiatingOccupancyFraction=75 "}	55	-XX:CMSInitiatingOccupancyFraction=75 "}
55		56
56	riemann_pidfile="%%RIEMANN_PIDDIR%%${name}.pid"	57	pidfile="%%RIEMANN_PIDFILE%%"
57	command="/usr/sbin/daemon"	58	command="/usr/sbin/daemon"
58	procname="${riemann_java_home}/bin/java"	59	command_args="-f -c -r -P ${pidfile} \
59	command_args="-f -c -p ${riemann_pidfile} ${procname} ${riemann_java_opts} \	60	${riemann_java_home}/bin/java \
		61	${riemann_java_opts} \
60	-jar ${riemann_jarfile} ${riemann_config}"	62	-jar ${riemann_jarfile} ${riemann_config}"
61	required_files="${java_cmd} ${riemann_config}"	63	required_files="${java_cmd} ${riemann_config}"
62		64
63	riemann_prestart()	65	riemann_prestart()
64	{	66	{
65	install -o ${riemann_user} /dev/null ${riemann_pidfile}	67	install -o ${riemann_user} /dev/null ${pidfile}
66	}	68	}
67	start_precmd=${name}_prestart	69	start_precmd=${name}_prestart
68		70

Lines 3-8 Link Here

(-)b/net-mgmt/riemann/Makefile (-4 / +4 lines)
3		3
4	PORTNAME= riemann	4	PORTNAME= riemann
5	PORTVERSION= 0.2.10	5	PORTVERSION= 0.2.10
		6	PORTREVISION= 1
6	CATEGORIES= net-mgmt java	7	CATEGORIES= net-mgmt java
7	MASTER_SITES= https://wintermute.skunkwerks.at/${PORTNAME}/releases/${PORTVERSION}/ \	8	MASTER_SITES= https://wintermute.skunkwerks.at/${PORTNAME}/releases/${PORTVERSION}/ \
8	http://aphyr.com/${PORTNAME}/	9	http://aphyr.com/${PORTNAME}/
Lines 22-34 SUB_FILES= ${PORTNAME} Link Here
22	SUB_LIST+= JAVA_HOME=${JAVA_HOME} \	23	SUB_LIST+= JAVA_HOME=${JAVA_HOME} \
23	RIEMANN_USER=${RIEMANN_USER} \	24	RIEMANN_USER=${RIEMANN_USER} \
24	RIEMANN_GROUP=${RIEMANN_GROUP} \	25	RIEMANN_GROUP=${RIEMANN_GROUP} \
25	RIEMANN_PIDDIR=${RIEMANN_PIDDIR} \	26	RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
26	RIEMANN_LOGDIR=${RIEMANN_LOGDIR}	27	RIEMANN_LOGDIR=${RIEMANN_LOGDIR}
27		28
28	PLIST_SUB= JAVA_HOME=${JAVA_HOME} \	29	PLIST_SUB= JAVA_HOME=${JAVA_HOME} \
29	RIEMANN_USER=${RIEMANN_USER} \	30	RIEMANN_USER=${RIEMANN_USER} \
30	RIEMANN_GROUP=${RIEMANN_GROUP} \	31	RIEMANN_GROUP=${RIEMANN_GROUP} \
31	RIEMANN_PIDDIR=${RIEMANN_PIDDIR} \	32	RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
32	RIEMANN_LOGDIR=${RIEMANN_LOGDIR}	33	RIEMANN_LOGDIR=${RIEMANN_LOGDIR}
33		34
34	RIEMANN_USER?= ${PORTNAME}	35	RIEMANN_USER?= ${PORTNAME}
Lines 44-56 GROUPS= ${PORTNAME} Link Here
44	USE_RC_SUBR= ${PORTNAME}	45	USE_RC_SUBR= ${PORTNAME}
45		46
46	RIEMANN_LOGDIR= /var/log/${PORTNAME}/	47	RIEMANN_LOGDIR= /var/log/${PORTNAME}/
47	RIEMANN_PIDDIR= /var/run/${PORTNAME}/	48	RIEMANN_PIDFILE= /var/run/${PORTNAME}.pid
48		49
49	do-install:	50	do-install:
50	${MKDIR} \	51	${MKDIR} \
51	${STAGEDIR}${JAVAJARDIR} \	52	${STAGEDIR}${JAVAJARDIR} \
52	${STAGEDIR}${ETCDIR} \	53	${STAGEDIR}${ETCDIR} \
53	${STAGEDIR}${RIEMANN_PIDDIR} \
54	${STAGEDIR}${RIEMANN_LOGDIR}	54	${STAGEDIR}${RIEMANN_LOGDIR}
55	${INSTALL_DATA} \	55	${INSTALL_DATA} \
56	${WRKSRC}/lib/${PORTNAME}.jar \	56	${WRKSRC}/lib/${PORTNAME}.jar \