CVS commit: pkgsrc/databases/elasticsearch

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Mon May 21 12:53:29 UTC 2018

Modified Files:
        pkgsrc/databases/elasticsearch: Makefile distinfo
Added Files:
        pkgsrc/databases/elasticsearch/patches: patch-jna_native_Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/elasticsearch/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/databases/elasticsearch/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/elasticsearch/patches/patch-jna_native_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.45 pkgsrc/databases/elasticsearch/Makefile:1.46
--- pkgsrc/databases/elasticsearch/Makefile:1.45        Sun May 20 12:53:01 2018
+++ pkgsrc/databases/elasticsearch/Makefile     Mon May 21 12:53:29 2018
@@ -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/
 

Index: pkgsrc/databases/elasticsearch/distinfo
diff -u pkgsrc/databases/elasticsearch/distinfo:1.46 pkgsrc/databases/elasticsearch/distinfo:1.47
--- pkgsrc/databases/elasticsearch/distinfo:1.46        Sun May 20 12:53:01 2018
+++ pkgsrc/databases/elasticsearch/distinfo     Mon May 21 12:53:29 2018
@@ -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 @@ 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
+SHA1 (patch-jna_native_Makefile) = 617b669a8748c2ec3998275d8531500b8f2cda89

Added files:

Index: pkgsrc/databases/elasticsearch/patches/patch-jna_native_Makefile
diff -u /dev/null pkgsrc/databases/elasticsearch/patches/patch-jna_native_Makefile:1.1
--- /dev/null   Mon May 21 12:53:29 2018
+++ pkgsrc/databases/elasticsearch/patches/patch-jna_native_Makefile    Mon May 21 12:53:29 2018
@@ -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)"'