ports/185896: [port-update] deve/zookeeper updated to latest stable version

[Bartek Rutkowski]

>Number:         185896
>Category:       ports
>Synopsis:       [port-update] deve/zookeeper updated to latest stable version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 19 22:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Bartek Rutkowski
>Release:        10.0-RC4
>Organization:
Pixeware LTD
>Environment:
FreeBSD karaczanek 10.0-RC4 FreeBSD 10.0-RC4 #0 r260130: Tue Dec 31 17:10:01 UTC 2013     root at snap.freebsd.org:/usr/obj/usr/src/sys/KARACZANEK  amd64
>Description:
This is update of devel/zookeeper port to latest stable version with lots of new features and bug fixes.
>How-To-Repeat:
Use attached patch, test port/package, commit.
>Fix:
Patch submitted.

Patch attached with submission follows:

diff -ruN zookeeper.orig/Makefile zookeeper/Makefile
--- zookeeper.orig/Makefile	2014-01-17 22:56:05.687376797 +0100
+++ zookeeper/Makefile	2014-01-17 22:56:25.717016797 +0100
@@ -2,7 +2,7 @@
 # $FreeBSD: devel/zookeeper/Makefile 339634 2014-01-13 21:00:02Z rene $
 
 PORTNAME=	zookeeper
-PORTVERSION=	3.3.6
+PORTVERSION=	3.4.5
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	zookeeper/zookeeper-${PORTVERSION}
@@ -41,7 +41,8 @@
 		zkServer.sh
 PORTDOCS=	*
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTNAME=${PORTNAME} \
+		PORTVERSION=${PORTVERSION}
 SUB_LIST=	ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \
 		ZOOKEEPER_RUNDIR=${ZOOKEEPER_RUNDIR}
 
diff -ruN zookeeper.orig/distinfo zookeeper/distinfo
--- zookeeper.orig/distinfo	2014-01-17 22:56:05.687376797 +0100
+++ zookeeper/distinfo	2014-01-17 22:56:25.717016797 +0100
@@ -1,2 +1,2 @@
-SHA256 (zookeeper-3.3.6.tar.gz) = eb311ec0479a9447d075a20350ecfc5cf6a2a6d9842d13b59d7548430ac37521
-SIZE (zookeeper-3.3.6.tar.gz) = 11833706
+SHA256 (zookeeper-3.4.5.tar.gz) = e92b634e99db0414c6642f6014506cc22eefbea42cc912b57d7d0527fb7db132
+SIZE (zookeeper-3.4.5.tar.gz) = 16402010
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-01-17 22:56:05.687376797 +0100
+++ zookeeper/files/patch-src-c-src-zookeeper.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-Index: zookeeper.c
-===================================================================
---- 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) { 
-     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 
-             // ai_flags as AI_ADDRCONFIG
-             if ((hints.ai_flags == AI_ADDRCONFIG) && 
--                ((rc ==EAI_BADFLAGS) || (rc == EAI_ADDRFAMILY))) {
-+                (rc ==EAI_BADFLAGS)) {
-                 //reset ai_flags to null
-                 hints.ai_flags = 0;
-                 //retry getaddrinfo
diff -ruN zookeeper.orig/pkg-plist zookeeper/pkg-plist
--- zookeeper.orig/pkg-plist	2014-01-17 22:56:05.687376797 +0100
+++ zookeeper/pkg-plist	2014-01-17 22:56:25.717016797 +0100
@@ -1,11 +1,11 @@
 %%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%%include/%%PORTNAME%%/recordio.h
+%%WITH_C%%include/%%PORTNAME%%/zookeeper.h
+%%WITH_C%%include/%%PORTNAME%%/zookeeper.jute.h
+%%WITH_C%%include/%%PORTNAME%%/zookeeper_log.h
+%%WITH_C%%include/%%PORTNAME%%/zookeeper_version.h
 %%WITH_C%%lib/libzookeeper_mt.a
 %%WITH_C%%lib/libzookeeper_mt.la
 %%WITH_C%%lib/libzookeeper_mt.so
@@ -25,13 +25,14 @@
 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.4.xml
+zookeeper/lib/jdiff/zookeeper_3.4.5.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
+%%WITH_C%%@dirrm include/%%PORTNAME%%
 @dirrm zookeeper/lib/jdiff
 @dirrm zookeeper/lib/cobertura
 @dirrm zookeeper/lib


>Release-Note:
>Audit-Trail:
>Unformatted: