Date: Wed, 19 Nov 2014 18:58:58 +0000 (UTC) From: Tom Judge <tj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372804 - head/textproc/elasticsearch Message-ID: <201411191858.sAJIwwgi048879@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tj Date: Wed Nov 19 18:58:58 2014 New Revision: 372804 URL: https://svnweb.freebsd.org/changeset/ports/372804 QAT: https://qat.redports.org/buildarchive/r372804/ Log: Update to use native sigar library. Modified: head/textproc/elasticsearch/Makefile head/textproc/elasticsearch/pkg-plist Modified: head/textproc/elasticsearch/Makefile ============================================================================== --- head/textproc/elasticsearch/Makefile Wed Nov 19 18:49:00 2014 (r372803) +++ head/textproc/elasticsearch/Makefile Wed Nov 19 18:58:58 2014 (r372804) @@ -3,6 +3,7 @@ PORTNAME= elasticsearch PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= textproc java devel MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ @@ -12,6 +13,8 @@ COMMENT= Full-text search engine for Jav LICENSE= APACHE20 +RUN_DEPENDS= java-sigar>=0:${PORTSDIR}/java/sigar + USE_JAVA= yes NO_BUILD= yes JAVA_VERSION= 1.7+ @@ -60,6 +63,8 @@ GROUPS= ${SEARCHGROUP} ELASTIC_DBDIR= /var/db/elasticsearch ELASTIC_LOGDIR= /var/log/elasticsearch +SIGAR_LIBNAME= libsigar-${ARCH:S,i386,x86,}-freebsd-${PLATFORM_VER}.so + SUB_LIST= SEARCHUSER=${SEARCHUSER} \ SEARCHGROUP=${SEARCHGROUP} \ PORTVERSION=${PORTVERSION} @@ -70,7 +75,8 @@ PLIST_SUB= SIGAR_ARCH=${SIGAR_ARCH} \ LUCENEVER=${LUCENEVER} \ PORTVERSION=${PORTVERSION} \ ELASTIC_DBDIR=${ELASTIC_DBDIR} \ - ELASTIC_LOGDIR=${ELASTIC_LOGDIR} + ELASTIC_LOGDIR=${ELASTIC_LOGDIR} \ + SIGAR_LIBNAME=${SIGAR_LIBNAME} post-patch: ${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml @@ -87,7 +93,9 @@ do-install: .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar - ${INSTALL_DATA} ${WRKSRC}/lib/sigar/sigar-1.6.4.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar/ +# ${INSTALL_DATA} ${WRKSRC}/lib/sigar/sigar-1.6.4.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar/ + cd ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar && ${LN} -s ${JAVAJARDIR}/sigar.jar + cd ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar && ${LN} -s ${JAVAJARDIR}/${SIGAR_LIBNAME} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/textproc/elasticsearch/pkg-plist ============================================================================== --- head/textproc/elasticsearch/pkg-plist Wed Nov 19 18:49:00 2014 (r372803) +++ head/textproc/elasticsearch/pkg-plist Wed Nov 19 18:58:58 2014 (r372804) @@ -32,8 +32,9 @@ lib/elasticsearch/lucene-queryparser-%%L lib/elasticsearch/lucene-sandbox-%%LUCENEVER%%.jar lib/elasticsearch/lucene-spatial-%%LUCENEVER%%.jar lib/elasticsearch/lucene-suggest-%%LUCENEVER%%.jar -lib/elasticsearch/sigar/sigar-1.6.4.jar lib/elasticsearch/spatial4j-0.4.1.jar +lib/elasticsearch/sigar/sigar.jar +lib/elasticsearch/sigar/%%SIGAR_LIBNAME%% %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt %%PORTDOCS%%%%DOCSDIR%%/README.textile
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411191858.sAJIwwgi048879>