[pkgsrc/trunk]: pkgsrc/databases/elasticsearch databases/elastic...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f5bd10a38fa
branches:  trunk
changeset: 308334:4f5bd10a38fa
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Mon May 21 12:53:29 2018 +0000

description:
databases/elasticsearch: Disable JAWT, removes the need for X11 headers.

diffstat:

 databases/elasticsearch/Makefile                          |   3 ++-
 databases/elasticsearch/distinfo                          |   3 ++-
 databases/elasticsearch/patches/patch-jna_native_Makefile |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (45 lines):

diff -r 5ea563546ac8 -r 4f5bd10a38fa databases/elasticsearch/Makefile
--- a/databases/elasticsearch/Makefile  Mon May 21 10:06:24 2018 +0000
+++ b/databases/elasticsearch/Makefile  Mon May 21 12:53:29 2018 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2018/05/20 12:53:01 fhajny Exp $
+# $NetBSD: Makefile,v 1.46 2018/05/21 12:53:29 fhajny Exp $
 
 DISTNAME=      elasticsearch-6.2.4
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  https://artifacts.elastic.co/downloads/elasticsearch/
 
diff -r 5ea563546ac8 -r 4f5bd10a38fa databases/elasticsearch/distinfo
--- a/databases/elasticsearch/distinfo  Mon May 21 10:06:24 2018 +0000
+++ b/databases/elasticsearch/distinfo  Mon May 21 12:53:29 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2018/05/20 12:53:01 fhajny Exp $
+$NetBSD: distinfo,v 1.47 2018/05/21 12:53:29 fhajny Exp $
 
 SHA1 (elasticsearch-6.2.4.tar.gz) = 8db5931278fd7a8687659ebcfaeab0d0f87f7d22
 RMD160 (elasticsearch-6.2.4.tar.gz) = a28f3c240a5d8b4e7eec72b8d72e9362820df1a5
@@ -11,3 +11,4 @@
 SHA1 (patch-bin_elasticsearch-env) = 7d8f71c6c1a99168cc4a7322e054ddc8fe94b68e
 SHA1 (patch-config_elasticsearch.yml) = f66dad65dec48a45a4d52b685d6e3ab29de62cf2
 SHA1 (patch-jna_build.xml) = d7c743ed8056109b9101c6550d9a4df7a7b05b58
+SHA1 (patch-jna_native_Makefile) = 617b669a8748c2ec3998275d8531500b8f2cda89
diff -r 5ea563546ac8 -r 4f5bd10a38fa databases/elasticsearch/patches/patch-jna_native_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/elasticsearch/patches/patch-jna_native_Makefile Mon May 21 12:53:29 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-jna_native_Makefile,v 1.1 2018/05/21 12:53:29 fhajny Exp $
+
+Disable JAWT. Removes dependency on X11.
+
+--- jna/native/Makefile.orig   2017-12-27 19:27:16.000000000 +0000
++++ jna/native/Makefile
+@@ -93,7 +93,7 @@ endif
+ CFLAGS_EXTRA=
+ COUT=-o $@
+ CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
+-CDEFINES=-D_REENTRANT
++CDEFINES=-D_REENTRANT -DNO_JAWT
+ PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
+ CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
+        -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'