From owner-svn-ports-head@freebsd.org  Mon Feb 26 23:11:54 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3F15F2B909;
 Mon, 26 Feb 2018 23:11:53 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 91FEA71C53;
 Mon, 26 Feb 2018 23:11:53 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CE1722007;
 Mon, 26 Feb 2018 23:11:53 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1QNBrGS049976;
 Mon, 26 Feb 2018 23:11:53 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1QNBrHh049975;
 Mon, 26 Feb 2018 23:11:53 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201802262311.w1QNBrHh049975@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 26 Feb 2018 23:11:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r463098 - head/textproc/elasticsearch6
X-SVN-Group: ports-head
X-SVN-Commit-Author: feld
X-SVN-Commit-Paths: head/textproc/elasticsearch6
X-SVN-Commit-Revision: 463098
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Feb 2018 23:11:54 -0000

Author: feld
Date: Mon Feb 26 23:11:53 2018
New Revision: 463098
URL: https://svnweb.freebsd.org/changeset/ports/463098

Log:
  textproc/elasticsearch6: 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

Modified:
  head/textproc/elasticsearch6/Makefile

Modified: head/textproc/elasticsearch6/Makefile
==============================================================================
--- head/textproc/elasticsearch6/Makefile	Mon Feb 26 23:10:53 2018	(r463097)
+++ head/textproc/elasticsearch6/Makefile	Mon Feb 26 23:11:53 2018	(r463098)
@@ -3,7 +3,7 @@
 
 PORTNAME=	elasticsearch
 PORTVERSION=	6.2.2
-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]* elasticsearch5-[0-9]*
 
@@ -51,6 +52,7 @@ SUB_FILES=	pkg-message
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch
+	${RM} ${WRKSRC}/lib/jna-*.jar
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
@@ -69,6 +71,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}