From owner-svn-ports-all@freebsd.org Mon Feb 26 23:06:03 2018 Return-Path: Delivered-To: svn-ports-all@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 F258CF2B249; Mon, 26 Feb 2018 23:06:02 +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 9F2E371726; Mon, 26 Feb 2018 23:06:02 +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 9600721EA6; Mon, 26 Feb 2018 23:06:02 +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 w1QN62L6045164; Mon, 26 Feb 2018 23:06:02 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1QN625p045163; Mon, 26 Feb 2018 23:06:02 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201802262306.w1QN625p045163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 26 Feb 2018 23:06:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463096 - head/textproc/elasticsearch5 X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: head/textproc/elasticsearch5 X-SVN-Commit-Revision: 463096 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2018 23:06:03 -0000 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}