Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Feb 2018 23:06:02 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r463096 - head/textproc/elasticsearch5
Message-ID:  <201802262306.w1QN625p045163@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Mon Feb 26 23:06:02 2018
New Revision: 463096
URL: https://svnweb.freebsd.org/changeset/ports/463096

Log:
  textproc/elasticsearch5: Fix JNA support
  
  JNA (Java Native Access) provides access to OS-native facilities in pure
  Java code. The JNA shipped with Elastic is meant for Linux so it does
  not function correctly. We will ship one built for FreeBSD instead.
  
  PR:		222261
  Approved by:	portmgr (with hat)

Modified:
  head/textproc/elasticsearch5/Makefile

Modified: head/textproc/elasticsearch5/Makefile
==============================================================================
--- head/textproc/elasticsearch5/Makefile	Mon Feb 26 22:33:20 2018	(r463095)
+++ head/textproc/elasticsearch5/Makefile	Mon Feb 26 23:06:02 2018	(r463096)
@@ -3,7 +3,7 @@
 
 PORTNAME=	elasticsearch
 PORTVERSION=	5.6.8
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
@@ -15,6 +15,7 @@ COMMENT=	Full-text search engine for Java
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash>0:shells/bash
+BUILD_DEPENDS=	jna>0:devel/jna
 
 CONFLICTS=	elasticsearch-[0-9]* elasticsearch2-[0-9]* elasticsearch6-[0-9]*
 
@@ -53,6 +54,7 @@ post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch
+	${RM} ${WRKSRC}/lib/jna-*.jar
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
@@ -71,6 +73,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
 	${INSTALL} -lrs ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin/elasticsearch-plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin
+	${INSTALL} -lrs ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/jna.jar
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802262306.w1QN625p045163>