From owner-svn-ports-all@freebsd.org Sat Jan 30 21:11:05 2016 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 19FFBA725AD; Sat, 30 Jan 2016 21:11:05 +0000 (UTC) (envelope-from pawel@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 D22E0CE3; Sat, 30 Jan 2016 21:11:04 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0ULB3Wn072075; Sat, 30 Jan 2016 21:11:03 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0ULB3Wv072073; Sat, 30 Jan 2016 21:11:03 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601302111.u0ULB3Wv072073@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sat, 30 Jan 2016 21:11:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407552 - head/devel/zookeeper X-SVN-Group: ports-head 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.20 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: Sat, 30 Jan 2016 21:11:05 -0000 Author: pawel Date: Sat Jan 30 21:11:03 2016 New Revision: 407552 URL: https://svnweb.freebsd.org/changeset/ports/407552 Log: - Fix link pointing to STAGEDIR after install, this fixes runtime error: /jline.jar:/usr/local/share/java/classes/zookeeper.jar: org.apache.zookeeper.server.quorum.QuorumPeerMain /usr/local/etc/zookeeper/zoo.cfg"' Error: Could not find or load main class org.apache.zookeeper.server.quorum.QuorumPeerMain - Add NO_ARCH - There's no need to include bsd.port.pre.mk - Use options helper - Remove deprecated @dirrmtry from pkg-plist PR: 206739 Submitted by: myself Approved by: maintainer MFH: 2016Q1 Modified: head/devel/zookeeper/Makefile head/devel/zookeeper/pkg-plist Modified: head/devel/zookeeper/Makefile ============================================================================== --- head/devel/zookeeper/Makefile Sat Jan 30 20:24:18 2016 (r407551) +++ head/devel/zookeeper/Makefile Sat Jan 30 21:11:03 2016 (r407552) @@ -2,6 +2,7 @@ PORTNAME= zookeeper PORTVERSION= 3.4.7 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= ${PORTNAME}/current @@ -37,6 +38,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} \ JAVALIBDIR=${JAVALIBDIR} NO_BUILD= yes +NO_ARCH= yes USE_JAVA= yes JAVA_VERSION= 1.7 JAVA_VENDOR= openjdk @@ -45,8 +47,6 @@ USE_RC_SUBR= zookeeper PORTDOCS= * -.include - post-extract: @${REINPLACE_CMD} "/dataDir/s|=.*|=${ZOOKEEPER_DBDIR}|" ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg @${RM} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg.bak @@ -54,7 +54,8 @@ post-extract: do-install: ${CP} -Rp ${WRKDIR}/${DISTNAME}/conf/ ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${ZOOKEEPER_JAR} ${STAGEDIR}${JAVALIBDIR} - ${LN} -nfs ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar + (cd ${STAGEDIR}/${JAVAJARDIR} && ${LN} -nfs \ + ${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}.jar) ${INSTALL_SCRIPT} ${WRKDIR}/zkCli.sh ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKDIR}/zkServer.sh ${STAGEDIR}${PREFIX}/bin/ @@ -62,10 +63,9 @@ do-install: ${MKDIR} ${STAGEDIR}${ZOOKEEPER_LOGDIR} ${MKDIR} ${STAGEDIR}${ZOOKEEPER_DBDIR} -.if (PORT_OPTIONS:MDOCS) +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKDIR}/${DISTNAME}/docs && \ ${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR}) -.endif -.include +.include Modified: head/devel/zookeeper/pkg-plist ============================================================================== --- head/devel/zookeeper/pkg-plist Sat Jan 30 20:24:18 2016 (r407551) +++ head/devel/zookeeper/pkg-plist Sat Jan 30 21:11:03 2016 (r407552) @@ -5,6 +5,5 @@ bin/zkServer.sh %%ETCDIR%%/log4j.properties %%ETCDIR%%/configuration.xsl %%ETCDIR%%/zoo_sample.cfg -@dirrmtry %%ETCDIR%% @dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%% @dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%