Attachment #204772 for bug #238283




# $FreeBSD$

PORTNAME=	zookeeper
PORTVERSION=	3.5.5
CATEGORIES=	devel java
MASTER_SITES=	APACHE/${PORTNAME}/current
DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin

MAINTAINER=	skreuzer@FreeBSD.org
COMMENT=	Coordination Service for Distributed Applications


LICENSE=	APACHE20

RUN_DEPENDS=	libzookeeper>=${PORTVERSION}:devel/libzookeeper
		netty>=3.5.5:java/netty \
		jline>=0.9.94:devel/jline \
		log4j>=1.2.16:devel/log4j \
		libzookeeper>=${PORTVERSION}:devel/libzookeeper

USERS=	zookeeper
GROUPS=	zookeeper


ZOOKEEPER_CONFS=	configuration.xsl log4j.properties zoo.cfg

DATADIR=		${JAVASHAREDIR}/${PORTNAME}

ZOOKEEPER_DBDIR?=	/var/db/zookeeper
ZOOKEEPER_LOGDIR?=	/var/log/zookeeper

SUB_LIST=	JAVA=${JAVA} \
		JAVALIBDIR=${JAVALIBDIR} \
		ETCDIR=${ETCDIR} \
		USERS=${USERS} \
		GROUPS=${GROUPS} \
		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}

PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
		USERS=${USERS} \
		GROUPS=${GROUPS} \
		ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
		JAVALIBDIR=${JAVALIBDIR}

NO_BUILD=	yes
NO_ARCH=	yes
USE_JAVA=	yes
JAVA_VERSION=	1.8+
JAVA_RUN=	yes
USE_RC_SUBR=	zookeeper


.for f in ${ZOOKEEPER_CONFS}
	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
.endfor
	@${MKDIR} ${STAGEDIR}${DATADIR}
	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! -name *\.txt")
		${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}.jar)

	${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/
	${INSTALL_SCRIPT} ${WRKDIR}/zkServer.sh ${STAGEDIR}${PREFIX}/bin/

Lines 1-3 Link Here

(-)devel/zookeeper/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1525190291	1	TIMESTAMP = 1559404113
2	SHA256 (zookeeper-3.4.12.tar.gz) = c686f9319050565b58e642149cb9e4c9cc8c7207aacc2cb70c5c0672849594b9	2	SHA256 (apache-zookeeper-3.5.5-bin.tar.gz) = c5ff531cbda56c157199ab80632dc50ffefa8b7cbe866a0431345d3c4d72bbd1
3	SIZE (zookeeper-3.4.12.tar.gz) = 36667596	3	SIZE (apache-zookeeper-3.5.5-bin.tar.gz) = 10622522




zookeeper_logdir="%%ZOOKEEPER_LOGDIR%%"

JAVA=%%JAVA%%
JAVAJARDIR=%%JAVAJARDIR%%

CLASSPATH=":%%DATADIR%%/*"
do
    CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
done
CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH

zookeeper_main="org.apache.zookeeper.ZooKeeperMain"
log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \




zookeeper_config=${2:-%%ETCDIR%%/zoo.cfg}

JAVA=%%JAVA%%
JAVAJARDIR=%%JAVAJARDIR%%

zookeeper_datadir=$(grep '^dataDir' ${zookeeper_config} | sed -e 's/.*=//')

zookeeper_pidfile=${zookeeper_datadir}/zookeeper.pid

CLASSPATH=":%%DATADIR%%/*"
do
    CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
done
CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH

zookeeper_main="org.apache.zookeeper.server.quorum.QuorumPeerMain"
log4j_params="-Dzookeeper.log.dir=${zookeeper_datadir} \




load_rc_config "${name}"

: ${zookeeper_enable:=NO}
: ${zookeeper_user:=%%USERS%%}
: ${zookeeper_group:=%%GROUPS%%}
: ${zookeeper_pidfile:=/var/run/zookeeper.pid}
: ${zookeeper_config:=%%ETCDIR%%/zoo.cfg}
: ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}

: ${zookeeper_jvmopts:=}

JAVA=%%JAVA%%
JAVAJARDIR=%%JAVAJARDIR%%

CLASSPATH=":%%DATADIR%%/*"
do
    CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
done
CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH

zookeeper_main="-cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"
log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \




bin/zkCli.sh
bin/zkServer.sh
%%DATADIR%%/audience-annotations-0.5.0.jar
%%DATADIR%%/commons-cli-1.2.jar
%%DATADIR%%/jackson-annotations-2.9.0.jar
%%DATADIR%%/jackson-core-2.9.8.jar
%%DATADIR%%/jackson-databind-2.9.8.jar
%%DATADIR%%/javax.servlet-api-3.1.0.jar
%%DATADIR%%/jetty-http-9.4.17.v20190418.jar
%%DATADIR%%/jetty-io-9.4.17.v20190418.jar
%%DATADIR%%/jetty-security-9.4.17.v20190418.jar
%%DATADIR%%/jetty-server-9.4.17.v20190418.jar
%%DATADIR%%/jetty-servlet-9.4.17.v20190418.jar
%%DATADIR%%/jetty-util-9.4.17.v20190418.jar
%%DATADIR%%/jline-2.11.jar
%%DATADIR%%/json-simple-1.1.1.jar
%%DATADIR%%/log4j-1.2.17.jar
%%DATADIR%%/netty-all-4.1.29.Final.jar
%%DATADIR%%/slf4j-api-1.7.25.jar
%%DATADIR%%/slf4j-log4j12-1.7.25.jar
%%DATADIR%%/zookeeper-%%PORTVERSION%%.jar
%%DATADIR%%/zookeeper-jute-%%PORTVERSION%%.jar
@sample %%ETCDIR%%/log4j.properties.sample
@sample %%ETCDIR%%/configuration.xsl.sample
@sample %%ETCDIR%%/zoo.cfg.sample
@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_LOGDIR%%
@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_DBDIR%%

Return to bug 238283

Lines 1-9 Link Here

(-)devel/zookeeper/Makefile (-15 / +12 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= zookeeper	3	PORTNAME= zookeeper
4	PORTVERSION= 3.4.12	4	PORTVERSION= 3.5.5
5	CATEGORIES= devel java	5	CATEGORIES= devel java
6	MASTER_SITES= APACHE/${PORTNAME}/current	6	MASTER_SITES= APACHE/${PORTNAME}/current
		7	DISTNAME= apache-${PORTNAME}-${PORTVERSION}-bin
7		8
8	MAINTAINER= skreuzer@FreeBSD.org	9	MAINTAINER= skreuzer@FreeBSD.org
9	COMMENT= Coordination Service for Distributed Applications	10	COMMENT= Coordination Service for Distributed Applications
Lines 10-20 Link Here
10		11
11	LICENSE= APACHE20	12	LICENSE= APACHE20
12		13
13	RUN_DEPENDS= slf4j>=1.7.5:devel/slf4j \	14	RUN_DEPENDS= libzookeeper>=${PORTVERSION}:devel/libzookeeper
14	netty>=3.5.5:java/netty \
15	jline>=0.9.94:devel/jline \
16	log4j>=1.2.16:devel/log4j \
17	libzookeeper>=${PORTVERSION}:devel/libzookeeper
18		15
19	USERS= zookeeper	16	USERS= zookeeper
20	GROUPS= zookeeper	17	GROUPS= zookeeper
Lines 21-27 Link Here
21		18
22	ZOOKEEPER_CONFS= configuration.xsl log4j.properties zoo.cfg	19	ZOOKEEPER_CONFS= configuration.xsl log4j.properties zoo.cfg
23		20
24	ZOOKEEPER_JAR= ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar	21	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
25		22
26	ZOOKEEPER_DBDIR?= /var/db/zookeeper	23	ZOOKEEPER_DBDIR?= /var/db/zookeeper
27	ZOOKEEPER_LOGDIR?= /var/log/zookeeper	24	ZOOKEEPER_LOGDIR?= /var/log/zookeeper
Lines 30-48 Link Here
30	SUB_LIST= JAVA=${JAVA} \	27	SUB_LIST= JAVA=${JAVA} \
31	JAVALIBDIR=${JAVALIBDIR} \	28	JAVALIBDIR=${JAVALIBDIR} \
32	ETCDIR=${ETCDIR} \	29	ETCDIR=${ETCDIR} \
33	ZOOKEEPER_USER=${USERS} \	30	USERS=${USERS} \
34	ZOOKEEPER_GROUP=${GROUPS} \	31	GROUPS=${GROUPS} \
35	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}	32	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
36		33
37	PLIST_SUB+= PORTVERSION=${PORTVERSION} \	34	PLIST_SUB+= PORTVERSION=${PORTVERSION} \
		35	USERS=${USERS} \
		36	GROUPS=${GROUPS} \
38	ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \	37	ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
39	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \	38	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
40	JAVALIBDIR=${JAVALIBDIR}
41		39
42	NO_BUILD= yes	40	NO_BUILD= yes
43	NO_ARCH= yes	41	NO_ARCH= yes
44	USE_JAVA= yes	42	USE_JAVA= yes
45	JAVA_VERSION= 1.7+	43	JAVA_VERSION= 1.8+
46	JAVA_RUN= yes	44	JAVA_RUN= yes
47	USE_RC_SUBR= zookeeper	45	USE_RC_SUBR= zookeeper
48		46
Lines 59-67 Link Here
59	.for f in ${ZOOKEEPER_CONFS}	57	.for f in ${ZOOKEEPER_CONFS}
60	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample	58	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
61	.endfor	59	.endfor
62	${INSTALL_DATA} ${ZOOKEEPER_JAR} ${STAGEDIR}${JAVALIBDIR}	60	@${MKDIR} ${STAGEDIR}${DATADIR}
63	(cd ${STAGEDIR}/${JAVAJARDIR} && ${LN} -nfs \	61	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! -name *\.txt")
64	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}.jar)
65		62
66	${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/	63	${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/
67	${INSTALL_SCRIPT} ${WRKDIR}/zkServer.sh ${STAGEDIR}${PREFIX}/bin/	64	${INSTALL_SCRIPT} ${WRKDIR}/zkServer.sh ${STAGEDIR}${PREFIX}/bin/

Lines 6-18 Link Here

(-)devel/zookeeper/files/zkCli.sh.in (-6 / +1 lines)
6	zookeeper_logdir="%%ZOOKEEPER_LOGDIR%%"	6	zookeeper_logdir="%%ZOOKEEPER_LOGDIR%%"
7		7
8	JAVA=%%JAVA%%	8	JAVA=%%JAVA%%
9	JAVAJARDIR=%%JAVAJARDIR%%
10		9
11	for i in zookeeper jline slf4j-api netty log4j	10	CLASSPATH=":%%DATADIR%%/*"
12	do
13	CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
14	done
15	CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH
16		11
17	zookeeper_main="org.apache.zookeeper.ZooKeeperMain"	12	zookeeper_main="org.apache.zookeeper.ZooKeeperMain"
18	log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \	13	log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \

Lines 6-22 Link Here

(-)devel/zookeeper/files/zkServer.sh.in (-6 / +1 lines)
6	zookeeper_config=${2:-%%ETCDIR%%/zoo.cfg}	6	zookeeper_config=${2:-%%ETCDIR%%/zoo.cfg}
7		7
8	JAVA=%%JAVA%%	8	JAVA=%%JAVA%%
9	JAVAJARDIR=%%JAVAJARDIR%%
10		9
11	zookeeper_datadir=$(grep '^dataDir' ${zookeeper_config} \| sed -e 's/.*=//')	10	zookeeper_datadir=$(grep '^dataDir' ${zookeeper_config} \| sed -e 's/.*=//')
12		11
13	zookeeper_pidfile=${zookeeper_datadir}/zookeeper.pid	12	zookeeper_pidfile=${zookeeper_datadir}/zookeeper.pid
14		13
15	for i in zookeeper jline slf4j-api netty log4j	14	CLASSPATH=":%%DATADIR%%/*"
16	do
17	CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
18	done
19	CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH
20		15
21	zookeeper_main="org.apache.zookeeper.server.quorum.QuorumPeerMain"	16	zookeeper_main="org.apache.zookeeper.server.quorum.QuorumPeerMain"
22	log4j_params="-Dzookeeper.log.dir=${zookeeper_datadir} \	17	log4j_params="-Dzookeeper.log.dir=${zookeeper_datadir} \

Lines 18-25 Link Here

(-)devel/zookeeper/files/zookeeper.in (-8 / +3 lines)
18	load_rc_config "${name}"	18	load_rc_config "${name}"
19		19
20	: ${zookeeper_enable:=NO}	20	: ${zookeeper_enable:=NO}
21	: ${zookeeper_user:=%%ZOOKEEPER_USER%%}	21	: ${zookeeper_user:=%%USERS%%}
22	: ${zookeeper_group:=%%ZOOKEEPER_GROUP%%}	22	: ${zookeeper_group:=%%GROUPS%%}
23	: ${zookeeper_pidfile:=/var/run/zookeeper.pid}	23	: ${zookeeper_pidfile:=/var/run/zookeeper.pid}
24	: ${zookeeper_config:=%%ETCDIR%%/zoo.cfg}	24	: ${zookeeper_config:=%%ETCDIR%%/zoo.cfg}
25	: ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}	25	: ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}
Lines 28-40 Link Here
28	: ${zookeeper_jvmopts:=}	28	: ${zookeeper_jvmopts:=}
29		29
30	JAVA=%%JAVA%%	30	JAVA=%%JAVA%%
31	JAVAJARDIR=%%JAVAJARDIR%%
32		31
33	for i in zookeeper jline slf4j-api netty log4j	32	CLASSPATH=":%%DATADIR%%/*"
34	do
35	CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
36	done
37	CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH
38		33
39	zookeeper_main="-cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"	34	zookeeper_main="-cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"
40	log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \	35	log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \

Lines 1-9 Link Here

(-)devel/zookeeper/pkg-plist (-4 / +22 lines)
1	bin/zkCli.sh	1	bin/zkCli.sh
2	bin/zkServer.sh	2	bin/zkServer.sh
3	%%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar	3	%%DATADIR%%/audience-annotations-0.5.0.jar
4	%%JAVAJARDIR%%/zookeeper.jar	4	%%DATADIR%%/commons-cli-1.2.jar
		5	%%DATADIR%%/jackson-annotations-2.9.0.jar
		6	%%DATADIR%%/jackson-core-2.9.8.jar
		7	%%DATADIR%%/jackson-databind-2.9.8.jar
		8	%%DATADIR%%/javax.servlet-api-3.1.0.jar
		9	%%DATADIR%%/jetty-http-9.4.17.v20190418.jar
		10	%%DATADIR%%/jetty-io-9.4.17.v20190418.jar
		11	%%DATADIR%%/jetty-security-9.4.17.v20190418.jar
		12	%%DATADIR%%/jetty-server-9.4.17.v20190418.jar
		13	%%DATADIR%%/jetty-servlet-9.4.17.v20190418.jar
		14	%%DATADIR%%/jetty-util-9.4.17.v20190418.jar
		15	%%DATADIR%%/jline-2.11.jar
		16	%%DATADIR%%/json-simple-1.1.1.jar
		17	%%DATADIR%%/log4j-1.2.17.jar
		18	%%DATADIR%%/netty-all-4.1.29.Final.jar
		19	%%DATADIR%%/slf4j-api-1.7.25.jar
		20	%%DATADIR%%/slf4j-log4j12-1.7.25.jar
		21	%%DATADIR%%/zookeeper-%%PORTVERSION%%.jar
		22	%%DATADIR%%/zookeeper-jute-%%PORTVERSION%%.jar
5	@sample %%ETCDIR%%/log4j.properties.sample	23	@sample %%ETCDIR%%/log4j.properties.sample
6	@sample %%ETCDIR%%/configuration.xsl.sample	24	@sample %%ETCDIR%%/configuration.xsl.sample
7	@sample %%ETCDIR%%/zoo.cfg.sample	25	@sample %%ETCDIR%%/zoo.cfg.sample
8	@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%%	26	@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_LOGDIR%%
9	@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%	27	@dir(%%USERS%%,%%GROUPS%%,755) %%ZOOKEEPER_DBDIR%%