Index: head/devel/zookeeper/Makefile =================================================================== --- head/devel/zookeeper/Makefile (revision 405460) +++ head/devel/zookeeper/Makefile (revision 405461) @@ -1,76 +1,71 @@ -# Created by: gnn@FreeBSD.org # $FreeBSD$ PORTNAME= zookeeper -PORTVERSION= 3.4.6 -PORTREVISION= 4 +PORTVERSION= 3.4.7 CATEGORIES= devel java -MASTER_SITES= APACHE/zookeeper/zookeeper-${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_APACHE} +MASTER_SITE_SUBDIR= ${PORTNAME}/current MAINTAINER= skreuzer@FreeBSD.org -COMMENT= Service for maintaining distributed configuration, naming and locks +COMMENT= Coordination Service for Distributed Applications -LICENSE= APACHE20 +RUN_DEPENDS= slf4j>=1.7.5:${PORTSDIR}/devel/slf4j \ + netty>=3.5.5:${PORTSDIR}/java/netty \ + jline>=0.9.94:${PORTSDIR}/devel/jline \ + log4j>=1.2.16:${PORTSDIR}/devel/log4j \ + libzookeeper>=3.4.7:${PORTSDIR}/devel/libzookeeper -LIB_DEPENDS= libcppunit.so:${PORTSDIR}/devel/cppunit -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash +USERS= zookeeper +GROUPS= zookeeper -USES+= cpe -CPE_VENDOR= apache +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 USE_JAVA= yes JAVA_VERSION= 1.7 JAVA_VENDOR= openjdk JAVA_RUN= yes - USE_RC_SUBR= zookeeper -NO_BUILD= yes -NO_ARCH= yes - -SCRIPTS= zkCleanup.sh \ - zkCli.sh \ - zkEnv.sh \ - zkServer.sh PORTDOCS= * -PLIST_SUB= PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - JAVA_HOME=${JAVA_HOME} +.include -ZOOKEEPER_LOGDIR?= /var/log/${PORTNAME} -ZOOKEEPER_RUNDIR?= /var/run/${PORTNAME} +post-extract: + @${REINPLACE_CMD} "/dataDir/s|=.*|=${ZOOKEEPER_DBDIR}|" ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg + @${RM} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg.bak -SUB_LIST+= ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \ - ZOOKEEPER_RUNDIR=${ZOOKEEPER_RUNDIR} \ - JAVA_HOME=${JAVA_HOME} - -OPTIONS_DEFINE= DOCS - -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 + ${CP} -Rp ${WRKDIR}/${DISTNAME}/conf/ ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${ZOOKEEPER_JAR} ${STAGEDIR}${JAVALIBDIR} + ${LN} -nfs ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar -post-install: - @${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR} - @${MKDIR} ${STAGEDIR}${ZOOKEEPER_RUNDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKDIR}/zkServer.sh ${STAGEDIR}${PREFIX}/bin/ -post-install-DOCS-on: - ${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 + ${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR} + ${MKDIR} ${STAGEDIR}${ZOOKEEPER_DBDIR} -.include +.if (PORT_OPTIONS:MDOCS) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKDIR}/${DISTNAME}/docs && \ + ${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR}) +.endif + +.include Index: head/devel/zookeeper/distinfo =================================================================== --- head/devel/zookeeper/distinfo (revision 405460) +++ head/devel/zookeeper/distinfo (revision 405461) @@ -1,2 +1,2 @@ -SHA256 (zookeeper-3.4.6.tar.gz) = 01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994 -SIZE (zookeeper-3.4.6.tar.gz) = 17699306 +SHA256 (zookeeper-3.4.7.tar.gz) = 2e043e04c4da82fbdb38a68e585f3317535b3842c726e0993312948afcc83870 +SIZE (zookeeper-3.4.7.tar.gz) = 21816477 Index: head/devel/zookeeper/pkg-descr =================================================================== --- head/devel/zookeeper/pkg-descr (revision 405460) +++ head/devel/zookeeper/pkg-descr (revision 405461) @@ -1,8 +1,14 @@ ZooKeeper is a distributed, open-source coordination service for distributed applications. It exposes a simple set of primitives that -applications can build upon to implement higher level services -for synchronization, configuration maintenance, and groups and naming. -It is designed to be easy to program to, and uses a data model -styled after the familiar directory tree structure of filesystems. +distributed applications can build upon to implement higher level +services for synchronization, configuration maintenance, and groups +and naming. It is designed to be easy to program to, and uses a data +model styled after the familiar directory tree structure of file +systems. It runs in Java and has bindings for both Java and C. -WWW: http://zookeeper.apache.org/ +Coordination services are notoriously hard to get right. They are +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: head/devel/zookeeper/pkg-plist =================================================================== --- head/devel/zookeeper/pkg-plist (revision 405460) +++ head/devel/zookeeper/pkg-plist (revision 405461) @@ -1,22 +1,10 @@ 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%% +bin/zkServer.sh +%%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar +%%JAVAJARDIR%%/zookeeper.jar +%%ETCDIR%%/log4j.properties +%%ETCDIR%%/configuration.xsl +%%ETCDIR%%/zoo_sample.cfg +@dirrmtry %%ETCDIR%% +@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%% +@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%