svn commit: r362548 - in head/devel/zookeeper: . files

[Steven Kreuzer]

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 <hsn at sendmail.cz>

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 <bsd.port.options.mk>
 
 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 <bsd.port.mk>

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