pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zookeeper-server: install zkCleanup.sh



Module Name:	pkgsrc-wip
Committed By:	Sergey Svishchev <shattered%NetBSD.org@localhost>
Pushed By:	shattered
Date:		Sun Oct 4 12:29:52 2015 +0300
Changeset:	f015935b4d6b2f9a701c9b9fa12ed1c43af2171c

Modified Files:
	zookeeper-server/Makefile
	zookeeper-server/PLIST
	zookeeper-server/distinfo
Added Files:
	zookeeper-server/patches/patch-build.xml

Log Message:
zookeeper-server: install zkCleanup.sh

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f015935b4d6b2f9a701c9b9fa12ed1c43af2171c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zookeeper-server/Makefile                |  3 ++-
 zookeeper-server/PLIST                   |  3 ++-
 zookeeper-server/distinfo                |  1 +
 zookeeper-server/patches/patch-build.xml | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diffs:
diff --git a/zookeeper-server/Makefile b/zookeeper-server/Makefile
index bfa007d..69189c4 100644
--- a/zookeeper-server/Makefile
+++ b/zookeeper-server/Makefile
@@ -48,7 +48,7 @@ SUBST_FILES.paths=	conf/zoo_sample.cfg
 SUBST_FILES.paths+=	src/packages/templates/conf/zookeeper-env.sh
 SUBST_VARS.paths+=	PKG_JAVA_HOME ZK_DB ZK_LOG ZK_RUN
 
-REPLACE_BASH=		bin/zkCli.sh bin/zkEnv.sh bin/zkServer.sh
+REPLACE_BASH=		bin/zkCleanup.sh bin/zkCli.sh bin/zkEnv.sh bin/zkServer.sh
 
 INSTALLATION_DIRS+=	bin libexec sbin share/examples/zookeeper share/zookeeper
 
@@ -62,6 +62,7 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${PKG_JAVA_HOME} ant bin-package
 
 do-install:
+	${INSTALL_SCRIPT} ${BUILDDIR}/bin/zkCleanup.sh ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${BUILDDIR}/bin/zkCli.sh ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${BUILDDIR}/libexec/zkEnv.sh ${DESTDIR}${PREFIX}/libexec
 	${INSTALL_SCRIPT} ${BUILDDIR}/sbin/zkServer.sh ${DESTDIR}${PREFIX}/sbin
diff --git a/zookeeper-server/PLIST b/zookeeper-server/PLIST
index 93c2c63..d48a76d 100644
--- a/zookeeper-server/PLIST
+++ b/zookeeper-server/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2014/05/14 13:58:41 fhajny Exp $
+@comment $NetBSD$
+bin/zkCleanup.sh
 bin/zkCli.sh
 libexec/zkEnv.sh
 sbin/zkServer.sh
diff --git a/zookeeper-server/distinfo b/zookeeper-server/distinfo
index 322c771..d962ca5 100644
--- a/zookeeper-server/distinfo
+++ b/zookeeper-server/distinfo
@@ -5,6 +5,7 @@ RMD160 (zookeeper-3.4.6.tar.gz) = d9fadf07a40a85b8fd5a7e04e7200c74fd7393ce
 Size (zookeeper-3.4.6.tar.gz) = 17699306 bytes
 SHA1 (patch-bin_zkEnv.sh) = 210b94572a221cc46898750da0a822c90708ef9f
 SHA1 (patch-bin_zkServer.sh) = 2fd1d6c37aac2ee473b62de1ebf21ea8ad57ed75
+SHA1 (patch-build.xml) = 21ca6d1987ca3c64ee1b13bb77be981426e3ade6
 SHA1 (patch-conf__zoo_sample.cfg) = 74885bea53e5b9b723fb1564db362a08d7b47705
 SHA1 (patch-include_recordio.h) = ab07325a556eee1f6b595de241e9f7c7084c8065
 SHA1 (patch-src__zk_log.c) = 9dc6e801f53a96bf8b3ec1bac429f83a0ff2cae4
diff --git a/zookeeper-server/patches/patch-build.xml b/zookeeper-server/patches/patch-build.xml
new file mode 100644
index 0000000..200d7ea
--- /dev/null
+++ b/zookeeper-server/patches/patch-build.xml
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- build.xml.orig	2014-02-20 10:14:08.000000000 +0000
++++ build.xml
+@@ -843,6 +843,10 @@ xmlns:maven="antlib:org.apache.maven.art
+ 
+ 
+       <copy todir="${dist.dir}/bin">
++        <fileset dir="bin" includes="zkCleanup*"/>
++      </copy>
++
++      <copy todir="${dist.dir}/bin">
+         <fileset dir="bin" includes="zkCli*"/>
+       </copy>
+ 


Home | Main Index | Thread Index | Old Index