CVS commit: pkgsrc/databases/elasticsearch

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Apr 20 00:32:04 UTC 2020

Modified Files:
        pkgsrc/databases/elasticsearch: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/databases/elasticsearch/Makefile

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

Modified files:

Index: pkgsrc/databases/elasticsearch/Makefile
diff -u pkgsrc/databases/elasticsearch/Makefile:1.48 pkgsrc/databases/elasticsearch/Makefile:1.49
--- pkgsrc/databases/elasticsearch/Makefile:1.48        Sun Mar  8 16:42:24 2020
+++ pkgsrc/databases/elasticsearch/Makefile     Mon Apr 20 00:32:04 2020
@@ -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 @@ HOMEPAGE=     http://www.elasticsearch.org/
 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 @@ post-extract:
 
 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}