svn commit: r349005 - in head/devel/zookeeper: . files
Steve Wills
swills at FreeBSD.org
Mon Mar 24 14:40:20 UTC 2014
Author: swills
Date: Mon Mar 24 14:40:18 2014
New Revision: 349005
URL: http://svnweb.freebsd.org/changeset/ports/349005
QAT: https://qat.redports.org/buildarchive/r349005/
Log:
- Update to 3.4.6
- Stage
- Fix startup scripts
- Remove C/Python bindings, will be readded in separate ports hopefully soon
- Update description and comment
- Pet portlint
PR: ports/185896
Submitted by: Bartek Rutkowski <ports at robakdesign.com>
Approved by: Steven Kreuzer <skreuzer at freebsd.org> (maintainer)
Deleted:
head/devel/zookeeper/files/patch-src-c-src-zookeeper.c
Modified:
head/devel/zookeeper/Makefile
head/devel/zookeeper/distinfo
head/devel/zookeeper/pkg-descr
head/devel/zookeeper/pkg-plist
Modified: head/devel/zookeeper/Makefile
==============================================================================
--- head/devel/zookeeper/Makefile Mon Mar 24 14:11:02 2014 (r349004)
+++ head/devel/zookeeper/Makefile Mon Mar 24 14:40:18 2014 (r349005)
@@ -2,22 +2,18 @@
# $FreeBSD$
PORTNAME= zookeeper
-PORTVERSION= 3.3.6
+PORTVERSION= 3.4.6
CATEGORIES= devel java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= zookeeper/zookeeper-${PORTVERSION}
MAINTAINER= skreuzer at FreeBSD.org
-COMMENT= A Coordination Service for Distributed Applications
+COMMENT= Service for maintaining distributed configuration, naming and locks
LICENSE= APACHE20
LIB_DEPENDS= libcppunit.so:${PORTSDIR}/devel/cppunit
-RUN_DEPENDS:= ${BUILD_DEPENDS}
-
-OPTIONS_DEFINE= C PYTHON
-C_DESC= Build C library bindings and command line tool
-OPTIONS_DEFAULT= C PYTHON DOC
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USE_JAVA= yes
JAVA_VERSION= 1.7
@@ -26,14 +22,11 @@ JAVA_RUN= yes
USE_RC_SUBR= zookeeper
-ZOOKEEPER_LOGDIR= /var/log/${PORTNAME}
-ZOOKEEPER_RUNDIR= /var/run/${PORTNAME}
-
-PYTHON_BINDING_WRKSRC= ${WRKSRC}/src/contrib/zkpython
-PYDISTUTILS_PKGNAME= ZooKeeper
-PYDISTUTILS_PKGVERSION= 0.4
+OPTIONS_DEFINE= DOC
+DOC_DESC= Install documentation
+OPTIONS_DEFAULT= DOC
-CONFIGURE_WRKSRC= ${WRKSRC}/src/c
+NO_BUILD= yes
SCRIPTS= zkCleanup.sh \
zkCli.sh \
@@ -41,76 +34,28 @@ SCRIPTS= zkCleanup.sh \
zkServer.sh
PORTDOCS= *
-PLIST_SUB= PORTVERSION=${PORTVERSION}
-SUB_LIST= ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
- ZOOKEEPER_RUNDIR=${ZOOKEEPER_RUNDIR}
-
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= 2
-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
+PLIST_SUB= PORTNAME=${PORTNAME} \
+ PORTVERSION=${PORTVERSION} \
+ RESETPREFIX=${PREFIX}
.include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MC}
-#run-autotools: run-autotools-autoreconf
-
-#run-autotools-autoreconf:
-run-autotools:
- @cd ${CONFIGURE_WRKSRC} && \
- ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -if
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|executable="python"|executable="${PYTHON_CMD}"|' \
- ${PYTHON_BINDING_WRKSRC}/build.xml
-
-do-build:
-.if ${PORT_OPTIONS:MC}
- cd ${CONFIGURE_WRKSRC} && \
- ${MAKE}
-.endif
-.if ${PORT_OPTIONS:MPYTHON}
- cd ${PYTHON_BINDING_WRKSRC} && \
- ant compile
-.endif
-
do-install:
- ${MKDIR} ${PREFIX}/${PORTNAME}
- ${MKDIR} ${PREFIX}/${PORTNAME}/bin
- ${MKDIR} ${ZOOKEEPER_LOGDIR}
- ${MKDIR} ${ZOOKEEPER_RUNDIR}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
.for f in ${SCRIPTS}
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/${PORTNAME}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${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} && \
- ${MAKE} install
-.endif
-.if ${PORT_OPTIONS:MPYTHON}
- cd ${PYTHON_BINDING_WRKSRC} && \
- ant install
-.endif
+ cd ${WRKSRC} && ${COPYTREE_SHARE} conf ${STAGEDIR}${PREFIX}/${PORTNAME}/
+ cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX}/${PORTNAME}/
+ ${INSTALL_DATA} ${WRKSRC}/*.jar ${STAGEDIR}${PREFIX}/${PORTNAME}
+
+post-install:
.if ${PORT_OPTIONS:MDOC}
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.endif
+ @${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
+ @${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
.include <bsd.port.post.mk>
Modified: head/devel/zookeeper/distinfo
==============================================================================
--- head/devel/zookeeper/distinfo Mon Mar 24 14:11:02 2014 (r349004)
+++ head/devel/zookeeper/distinfo Mon Mar 24 14:40:18 2014 (r349005)
@@ -1,2 +1,2 @@
-SHA256 (zookeeper-3.3.6.tar.gz) = eb311ec0479a9447d075a20350ecfc5cf6a2a6d9842d13b59d7548430ac37521
-SIZE (zookeeper-3.3.6.tar.gz) = 11833706
+SHA256 (zookeeper-3.4.6.tar.gz) = 01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994
+SIZE (zookeeper-3.4.6.tar.gz) = 17699306
Modified: head/devel/zookeeper/pkg-descr
==============================================================================
--- head/devel/zookeeper/pkg-descr Mon Mar 24 14:11:02 2014 (r349004)
+++ head/devel/zookeeper/pkg-descr Mon Mar 24 14:40:18 2014 (r349005)
@@ -1,16 +1,8 @@
-ZooKeeper: A Distributed Coordination Service for Distributed Applications
-
ZooKeeper is a distributed, open-source coordination service for
distributed applications. It exposes a simple set of primitives that
-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.
-
-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.
+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.
-WWW: http://zookeeper.apache.org/
+WWW: http://zookeeper.apache.org/
Modified: head/devel/zookeeper/pkg-plist
==============================================================================
--- head/devel/zookeeper/pkg-plist Mon Mar 24 14:11:02 2014 (r349004)
+++ head/devel/zookeeper/pkg-plist Mon Mar 24 14:40:18 2014 (r349005)
@@ -1,40 +1,29 @@
-%%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/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/log4j-1.2.15.LICENSE.txt
-zookeeper/lib/log4j-1.2.15.jar
-zookeeper/zookeeper-%%PORTVERSION%%.jar
-%%WITH_C%%@dirrm include/c-client-src
- at dirrm zookeeper/lib/jdiff
- at dirrm zookeeper/lib/cobertura
- at dirrm zookeeper/lib
- at dirrmtry zookeeper/conf
- at dirrm zookeeper/bin
- at dirrmtry zookeeper
+%%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
+ at dirrm %%PORTNAME%%/lib/jdiff
+ at dirrm %%PORTNAME%%/lib/cobertura
+ at dirrm %%PORTNAME%%/lib
+ at dirrm %%PORTNAME%%/bin
+ at dirrmtry %%PORTNAME%%/conf
+ at dirrmtry %%PORTNAME%%
+ at cwd /
+ at dirrmtry var/log/%%PORTNAME%%
+ at dirrmtry var/run/%%PORTNAME%%
+ at cwd %%RESETPREFIX%%
More information about the svn-ports-all
mailing list