Attachment 184461 Details for Bug 220815 – port patch

[patch] port patch

zookeeper.patch (text/plain), 2.62 KB, created by Pavel Timofeev on 2017-07-18 04:47:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2017-07-18 04:47:56 UTC

Size: 2.62 KB

patch

obsolete

>diff -ruN /root/zookeeper.orig/Makefile zookeeper/Makefile
>--- /root/zookeeper.orig/Makefile	2017-07-17 21:58:09.817331000 +0300
>+++ zookeeper/Makefile	2017-07-18 07:03:33.182463000 +0300
>@@ -8,6 +8,8 @@
> MAINTAINER=	skreuzer@FreeBSD.org
> COMMENT=	Coordination Service for Distributed Applications
> 
>+LICENSE=	APACHE20
>+
> RUN_DEPENDS=	slf4j>=1.7.5:devel/slf4j \
> 		netty>=3.5.5:java/netty \
> 		jline>=0.9.94:devel/jline \
>@@ -17,6 +19,8 @@
> USERS=	zookeeper
> GROUPS=	zookeeper
> 
>+ZOOKEEPER_CONFS=	configuration.xsl log4j.properties zoo.cfg
>+
> ZOOKEEPER_JAR=	${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar
> 
> ZOOKEEPER_DBDIR?=	/var/db/zookeeper
>@@ -47,10 +51,13 @@
> 
> post-extract:
> 	@${REINPLACE_CMD} "/dataDir/s|=.*|=${ZOOKEEPER_DBDIR}|" ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg
>-	@${RM} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg.bak
>+	@${MV} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg ${WRKDIR}/${DISTNAME}/conf/zoo.cfg
> 
> do-install:
>-	${CP} -Rp ${WRKDIR}/${DISTNAME}/conf/ ${STAGEDIR}${ETCDIR}
>+	@${MKDIR} ${STAGEDIR}${ETCDIR}
>+.for f in ${ZOOKEEPER_CONFS}
>+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
>+.endfor
> 	${INSTALL_DATA} ${ZOOKEEPER_JAR} ${STAGEDIR}${JAVALIBDIR}
> 	(cd ${STAGEDIR}/${JAVAJARDIR} && ${LN} -nfs \
> 		${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}.jar)
>diff -ruN /root/zookeeper.orig/files/zookeeper.in zookeeper/files/zookeeper.in
>--- /root/zookeeper.orig/files/zookeeper.in	2017-07-17 21:58:09.819245000 +0300
>+++ zookeeper/files/zookeeper.in	2017-07-18 07:01:59.325381000 +0300
>@@ -25,6 +25,7 @@
> : ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}
> : ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
> : ${zookeeper_logdir:=%%ZOOKEEPER_LOGDIR%%}
>+: ${zookeeper_jvmopts:=}
> 
> JAVA=%%JAVA%%
> JAVAJARDIR=%%JAVAJARDIR%%
>@@ -44,7 +45,7 @@
> required_files="${zookeeper_config}"
> 
> command="/usr/sbin/daemon"
>-command_args="-p ${pidfile} ${JAVA} ${log4j_params} ${zookeeper_main}"
>+command_args="-p ${pidfile} ${JAVA} ${zookeeper_jvmopts} ${log4j_params} ${zookeeper_main}"
> 
> start_precmd="zookeeper_init"
> 
>diff -ruN /root/zookeeper.orig/pkg-plist zookeeper/pkg-plist
>--- /root/zookeeper.orig/pkg-plist	2017-07-17 21:58:09.819742000 +0300
>+++ zookeeper/pkg-plist	2017-07-17 22:24:15.865876000 +0300
>@@ -2,8 +2,8 @@
> bin/zkServer.sh
> %%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar
> %%JAVAJARDIR%%/zookeeper.jar
>-%%ETCDIR%%/log4j.properties
>-%%ETCDIR%%/configuration.xsl
>-%%ETCDIR%%/zoo_sample.cfg
>+@sample %%ETCDIR%%/log4j.properties.sample
>+@sample %%ETCDIR%%/configuration.xsl.sample
>+@sample %%ETCDIR%%/zoo.cfg.sample
> @dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%%
> @dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%

Actions: View | Diff

Attachments on bug 220815: 184461