Fixups from jgh@:

- Use standard USE_RC_SUBR (`set_rcvar` is deprecated`)
- Remove stale entry from plist
- Use OptionsNG, and not old options framework
- Use autotools tools, and don't call specifically as a build dependency (ie. libtool, automake), automake is required
- Add an additional MASTER_SITE
- remove extra new line from pkg-descr
- fix make install by using CONFIGURE_WRKSRC
- some portlint petting was necessary

Approved by: skreuzer (mentor)

devel/zookeeper/Makefile

@@ -10,39 +10,42 @@
 PORTNAME=	zookeeper
 PORTVERSION=	3.3.5
 CATEGORIES=	devel java
-MASTER_SITES=	http://apache.mesi.com.ar/zookeeper/stable/
+MASTER_SITES=	http://apache.mesi.com.ar/zookeeper/stable/ \
+	http://www.trieuvan.com/apache/zookeeper/stable/
 
 MAINTAINER=	gnn@FreeBSD.org
 COMMENT=	A Coordination Service for Distributed Applications
 
+BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
 LIB_DEPENDS=	cppunit:${PORTSDIR}/devel/cppunit
-BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
-		libtool:${PORTSDIR}/devel/libtool \
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-.if defined(WITH_PYTHON)
+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
 
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
 USE_JAVA=	yes
 JAVA_VERSION=	1.7
 JAVA_VENDOR=	openjdk
 JAVA_RUN=	yes
+USE_RC_SUBR=	zookeeper
 
-USE_AUTOTOOLS=	autoconf
+USE_AUTOTOOLS=	automake autoconf libtool
 
 CONFLICTS=	zookeeper-devel-[0-9]*
 
 PYTHON_WRKSRC=	${WRKSRC}/src/contrib/zkpython
 CONFIGURE_WRKSRC=${WRKSRC}/src/c
 
-OPTIONS=	C "Build C library bindings" on \
-		PYTHON "Build Python library bindings" on
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_C)
+.if ${PORT_OPTIONS:MC}
 run-autotools:	run-autotools-autoreconf
 
 run-autotools-autoreconf:
@@ -50,11 +53,11 @@ run-autotools-autoreconf:
 .endif
 
 do-build:
-.if defined(WITH_C)
+.if ${PORT_OPTIONS:MC}
 	@cd ${CONFIGURE_WRKSRC} && \
 	${MAKE}
 .endif
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	@cd ${PYTHON_WRKSRC} &&\
 	ant compile
 .endif
@@ -66,12 +69,11 @@ do-install:
 	@${CP} -Rp ${WRKSRC}/lib ${PREFIX}/${PORTNAME}
 	@${CP} -Rp ${WRKSRC}/docs ${PREFIX}/${PORTNAME}
 	@${CP} -Rp ${WRKSRC}/*.jar ${PREFIX}/${PORTNAME}
-	@${INSTALL} ${FILESDIR}/zookeeper ${PREFIX}/etc/rc.d/
-.if defined(WITH_C)
-	@cd ${BUILD_WRKSRC} && \
-	make install
+.if ${PORT_OPTIONS:MC}
+	@cd ${CONFIGURE_WRKSRC} && \
+	${MAKE} install
 .endif
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	@cd ${PYTHON_WRKSRC} && \
 	ant install
 .endif

devel/zookeeper/files/zookeeper.in

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD: /tmp/pcvs/ports/devel/zookeeper/files/Attic/zookeeper,v 1.1 2012-07-06 20:27:35 gnn Exp $
+# $FreeBSD$
 #
 # PROVIDE: zookeeper
 #
@@ -18,7 +18,7 @@ load_rc_config zookeeper
 zookeeper_enable=${zookeeper_enable:-"NO"}
 
 name=zookeeper
-rcvar=`set_rcvar`
+rcvar=zookeeper_enable
 
 start_cmd="zookeeper_command start"
 stop_cmd="zookeeper_command stop"
@@ -30,4 +30,4 @@ zookeeper_command()
 	${command} ${rc_arg}
 }
 
-run_rc_command "$1"
+run_rc_command "$1"

devel/zookeeper/pkg-descr

@@ -14,4 +14,3 @@ 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.
-

devel/zookeeper/pkg-plist

@@ -336,7 +336,6 @@ zookeeper/bin/zkEnv.cmd
 zookeeper/bin/zkServer.sh
 zookeeper/bin/zkEnv.sh
 zookeeper/bin/README.txt
-etc/rc.d/zookeeper
 include/c-client-src/zookeeper.h
 include/c-client-src/zookeeper_version.h
 include/c-client-src/zookeeper_log.h