Date: Sat, 22 Mar 2014 21:42:47 +0100 From: =?utf-8?Q?Bart=C5=82omiej_Rutkowski?= <r@robakdesign.com> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/185896: [port-update] deve/zookeeper updated to latest stable version Message-ID: <822BB403-B276-432E-84D3-83C48D12993E@robakdesign.com> In-Reply-To: <C0329A26-6686-42ED-B1CC-F248F1040E96@robakdesign.com> References: <201401192220.s0JMK0X5091130@freefall.freebsd.org> <C0329A26-6686-42ED-B1CC-F248F1040E96@robakdesign.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_1F2A8E09-0986-4D6C-8BA4-DD33D684C964
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=us-ascii
Patch attached.
--Apple-Mail=_1F2A8E09-0986-4D6C-8BA4-DD33D684C964
Content-Disposition: attachment;
filename=zookeeper.txt
Content-Type: text/plain;
x-unix-mode=0644;
name="zookeeper.txt"
Content-Transfer-Encoding: quoted-printable
diff -ruN zookeeper.orig/Makefile zookeeper/Makefile
--- zookeeper.orig/Makefile 2014-03-22 08:07:50.474748600 +0100
+++ zookeeper/Makefile 2014-03-22 12:26:45.686756588 +0100
@@ -2,22 +2,18 @@
# $FreeBSD: head/devel/zookeeper/Makefile 343798 2014-02-11 18:51:26Z =
skreuzer $
=20
PORTNAME=3D zookeeper
-PORTVERSION=3D 3.3.6
+PORTVERSION=3D 3.4.6
CATEGORIES=3D devel java
MASTER_SITES=3D ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR=3D zookeeper/zookeeper-${PORTVERSION}
=20
MAINTAINER=3D skreuzer@FreeBSD.org
-COMMENT=3D A Coordination Service for Distributed Applications
+COMMENT=3D Service for maintaining distributed configuration, =
naming and locks
=20
LICENSE=3D APACHE20
=20
LIB_DEPENDS=3D libcppunit.so:${PORTSDIR}/devel/cppunit
-RUN_DEPENDS:=3D ${BUILD_DEPENDS}
-
-OPTIONS_DEFINE=3D C PYTHON
-C_DESC=3D Build C library bindings and command line tool
-OPTIONS_DEFAULT=3D C PYTHON DOC
+RUN_DEPENDS=3D bash:${PORTSDIR}/shells/bash
=20
USE_JAVA=3D yes
JAVA_VERSION=3D 1.7
@@ -26,14 +22,11 @@
=20
USE_RC_SUBR=3D zookeeper
=20
-ZOOKEEPER_LOGDIR=3D /var/log/${PORTNAME}
-ZOOKEEPER_RUNDIR=3D /var/run/${PORTNAME}
-
-PYTHON_BINDING_WRKSRC=3D ${WRKSRC}/src/contrib/zkpython
-PYDISTUTILS_PKGNAME=3D ZooKeeper
-PYDISTUTILS_PKGVERSION=3D 0.4
+OPTIONS_DEFINE=3D DOC
+DOC_DESC=3D Install documentation
+OPTIONS_DEFAULT=3D DOC
=20
-CONFIGURE_WRKSRC=3D ${WRKSRC}/src/c
+NO_BUILD=3D yes
=20
SCRIPTS=3D zkCleanup.sh \
zkCli.sh \
@@ -41,76 +34,28 @@
zkServer.sh
PORTDOCS=3D *
=20
-PLIST_SUB=3D PORTVERSION=3D${PORTVERSION}
-SUB_LIST=3D ZOOKEEPER_LOGDIR=3D${ZOOKEEPER_LOGDIR} \
- ZOOKEEPER_RUNDIR=3D${ZOOKEEPER_RUNDIR}
-
-NO_STAGE=3D yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=3D 2
-BUILD_DEPENDS+=3D ant:${PORTSDIR}/devel/apache-ant
-PLIST_SUB+=3D WITH_PYTHON=3D""
-.else
-PLIST_SUB+=3D WITH_PYTHON=3D"@comment "
-.endif
-
-.if ${PORT_OPTIONS:MC}
-USE_AUTOTOOLS=3D automake autoconf libtool
-USE_LDCONFIG=3D yes
-PLIST_SUB+=3D WITH_C=3D""
-.else
-PLIST_SUB+=3D WITH_C=3D"@comment "
-.endif
+PLIST_SUB=3D PORTNAME=3D${PORTNAME} \
+ PORTVERSION=3D${PORTVERSION} \
+ RESETPREFIX=3D${PREFIX}
=20
.include <bsd.port.pre.mk>
=20
-.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=3D"python"|executable=3D"${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}
=20
.include <bsd.port.post.mk>
diff -ruN zookeeper.orig/distinfo zookeeper/distinfo
--- zookeeper.orig/distinfo 2014-03-22 08:07:50.474748600 +0100
+++ zookeeper/distinfo 2014-03-22 11:51:22.103331590 +0100
@@ -1,2 +1,2 @@
-SHA256 (zookeeper-3.3.6.tar.gz) =3D =
eb311ec0479a9447d075a20350ecfc5cf6a2a6d9842d13b59d7548430ac37521
-SIZE (zookeeper-3.3.6.tar.gz) =3D 11833706
+SHA256 (zookeeper-3.4.6.tar.gz) =3D =
01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994
+SIZE (zookeeper-3.4.6.tar.gz) =3D 17699306
diff -ruN zookeeper.orig/files/patch-src-c-src-zookeeper.c =
zookeeper/files/patch-src-c-src-zookeeper.c
--- zookeeper.orig/files/patch-src-c-src-zookeeper.c 2014-03-22 =
08:07:50.474748600 +0100
+++ zookeeper/files/patch-src-c-src-zookeeper.c 1970-01-01 =
01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-Index: zookeeper.c
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
---- src/c/src/zookeeper.c 2012-07-05 15:53:43.348806000 -0400
-+++ src/c/src/zookeeper.c 2012-07-05 15:55:12.800391000 -0400
-@@ -413,7 +413,6 @@
- static int getaddrinfo_errno(int rc) {=20
- switch(rc) {
- case EAI_NONAME:
-- case EAI_NODATA:
- return ENOENT;
- case EAI_MEMORY:
- return ENOMEM;
-@@ -546,7 +545,7 @@
- //EAI_BADFLAGS or EAI_ADDRFAMILY with AF_UNSPEC and=20
- // ai_flags as AI_ADDRCONFIG
- if ((hints.ai_flags =3D=3D AI_ADDRCONFIG) &&=20
-- ((rc =3D=3DEAI_BADFLAGS) || (rc =3D=3D =
EAI_ADDRFAMILY))) {
-+ (rc =3D=3DEAI_BADFLAGS)) {
- //reset ai_flags to null
- hints.ai_flags =3D 0;
- //retry getaddrinfo
diff -ruN zookeeper.orig/pkg-descr zookeeper/pkg-descr
--- zookeeper.orig/pkg-descr 2014-03-22 08:07:50.474748600 +0100
+++ zookeeper/pkg-descr 2014-03-22 10:51:50.229737592 +0100
@@ -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.
=20
-WWW: http://zookeeper.apache.org/
+WWW: http://zookeeper.apache.org/
diff -ruN zookeeper.orig/pkg-plist zookeeper/pkg-plist
--- zookeeper.orig/pkg-plist 2014-03-22 08:07:50.474748600 +0100
+++ zookeeper/pkg-plist 2014-03-22 11:56:00.226067590 +0100
@@ -1,21 +1,3 @@
-%%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
@@ -25,16 +7,19 @@
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/jdiff/zookeeper_3.4.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/lib/log4j-1.2.16.LICENSE.txt
+zookeeper/lib/log4j-1.2.16.jar
zookeeper/zookeeper-%%PORTVERSION%%.jar
-%%WITH_C%%@dirrm include/c-client-src
@dirrm zookeeper/lib/jdiff
@dirrm zookeeper/lib/cobertura
@dirrm zookeeper/lib
@dirrmtry zookeeper/conf
@dirrm zookeeper/bin
@dirrmtry zookeeper
+@cwd /
+@dirrmtry var/log/%%PORTNAME%%
+@dirrmtry var/run/%%PORTNAME%%
+@cwd %%RESETPREFIX%%
--Apple-Mail=_1F2A8E09-0986-4D6C-8BA4-DD33D684C964
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=utf-8
Wiadomo=C5=9B=C4=87 napisana przez Bart=C5=82omiej Rutkowski =
<r@robakdesign.com> w dniu 22 mar 2014, o godz. 21:39:
> Please, use the newest patch with following changes:
>=20
> - updated Zookeeper to latest 3.4.6 version
> - support for STAGING
> - fixes for port functionality (statup scripts were broken)
> - removed C/Python bindings installation from the port
> - updated description and comment
> - portlint polishing
>=20
> Redports report: =
https://redports.org/buildarchive/20140322203001-2625/
>=20
> Kind regards,
> Bartek Rutkowski
>=20
> Wiadomo=C5=9B=C4=87 napisana przez FreeBSD-gnats-submit@FreeBSD.org w =
dniu 19 sty 2014, o godz. 23:20:
>=20
>> Thank you very much for your problem report.
>> It has the internal identification `ports/185896'.
>> The individual assigned to look at your
>> report is: freebsd-ports-bugs.=20
>>=20
>> You can access the state of your problem report at any time
>> via this link:
>>=20
>> http://www.freebsd.org/cgi/query-pr.cgi?pr=3D185896
>>=20
>>> Category: ports
>>> Responsible: freebsd-ports-bugs
>>> Synopsis: [port-update] deve/zookeeper updated to latest =
stable version
>>> Arrival-Date: Sun Jan 19 22:20:00 UTC 2014
>=20
--Apple-Mail=_1F2A8E09-0986-4D6C-8BA4-DD33D684C964--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?822BB403-B276-432E-84D3-83C48D12993E>