Index: head/devel/zookeeper/Makefile
===================================================================
--- head/devel/zookeeper/Makefile	(revision 449044)
+++ head/devel/zookeeper/Makefile	(revision 449045)
@@ -1,69 +1,77 @@
 # $FreeBSD$
 
 PORTNAME=	zookeeper
 PORTVERSION=	3.4.10
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/${PORTNAME}/current
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Coordination Service for Distributed Applications
 
+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
 
 USERS=	zookeeper
 GROUPS=	zookeeper
 
+ZOOKEEPER_CONFS=	configuration.xsl log4j.properties zoo.cfg
+
 ZOOKEEPER_JAR=	${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar
 
 ZOOKEEPER_DBDIR?=	/var/db/zookeeper
 ZOOKEEPER_LOGDIR?=	/var/log/zookeeper
 
 SUB_FILES=	zookeeper zkCli.sh zkServer.sh
 SUB_LIST=	JAVA=${JAVA} \
 		JAVALIBDIR=${JAVALIBDIR} \
 		ETCDIR=${ETCDIR} \
 		ZOOKEEPER_USER=${USERS} \
 		ZOOKEEPER_GROUP=${GROUPS} \
 		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		ZOOKEEPER_DBDIR=${ZOOKEEPER_DBDIR} \
 		ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
 		JAVALIBDIR=${JAVALIBDIR}
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.7
 JAVA_VENDOR=	openjdk
 JAVA_RUN=	yes
 USE_RC_SUBR=	zookeeper
 
 PORTDOCS=	*
 
 post-extract:
 	@${REINPLACE_CMD} "/dataDir/s|=.*|=${ZOOKEEPER_DBDIR}|" ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg
-	@${RM} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg.bak
+	@${MV} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg ${WRKDIR}/${DISTNAME}/conf/zoo.cfg
 
 do-install:
-	${CP} -Rp ${WRKDIR}/${DISTNAME}/conf/ ${STAGEDIR}${ETCDIR}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+.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)
 
 	${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKDIR}/zkServer.sh ${STAGEDIR}${PREFIX}/bin/
 
 	${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR}
 	${MKDIR} ${STAGEDIR}${ZOOKEEPER_DBDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKDIR}/${DISTNAME}/docs && \
 	${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/devel/zookeeper/files/zookeeper.in
===================================================================
--- head/devel/zookeeper/files/zookeeper.in	(revision 449044)
+++ head/devel/zookeeper/files/zookeeper.in	(revision 449045)
@@ -1,58 +1,59 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: zookeeper
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable zookeeper:
 #
 # zookeeper_enable="YES"
 
 . /etc/rc.subr
 
 name=zookeeper
 rcvar=zookeeper_enable
 
 load_rc_config "${name}"
 
 : ${zookeeper_enable:=NO}
 : ${zookeeper_user:=%%ZOOKEEPER_USER%%}
 : ${zookeeper_group:=%%ZOOKEEPER_GROUP%%}
 : ${zookeeper_pidfile:=/var/run/zookeeper.pid}
 : ${zookeeper_config:=%%ETCDIR%%/zoo.cfg}
 : ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}
 : ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
 : ${zookeeper_logdir:=%%ZOOKEEPER_LOGDIR%%}
+: ${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
 
 zookeeper_main="-cp $CLASSPATH org.apache.zookeeper.server.quorum.QuorumPeerMain ${zookeeper_config}"
 log4j_params="-Dzookeeper.log.dir=${zookeeper_logdir} \
             -Dlog4j.configuration=${zookeeper_log4jpropfile} \
             -Dzookeeper.root.logger=${zookeeper_rootlogger}"
 pidfile=${zookeeper_pidfile}
 procname=${JAVA}
 required_files="${zookeeper_config}"
 
 command="/usr/sbin/daemon"
-command_args="-p ${pidfile} ${JAVA} ${log4j_params} ${zookeeper_main}"
+command_args="-p ${pidfile} ${JAVA} ${zookeeper_jvmopts} ${log4j_params} ${zookeeper_main}"
 
 start_precmd="zookeeper_init"
 
 zookeeper_init()
 {
     touch ${pidfile}
     chown ${zookeeper_user}:${zookeeper_group} ${pidfile}
     install -d -m 755 -o ${zookeeper_user} -g ${zookeeper_group} ${zookeeper_logdir}
 }
 
 run_rc_command "$1"
Index: head/devel/zookeeper/pkg-plist
===================================================================
--- head/devel/zookeeper/pkg-plist	(revision 449044)
+++ head/devel/zookeeper/pkg-plist	(revision 449045)
@@ -1,9 +1,9 @@
 bin/zkCli.sh
 bin/zkServer.sh
 %%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar
 %%JAVAJARDIR%%/zookeeper.jar
-%%ETCDIR%%/log4j.properties
-%%ETCDIR%%/configuration.xsl
-%%ETCDIR%%/zoo_sample.cfg
+@sample %%ETCDIR%%/log4j.properties.sample
+@sample %%ETCDIR%%/configuration.xsl.sample
+@sample %%ETCDIR%%/zoo.cfg.sample
 @dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%%
 @dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%