Attachment 144332 Details for Bug 191536 – patch for port

[patch] patch for port

zookeeper2.diff (text/plain), 2.72 KB, created by Radim Kolar on 2014-07-02 10:21:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Kolar

Created: 2014-07-02 10:21:03 UTC

Size: 2.72 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with less
>diff -ruN /usr/ports/devel/zookeeper/Makefile ./Makefile
>--- /usr/ports/devel/zookeeper/Makefile	2014-04-25 16:13:06.000000000 +0200
>+++ ./Makefile	2014-07-02 11:44:23.000000000 +0200
>@@ -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}
>@@ -36,6 +37,16 @@
> 		PORTVERSION=${PORTVERSION} \
> 		RESETPREFIX=${PREFIX}
> 
>+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}
> 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
>@@ -45,6 +56,7 @@
> 	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
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>diff -ruN /usr/ports/devel/zookeeper/files/patch-bash ./files/patch-bash
>--- /usr/ports/devel/zookeeper/files/patch-bash	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-bash	2014-07-02 12:08:54.000000000 +0200
>@@ -0,0 +1,11 @@
>+--- bin/zkCli.sh.bak	2014-07-02 11:59:57.000000000 +0200
>++++ bin/zkCli.sh	2014-07-02 12:00:36.000000000 +0200
>+@@ -26,7 +26,7 @@
>+ #
>+ 
>+ # use POSTIX interface, symlink is followed automatically
>+-ZOOBIN="${BASH_SOURCE-$0}"
>++ZOOBIN=`readlink -f $0`
>+ ZOOBIN="$(dirname "${ZOOBIN}")"
>+ ZOOBINDIR="$(cd "${ZOOBIN}"; pwd)"
>+ 
>diff -ruN /usr/ports/devel/zookeeper/files/zookeeper.in ./files/zookeeper.in
>--- /usr/ports/devel/zookeeper/files/zookeeper.in	2014-01-24 01:14:07.000000000 +0100
>+++ ./files/zookeeper.in	2014-07-02 11:37:25.000000000 +0200
>@@ -21,6 +21,7 @@
> : ${zookeeper_enable:="NO"}
> : ${zookeeper_logdir="%%ZOOKEEPER_LOGDIR%%"}
> : ${zookeeper_rundir="%%ZOOKEEPER_RUNDIR%%"}
>+: ${zookeeper_jmx:="YES"}
> 
> command="%%PREFIX%%/zookeeper/bin/zkServer.sh"
> 
>@@ -34,6 +35,10 @@
> 
> zookeeper_command()
> {
>+	export JAVA_HOME=%%LOCALBASE%%/openjdk7
>+	if ! checkyesno zookeeper_jmx; then
>+	    export JMXDISABLE=yes
>+	fi
> 	${command} ${rc_arg}
> }
> 
>diff -ruN /usr/ports/devel/zookeeper/pkg-plist ./pkg-plist
>--- /usr/ports/devel/zookeeper/pkg-plist	2014-03-24 15:40:18.000000000 +0100
>+++ ./pkg-plist	2014-07-02 11:23:41.000000000 +0200
>@@ -1,3 +1,4 @@
>+bin/zkCli.sh
> %%PORTNAME%%/bin/zkCleanup.sh
> %%PORTNAME%%/bin/zkCli.sh
> %%PORTNAME%%/bin/zkEnv.sh
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 191536: 144325 | 144332