svn commit: r449045 - in head/devel/zookeeper: . files
Steven Kreuzer
skreuzer at FreeBSD.org
Thu Aug 31 16:06:37 UTC 2017
Author: skreuzer
Date: Thu Aug 31 16:06:36 2017
New Revision: 449045
URL: https://svnweb.freebsd.org/changeset/ports/449045
Log:
Add ability to pass JVM options to rc script
Add LICENSE
Define config files as @sample
PR: 220815
Submitted by: timp87 at gmail.com
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 Thu Aug 31 15:32:18 2017 (r449044)
+++ head/devel/zookeeper/Makefile Thu Aug 31 16:06:36 2017 (r449045)
@@ -2,12 +2,15 @@
PORTNAME= zookeeper
PORTVERSION= 3.4.10
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= APACHE/${PORTNAME}/current
MAINTAINER= skreuzer at 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 +20,8 @@ RUN_DEPENDS= slf4j>=1.7.5:devel/slf4j \
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 +52,13 @@ PORTDOCS= *
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)
Modified: head/devel/zookeeper/files/zookeeper.in
==============================================================================
--- head/devel/zookeeper/files/zookeeper.in Thu Aug 31 15:32:18 2017 (r449044)
+++ head/devel/zookeeper/files/zookeeper.in Thu Aug 31 16:06:36 2017 (r449045)
@@ -25,6 +25,7 @@ load_rc_config "${name}"
: ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}
: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
: ${zookeeper_logdir:=%%ZOOKEEPER_LOGDIR%%}
+: ${zookeeper_jvmopts:=}
JAVA=%%JAVA%%
JAVAJARDIR=%%JAVAJARDIR%%
@@ -44,7 +45,7 @@ procname=${JAVA}
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"
Modified: head/devel/zookeeper/pkg-plist
==============================================================================
--- head/devel/zookeeper/pkg-plist Thu Aug 31 15:32:18 2017 (r449044)
+++ head/devel/zookeeper/pkg-plist Thu Aug 31 16:06:36 2017 (r449045)
@@ -2,8 +2,8 @@ bin/zkCli.sh
bin/zkServer.sh
%%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar
%%JAVAJARDIR%%/zookeeper.jar
-%%ETCDIR%%/log4j.properties
-%%ETCDIR%%/configuration.xsl
-%%ETCDIR%%/zoo_sample.cfg
+ at sample %%ETCDIR%%/log4j.properties.sample
+ at sample %%ETCDIR%%/configuration.xsl.sample
+ at sample %%ETCDIR%%/zoo.cfg.sample
@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%%
@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%
More information about the svn-ports-all
mailing list