From owner-svn-ports-head@FreeBSD.ORG Tue Jul 22 15:25:14 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54177863; Tue, 22 Jul 2014 15:25:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4170F2223; Tue, 22 Jul 2014 15:25:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6MFPE6u044263; Tue, 22 Jul 2014 15:25:14 GMT (envelope-from skreuzer@svn.freebsd.org) Received: (from skreuzer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6MFPDXn044260; Tue, 22 Jul 2014 15:25:13 GMT (envelope-from skreuzer@svn.freebsd.org) Message-Id: <201407221525.s6MFPDXn044260@svn.freebsd.org> From: Steven Kreuzer Date: Tue, 22 Jul 2014 15:25:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362548 - in head/devel/zookeeper: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jul 2014 15:25:14 -0000 Author: skreuzer Date: Tue Jul 22 15:25:13 2014 New Revision: 362548 URL: http://svnweb.freebsd.org/changeset/ports/362548 QAT: https://qat.redports.org/buildarchive/r362548/ Log: Fix issue preventing zookeeper from starting when using service(8) Add ability to disable JMX in zookeeper by setting zookeeper_jmx=NO Link to command line client zkCli.sh added to ${PREFIX}/bin PR: 191536 Submitted by: Radim Kolar Modified: head/devel/zookeeper/Makefile head/devel/zookeeper/files/zookeeper.in head/devel/zookeeper/pkg-plist Modified: head/devel/zookeeper/Makefile ============================================================================== --- head/devel/zookeeper/Makefile Tue Jul 22 15:20:06 2014 (r362547) +++ head/devel/zookeeper/Makefile Tue Jul 22 15:25:13 2014 (r362548) @@ -3,6 +3,7 @@ PORTNAME= zookeeper PORTVERSION= 3.4.6 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= zookeeper/zookeeper-${PORTVERSION} @@ -22,8 +23,6 @@ JAVA_RUN= yes USE_RC_SUBR= zookeeper -OPTIONS_DEFINE= DOCS - NO_BUILD= yes SCRIPTS= zkCleanup.sh \ @@ -34,7 +33,18 @@ PORTDOCS= * PLIST_SUB= PORTNAME=${PORTNAME} \ PORTVERSION=${PORTVERSION} \ - RESETPREFIX=${PREFIX} + RESETPREFIX=${PREFIX} \ + JAVA_HOME=${JAVA_HOME} + +ZOOKEEPER_LOGDIR?= /var/log/${PORTNAME} +ZOOKEEPER_RUNDIR?= /var/run/${PORTNAME} + +SUB_LIST+= ZOOKEEPER_LOGDIR=${ZOOKEEPER_LOGDIR} \ + ZOOKEEPER_RUNDIR=${ZOOKEEPER_RUNDIR} +post-patch: +.for f in ${SCRIPTS} + ${REINPLACE_CMD} -e "s|bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/bin/${f} +.endfor do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME} @@ -45,11 +55,19 @@ do-install: 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 + +.include post-install: + @${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR} + @${MKDIR} ${STAGEDIR}${ZOOKEEPER_RUNDIR} +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}/var/log/${PORTNAME} - @${MKDIR} ${STAGEDIR}/var/run/${PORTNAME} + ${RM} -r ${STAGEDIR}${DOCSDIR}/skin/translations + ${RM} -r ${STAGEDIR}${DOCSDIR}/skin/scripts + ${RM} -r ${STAGEDIR}${DOCSDIR}/skin/css +.endif .include Modified: head/devel/zookeeper/files/zookeeper.in ============================================================================== --- head/devel/zookeeper/files/zookeeper.in Tue Jul 22 15:20:06 2014 (r362547) +++ head/devel/zookeeper/files/zookeeper.in Tue Jul 22 15:25:13 2014 (r362548) @@ -21,6 +21,7 @@ load_rc_config $name : ${zookeeper_enable:="NO"} : ${zookeeper_logdir="%%ZOOKEEPER_LOGDIR%%"} : ${zookeeper_rundir="%%ZOOKEEPER_RUNDIR%%"} +: ${zookeeper_jmx:="YES"} command="%%PREFIX%%/zookeeper/bin/zkServer.sh" @@ -34,6 +35,10 @@ export ZOOPIDFILE=${zookeeper_rundir}/zo zookeeper_command() { + export JAVA_HOME=%%JAVA_HOME%% + if ! checkyesno zookeeper_jmx; then + export JMXDISABLE=yes + fi ${command} ${rc_arg} } Modified: head/devel/zookeeper/pkg-plist ============================================================================== --- head/devel/zookeeper/pkg-plist Tue Jul 22 15:20:06 2014 (r362547) +++ head/devel/zookeeper/pkg-plist Tue Jul 22 15:25:13 2014 (r362548) @@ -1,3 +1,4 @@ +bin/zkCli.sh %%PORTNAME%%/bin/zkCleanup.sh %%PORTNAME%%/bin/zkCli.sh %%PORTNAME%%/bin/zkEnv.sh