[pkgsrc/trunk]: pkgsrc/databases/elasticsearch Honor relaxed resource limits ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa41657d4bf6
branches:  trunk
changeset: 429403:fa41657d4bf6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Apr 20 00:32:04 2020 +0000

description:
Honor relaxed resource limits from Java settings. Don't allow JDK10+ as
it depends on obsolete javah.

diffstat:

 databases/elasticsearch/Makefile |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r aa332209f64f -r fa41657d4bf6 databases/elasticsearch/Makefile
--- a/databases/elasticsearch/Makefile  Sun Apr 19 23:34:48 2020 +0000
+++ b/databases/elasticsearch/Makefile  Mon Apr 20 00:32:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2020/03/08 16:42:24 bsiegert Exp $
+# $NetBSD: Makefile,v 1.49 2020/04/20 00:32:04 joerg Exp $
 
 DISTNAME=      elasticsearch-6.4.0
 PKGREVISION=   1
@@ -10,6 +10,9 @@
 COMMENT=       Distributed RESTful Search Engine
 LICENSE=       apache-2.0
 
+# Uses javah, which doesn't exist in JDK10+ anymore.
+PKG_JVMS_ACCEPTED=     openjdk8 oracle-jdk8 openjdk7 sun-jdk7
+
 # Build our own native JNA, the version should match the one that ES ships with
 JNA=                   jna-4.5.1
 DISTFILES=             ${DEFAULT_DISTFILES} ${JNA}.tar.gz
@@ -75,8 +78,8 @@
 
 do-build:
        # Override silly SunOS et al. assumptions.
-       cd ${WRKSRC}/jna && ${SETENV} ${MAKE_ENV} ant -Ddynlink.native=true -Dgrep=grep -Dmake.PATH=PATH=${PATH:Q} -Dmake=make native
-       cd ${WRKSRC}/jna/build/classes && ${SETENV} ${MAKE_ENV} jar cf ${WRKSRC}/lib/${JNA}.jar com/
+       ${_ULIMIT_CMD} cd ${WRKSRC}/jna && ${SETENV} ${MAKE_ENV} ant -Ddynlink.native=true -Dgrep=grep -Dmake.PATH=PATH=${PATH:Q} -Dmake=make native
+       ${_ULIMIT_CMD} cd ${WRKSRC}/jna/build/classes && ${SETENV} ${MAKE_ENV} jar cf ${WRKSRC}/lib/${JNA}.jar com/
 
 do-install:
 .for f in ${CONFS}