Attachment #184461 for bug #220815

View | Details | Raw Unified | Return to bug 220815
Collapse All | Expand All

Lines 8-13 Link Here

(-)zookeeper/Makefile (-2 / +9 lines)
8	MAINTAINER= skreuzer@FreeBSD.org	8	MAINTAINER= skreuzer@FreeBSD.org
9	COMMENT= Coordination Service for Distributed Applications	9	COMMENT= Coordination Service for Distributed Applications
10		10
		11	LICENSE= APACHE20
		12
11	RUN_DEPENDS= slf4j>=1.7.5:devel/slf4j \	13	RUN_DEPENDS= slf4j>=1.7.5:devel/slf4j \
12	netty>=3.5.5:java/netty \	14	netty>=3.5.5:java/netty \
13	jline>=0.9.94:devel/jline \	15	jline>=0.9.94:devel/jline \
Lines 17-22 Link Here
17	USERS= zookeeper	19	USERS= zookeeper
18	GROUPS= zookeeper	20	GROUPS= zookeeper
19		21
		22	ZOOKEEPER_CONFS= configuration.xsl log4j.properties zoo.cfg
		23
20	ZOOKEEPER_JAR= ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar	24	ZOOKEEPER_JAR= ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar
21		25
22	ZOOKEEPER_DBDIR?= /var/db/zookeeper	26	ZOOKEEPER_DBDIR?= /var/db/zookeeper
Lines 47-56 Link Here
47		51
48	post-extract:	52	post-extract:
49	@${REINPLACE_CMD} "/dataDir/s\|=.*\|=${ZOOKEEPER_DBDIR}\|" ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg	53	@${REINPLACE_CMD} "/dataDir/s\|=.*\|=${ZOOKEEPER_DBDIR}\|" ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg
50	@${RM} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg.bak	54	@${MV} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg ${WRKDIR}/${DISTNAME}/conf/zoo.cfg
51		55
52	do-install:	56	do-install:
53	${CP} -Rp ${WRKDIR}/${DISTNAME}/conf/ ${STAGEDIR}${ETCDIR}	57	@${MKDIR} ${STAGEDIR}${ETCDIR}
		58	.for f in ${ZOOKEEPER_CONFS}
		59	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
		60	.endfor
54	${INSTALL_DATA} ${ZOOKEEPER_JAR} ${STAGEDIR}${JAVALIBDIR}	61	${INSTALL_DATA} ${ZOOKEEPER_JAR} ${STAGEDIR}${JAVALIBDIR}
55	(cd ${STAGEDIR}/${JAVAJARDIR} && ${LN} -nfs \	62	(cd ${STAGEDIR}/${JAVAJARDIR} && ${LN} -nfs \
56	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}.jar)	63	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}.jar)

Lines 25-30 Link Here

(-)zookeeper/files/zookeeper.in (-1 / +2 lines)
25	: ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}	25	: ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}
26	: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}	26	: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
27	: ${zookeeper_logdir:=%%ZOOKEEPER_LOGDIR%%}	27	: ${zookeeper_logdir:=%%ZOOKEEPER_LOGDIR%%}
		28	: ${zookeeper_jvmopts:=}
28		29
29	JAVA=%%JAVA%%	30	JAVA=%%JAVA%%
30	JAVAJARDIR=%%JAVAJARDIR%%	31	JAVAJARDIR=%%JAVAJARDIR%%
Lines 44-50 Link Here
44	required_files="${zookeeper_config}"	45	required_files="${zookeeper_config}"
45		46
46	command="/usr/sbin/daemon"	47	command="/usr/sbin/daemon"
47	command_args="-p ${pidfile} ${JAVA} ${log4j_params} ${zookeeper_main}"	48	command_args="-p ${pidfile} ${JAVA} ${zookeeper_jvmopts} ${log4j_params} ${zookeeper_main}"
48		49
49	start_precmd="zookeeper_init"	50	start_precmd="zookeeper_init"
50		51

Lines 2-9 Link Here

(-)zookeeper/pkg-plist (-3 / +3 lines)
2	bin/zkServer.sh	2	bin/zkServer.sh
3	%%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar	3	%%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar
4	%%JAVAJARDIR%%/zookeeper.jar	4	%%JAVAJARDIR%%/zookeeper.jar
5	%%ETCDIR%%/log4j.properties	5	@sample %%ETCDIR%%/log4j.properties.sample
6	%%ETCDIR%%/configuration.xsl	6	@sample %%ETCDIR%%/configuration.xsl.sample
7	%%ETCDIR%%/zoo_sample.cfg	7	@sample %%ETCDIR%%/zoo.cfg.sample
8	@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%%	8	@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%%
9	@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%	9	@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%

Return to bug 220815