Wed Apr 15 22:51:19 2020 UTC ()
Honor resource restriction relaxation


(joerg)
diff -r1.7 -r1.8 pkgsrc/devel/zookeeper/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/devel/zookeeper/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/zookeeper/Makefile 2018/07/24 16:28:35 1.7
+++ pkgsrc/devel/zookeeper/Makefile 2020/04/15 22:51:19 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2018/07/24 16:28:35 jperkin Exp $ 1# $NetBSD: Makefile,v 1.8 2020/04/15 22:51:19 joerg Exp $
2# 2#
3 3
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Highly reliable distributed coordination server 6COMMENT= Highly reliable distributed coordination server
7 7
8DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz 8DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz
9SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/ 9SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
10 10
11BUILD_DEPENDS+= apache-ivy>=2.2.0:../../devel/apache-ivy 11BUILD_DEPENDS+= apache-ivy>=2.2.0:../../devel/apache-ivy
12 12
13USE_JAVA= yes 13USE_JAVA= yes
14USE_JAVA2= yes 14USE_JAVA2= yes
@@ -57,27 +57,27 @@ CONF_FILES+= ${EGDIR}/log4j.properties  @@ -57,27 +57,27 @@ CONF_FILES+= ${EGDIR}/log4j.properties
57CONF_FILES+= ${EGDIR}/zoo.cfg ${PKG_SYSCONFDIR}/zoo.cfg 57CONF_FILES+= ${EGDIR}/zoo.cfg ${PKG_SYSCONFDIR}/zoo.cfg
58CONF_FILES_PERMS+= ${EGDIR}/zookeeper-env.sh ${PKG_SYSCONFDIR}/zookeeper-env.sh \ 58CONF_FILES_PERMS+= ${EGDIR}/zookeeper-env.sh ${PKG_SYSCONFDIR}/zookeeper-env.sh \
59 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 59 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
60 60
61FILES_SUBST+= ZK_USER=${ZK_USER} ZK_GROUP=${ZK_GROUP} 61FILES_SUBST+= ZK_USER=${ZK_USER} ZK_GROUP=${ZK_GROUP}
62 62
63ANT_ARGS+= -Duser.home=${FAKEHOMEDIR} -Divy.home=${WRKDIR}/ivy 63ANT_ARGS+= -Duser.home=${FAKEHOMEDIR} -Divy.home=${WRKDIR}/ivy
64ANT_TARGET= bin-package 64ANT_TARGET= bin-package
65 65
66post-extract: 66post-extract:
67 ${LN} -s ${PREFIX}/lib/java/ant/ivy-*.jar ${WRKSRC}/src/java/lib/ivy-0.0.0.jar 67 ${LN} -s ${PREFIX}/lib/java/ant/ivy-*.jar ${WRKSRC}/src/java/lib/ivy-0.0.0.jar
68 68
69do-build: 69do-build:
70 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ant ${ANT_ARGS} ${ANT_TARGET} 70 ${_ULIMIT_CMD} cd ${WRKSRC} &&${SETENV} ${MAKE_ENV} ant ${ANT_ARGS} ${ANT_TARGET}
71 71
72do-install: 72do-install:
73 ${INSTALL_SCRIPT} ${BUILDDIR}/bin/zkCli.sh ${DESTDIR}${PREFIX}/bin 73 ${INSTALL_SCRIPT} ${BUILDDIR}/bin/zkCli.sh ${DESTDIR}${PREFIX}/bin
74 ${INSTALL_SCRIPT} ${BUILDDIR}/libexec/zkEnv.sh ${DESTDIR}${PREFIX}/libexec 74 ${INSTALL_SCRIPT} ${BUILDDIR}/libexec/zkEnv.sh ${DESTDIR}${PREFIX}/libexec
75 ${INSTALL_SCRIPT} ${BUILDDIR}/sbin/zkServer.sh ${DESTDIR}${PREFIX}/sbin 75 ${INSTALL_SCRIPT} ${BUILDDIR}/sbin/zkServer.sh ${DESTDIR}${PREFIX}/sbin
76 ${INSTALL_DATA} ${BUILDDIR}/conf/configuration.xsl ${DESTDIR}${PREFIX}/${EGDIR} 76 ${INSTALL_DATA} ${BUILDDIR}/conf/configuration.xsl ${DESTDIR}${PREFIX}/${EGDIR}
77 ${INSTALL_DATA} ${BUILDDIR}/conf/log4j.properties ${DESTDIR}${PREFIX}/${EGDIR} 77 ${INSTALL_DATA} ${BUILDDIR}/conf/log4j.properties ${DESTDIR}${PREFIX}/${EGDIR}
78 ${INSTALL_DATA} ${BUILDDIR}/conf/zoo_sample.cfg ${DESTDIR}${PREFIX}/${EGDIR}/zoo.cfg 78 ${INSTALL_DATA} ${BUILDDIR}/conf/zoo_sample.cfg ${DESTDIR}${PREFIX}/${EGDIR}/zoo.cfg
79 ${INSTALL_DATA} ${BUILDDIR}/share/zookeeper/templates/conf/zookeeper-env.sh \ 79 ${INSTALL_DATA} ${BUILDDIR}/share/zookeeper/templates/conf/zookeeper-env.sh \
80 ${DESTDIR}${PREFIX}/${EGDIR}/zookeeper-env.sh 80 ${DESTDIR}${PREFIX}/${EGDIR}/zookeeper-env.sh
81 cd ${BUILDDIR}/share/zookeeper && ${PAX} -rw -pp * ${DESTDIR}${PREFIX}/share/zookeeper/ 81 cd ${BUILDDIR}/share/zookeeper && ${PAX} -rw -pp * ${DESTDIR}${PREFIX}/share/zookeeper/
82 ${RM} -f ${DESTDIR}${PREFIX}/share/zookeeper/templates/conf/zookeeper-env.sh.orig 82 ${RM} -f ${DESTDIR}${PREFIX}/share/zookeeper/templates/conf/zookeeper-env.sh.orig
83 83