From lwhsu@lwbsd.csie.net  Fri Sep 21 21:55:56 2012
Return-Path: <lwhsu@lwbsd.csie.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C89CA1065670;
	Fri, 21 Sep 2012 21:55:56 +0000 (UTC)
	(envelope-from lwhsu@lwbsd.csie.net)
Received: from lwbsd.csie.net (lwbsd.cs.nctu.edu.tw [140.113.17.197])
	by mx1.freebsd.org (Postfix) with ESMTP id 4217D8FC15;
	Fri, 21 Sep 2012 21:55:54 +0000 (UTC)
Received: by lwbsd.csie.net (Postfix, from userid 1001)
	id 695443A190; Sat, 22 Sep 2012 05:46:46 +0800 (CST)
Message-Id: <20120921214646.695443A190@lwbsd.csie.net>
Date: Sat, 22 Sep 2012 05:46:46 +0800 (CST)
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gnn@FreeBSD.org
Subject: [PATCH] devel/zookeeper: update to 3.3.6
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         171858
>Category:       ports
>Synopsis:       [PATCH] devel/zookeeper: update to 3.3.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lwhsu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 21 22:00:21 UTC 2012
>Closed-Date:    Tue Sep 25 14:47:57 UTC 2012
>Last-Modified:  Sat Oct 06 18:50:52 UTC 2012
>Originator:     Li-Wen Hsu
>Release:        FreeBSD 9.0-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD lwbsd.cs.nctu.edu.tw 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012
>Description:
- Update to 3.3.6
- Build cleanly with C, PYTHON and DOC options
- Improve rc script
- Do not install Windows cmd files
- Put docs to ${DOCSDIR}
- Put logs to /var/log/zookeeper
- Put pid file to /var/run/zookeeper/zookeeper.pid
- Use ${MASTER_SITE_APACHE} as MASTER_SITES
- Add LICENSE
- Add WWW

Port maintainer (gnn@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- zookeeper-3.3.6.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 304637)
+++ Makefile	(working copy)
@@ -4,78 +4,112 @@
 #
 # $FreeBSD$
 #
-# For more information, please read Makefile.doc
-#
 
 PORTNAME=	zookeeper
-PORTVERSION=	3.3.5
+PORTVERSION=	3.3.6
 CATEGORIES=	devel java
-MASTER_SITES=	http://apache.mesi.com.ar/zookeeper/stable/ \
-	http://www.trieuvan.com/apache/zookeeper/stable/
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	zookeeper/stable
 
 MAINTAINER=	gnn@FreeBSD.org
 COMMENT=	A Coordination Service for Distributed Applications
 
-BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
+LICENSE=	AL2
+
 LIB_DEPENDS=	cppunit:${PORTSDIR}/devel/cppunit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	C PYTHON
-C_DESC=	Build C library bindings
-OPTIONS_DEFAULT=	C PYTHON
+C_DESC=	Build C library bindings and command line tool
+OPTIONS_DEFAULT=	C PYTHON DOC
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPYTHON}
-BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python
-.endif
-
 USE_JAVA=	yes
 JAVA_VERSION=	1.7
 JAVA_VENDOR=	openjdk
 JAVA_RUN=	yes
+
 USE_RC_SUBR=	zookeeper
 
-USE_AUTOTOOLS=	automake autoconf libtool
+ZOOKEEPER_LOGDIR=	/var/log/${PORTNAME}
+ZOOKEEPER_RUNDIR=	/var/run/${PORTNAME}
 
-CONFLICTS=	zookeeper-devel-[0-9]*
+PYTHON_BINDING_WRKSRC=	${WRKSRC}/src/contrib/zkpython
+PYDISTUTILS_PKGNAME=	ZooKeeper
+PYDISTUTILS_PKGVERSION=	0.4
 
-PYTHON_WRKSRC=	${WRKSRC}/src/contrib/zkpython
-CONFIGURE_WRKSRC=${WRKSRC}/src/c
+CONFIGURE_WRKSRC=	${WRKSRC}/src/c
 
+SCRIPTS=	zkCleanup.sh \
+		zkCli.sh \
+		zkEnv.sh \
+		zkServer.sh
+PORTDOCS=	*
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+SUB_LIST=	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
+		ZOOKEEPER_RUNDIR=${ZOOKEEPER_RUNDIR}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPYTHON}
+USE_PYTHON=	yes
+BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
+PLIST_SUB+=	WITH_PYTHON=""
+.else
+PLIST_SUB+=	WITH_PYTHON="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MC}
+USE_AUTOTOOLS=	automake autoconf libtool
+USE_LDCONFIG=	yes
+PLIST_SUB+=	WITH_C=""
+.else
+PLIST_SUB+=	WITH_C="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MC}
-run-autotools:	run-autotools-autoreconf
+#run-autotools:	run-autotools-autoreconf
 
-run-autotools-autoreconf:
-	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -if
+#run-autotools-autoreconf:
+run-autotools:
+	@cd ${CONFIGURE_WRKSRC} && \
+	${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -if
 .endif
 
 do-build:
 .if ${PORT_OPTIONS:MC}
-	@cd ${CONFIGURE_WRKSRC} && \
+	cd ${CONFIGURE_WRKSRC} && \
 	${MAKE}
 .endif
 .if ${PORT_OPTIONS:MPYTHON}
-	@cd ${PYTHON_WRKSRC} &&\
+	cd ${PYTHON_BINDING_WRKSRC} && \
 	ant compile
 .endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/${PORTNAME}
-	@${CP} -Rp ${WRKSRC}/conf ${PREFIX}/${PORTNAME}
-	@${CP} -Rp ${WRKSRC}/bin ${PREFIX}/${PORTNAME}
-	@${CP} -Rp ${WRKSRC}/lib ${PREFIX}/${PORTNAME}
-	@${CP} -Rp ${WRKSRC}/docs ${PREFIX}/${PORTNAME}
-	@${CP} -Rp ${WRKSRC}/*.jar ${PREFIX}/${PORTNAME}
+	${MKDIR} ${PREFIX}/${PORTNAME}
+	${MKDIR} ${PREFIX}/${PORTNAME}/bin
+	${MKDIR} ${ZOOKEEPER_LOGDIR}
+	${MKDIR} ${ZOOKEEPER_RUNDIR}
+.for f in ${SCRIPTS}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/${PORTNAME}/bin
+.endfor
+	cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${PREFIX}/${PORTNAME}/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${PREFIX}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/*.jar ${PREFIX}/${PORTNAME}
 .if ${PORT_OPTIONS:MC}
-	@cd ${CONFIGURE_WRKSRC} && \
+	cd ${CONFIGURE_WRKSRC} && \
 	${MAKE} install
 .endif
 .if ${PORT_OPTIONS:MPYTHON}
-	@cd ${PYTHON_WRKSRC} && \
+	cd ${PYTHON_BINDING_WRKSRC} && \
 	ant install
 .endif
+.if ${PORT_OPTIONS:MDOC}
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 304637)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (zookeeper-3.3.5.tar.gz) = b78b92edf489fca7587ec6ddfcd95714449d55b1288a67a7369844fa61124f0a
-SIZE (zookeeper-3.3.5.tar.gz) = 11804212
+SHA256 (zookeeper-3.3.6.tar.gz) = eb311ec0479a9447d075a20350ecfc5cf6a2a6d9842d13b59d7548430ac37521
+SIZE (zookeeper-3.3.6.tar.gz) = 11833706
Index: files/zookeeper.in
===================================================================
--- files/zookeeper.in	(revision 304637)
+++ files/zookeeper.in	(working copy)
@@ -3,31 +3,38 @@
 # $FreeBSD$
 #
 # PROVIDE: zookeeper
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable zookeeper:
 #
 # zookeeper_enable="YES"
 
-command="/usr/local/zookeeper/bin/zkServer.sh"
-
 . /etc/rc.subr
 
-load_rc_config zookeeper
-
-#set defaults
-zookeeper_enable=${zookeeper_enable:-"NO"}
-
 name=zookeeper
 rcvar=zookeeper_enable
 
+load_rc_config $name
+
+# set defaults
+: ${zookeeper_enable:="NO"}
+: ${zookeeper_logdir="%%ZOOKEEPER_LOGDIR%%"}
+: ${zookeeper_rundir="%%ZOOKEEPER_RUNDIR%%"}
+
+command="%%PREFIX%%/zookeeper/bin/zkServer.sh"
+
 start_cmd="zookeeper_command start"
 stop_cmd="zookeeper_command stop"
 restart_cmd="zookeeper_command restart"
 status_cmd="zookeeper_command status"
 
+export ZOO_LOG_DIR=${zookeeper_logdir}
+export ZOOPIDFILE=${zookeeper_rundir}/zookeeper.pid
+
 zookeeper_command()
 {
 	${command} ${rc_arg}
 }
 
-run_rc_command "$1"
\ No newline at end of file
+run_rc_command "$1"
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 304637)
+++ pkg-descr	(working copy)
@@ -1,5 +1,3 @@
-A port of Apache's ZooKeeper software for FreeBSD.
-
 ZooKeeper: A Distributed Coordination Service for Distributed Applications
 
 ZooKeeper is a distributed, open-source coordination service for
@@ -14,3 +12,5 @@
 especially prone to errors such as race conditions and deadlock. The
 motivation behind ZooKeeper is to relieve distributed applications the
 responsibility of implementing coordination services from scratch.
+
+WWW:	http://zookeeper.apache.org/
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 304637)
+++ pkg-plist	(working copy)
@@ -1,377 +1,40 @@
-bin/load_gen
-bin/cli_mt
-bin/cli_st
-lib/libzookeeper_mt.a
-lib/libzookeeper_st.a
-lib/libzookeeper_mt.la
-lib/libzookeeper_mt.so
-lib/libzookeeper_mt.so.2
-lib/libzookeeper_st.la
-lib/libzookeeper_st.so
-lib/libzookeeper_st.so.2
-zookeeper/docs/javaExample.pdf
-zookeeper/docs/recipes.pdf
-zookeeper/docs/linkmap.pdf
-zookeeper/docs/images/bk-overview.jpg
-zookeeper/docs/images/hadoop-logo.jpg
-zookeeper/docs/images/zookeeper_small.gif
-zookeeper/docs/images/favicon.ico
-zookeeper/docs/images/zkperfRW-3.2.jpg
-zookeeper/docs/images/zkcomponents.jpg
-zookeeper/docs/images/zkservice.jpg
-zookeeper/docs/images/instruction_arrow.png
-zookeeper/docs/images/zkperfreliability.jpg
-zookeeper/docs/images/zknamespace.jpg
-zookeeper/docs/images/state_dia.jpg
-zookeeper/docs/images/2pc.jpg
-zookeeper/docs/images/zkperfRW.jpg
-zookeeper/docs/images/built-with-forrest-button.png
-zookeeper/docs/releasenotes.pdf
-zookeeper/docs/zookeeperInternals.html
-zookeeper/docs/zookeeperStarted.html
-zookeeper/docs/bookkeeperStarted.html
-zookeeper/docs/bookkeeperStarted.pdf
-zookeeper/docs/zookeeperAdmin.pdf
-zookeeper/docs/zookeeperStarted.pdf
-zookeeper/docs/bookkeeperStream.html
-zookeeper/docs/jdiff/missingSinces.txt
-zookeeper/docs/jdiff/stylesheet-jdiff.css
-zookeeper/docs/jdiff/user_comments_for_zookeeper_3.1.1_to_zookeeper_3.3.5.xml
-zookeeper/docs/jdiff/changes/jdiff_statistics.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.NoNodeException.html
-zookeeper/docs/jdiff/changes/constructors_index_all.html
-zookeeper/docs/jdiff/changes/pkg_org.apache.zookeeper.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.ZooKeeper.html
-zookeeper/docs/jdiff/changes/packages_index_all.html
-zookeeper/docs/jdiff/changes/packages_index_changes.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.ZooDefs.OpCode.html
-zookeeper/docs/jdiff/changes/methods_index_all.html
-zookeeper/docs/jdiff/changes/classes_index_all.html
-zookeeper/docs/jdiff/changes/constructors_index_changes.html
-zookeeper/docs/jdiff/changes/classes_index_changes.html
-zookeeper/docs/jdiff/changes/fields_index_removals.html
-zookeeper/docs/jdiff/changes/alldiffs_index_additions.html
-zookeeper/docs/jdiff/changes/alldiffs_index_all.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.InvalidACLException.html
-zookeeper/docs/jdiff/changes/packages_index_additions.html
-zookeeper/docs/jdiff/changes/fields_index_all.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.BadVersionException.html
-zookeeper/docs/jdiff/changes/classes_index_additions.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.BadArgumentsException.html
-zookeeper/docs/jdiff/changes/constructors_index_additions.html
-zookeeper/docs/jdiff/changes/jdiff_help.html
-zookeeper/docs/jdiff/changes/constructors_index_removals.html
-zookeeper/docs/jdiff/changes/fields_index_additions.html
-zookeeper/docs/jdiff/changes/alldiffs_index_changes.html
-zookeeper/docs/jdiff/changes/jdiff_topleftframe.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.NodeExistsException.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.ZooKeeperMain.html
-zookeeper/docs/jdiff/changes/fields_index_changes.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.Code.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.NotEmptyException.html
-zookeeper/docs/jdiff/changes/classes_index_removals.html
-zookeeper/docs/jdiff/changes/methods_index_changes.html
-zookeeper/docs/jdiff/changes/methods_index_removals.html
-zookeeper/docs/jdiff/changes/changes-summary.html
-zookeeper/docs/jdiff/changes/alldiffs_index_removals.html
-zookeeper/docs/jdiff/changes/packages_index_removals.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.NoChildrenForEphemeralsException.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.Watcher.Event.KeeperState.html
-zookeeper/docs/jdiff/changes/methods_index_additions.html
-zookeeper/docs/jdiff/changes/org.apache.zookeeper.ClientCnxn.html
-zookeeper/docs/jdiff/changes.html
-zookeeper/docs/zookeeperTutorial.pdf
-zookeeper/docs/zookeeperOver.pdf
-zookeeper/docs/zookeeperObservers.html
-zookeeper/docs/zookeeperProgrammers.pdf
-zookeeper/docs/api/allclasses-frame.html
-zookeeper/docs/api/constant-values.html
-zookeeper/docs/api/overview-summary.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.InvalidCallbackException.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.MarshallingErrorException.html
-zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.DataCallback.html
-zookeeper/docs/api/org/apache/zookeeper/package-tree.html
-zookeeper/docs/api/org/apache/zookeeper/package-summary.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.BadArgumentsException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.StatCallback.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.ConnectionLossException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/ZooDefs.OpCode.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.ChildrenCallback.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NoChildrenForEphemeralsException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.SessionExpiredException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NoAuthException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.MarshallingErrorException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.VoidCallback.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/ZooDefs.Ids.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.RuntimeInconsistencyException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NoNodeException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.ACLCallback.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/ZooDefs.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/ZooKeeper.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/Watcher.Event.KeeperState.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/ZooDefs.Perms.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NotEmptyException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.UnimplementedException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.StringCallback.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.DataInconsistencyException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/CreateMode.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/ZooKeeperMain.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.InvalidACLException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.BadVersionException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/Watcher.Event.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.Code.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.OperationTimeoutException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.BadArgumentsException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.DataCallback.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.CodeDeprecated.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NodeExistsException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/ServerAdminClient.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.AuthFailedException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/Watcher.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.SessionMovedException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/ZooKeeper.States.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.InvalidCallbackException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.SystemErrorException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.APIErrorException.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/Watcher.Event.EventType.html
-zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.Children2Callback.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.DataInconsistencyException.html
-zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.ChildrenCallback.html
-zookeeper/docs/api/org/apache/zookeeper/ServerAdminClient.html
-zookeeper/docs/api/org/apache/zookeeper/CreateMode.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.InvalidACLException.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.SystemErrorException.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.ConnectionLossException.html
-zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.Children2Callback.html
-zookeeper/docs/api/org/apache/zookeeper/ZooDefs.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.NoChildrenForEphemeralsException.html
-zookeeper/docs/api/org/apache/zookeeper/ZooDefs.Ids.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.UnimplementedException.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.SessionMovedException.html
-zookeeper/docs/api/org/apache/zookeeper/Watcher.Event.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.Code.html
-zookeeper/docs/api/org/apache/zookeeper/package-use.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.NotEmptyException.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.SessionExpiredException.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.CodeDeprecated.html
-zookeeper/docs/api/org/apache/zookeeper/server/ZooKeeperServerMain.html
-zookeeper/docs/api/org/apache/zookeeper/server/package-use.html
-zookeeper/docs/api/org/apache/zookeeper/server/package-tree.html
-zookeeper/docs/api/org/apache/zookeeper/server/class-use/LogFormatter.html
-zookeeper/docs/api/org/apache/zookeeper/server/class-use/PurgeTxnLog.html
-zookeeper/docs/api/org/apache/zookeeper/server/class-use/ZooKeeperServerMain.html
-zookeeper/docs/api/org/apache/zookeeper/server/package-frame.html
-zookeeper/docs/api/org/apache/zookeeper/server/upgrade/UpgradeMain.html
-zookeeper/docs/api/org/apache/zookeeper/server/upgrade/package-tree.html
-zookeeper/docs/api/org/apache/zookeeper/server/upgrade/class-use/UpgradeMain.html
-zookeeper/docs/api/org/apache/zookeeper/server/upgrade/package-use.html
-zookeeper/docs/api/org/apache/zookeeper/server/upgrade/package-frame.html
-zookeeper/docs/api/org/apache/zookeeper/server/upgrade/package-summary.html
-zookeeper/docs/api/org/apache/zookeeper/server/package-summary.html
-zookeeper/docs/api/org/apache/zookeeper/server/quorum/package-frame.html
-zookeeper/docs/api/org/apache/zookeeper/server/quorum/class-use/QuorumPeerMain.html
-zookeeper/docs/api/org/apache/zookeeper/server/quorum/package-tree.html
-zookeeper/docs/api/org/apache/zookeeper/server/quorum/package-summary.html
-zookeeper/docs/api/org/apache/zookeeper/server/quorum/package-use.html
-zookeeper/docs/api/org/apache/zookeeper/server/quorum/QuorumPeerMain.html
-zookeeper/docs/api/org/apache/zookeeper/server/PurgeTxnLog.html
-zookeeper/docs/api/org/apache/zookeeper/server/LogFormatter.html
-zookeeper/docs/api/org/apache/zookeeper/ZooKeeperMain.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.RuntimeInconsistencyException.html
-zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.StatCallback.html
-zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.StringCallback.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.NoAuthException.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.NodeExistsException.html
-zookeeper/docs/api/org/apache/zookeeper/package-frame.html
-zookeeper/docs/api/org/apache/zookeeper/client/package-frame.html
-zookeeper/docs/api/org/apache/zookeeper/client/class-use/FourLetterWordMain.html
-zookeeper/docs/api/org/apache/zookeeper/client/package-tree.html
-zookeeper/docs/api/org/apache/zookeeper/client/package-use.html
-zookeeper/docs/api/org/apache/zookeeper/client/package-summary.html
-zookeeper/docs/api/org/apache/zookeeper/client/FourLetterWordMain.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.BadVersionException.html
-zookeeper/docs/api/org/apache/zookeeper/Watcher.Event.KeeperState.html
-zookeeper/docs/api/org/apache/zookeeper/ZooKeeper.States.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.OperationTimeoutException.html
-zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.ACLCallback.html
-zookeeper/docs/api/org/apache/zookeeper/ZooDefs.Perms.html
-zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.VoidCallback.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.APIErrorException.html
-zookeeper/docs/api/org/apache/zookeeper/ZooDefs.OpCode.html
-zookeeper/docs/api/org/apache/zookeeper/Watcher.html
-zookeeper/docs/api/org/apache/zookeeper/ZooKeeper.html
-zookeeper/docs/api/org/apache/zookeeper/Watcher.Event.EventType.html
-zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.html
-zookeeper/docs/api/org/apache/zookeeper/data/package-summary.html
-zookeeper/docs/api/org/apache/zookeeper/data/package-tree.html
-zookeeper/docs/api/org/apache/zookeeper/data/package-frame.html
-zookeeper/docs/api/org/apache/zookeeper/data/Stat.html
-zookeeper/docs/api/org/apache/zookeeper/data/ACL.html
-zookeeper/docs/api/org/apache/zookeeper/data/class-use/Stat.html
-zookeeper/docs/api/org/apache/zookeeper/data/class-use/ACL.html
-zookeeper/docs/api/org/apache/zookeeper/data/class-use/Id.html
-zookeeper/docs/api/org/apache/zookeeper/data/class-use/StatPersistedV1.html
-zookeeper/docs/api/org/apache/zookeeper/data/class-use/StatPersisted.html
-zookeeper/docs/api/org/apache/zookeeper/data/package-use.html
-zookeeper/docs/api/org/apache/zookeeper/data/StatPersistedV1.html
-zookeeper/docs/api/org/apache/zookeeper/data/Id.html
-zookeeper/docs/api/org/apache/zookeeper/data/StatPersisted.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.AuthFailedException.html
-zookeeper/docs/api/org/apache/zookeeper/KeeperException.NoNodeException.html
-zookeeper/docs/api/stylesheet.css
-zookeeper/docs/api/index-all.html
-zookeeper/docs/api/serialized-form.html
-zookeeper/docs/api/deprecated-list.html
-zookeeper/docs/api/overview-frame.html
-zookeeper/docs/api/allclasses-noframe.html
-zookeeper/docs/api/overview-tree.html
-zookeeper/docs/api/package-list
-zookeeper/docs/api/resources/inherit.gif
-zookeeper/docs/api/index.html
-zookeeper/docs/api/help-doc.html
-zookeeper/docs/skin/CommonMessages_fr.xml
-zookeeper/docs/skin/basic.css
-zookeeper/docs/skin/breadcrumbs.js
-zookeeper/docs/skin/breadcrumbs-optimized.js
-zookeeper/docs/skin/images/pdfdoc.gif
-zookeeper/docs/skin/images/success.png
-zookeeper/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
-zookeeper/docs/skin/images/valid-html401.png
-zookeeper/docs/skin/images/vcss.png
-zookeeper/docs/skin/images/apache-thanks.png
-zookeeper/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
-zookeeper/docs/skin/images/hack.jpg
-zookeeper/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
-zookeeper/docs/skin/images/README.txt
-zookeeper/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
-zookeeper/docs/skin/images/chapter_open.gif
-zookeeper/docs/skin/images/current.gif
-zookeeper/docs/skin/images/poddoc.png
-zookeeper/docs/skin/images/fix.jpg
-zookeeper/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
-zookeeper/docs/skin/images/chapter.gif
-zookeeper/docs/skin/images/printer.gif
-zookeeper/docs/skin/images/page.gif
-zookeeper/docs/skin/images/built-with-forrest-button.png
-zookeeper/docs/skin/images/remove.jpg
-zookeeper/docs/skin/images/error.png
-zookeeper/docs/skin/images/built-with-cocoon.gif
-zookeeper/docs/skin/images/header_white_line.gif
-zookeeper/docs/skin/images/label.gif
-zookeeper/docs/skin/images/warning.png
-zookeeper/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
-zookeeper/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
-zookeeper/docs/skin/images/forrest-credit-logo.png
-zookeeper/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
-zookeeper/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
-zookeeper/docs/skin/images/info.png
-zookeeper/docs/skin/images/external-link.gif
-zookeeper/docs/skin/images/txtdoc.png
-zookeeper/docs/skin/images/spacer.gif
-zookeeper/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
-zookeeper/docs/skin/images/add.jpg
-zookeeper/docs/skin/images/rss.png
-zookeeper/docs/skin/images/update.jpg
-zookeeper/docs/skin/images/xmldoc.gif
-zookeeper/docs/skin/images/instruction_arrow.png
-zookeeper/docs/skin/CommonMessages_en_US.xml
-zookeeper/docs/skin/CommonMessages_de.xml
-zookeeper/docs/skin/getMenu.js
-zookeeper/docs/skin/prototype.js
-zookeeper/docs/skin/profile.css
-zookeeper/docs/skin/getBlank.js
-zookeeper/docs/skin/note.txt
-zookeeper/docs/skin/menu.js
-zookeeper/docs/skin/print.css
-zookeeper/docs/skin/fontsize.js
-zookeeper/docs/skin/CommonMessages_es.xml
-zookeeper/docs/skin/screen.css
-zookeeper/docs/zookeeperJMX.pdf
-zookeeper/docs/index.pdf
-zookeeper/docs/bookkeeperProgrammer.pdf
-zookeeper/docs/zookeeperOver.html
-zookeeper/docs/bookkeeperConfig.pdf
-zookeeper/docs/zookeeperProgrammers.html
-zookeeper/docs/bookkeeperOverview.pdf
-zookeeper/docs/zookeeperInternals.pdf
-zookeeper/docs/index.html
-zookeeper/docs/broken-links.xml
-zookeeper/docs/bookkeeperOverview.html
-zookeeper/docs/zookeeperOtherInfo.html
-zookeeper/docs/bookkeeperStream.pdf
-zookeeper/docs/javaExample.html
-zookeeper/docs/zookeeperHierarchicalQuorums.html
-zookeeper/docs/bookkeeperConfig.html
-zookeeper/docs/zookeeperTutorial.html
-zookeeper/docs/releasenotes.html
-zookeeper/docs/zookeeperAdmin.html
-zookeeper/docs/zookeeperQuotas.html
-zookeeper/docs/zookeeperObservers.pdf
-zookeeper/docs/zookeeperOtherInfo.pdf
-zookeeper/docs/bookkeeperProgrammer.html
-zookeeper/docs/zookeeperQuotas.pdf
-zookeeper/docs/zookeeperHierarchicalQuorums.pdf
-zookeeper/docs/linkmap.html
-zookeeper/docs/zookeeperJMX.html
-zookeeper/docs/recipes.html
-zookeeper/zookeeper-3.3.5.jar
+%%WITH_C%%bin/cli_mt
+%%WITH_C%%bin/cli_st
+%%WITH_C%%bin/load_gen
+%%WITH_C%%include/c-client-src/recordio.h
+%%WITH_C%%include/c-client-src/zookeeper.h
+%%WITH_C%%include/c-client-src/zookeeper.jute.h
+%%WITH_C%%include/c-client-src/zookeeper_log.h
+%%WITH_C%%include/c-client-src/zookeeper_version.h
+%%WITH_C%%lib/libzookeeper_mt.a
+%%WITH_C%%lib/libzookeeper_mt.la
+%%WITH_C%%lib/libzookeeper_mt.so
+%%WITH_C%%lib/libzookeeper_mt.so.2
+%%WITH_C%%lib/libzookeeper_st.a
+%%WITH_C%%lib/libzookeeper_st.la
+%%WITH_C%%lib/libzookeeper_st.so
+%%WITH_C%%lib/libzookeeper_st.so.2
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/ZooKeeper-0.4-py2.7.egg-info
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/zookeeper.so
+zookeeper/bin/zkCleanup.sh
+zookeeper/bin/zkCli.sh
+zookeeper/bin/zkEnv.sh
+zookeeper/bin/zkServer.sh
+zookeeper/conf/configuration.xsl
 zookeeper/conf/log4j.properties
-zookeeper/conf/configuration.xsl
 zookeeper/conf/zoo_sample.cfg
-zookeeper/lib/log4j-1.2.15.jar
 zookeeper/lib/cobertura/README.txt
+zookeeper/lib/jdiff/zookeeper_3.1.1.xml
+zookeeper/lib/jdiff/zookeeper_3.3.6.xml
+zookeeper/lib/jline-0.9.94.LICENSE.txt
 zookeeper/lib/jline-0.9.94.jar
-zookeeper/lib/jdiff/zookeeper_3.3.5.xml
-zookeeper/lib/jdiff/zookeeper_3.1.1.xml
 zookeeper/lib/log4j-1.2.15.LICENSE.txt
-zookeeper/lib/jline-0.9.94.LICENSE.txt
-zookeeper/bin/zkServer.cmd
-zookeeper/bin/zkCli.cmd
-zookeeper/bin/zkCli.sh
-zookeeper/bin/zkCleanup.sh
-zookeeper/bin/zkEnv.cmd
-zookeeper/bin/zkServer.sh
-zookeeper/bin/zkEnv.sh
-zookeeper/bin/README.txt
-include/c-client-src/zookeeper.h
-include/c-client-src/zookeeper_version.h
-include/c-client-src/zookeeper_log.h
-include/c-client-src/recordio.h
-include/c-client-src/zookeeper.jute.h
-lib/python2.7/site-packages/zookeeper.so
-lib/python2.7/site-packages/ZooKeeper-0.4-py2.7.egg-info
-@dirrm include/c-client-src
+zookeeper/lib/log4j-1.2.15.jar
+zookeeper/zookeeper-%%PORTVERSION%%.jar
+%%WITH_C%%@dirrm include/c-client-src
 @dirrm zookeeper/lib/jdiff
 @dirrm zookeeper/lib/cobertura
 @dirrm zookeeper/lib
-@dirrm zookeeper/docs/skin/translations
-@dirrm zookeeper/docs/skin/scripts
-@dirrm zookeeper/docs/skin/images
-@dirrm zookeeper/docs/skin/css
-@dirrm zookeeper/docs/skin
-@dirrm zookeeper/docs/jdiff/changes
-@dirrm zookeeper/docs/jdiff
-@dirrm zookeeper/docs/images
-@dirrm zookeeper/docs/api/resources
-@dirrm zookeeper/docs/api/org/apache/zookeeper/server/upgrade/class-use
-@dirrm zookeeper/docs/api/org/apache/zookeeper/server/upgrade
-@dirrm zookeeper/docs/api/org/apache/zookeeper/server/quorum/class-use
-@dirrm zookeeper/docs/api/org/apache/zookeeper/server/quorum
-@dirrm zookeeper/docs/api/org/apache/zookeeper/server/class-use
-@dirrm zookeeper/docs/api/org/apache/zookeeper/server
-@dirrm zookeeper/docs/api/org/apache/zookeeper/data/class-use
-@dirrm zookeeper/docs/api/org/apache/zookeeper/data
-@dirrm zookeeper/docs/api/org/apache/zookeeper/client/class-use
-@dirrm zookeeper/docs/api/org/apache/zookeeper/client
-@dirrm zookeeper/docs/api/org/apache/zookeeper/class-use
-@dirrm zookeeper/docs/api/org/apache/zookeeper
-@dirrm zookeeper/docs/api/org/apache
-@dirrm zookeeper/docs/api/org
-@dirrm zookeeper/docs/api
-@dirrm zookeeper/docs
 @dirrmtry zookeeper/conf
 @dirrm zookeeper/bin
 @dirrmtry zookeeper
--- zookeeper-3.3.6.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnn 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Sep 21 22:00:36 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171858 

Date: Sat, 22 Sep 2012 14:02:20 -0400
From: George Neville-Neil <gnn@FreeBSD.org>
To: Li-Wen Hsu <lwhsu@FreeBSD.ORG>
Subject: Re: [PATCH] devel/zookeeper: update to 3.3.6

 Looks good to me.
 
 Thanks,
 George
Responsible-Changed-From-To: gnn->lwhsu 
Responsible-Changed-By: lwhsu 
Responsible-Changed-When: Tue Sep 25 14:47:47 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171858 
State-Changed-From-To: open->closed 
State-Changed-By: lwhsu 
State-Changed-When: Tue Sep 25 14:47:56 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171858 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171858: commit references a PR
Date: Tue, 25 Sep 2012 14:47:37 +0000 (UTC)

 Author: lwhsu
 Date: Tue Sep 25 14:47:21 2012
 New Revision: 304838
 URL: http://svn.freebsd.org/changeset/ports/304838
 
 Log:
   - Update to 3.3.6
   - Build cleanly with C, PYTHON and DOC options
   - Improve rc script
   - Do not install Windows cmd files
   - Put docs to ${DOCSDIR}
   - Put logs to /var/log/zookeeper
   - Put pid file to /var/run/zookeeper/zookeeper.pid
   - Use ${MASTER_SITE_APACHE} as MASTER_SITES
   - Add LICENSE
   - Add WWW
   
   PR:		ports/171858
   Submitted by:	lwhsu
   Approved by:	gnn (maintainer)
 
 Modified:
   head/devel/zookeeper/Makefile
   head/devel/zookeeper/distinfo
   head/devel/zookeeper/files/zookeeper.in
   head/devel/zookeeper/pkg-descr
   head/devel/zookeeper/pkg-plist
 
 Modified: head/devel/zookeeper/Makefile
 ==============================================================================
 --- head/devel/zookeeper/Makefile	Tue Sep 25 13:48:41 2012	(r304837)
 +++ head/devel/zookeeper/Makefile	Tue Sep 25 14:47:21 2012	(r304838)
 @@ -4,78 +4,112 @@
  #
  # $FreeBSD$
  #
 -# For more information, please read Makefile.doc
 -#
  
  PORTNAME=	zookeeper
 -PORTVERSION=	3.3.5
 +PORTVERSION=	3.3.6
  CATEGORIES=	devel java
 -MASTER_SITES=	http://apache.mesi.com.ar/zookeeper/stable/ \
 -	http://www.trieuvan.com/apache/zookeeper/stable/
 +MASTER_SITES=	${MASTER_SITE_APACHE}
 +MASTER_SITE_SUBDIR=	zookeeper/stable
  
  MAINTAINER=	gnn@FreeBSD.org
  COMMENT=	A Coordination Service for Distributed Applications
  
 -BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
 +LICENSE=	AL2
 +
  LIB_DEPENDS=	cppunit:${PORTSDIR}/devel/cppunit
  RUN_DEPENDS:=	${BUILD_DEPENDS}
  
  OPTIONS_DEFINE=	C PYTHON
 -C_DESC=	Build C library bindings
 -OPTIONS_DEFAULT=	C PYTHON
 -
 -.include <bsd.port.options.mk>
 -
 -.if ${PORT_OPTIONS:MPYTHON}
 -BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python
 -.endif
 +C_DESC=	Build C library bindings and command line tool
 +OPTIONS_DEFAULT=	C PYTHON DOC
  
  USE_JAVA=	yes
  JAVA_VERSION=	1.7
  JAVA_VENDOR=	openjdk
  JAVA_RUN=	yes
 +
  USE_RC_SUBR=	zookeeper
  
 -USE_AUTOTOOLS=	automake autoconf libtool
 +ZOOKEEPER_LOGDIR=	/var/log/${PORTNAME}
 +ZOOKEEPER_RUNDIR=	/var/run/${PORTNAME}
  
 -CONFLICTS=	zookeeper-devel-[0-9]*
 +PYTHON_BINDING_WRKSRC=	${WRKSRC}/src/contrib/zkpython
 +PYDISTUTILS_PKGNAME=	ZooKeeper
 +PYDISTUTILS_PKGVERSION=	0.4
 +
 +CONFIGURE_WRKSRC=	${WRKSRC}/src/c
 +
 +SCRIPTS=	zkCleanup.sh \
 +		zkCli.sh \
 +		zkEnv.sh \
 +		zkServer.sh
 +PORTDOCS=	*
 +
 +PLIST_SUB=	PORTVERSION=${PORTVERSION}
 +SUB_LIST=	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
 +		ZOOKEEPER_RUNDIR=${ZOOKEEPER_RUNDIR}
  
 -PYTHON_WRKSRC=	${WRKSRC}/src/contrib/zkpython
 -CONFIGURE_WRKSRC=${WRKSRC}/src/c
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MPYTHON}
 +USE_PYTHON=	yes
 +BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 +PLIST_SUB+=	WITH_PYTHON=""
 +.else
 +PLIST_SUB+=	WITH_PYTHON="@comment "
 +.endif
 +
 +.if ${PORT_OPTIONS:MC}
 +USE_AUTOTOOLS=	automake autoconf libtool
 +USE_LDCONFIG=	yes
 +PLIST_SUB+=	WITH_C=""
 +.else
 +PLIST_SUB+=	WITH_C="@comment "
 +.endif
  
  .include <bsd.port.pre.mk>
  
  .if ${PORT_OPTIONS:MC}
 -run-autotools:	run-autotools-autoreconf
 +#run-autotools:	run-autotools-autoreconf
  
 -run-autotools-autoreconf:
 -	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -if
 +#run-autotools-autoreconf:
 +run-autotools:
 +	@cd ${CONFIGURE_WRKSRC} && \
 +	${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -if
  .endif
  
  do-build:
  .if ${PORT_OPTIONS:MC}
 -	@cd ${CONFIGURE_WRKSRC} && \
 +	cd ${CONFIGURE_WRKSRC} && \
  	${MAKE}
  .endif
  .if ${PORT_OPTIONS:MPYTHON}
 -	@cd ${PYTHON_WRKSRC} &&\
 +	cd ${PYTHON_BINDING_WRKSRC} && \
  	ant compile
  .endif
  
  do-install:
 -	@${MKDIR} ${PREFIX}/${PORTNAME}
 -	@${CP} -Rp ${WRKSRC}/conf ${PREFIX}/${PORTNAME}
 -	@${CP} -Rp ${WRKSRC}/bin ${PREFIX}/${PORTNAME}
 -	@${CP} -Rp ${WRKSRC}/lib ${PREFIX}/${PORTNAME}
 -	@${CP} -Rp ${WRKSRC}/docs ${PREFIX}/${PORTNAME}
 -	@${CP} -Rp ${WRKSRC}/*.jar ${PREFIX}/${PORTNAME}
 +	${MKDIR} ${PREFIX}/${PORTNAME}
 +	${MKDIR} ${PREFIX}/${PORTNAME}/bin
 +	${MKDIR} ${ZOOKEEPER_LOGDIR}
 +	${MKDIR} ${ZOOKEEPER_RUNDIR}
 +.for f in ${SCRIPTS}
 +	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/${PORTNAME}/bin
 +.endfor
 +	cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${PREFIX}/${PORTNAME}/
 +	cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${PREFIX}/${PORTNAME}/
 +	${INSTALL_DATA} ${WRKSRC}/*.jar ${PREFIX}/${PORTNAME}
  .if ${PORT_OPTIONS:MC}
 -	@cd ${CONFIGURE_WRKSRC} && \
 +	cd ${CONFIGURE_WRKSRC} && \
  	${MAKE} install
  .endif
  .if ${PORT_OPTIONS:MPYTHON}
 -	@cd ${PYTHON_WRKSRC} && \
 +	cd ${PYTHON_BINDING_WRKSRC} && \
  	ant install
  .endif
 +.if ${PORT_OPTIONS:MDOC}
 +	${MKDIR} ${DOCSDIR}
 +	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 +.endif
  
  .include <bsd.port.post.mk>
 
 Modified: head/devel/zookeeper/distinfo
 ==============================================================================
 --- head/devel/zookeeper/distinfo	Tue Sep 25 13:48:41 2012	(r304837)
 +++ head/devel/zookeeper/distinfo	Tue Sep 25 14:47:21 2012	(r304838)
 @@ -1,2 +1,2 @@
 -SHA256 (zookeeper-3.3.5.tar.gz) = b78b92edf489fca7587ec6ddfcd95714449d55b1288a67a7369844fa61124f0a
 -SIZE (zookeeper-3.3.5.tar.gz) = 11804212
 +SHA256 (zookeeper-3.3.6.tar.gz) = eb311ec0479a9447d075a20350ecfc5cf6a2a6d9842d13b59d7548430ac37521
 +SIZE (zookeeper-3.3.6.tar.gz) = 11833706
 
 Modified: head/devel/zookeeper/files/zookeeper.in
 ==============================================================================
 --- head/devel/zookeeper/files/zookeeper.in	Tue Sep 25 13:48:41 2012	(r304837)
 +++ head/devel/zookeeper/files/zookeeper.in	Tue Sep 25 14:47:21 2012	(r304838)
 @@ -3,31 +3,38 @@
  # $FreeBSD$
  #
  # PROVIDE: zookeeper
 +# REQUIRE: LOGIN
 +# KEYWORD: shutdown
  #
  # Add the following line to /etc/rc.conf to enable zookeeper:
  #
  # zookeeper_enable="YES"
  
 -command="/usr/local/zookeeper/bin/zkServer.sh"
 -
  . /etc/rc.subr
  
 -load_rc_config zookeeper
 -
 -#set defaults
 -zookeeper_enable=${zookeeper_enable:-"NO"}
 -
  name=zookeeper
  rcvar=zookeeper_enable
  
 +load_rc_config $name
 +
 +# set defaults
 +: ${zookeeper_enable:="NO"}
 +: ${zookeeper_logdir="%%ZOOKEEPER_LOGDIR%%"}
 +: ${zookeeper_rundir="%%ZOOKEEPER_RUNDIR%%"}
 +
 +command="%%PREFIX%%/zookeeper/bin/zkServer.sh"
 +
  start_cmd="zookeeper_command start"
  stop_cmd="zookeeper_command stop"
  restart_cmd="zookeeper_command restart"
  status_cmd="zookeeper_command status"
  
 +export ZOO_LOG_DIR=${zookeeper_logdir}
 +export ZOOPIDFILE=${zookeeper_rundir}/zookeeper.pid
 +
  zookeeper_command()
  {
  	${command} ${rc_arg}
  }
  
 -run_rc_command "$1"
 \ No newline at end of file
 +run_rc_command "$1"
 
 Modified: head/devel/zookeeper/pkg-descr
 ==============================================================================
 --- head/devel/zookeeper/pkg-descr	Tue Sep 25 13:48:41 2012	(r304837)
 +++ head/devel/zookeeper/pkg-descr	Tue Sep 25 14:47:21 2012	(r304838)
 @@ -1,5 +1,3 @@
 -A port of Apache's ZooKeeper software for FreeBSD.
 -
  ZooKeeper: A Distributed Coordination Service for Distributed Applications
  
  ZooKeeper is a distributed, open-source coordination service for
 @@ -14,3 +12,5 @@ Coordination services are notoriously ha
  especially prone to errors such as race conditions and deadlock. The
  motivation behind ZooKeeper is to relieve distributed applications the
  responsibility of implementing coordination services from scratch.
 +
 +WWW:	http://zookeeper.apache.org/
 
 Modified: head/devel/zookeeper/pkg-plist
 ==============================================================================
 --- head/devel/zookeeper/pkg-plist	Tue Sep 25 13:48:41 2012	(r304837)
 +++ head/devel/zookeeper/pkg-plist	Tue Sep 25 14:47:21 2012	(r304838)
 @@ -1,377 +1,40 @@
 -bin/load_gen
 -bin/cli_mt
 -bin/cli_st
 -lib/libzookeeper_mt.a
 -lib/libzookeeper_st.a
 -lib/libzookeeper_mt.la
 -lib/libzookeeper_mt.so
 -lib/libzookeeper_mt.so.2
 -lib/libzookeeper_st.la
 -lib/libzookeeper_st.so
 -lib/libzookeeper_st.so.2
 -zookeeper/docs/javaExample.pdf
 -zookeeper/docs/recipes.pdf
 -zookeeper/docs/linkmap.pdf
 -zookeeper/docs/images/bk-overview.jpg
 -zookeeper/docs/images/hadoop-logo.jpg
 -zookeeper/docs/images/zookeeper_small.gif
 -zookeeper/docs/images/favicon.ico
 -zookeeper/docs/images/zkperfRW-3.2.jpg
 -zookeeper/docs/images/zkcomponents.jpg
 -zookeeper/docs/images/zkservice.jpg
 -zookeeper/docs/images/instruction_arrow.png
 -zookeeper/docs/images/zkperfreliability.jpg
 -zookeeper/docs/images/zknamespace.jpg
 -zookeeper/docs/images/state_dia.jpg
 -zookeeper/docs/images/2pc.jpg
 -zookeeper/docs/images/zkperfRW.jpg
 -zookeeper/docs/images/built-with-forrest-button.png
 -zookeeper/docs/releasenotes.pdf
 -zookeeper/docs/zookeeperInternals.html
 -zookeeper/docs/zookeeperStarted.html
 -zookeeper/docs/bookkeeperStarted.html
 -zookeeper/docs/bookkeeperStarted.pdf
 -zookeeper/docs/zookeeperAdmin.pdf
 -zookeeper/docs/zookeeperStarted.pdf
 -zookeeper/docs/bookkeeperStream.html
 -zookeeper/docs/jdiff/missingSinces.txt
 -zookeeper/docs/jdiff/stylesheet-jdiff.css
 -zookeeper/docs/jdiff/user_comments_for_zookeeper_3.1.1_to_zookeeper_3.3.5.xml
 -zookeeper/docs/jdiff/changes/jdiff_statistics.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.NoNodeException.html
 -zookeeper/docs/jdiff/changes/constructors_index_all.html
 -zookeeper/docs/jdiff/changes/pkg_org.apache.zookeeper.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.ZooKeeper.html
 -zookeeper/docs/jdiff/changes/packages_index_all.html
 -zookeeper/docs/jdiff/changes/packages_index_changes.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.ZooDefs.OpCode.html
 -zookeeper/docs/jdiff/changes/methods_index_all.html
 -zookeeper/docs/jdiff/changes/classes_index_all.html
 -zookeeper/docs/jdiff/changes/constructors_index_changes.html
 -zookeeper/docs/jdiff/changes/classes_index_changes.html
 -zookeeper/docs/jdiff/changes/fields_index_removals.html
 -zookeeper/docs/jdiff/changes/alldiffs_index_additions.html
 -zookeeper/docs/jdiff/changes/alldiffs_index_all.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.InvalidACLException.html
 -zookeeper/docs/jdiff/changes/packages_index_additions.html
 -zookeeper/docs/jdiff/changes/fields_index_all.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.BadVersionException.html
 -zookeeper/docs/jdiff/changes/classes_index_additions.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.BadArgumentsException.html
 -zookeeper/docs/jdiff/changes/constructors_index_additions.html
 -zookeeper/docs/jdiff/changes/jdiff_help.html
 -zookeeper/docs/jdiff/changes/constructors_index_removals.html
 -zookeeper/docs/jdiff/changes/fields_index_additions.html
 -zookeeper/docs/jdiff/changes/alldiffs_index_changes.html
 -zookeeper/docs/jdiff/changes/jdiff_topleftframe.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.NodeExistsException.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.ZooKeeperMain.html
 -zookeeper/docs/jdiff/changes/fields_index_changes.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.Code.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.NotEmptyException.html
 -zookeeper/docs/jdiff/changes/classes_index_removals.html
 -zookeeper/docs/jdiff/changes/methods_index_changes.html
 -zookeeper/docs/jdiff/changes/methods_index_removals.html
 -zookeeper/docs/jdiff/changes/changes-summary.html
 -zookeeper/docs/jdiff/changes/alldiffs_index_removals.html
 -zookeeper/docs/jdiff/changes/packages_index_removals.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.KeeperException.NoChildrenForEphemeralsException.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.Watcher.Event.KeeperState.html
 -zookeeper/docs/jdiff/changes/methods_index_additions.html
 -zookeeper/docs/jdiff/changes/org.apache.zookeeper.ClientCnxn.html
 -zookeeper/docs/jdiff/changes.html
 -zookeeper/docs/zookeeperTutorial.pdf
 -zookeeper/docs/zookeeperOver.pdf
 -zookeeper/docs/zookeeperObservers.html
 -zookeeper/docs/zookeeperProgrammers.pdf
 -zookeeper/docs/api/allclasses-frame.html
 -zookeeper/docs/api/constant-values.html
 -zookeeper/docs/api/overview-summary.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.InvalidCallbackException.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.MarshallingErrorException.html
 -zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.DataCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/package-tree.html
 -zookeeper/docs/api/org/apache/zookeeper/package-summary.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.BadArgumentsException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.StatCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.ConnectionLossException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/ZooDefs.OpCode.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.ChildrenCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NoChildrenForEphemeralsException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.SessionExpiredException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NoAuthException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.MarshallingErrorException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.VoidCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/ZooDefs.Ids.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.RuntimeInconsistencyException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NoNodeException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.ACLCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/ZooDefs.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/ZooKeeper.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/Watcher.Event.KeeperState.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/ZooDefs.Perms.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NotEmptyException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.UnimplementedException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.StringCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.DataInconsistencyException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/CreateMode.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/ZooKeeperMain.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.InvalidACLException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.BadVersionException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/Watcher.Event.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.Code.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.OperationTimeoutException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.BadArgumentsException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.DataCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.CodeDeprecated.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.NodeExistsException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/ServerAdminClient.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.AuthFailedException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/Watcher.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.SessionMovedException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/ZooKeeper.States.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.InvalidCallbackException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.SystemErrorException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/KeeperException.APIErrorException.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/Watcher.Event.EventType.html
 -zookeeper/docs/api/org/apache/zookeeper/class-use/AsyncCallback.Children2Callback.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.DataInconsistencyException.html
 -zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.ChildrenCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/ServerAdminClient.html
 -zookeeper/docs/api/org/apache/zookeeper/CreateMode.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.InvalidACLException.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.SystemErrorException.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.ConnectionLossException.html
 -zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.Children2Callback.html
 -zookeeper/docs/api/org/apache/zookeeper/ZooDefs.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.NoChildrenForEphemeralsException.html
 -zookeeper/docs/api/org/apache/zookeeper/ZooDefs.Ids.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.UnimplementedException.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.SessionMovedException.html
 -zookeeper/docs/api/org/apache/zookeeper/Watcher.Event.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.Code.html
 -zookeeper/docs/api/org/apache/zookeeper/package-use.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.NotEmptyException.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.SessionExpiredException.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.CodeDeprecated.html
 -zookeeper/docs/api/org/apache/zookeeper/server/ZooKeeperServerMain.html
 -zookeeper/docs/api/org/apache/zookeeper/server/package-use.html
 -zookeeper/docs/api/org/apache/zookeeper/server/package-tree.html
 -zookeeper/docs/api/org/apache/zookeeper/server/class-use/LogFormatter.html
 -zookeeper/docs/api/org/apache/zookeeper/server/class-use/PurgeTxnLog.html
 -zookeeper/docs/api/org/apache/zookeeper/server/class-use/ZooKeeperServerMain.html
 -zookeeper/docs/api/org/apache/zookeeper/server/package-frame.html
 -zookeeper/docs/api/org/apache/zookeeper/server/upgrade/UpgradeMain.html
 -zookeeper/docs/api/org/apache/zookeeper/server/upgrade/package-tree.html
 -zookeeper/docs/api/org/apache/zookeeper/server/upgrade/class-use/UpgradeMain.html
 -zookeeper/docs/api/org/apache/zookeeper/server/upgrade/package-use.html
 -zookeeper/docs/api/org/apache/zookeeper/server/upgrade/package-frame.html
 -zookeeper/docs/api/org/apache/zookeeper/server/upgrade/package-summary.html
 -zookeeper/docs/api/org/apache/zookeeper/server/package-summary.html
 -zookeeper/docs/api/org/apache/zookeeper/server/quorum/package-frame.html
 -zookeeper/docs/api/org/apache/zookeeper/server/quorum/class-use/QuorumPeerMain.html
 -zookeeper/docs/api/org/apache/zookeeper/server/quorum/package-tree.html
 -zookeeper/docs/api/org/apache/zookeeper/server/quorum/package-summary.html
 -zookeeper/docs/api/org/apache/zookeeper/server/quorum/package-use.html
 -zookeeper/docs/api/org/apache/zookeeper/server/quorum/QuorumPeerMain.html
 -zookeeper/docs/api/org/apache/zookeeper/server/PurgeTxnLog.html
 -zookeeper/docs/api/org/apache/zookeeper/server/LogFormatter.html
 -zookeeper/docs/api/org/apache/zookeeper/ZooKeeperMain.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.RuntimeInconsistencyException.html
 -zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.StatCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.StringCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.NoAuthException.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.NodeExistsException.html
 -zookeeper/docs/api/org/apache/zookeeper/package-frame.html
 -zookeeper/docs/api/org/apache/zookeeper/client/package-frame.html
 -zookeeper/docs/api/org/apache/zookeeper/client/class-use/FourLetterWordMain.html
 -zookeeper/docs/api/org/apache/zookeeper/client/package-tree.html
 -zookeeper/docs/api/org/apache/zookeeper/client/package-use.html
 -zookeeper/docs/api/org/apache/zookeeper/client/package-summary.html
 -zookeeper/docs/api/org/apache/zookeeper/client/FourLetterWordMain.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.BadVersionException.html
 -zookeeper/docs/api/org/apache/zookeeper/Watcher.Event.KeeperState.html
 -zookeeper/docs/api/org/apache/zookeeper/ZooKeeper.States.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.OperationTimeoutException.html
 -zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.ACLCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/ZooDefs.Perms.html
 -zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.VoidCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.APIErrorException.html
 -zookeeper/docs/api/org/apache/zookeeper/ZooDefs.OpCode.html
 -zookeeper/docs/api/org/apache/zookeeper/Watcher.html
 -zookeeper/docs/api/org/apache/zookeeper/ZooKeeper.html
 -zookeeper/docs/api/org/apache/zookeeper/Watcher.Event.EventType.html
 -zookeeper/docs/api/org/apache/zookeeper/AsyncCallback.html
 -zookeeper/docs/api/org/apache/zookeeper/data/package-summary.html
 -zookeeper/docs/api/org/apache/zookeeper/data/package-tree.html
 -zookeeper/docs/api/org/apache/zookeeper/data/package-frame.html
 -zookeeper/docs/api/org/apache/zookeeper/data/Stat.html
 -zookeeper/docs/api/org/apache/zookeeper/data/ACL.html
 -zookeeper/docs/api/org/apache/zookeeper/data/class-use/Stat.html
 -zookeeper/docs/api/org/apache/zookeeper/data/class-use/ACL.html
 -zookeeper/docs/api/org/apache/zookeeper/data/class-use/Id.html
 -zookeeper/docs/api/org/apache/zookeeper/data/class-use/StatPersistedV1.html
 -zookeeper/docs/api/org/apache/zookeeper/data/class-use/StatPersisted.html
 -zookeeper/docs/api/org/apache/zookeeper/data/package-use.html
 -zookeeper/docs/api/org/apache/zookeeper/data/StatPersistedV1.html
 -zookeeper/docs/api/org/apache/zookeeper/data/Id.html
 -zookeeper/docs/api/org/apache/zookeeper/data/StatPersisted.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.AuthFailedException.html
 -zookeeper/docs/api/org/apache/zookeeper/KeeperException.NoNodeException.html
 -zookeeper/docs/api/stylesheet.css
 -zookeeper/docs/api/index-all.html
 -zookeeper/docs/api/serialized-form.html
 -zookeeper/docs/api/deprecated-list.html
 -zookeeper/docs/api/overview-frame.html
 -zookeeper/docs/api/allclasses-noframe.html
 -zookeeper/docs/api/overview-tree.html
 -zookeeper/docs/api/package-list
 -zookeeper/docs/api/resources/inherit.gif
 -zookeeper/docs/api/index.html
 -zookeeper/docs/api/help-doc.html
 -zookeeper/docs/skin/CommonMessages_fr.xml
 -zookeeper/docs/skin/basic.css
 -zookeeper/docs/skin/breadcrumbs.js
 -zookeeper/docs/skin/breadcrumbs-optimized.js
 -zookeeper/docs/skin/images/pdfdoc.gif
 -zookeeper/docs/skin/images/success.png
 -zookeeper/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
 -zookeeper/docs/skin/images/valid-html401.png
 -zookeeper/docs/skin/images/vcss.png
 -zookeeper/docs/skin/images/apache-thanks.png
 -zookeeper/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
 -zookeeper/docs/skin/images/hack.jpg
 -zookeeper/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
 -zookeeper/docs/skin/images/README.txt
 -zookeeper/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
 -zookeeper/docs/skin/images/chapter_open.gif
 -zookeeper/docs/skin/images/current.gif
 -zookeeper/docs/skin/images/poddoc.png
 -zookeeper/docs/skin/images/fix.jpg
 -zookeeper/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
 -zookeeper/docs/skin/images/chapter.gif
 -zookeeper/docs/skin/images/printer.gif
 -zookeeper/docs/skin/images/page.gif
 -zookeeper/docs/skin/images/built-with-forrest-button.png
 -zookeeper/docs/skin/images/remove.jpg
 -zookeeper/docs/skin/images/error.png
 -zookeeper/docs/skin/images/built-with-cocoon.gif
 -zookeeper/docs/skin/images/header_white_line.gif
 -zookeeper/docs/skin/images/label.gif
 -zookeeper/docs/skin/images/warning.png
 -zookeeper/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
 -zookeeper/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
 -zookeeper/docs/skin/images/forrest-credit-logo.png
 -zookeeper/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
 -zookeeper/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
 -zookeeper/docs/skin/images/info.png
 -zookeeper/docs/skin/images/external-link.gif
 -zookeeper/docs/skin/images/txtdoc.png
 -zookeeper/docs/skin/images/spacer.gif
 -zookeeper/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
 -zookeeper/docs/skin/images/add.jpg
 -zookeeper/docs/skin/images/rss.png
 -zookeeper/docs/skin/images/update.jpg
 -zookeeper/docs/skin/images/xmldoc.gif
 -zookeeper/docs/skin/images/instruction_arrow.png
 -zookeeper/docs/skin/CommonMessages_en_US.xml
 -zookeeper/docs/skin/CommonMessages_de.xml
 -zookeeper/docs/skin/getMenu.js
 -zookeeper/docs/skin/prototype.js
 -zookeeper/docs/skin/profile.css
 -zookeeper/docs/skin/getBlank.js
 -zookeeper/docs/skin/note.txt
 -zookeeper/docs/skin/menu.js
 -zookeeper/docs/skin/print.css
 -zookeeper/docs/skin/fontsize.js
 -zookeeper/docs/skin/CommonMessages_es.xml
 -zookeeper/docs/skin/screen.css
 -zookeeper/docs/zookeeperJMX.pdf
 -zookeeper/docs/index.pdf
 -zookeeper/docs/bookkeeperProgrammer.pdf
 -zookeeper/docs/zookeeperOver.html
 -zookeeper/docs/bookkeeperConfig.pdf
 -zookeeper/docs/zookeeperProgrammers.html
 -zookeeper/docs/bookkeeperOverview.pdf
 -zookeeper/docs/zookeeperInternals.pdf
 -zookeeper/docs/index.html
 -zookeeper/docs/broken-links.xml
 -zookeeper/docs/bookkeeperOverview.html
 -zookeeper/docs/zookeeperOtherInfo.html
 -zookeeper/docs/bookkeeperStream.pdf
 -zookeeper/docs/javaExample.html
 -zookeeper/docs/zookeeperHierarchicalQuorums.html
 -zookeeper/docs/bookkeeperConfig.html
 -zookeeper/docs/zookeeperTutorial.html
 -zookeeper/docs/releasenotes.html
 -zookeeper/docs/zookeeperAdmin.html
 -zookeeper/docs/zookeeperQuotas.html
 -zookeeper/docs/zookeeperObservers.pdf
 -zookeeper/docs/zookeeperOtherInfo.pdf
 -zookeeper/docs/bookkeeperProgrammer.html
 -zookeeper/docs/zookeeperQuotas.pdf
 -zookeeper/docs/zookeeperHierarchicalQuorums.pdf
 -zookeeper/docs/linkmap.html
 -zookeeper/docs/zookeeperJMX.html
 -zookeeper/docs/recipes.html
 -zookeeper/zookeeper-3.3.5.jar
 -zookeeper/conf/log4j.properties
 +%%WITH_C%%bin/cli_mt
 +%%WITH_C%%bin/cli_st
 +%%WITH_C%%bin/load_gen
 +%%WITH_C%%include/c-client-src/recordio.h
 +%%WITH_C%%include/c-client-src/zookeeper.h
 +%%WITH_C%%include/c-client-src/zookeeper.jute.h
 +%%WITH_C%%include/c-client-src/zookeeper_log.h
 +%%WITH_C%%include/c-client-src/zookeeper_version.h
 +%%WITH_C%%lib/libzookeeper_mt.a
 +%%WITH_C%%lib/libzookeeper_mt.la
 +%%WITH_C%%lib/libzookeeper_mt.so
 +%%WITH_C%%lib/libzookeeper_mt.so.2
 +%%WITH_C%%lib/libzookeeper_st.a
 +%%WITH_C%%lib/libzookeeper_st.la
 +%%WITH_C%%lib/libzookeeper_st.so
 +%%WITH_C%%lib/libzookeeper_st.so.2
 +%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/ZooKeeper-0.4-py2.7.egg-info
 +%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/zookeeper.so
 +zookeeper/bin/zkCleanup.sh
 +zookeeper/bin/zkCli.sh
 +zookeeper/bin/zkEnv.sh
 +zookeeper/bin/zkServer.sh
  zookeeper/conf/configuration.xsl
 +zookeeper/conf/log4j.properties
  zookeeper/conf/zoo_sample.cfg
 -zookeeper/lib/log4j-1.2.15.jar
  zookeeper/lib/cobertura/README.txt
 -zookeeper/lib/jline-0.9.94.jar
 -zookeeper/lib/jdiff/zookeeper_3.3.5.xml
  zookeeper/lib/jdiff/zookeeper_3.1.1.xml
 -zookeeper/lib/log4j-1.2.15.LICENSE.txt
 +zookeeper/lib/jdiff/zookeeper_3.3.6.xml
  zookeeper/lib/jline-0.9.94.LICENSE.txt
 -zookeeper/bin/zkServer.cmd
 -zookeeper/bin/zkCli.cmd
 -zookeeper/bin/zkCli.sh
 -zookeeper/bin/zkCleanup.sh
 -zookeeper/bin/zkEnv.cmd
 -zookeeper/bin/zkServer.sh
 -zookeeper/bin/zkEnv.sh
 -zookeeper/bin/README.txt
 -include/c-client-src/zookeeper.h
 -include/c-client-src/zookeeper_version.h
 -include/c-client-src/zookeeper_log.h
 -include/c-client-src/recordio.h
 -include/c-client-src/zookeeper.jute.h
 -lib/python2.7/site-packages/zookeeper.so
 -lib/python2.7/site-packages/ZooKeeper-0.4-py2.7.egg-info
 -@dirrm include/c-client-src
 +zookeeper/lib/jline-0.9.94.jar
 +zookeeper/lib/log4j-1.2.15.LICENSE.txt
 +zookeeper/lib/log4j-1.2.15.jar
 +zookeeper/zookeeper-%%PORTVERSION%%.jar
 +%%WITH_C%%@dirrm include/c-client-src
  @dirrm zookeeper/lib/jdiff
  @dirrm zookeeper/lib/cobertura
  @dirrm zookeeper/lib
 -@dirrm zookeeper/docs/skin/translations
 -@dirrm zookeeper/docs/skin/scripts
 -@dirrm zookeeper/docs/skin/images
 -@dirrm zookeeper/docs/skin/css
 -@dirrm zookeeper/docs/skin
 -@dirrm zookeeper/docs/jdiff/changes
 -@dirrm zookeeper/docs/jdiff
 -@dirrm zookeeper/docs/images
 -@dirrm zookeeper/docs/api/resources
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/server/upgrade/class-use
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/server/upgrade
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/server/quorum/class-use
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/server/quorum
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/server/class-use
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/server
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/data/class-use
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/data
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/client/class-use
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/client
 -@dirrm zookeeper/docs/api/org/apache/zookeeper/class-use
 -@dirrm zookeeper/docs/api/org/apache/zookeeper
 -@dirrm zookeeper/docs/api/org/apache
 -@dirrm zookeeper/docs/api/org
 -@dirrm zookeeper/docs/api
 -@dirrm zookeeper/docs
  @dirrmtry zookeeper/conf
  @dirrm zookeeper/bin
  @dirrmtry zookeeper
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
