Index: devel/zookeeper/Makefile
===================================================================
--- devel/zookeeper/Makefile	(revision 503229)
+++ devel/zookeeper/Makefile	(working copy)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	zookeeper
-PORTVERSION=	3.4.12
+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
@@ -10,11 +11,7 @@
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	slf4j>=1.7.5:devel/slf4j \
-		netty>=3.5.5:java/netty \
-		jline>=0.9.94:devel/jline \
-		log4j>=1.2.16:devel/log4j \
-		libzookeeper>=${PORTVERSION}:devel/libzookeeper
+RUN_DEPENDS=	libzookeeper>=${PORTVERSION}:devel/libzookeeper
 
 USERS=	zookeeper
 GROUPS=	zookeeper
@@ -21,7 +18,7 @@
 
 ZOOKEEPER_CONFS=	configuration.xsl log4j.properties zoo.cfg
 
-ZOOKEEPER_JAR=	${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar
+DATADIR=		${JAVASHAREDIR}/${PORTNAME}
 
 ZOOKEEPER_DBDIR?=	/var/db/zookeeper
 ZOOKEEPER_LOGDIR?=	/var/log/zookeeper
@@ -36,13 +33,12 @@
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
-		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
-		JAVALIBDIR=${JAVALIBDIR}
+		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
+JAVA_VERSION=	1.8+
 JAVA_RUN=	yes
 USE_RC_SUBR=	zookeeper
 
@@ -59,9 +55,8 @@
 .for f in ${ZOOKEEPER_CONFS}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
-	${INSTALL_DATA} ${ZOOKEEPER_JAR} ${STAGEDIR}${JAVALIBDIR}
-	(cd ${STAGEDIR}/${JAVAJARDIR} && ${LN} -nfs \
-		${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}.jar)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! -name *\.txt")
 
 	${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKDIR}/zkServer.sh ${STAGEDIR}${PREFIX}/bin/
Index: devel/zookeeper/distinfo
===================================================================
--- devel/zookeeper/distinfo	(revision 503229)
+++ devel/zookeeper/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525190291
-SHA256 (zookeeper-3.4.12.tar.gz) = c686f9319050565b58e642149cb9e4c9cc8c7207aacc2cb70c5c0672849594b9
-SIZE (zookeeper-3.4.12.tar.gz) = 36667596
+TIMESTAMP = 1559404113
+SHA256 (apache-zookeeper-3.5.5-bin.tar.gz) = c5ff531cbda56c157199ab80632dc50ffefa8b7cbe866a0431345d3c4d72bbd1
+SIZE (apache-zookeeper-3.5.5-bin.tar.gz) = 10622522
Index: devel/zookeeper/files/zkCli.sh.in
===================================================================
--- devel/zookeeper/files/zkCli.sh.in	(revision 503229)
+++ devel/zookeeper/files/zkCli.sh.in	(working copy)
@@ -6,13 +6,8 @@
 zookeeper_logdir="%%ZOOKEEPER_LOGDIR%%"
 
 JAVA=%%JAVA%%
-JAVAJARDIR=%%JAVAJARDIR%%
 
-for i in zookeeper jline slf4j-api netty log4j
-do
-    CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
-done
-CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH
+CLASSPATH=":%%DATADIR%%/*"
 
 zookeeper_main="org.apache.zookeeper.ZooKeeperMain"
 log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \
Index: devel/zookeeper/files/zkServer.sh.in
===================================================================
--- devel/zookeeper/files/zkServer.sh.in	(revision 503229)
+++ devel/zookeeper/files/zkServer.sh.in	(working copy)
@@ -6,17 +6,12 @@
 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
 
-for i in zookeeper jline slf4j-api netty log4j
-do
-    CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
-done
-CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH
+CLASSPATH=":%%DATADIR%%/*"
 
 zookeeper_main="org.apache.zookeeper.server.quorum.QuorumPeerMain"
 log4j_params="-Dzookeeper.log.dir=${zookeeper_datadir} \
Index: devel/zookeeper/files/zookeeper.in
===================================================================
--- devel/zookeeper/files/zookeeper.in	(revision 503229)
+++ devel/zookeeper/files/zookeeper.in	(working copy)
@@ -28,13 +28,8 @@
 : ${zookeeper_jvmopts:=}
 
 JAVA=%%JAVA%%
-JAVAJARDIR=%%JAVAJARDIR%%
 
-for i in zookeeper jline slf4j-api netty log4j
-do
-    CLASSPATH="${JAVAJARDIR}/$i.jar:$CLASSPATH"
-done
-CLASSPATH=/usr/local/share/slf4j/slf4j-log4j12.jar:$CLASSPATH
+CLASSPATH=":%%DATADIR%%/*"
 
 zookeeper_main="-cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"
 log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \
Index: devel/zookeeper/pkg-plist
===================================================================
--- devel/zookeeper/pkg-plist	(revision 503229)
+++ devel/zookeeper/pkg-plist	(working copy)
@@ -1,7 +1,25 @@
 bin/zkCli.sh
 bin/zkServer.sh
-%%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar
-%%JAVAJARDIR%%/zookeeper.jar
+%%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