databases/elasticsearch: Skip unneeded API check, avoid GNU grep dep.

3 files changed, 31 insertions, 5 deletions

diff --git a/databases/elasticsearch/Makefile b/databases/elasticsearch/Makefile
index b3a3be9961e..bbd3cf76965 100644
--- a/databases/elasticsearch/Makefile
+++ b/databases/elasticsearch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2018/04/18 11:27:21 fhajny Exp $
+# $NetBSD: Makefile,v 1.45 2018/05/20 12:53:01 fhajny Exp $
 
 DISTNAME=	elasticsearch-6.2.4
 CATEGORIES=	textproc
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
 USE_LANGUAGES=	c c++
 USE_JAVA=	run
 USE_JAVA2=	8
-USE_TOOLS+=	bash:run gmake grep pax pkg-config
+USE_TOOLS+=	bash:run gmake pax pkg-config
 
 PKG_SYSCONFSUBDIR=	elasticsearch
 EGDIR=			${PREFIX}/share/examples/elasticsearch
@@ -70,11 +70,12 @@ SUBST_VARS.paths=	PKG_JAVA_HOME PKG_SYSCONFDIR ES_DBDIR ES_BASEDIR ES_LOGDIR
 
 post-extract:
 	${RM} ${WRKSRC}/lib/${JNA}.jar
+	${MV} ${WRKDIR}/${JNA} ${WRKSRC}/jna
 
 do-build:
 	# Override silly SunOS et al. assumptions.
-	cd ${WRKDIR}/${JNA} && ${SETENV} ${MAKE_ENV} ant -Ddynlink.native=true -Dgrep=grep -Dmake.PATH=PATH=${PATH:Q} -Dmake=make native
-	cd ${WRKDIR}/${JNA}/build/classes && ${SETENV} ${MAKE_ENV} jar cf ${WRKSRC}/lib/${JNA}.jar com/
+	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/
 
 do-install:
 .for f in ${CONFS}
diff --git a/databases/elasticsearch/distinfo b/databases/elasticsearch/distinfo
index 46473628d4f..c9bbdc9b5c5 100644
--- a/databases/elasticsearch/distinfo
+++ b/databases/elasticsearch/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2018/04/18 11:27:21 fhajny Exp $
+$NetBSD: distinfo,v 1.46 2018/05/20 12:53:01 fhajny Exp $
 
 SHA1 (elasticsearch-6.2.4.tar.gz) = 8db5931278fd7a8687659ebcfaeab0d0f87f7d22
 RMD160 (elasticsearch-6.2.4.tar.gz) = a28f3c240a5d8b4e7eec72b8d72e9362820df1a5
@@ -10,3 +10,4 @@ SHA512 (jna-4.5.1.tar.gz) = 057e185011dc492fef3e9273f8df8dc9971752337bb39b6fa1d5
 Size (jna-4.5.1.tar.gz) = 73024055 bytes
 SHA1 (patch-bin_elasticsearch-env) = 7d8f71c6c1a99168cc4a7322e054ddc8fe94b68e
 SHA1 (patch-config_elasticsearch.yml) = f66dad65dec48a45a4d52b685d6e3ab29de62cf2
+SHA1 (patch-jna_build.xml) = d7c743ed8056109b9101c6550d9a4df7a7b05b58
diff --git a/databases/elasticsearch/patches/patch-jna_build.xml b/databases/elasticsearch/patches/patch-jna_build.xml
new file mode 100644
index 00000000000..f41e7f1e7e8
--- /dev/null
+++ b/databases/elasticsearch/patches/patch-jna_build.xml
@@ -0,0 +1,24 @@
+$NetBSD: patch-jna_build.xml,v 1.1 2018/05/20 12:53:01 fhajny Exp $
+
+Skip API check, we build from source anyway. Removes silly dependency on ggrep.
+
+--- jna/build.xml.orig	2017-12-27 19:27:16.000000000 +0000
++++ jna/build.xml
+@@ -682,7 +682,7 @@ osname=macosx;processor=x86;processor=x8
+     </condition>
+     <!-- args are based on GNU grep, other versions may differ -->
+     <apply dir="${build.native}" executable="${grep}" parallel="true"
+-           failonerror="${grep.required}" relative="true" output="${md5.file}">
++           relative="true" output="${md5.file}">
+       <arg value="-A"/>
+       <arg value="1"/>
+       <arg value="JNIEXPORT"/>
+@@ -790,7 +790,7 @@ osname=macosx;processor=x86;processor=x8
+                    file="${rsrc}" byline="true"/>
+   </target>
+ 
+-  <target name="native" depends="-enable-native,-setup,javah,-native-api-check,rsrc" unless="-native"
++  <target name="native" depends="-enable-native,-setup,javah,rsrc" unless="-native"
+           description="Build native libraries.  Use 'ant -DCC=xxx' to build using a compiler other than gcc">
+     <property name="comment" value="# auto-generated by ant"/>
+     <replaceregexp match="^JNA_JNI_VERSION=.*"