CVS commit: pkgsrc/databases/elasticsearch

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

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri Apr  6 15:48:33 UTC 2018

Modified Files:
        pkgsrc/databases/elasticsearch: Makefile distinfo

Log Message:
databases/elasticsearch: Build JNA from source ourselves to get just the native lib for the current platform rather than a list of preselected ones. Makes it possible to bind to non-localhost on 
platforms like NetBSD and SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/databases/elasticsearch/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/elasticsearch/distinfo

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.41 pkgsrc/databases/elasticsearch/Makefile:1.42
--- pkgsrc/databases/elasticsearch/Makefile:1.41        Tue Feb 27 12:37:56 2018
+++ pkgsrc/databases/elasticsearch/Makefile     Fri Apr  6 15:48:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2018/02/27 12:37:56 fhajny Exp $
+# $NetBSD: Makefile,v 1.42 2018/04/06 15:48:33 fhajny Exp $
 
 DISTNAME=      elasticsearch-6.2.2
 CATEGORIES=    textproc
@@ -9,11 +9,17 @@ HOMEPAGE=     http://www.elasticsearch.org/
 COMMENT=       Distributed RESTful Search Engine
 LICENSE=       apache-2.0
 
-USE_LANGUAGES= # none
+# 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
+SITES.${JNA}.tar.gz=   -${MASTER_SITE_GITHUB:=java-native-access/}jna/archive/${JNA:S/jna-//}.tar.gz
+
+BUILD_DEPENDS+=        apache-ant-[0-9]*:../../devel/apache-ant
+
+USE_LANGUAGES= c c++
 USE_JAVA=      run
 USE_JAVA2=     8
-USE_TOOLS+=    bash:run pax
-NO_BUILD=      yes
+USE_TOOLS+=    bash:run gmake grep pax pkg-config
 
 PKG_SYSCONFSUBDIR=     elasticsearch
 EGDIR=                 ${PREFIX}/share/examples/elasticsearch
@@ -62,6 +68,14 @@ SUBST_STAGE.paths=   pre-configure
 SUBST_FILES.paths=     bin/elasticsearch-env config/elasticsearch.yml
 SUBST_VARS.paths=      PKG_JAVA_HOME PKG_SYSCONFDIR ES_DBDIR ES_BASEDIR ES_LOGDIR
 
+post-extract:
+       ${RM} ${WRKSRC}/lib/${JNA}.jar
+
+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/
+
 do-install:
 .for f in ${CONFS}
        ${INSTALL_DATA} ${WRKSRC}/config/${f} ${DESTDIR}${EGDIR}
@@ -77,5 +91,6 @@ do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/bin/elasticsearch-translog ${DESTDIR}${ES_BASEDIR}/bin
        cd ${WRKSRC} && ${PAX} -rw -pp lib modules ${DESTDIR}${ES_BASEDIR}
 
+.include "../../devel/libffi/buildlink3.mk"
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/elasticsearch/distinfo
diff -u pkgsrc/databases/elasticsearch/distinfo:1.42 pkgsrc/databases/elasticsearch/distinfo:1.43
--- pkgsrc/databases/elasticsearch/distinfo:1.42        Tue Feb 27 12:37:56 2018
+++ pkgsrc/databases/elasticsearch/distinfo     Fri Apr  6 15:48:33 2018
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.42 2018/02/27 12:37:56 fhajny Exp $
+$NetBSD: distinfo,v 1.43 2018/04/06 15:48:33 fhajny Exp $
 
 SHA1 (elasticsearch-6.2.2.tar.gz) = b0c2c4f98b7bfe97ddc1be53b121ce08e488442f
 RMD160 (elasticsearch-6.2.2.tar.gz) = a5f62f46b9a90533d6cb4235994b2488428f3ae9
 SHA512 (elasticsearch-6.2.2.tar.gz) = e8363a3022b7c8d67be37bcdf4d026cefb166403dcdb19950fdf2da508eb0ccfe2b2e3717a60edb932b7b6f5ec94cd06726d4fc5c7bcdd24711df16945fb8c5c
 Size (elasticsearch-6.2.2.tar.gz) = 29049540 bytes
+SHA1 (jna-4.5.1.tar.gz) = 883e6250817ab73fbefd61320dff00f3350c896d
+RMD160 (jna-4.5.1.tar.gz) = 353462bf559cc368e739dd04a0e7652db2079911
+SHA512 (jna-4.5.1.tar.gz) = 057e185011dc492fef3e9273f8df8dc9971752337bb39b6fa1d53d305bb2ff52e8408b96bddc288cbbd2ae08c126904fa278276dd79d93801bcac361adda8300
+Size (jna-4.5.1.tar.gz) = 73024055 bytes
 SHA1 (patch-bin_elasticsearch-env) = 7d8f71c6c1a99168cc4a7322e054ddc8fe94b68e
 SHA1 (patch-config_elasticsearch.yml) = f66dad65dec48a45a4d52b685d6e3ab29de62cf2