svn commit: r463098 - head/textproc/elasticsearch6

Mark Felder feld at FreeBSD.org
Mon Feb 26 23:11:54 UTC 2018


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}


More information about the svn-ports-head mailing list