Index: head/devel/zookeeper/Makefile
===================================================================
--- head/devel/zookeeper/Makefile	(revision 383721)
+++ head/devel/zookeeper/Makefile	(revision 383722)
@@ -1,74 +1,76 @@
 # Created by: gnn@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	zookeeper
 PORTVERSION=	3.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	zookeeper/zookeeper-${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Service for maintaining distributed configuration, naming and locks
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/devel/cppunit
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
+USES+=	cpe
+CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	1.7
 JAVA_VENDOR=	openjdk
 JAVA_RUN=	yes
 
 USE_RC_SUBR=	zookeeper
 
 NO_BUILD=	yes
 
 SCRIPTS=	zkCleanup.sh \
 		zkCli.sh \
 		zkEnv.sh \
 		zkServer.sh
 PORTDOCS=	*
 
 PLIST_SUB=	PORTNAME=${PORTNAME} \
 		PORTVERSION=${PORTVERSION} \
 		JAVA_HOME=${JAVA_HOME}
 
 ZOOKEEPER_LOGDIR?=	/var/log/${PORTNAME}
 ZOOKEEPER_RUNDIR?=	/var/run/${PORTNAME}
 
 SUB_LIST+=	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
 		ZOOKEEPER_RUNDIR=${ZOOKEEPER_RUNDIR} \
 		JAVA_HOME=${JAVA_HOME}
 
 post-patch:
 .for f in ${SCRIPTS}
 	${REINPLACE_CMD} -e "s|bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/bin/${f}
 .endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
 .for f in ${SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
 .endfor
 	cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${STAGEDIR}${PREFIX}/${PORTNAME}/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX}/${PORTNAME}/
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${LN} -s ${PREFIX}/${PORTNAME}/bin/zkCli.sh ${STAGEDIR}${PREFIX}/bin/zkCli.sh
 
 .include <bsd.port.options.mk>
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR}
 	@${MKDIR} ${STAGEDIR}${ZOOKEEPER_RUNDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	${RM} -r ${STAGEDIR}${DOCSDIR}/skin/translations
 	${RM} -r ${STAGEDIR}${DOCSDIR}/skin/scripts
 	${RM} -r ${STAGEDIR}${DOCSDIR}/skin/css
 .endif
 
 .include <bsd.port.mk>
Index: head/devel/zookeeper/pkg-plist
===================================================================
--- head/devel/zookeeper/pkg-plist	(revision 383721)
+++ head/devel/zookeeper/pkg-plist	(revision 383722)
@@ -1,20 +1,22 @@
 bin/zkCli.sh
 %%PORTNAME%%/bin/zkCleanup.sh
 %%PORTNAME%%/bin/zkCli.sh
 %%PORTNAME%%/bin/zkEnv.sh
 %%PORTNAME%%/bin/zkServer.sh
 %%PORTNAME%%/conf/configuration.xsl
 %%PORTNAME%%/conf/log4j.properties
 %%PORTNAME%%/conf/zoo_sample.cfg
 %%PORTNAME%%/lib/cobertura/README.txt
 %%PORTNAME%%/lib/jdiff/%%PORTNAME%%_3.1.1.xml
 %%PORTNAME%%/lib/jdiff/%%PORTNAME%%_3.4.6.xml
 %%PORTNAME%%/lib/jdiff/%%PORTNAME%%_%%PORTVERSION%%-SNAPSHOT.xml
 %%PORTNAME%%/lib/jline-0.9.94.LICENSE.txt
 %%PORTNAME%%/lib/jline-0.9.94.jar
 %%PORTNAME%%/lib/log4j-1.2.16.LICENSE.txt
 %%PORTNAME%%/lib/log4j-1.2.16.jar
 %%PORTNAME%%/lib/netty-3.7.0.Final.jar
 %%PORTNAME%%/lib/slf4j-api-1.6.1.jar
 %%PORTNAME%%/lib/slf4j-log4j12-1.6.1.jar
 %%PORTNAME%%/%%PORTNAME%%-%%PORTVERSION%%.jar
+@dir /var/log/%%PORTNAME%%
+@dir /var/run/%%PORTNAME%%