From owner-svn-ports-all@freebsd.org Thu Aug 31 16:06:37 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0AF3E012E0; Thu, 31 Aug 2017 16:06:37 +0000 (UTC) (envelope-from skreuzer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 86A6482979; Thu, 31 Aug 2017 16:06:37 +0000 (UTC) (envelope-from skreuzer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7VG6ai3000748; Thu, 31 Aug 2017 16:06:36 GMT (envelope-from skreuzer@FreeBSD.org) Received: (from skreuzer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7VG6a7R000745; Thu, 31 Aug 2017 16:06:36 GMT (envelope-from skreuzer@FreeBSD.org) Message-Id: <201708311606.v7VG6a7R000745@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: skreuzer set sender to skreuzer@FreeBSD.org using -f From: Steven Kreuzer Date: Thu, 31 Aug 2017 16:06:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449045 - in head/devel/zookeeper: . files X-SVN-Group: ports-head X-SVN-Commit-Author: skreuzer X-SVN-Commit-Paths: in head/devel/zookeeper: . files X-SVN-Commit-Revision: 449045 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Aug 2017 16:06:37 -0000 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@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@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 +@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%%