Mon May 21 12:53:29 2018 UTC ()
databases/elasticsearch: Disable JAWT, removes the need for X11 headers.


(fhajny)
diff -r1.45 -r1.46 pkgsrc/databases/elasticsearch/Makefile
diff -r1.46 -r1.47 pkgsrc/databases/elasticsearch/distinfo
diff -r0 -r1.1 pkgsrc/databases/elasticsearch/patches/patch-jna_native_Makefile
cvs diff -r1.45 -r1.46 pkgsrc/databases/elasticsearch/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/elasticsearch/Makefile 2018/05/20 12:53:01 1.45
+++ pkgsrc/databases/elasticsearch/Makefile 2018/05/21 12:53:29 1.46
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.45 2018/05/20 12:53:01 fhajny Exp $ 1# $NetBSD: Makefile,v 1.46 2018/05/21 12:53:29 fhajny Exp $
2 2
3DISTNAME= elasticsearch-6.2.4 3DISTNAME= elasticsearch-6.2.4
 4PKGREVISION= 1
4CATEGORIES= textproc 5CATEGORIES= textproc
5MASTER_SITES= https://artifacts.elastic.co/downloads/elasticsearch/ 6MASTER_SITES= https://artifacts.elastic.co/downloads/elasticsearch/
6 7
7MAINTAINER= imil@NetBSD.org 8MAINTAINER= imil@NetBSD.org
8HOMEPAGE= http://www.elasticsearch.org/ 9HOMEPAGE= http://www.elasticsearch.org/
9COMMENT= Distributed RESTful Search Engine 10COMMENT= Distributed RESTful Search Engine
10LICENSE= apache-2.0 11LICENSE= apache-2.0
11 12
12# Build our own native JNA, the version should match the one that ES ships with 13# Build our own native JNA, the version should match the one that ES ships with
13JNA= jna-4.5.1 14JNA= jna-4.5.1
14DISTFILES= ${DEFAULT_DISTFILES} ${JNA}.tar.gz 15DISTFILES= ${DEFAULT_DISTFILES} ${JNA}.tar.gz
15SITES.${JNA}.tar.gz= -${MASTER_SITE_GITHUB:=java-native-access/}jna/archive/${JNA:S/jna-//}.tar.gz 16SITES.${JNA}.tar.gz= -${MASTER_SITE_GITHUB:=java-native-access/}jna/archive/${JNA:S/jna-//}.tar.gz
16 17
cvs diff -r1.46 -r1.47 pkgsrc/databases/elasticsearch/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/elasticsearch/distinfo 2018/05/20 12:53:01 1.46
+++ pkgsrc/databases/elasticsearch/distinfo 2018/05/21 12:53:29 1.47
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.46 2018/05/20 12:53:01 fhajny Exp $ 1$NetBSD: distinfo,v 1.47 2018/05/21 12:53:29 fhajny Exp $
2 2
3SHA1 (elasticsearch-6.2.4.tar.gz) = 8db5931278fd7a8687659ebcfaeab0d0f87f7d22 3SHA1 (elasticsearch-6.2.4.tar.gz) = 8db5931278fd7a8687659ebcfaeab0d0f87f7d22
4RMD160 (elasticsearch-6.2.4.tar.gz) = a28f3c240a5d8b4e7eec72b8d72e9362820df1a5 4RMD160 (elasticsearch-6.2.4.tar.gz) = a28f3c240a5d8b4e7eec72b8d72e9362820df1a5
5SHA512 (elasticsearch-6.2.4.tar.gz) = 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941 5SHA512 (elasticsearch-6.2.4.tar.gz) = 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
6Size (elasticsearch-6.2.4.tar.gz) = 29056810 bytes 6Size (elasticsearch-6.2.4.tar.gz) = 29056810 bytes
7SHA1 (jna-4.5.1.tar.gz) = 883e6250817ab73fbefd61320dff00f3350c896d 7SHA1 (jna-4.5.1.tar.gz) = 883e6250817ab73fbefd61320dff00f3350c896d
8RMD160 (jna-4.5.1.tar.gz) = 353462bf559cc368e739dd04a0e7652db2079911 8RMD160 (jna-4.5.1.tar.gz) = 353462bf559cc368e739dd04a0e7652db2079911
9SHA512 (jna-4.5.1.tar.gz) = 057e185011dc492fef3e9273f8df8dc9971752337bb39b6fa1d53d305bb2ff52e8408b96bddc288cbbd2ae08c126904fa278276dd79d93801bcac361adda8300 9SHA512 (jna-4.5.1.tar.gz) = 057e185011dc492fef3e9273f8df8dc9971752337bb39b6fa1d53d305bb2ff52e8408b96bddc288cbbd2ae08c126904fa278276dd79d93801bcac361adda8300
10Size (jna-4.5.1.tar.gz) = 73024055 bytes 10Size (jna-4.5.1.tar.gz) = 73024055 bytes
11SHA1 (patch-bin_elasticsearch-env) = 7d8f71c6c1a99168cc4a7322e054ddc8fe94b68e 11SHA1 (patch-bin_elasticsearch-env) = 7d8f71c6c1a99168cc4a7322e054ddc8fe94b68e
12SHA1 (patch-config_elasticsearch.yml) = f66dad65dec48a45a4d52b685d6e3ab29de62cf2 12SHA1 (patch-config_elasticsearch.yml) = f66dad65dec48a45a4d52b685d6e3ab29de62cf2
13SHA1 (patch-jna_build.xml) = d7c743ed8056109b9101c6550d9a4df7a7b05b58 13SHA1 (patch-jna_build.xml) = d7c743ed8056109b9101c6550d9a4df7a7b05b58
 14SHA1 (patch-jna_native_Makefile) = 617b669a8748c2ec3998275d8531500b8f2cda89
File Added: pkgsrc/databases/elasticsearch/patches/patch-jna_native_Makefile
$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)"'