Date: Fri, 24 Jan 2014 13:01:22 +0100 (CET) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: tj@FreeBSD.org Subject: ports/186072: textproc/elasticsearch: upgrade to 0.90.10 Message-ID: <201401241201.s0OC1MBV020114@olgeni.olgeni> Resent-Message-ID: <201401241210.s0OCA0O7045858@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186072 >Category: ports >Synopsis: textproc/elasticsearch: upgrade to 0.90.10 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 24 12:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Jimmy Olgeni >Release: FreeBSD 9.2-STABLE amd64 >Organization: >Environment: System: FreeBSD olgeni 9.2-STABLE FreeBSD 9.2-STABLE #0 r256529: Tue Oct 15 18:29:59 CEST 2013 root@olgeni:/usr/obj/usr/src/sys/KERNEL amd64 >Description: Upgrade elasticsearch to 0.90.10, with staging support. >How-To-Repeat: >Fix: Index: Makefile =================================================================== --- Makefile (revision 340890) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 0.90.0 +PORTVERSION= 0.90.10 CATEGORIES= textproc java devel MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ @@ -18,12 +18,15 @@ ONLY_FOR_ARCHS= i386 amd64 USE_RC_SUBR= ${PORTNAME} -NO_STAGE= yes .include <bsd.port.options.mk> -LUCENEVER= 4.2.1 +LUCENEVER= 4.6.0 CONFIG_FILES= elasticsearch.yml logging.yml + JARS= elasticsearch-${PORTVERSION}.jar \ + antlr-runtime-3.5.jar \ + asm-4.1.jar \ + asm-commons-4.1.jar \ jna-3.3.0.jar \ jts-1.12.jar \ log4j-1.2.17.jar \ @@ -34,6 +37,7 @@ lucene-highlighter-${LUCENEVER}.jar \ lucene-join-${LUCENEVER}.jar \ lucene-memory-${LUCENEVER}.jar \ + lucene-misc-${LUCENEVER}.jar \ lucene-queries-${LUCENEVER}.jar \ lucene-queryparser-${LUCENEVER}.jar \ lucene-sandbox-${LUCENEVER}.jar \ @@ -68,27 +72,24 @@ ${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml do-install: - ${INSTALL} -d -o ${SEARCHUSER} -g ${SEARCHUSER} -m 750 ${PREFIX}/etc/elasticsearch + @${MKDIR} ${STAGEDIR}${ELASTIC_DBDIR} + @${MKDIR} ${STAGEDIR}${ELASTIC_LOGDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch + + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} .for f in ${CONFIG_FILES} - ${INSTALL} -o ${SEARCHUSER} -g ${SEARCHUSER} -m 444 ${WRKSRC}/config/${f} ${PREFIX}/etc/elasticsearch/${f}.sample - @if [ ! -f ${CONFIG_DIR}/${f} ]; then \ - ${CP} -p ${PREFIX}/etc/elasticsearch/${f}.sample ${PREFIX}/etc/elasticsearch/${f} ; \ - fi + ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/${f}.sample .endfor - ${INSTALL_SCRIPT} ${WRKDIR}/elasticsearch-plugin ${PREFIX}/bin/elasticsearch-plugin - ${MKDIR} ${PREFIX}/lib/elasticsearch + ${INSTALL_SCRIPT} ${WRKDIR}/elasticsearch-plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} .for f in ${JARS} - ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${PREFIX}/lib/elasticsearch/ + ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ .endfor - - ${MKDIR} ${PREFIX}/lib/elasticsearch/sigar - ${INSTALL_DATA} ${WRKSRC}/lib/sigar/sigar-1.6.4.jar ${PREFIX}/lib/elasticsearch/sigar/ - -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/sigar + ${INSTALL_DATA} ${WRKSRC}/lib/sigar/sigar-1.6.4.jar ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/sigar/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (revision 340890) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (elasticsearch-0.90.0.tar.gz) = 168864fed1a7b9f11c3e144b881cf7f2c3021e68dd71819f87f02b06b0edc24c -SIZE (elasticsearch-0.90.0.tar.gz) = 17743635 +SHA256 (elasticsearch-0.90.10.tar.gz) = 78c87f600878a6cab41c1d447f6a40b25892a59f8fb49da11392a682884fb8df +SIZE (elasticsearch-0.90.10.tar.gz) = 18426339 Index: pkg-plist =================================================================== --- pkg-plist (revision 340890) +++ pkg-plist (working copy) @@ -1,17 +1,8 @@ -@unexec if cmp -s %D/etc/elasticsearch/elasticsearch.yml.sample %D/etc/elasticsearch/elasticsearch.yml; then rm -f %D/etc/elasticsearch/elasticsearch.yml; fi -etc/elasticsearch/elasticsearch.yml.sample -@exec if [ ! -f %D/etc/elasticsearch/elasticsearch.yml ] ; then cp -p %D/%F %B/elasticsearch.yml; fi -@unexec if cmp -s %D/etc/elasticsearch/logging.yml.sample %D/etc/elasticsearch/logging.yml; then rm -f %D/etc/elasticsearch/logging.yml; fi -etc/elasticsearch/logging.yml.sample -@exec if [ ! -f %D/etc/elasticsearch/logging.yml ] ; then cp -p %D/%F %B/logging.yml; fi -@exec install -d -o %%SEARCHUSER%% -g %%SEARCHGROUP%% %%ELASTIC_DBDIR%% -@dirrmtry %%ELASTIC_LOGDIR%% -@unexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi -@exec install -d -o %%SEARCHUSER%% -g %%SEARCHGROUP%% %%ELASTIC_LOGDIR%% -@dirrmtry %%ELASTIC_DBDIR%% -@unexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi bin/elasticsearch-plugin lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar +lib/elasticsearch/antlr-runtime-3.5.jar +lib/elasticsearch/asm-4.1.jar +lib/elasticsearch/asm-commons-4.1.jar lib/elasticsearch/jna-3.3.0.jar lib/elasticsearch/jts-1.12.jar lib/elasticsearch/log4j-1.2.17.jar @@ -22,6 +13,7 @@ lib/elasticsearch/lucene-highlighter-%%LUCENEVER%%.jar lib/elasticsearch/lucene-join-%%LUCENEVER%%.jar lib/elasticsearch/lucene-memory-%%LUCENEVER%%.jar +lib/elasticsearch/lucene-misc-%%LUCENEVER%%.jar lib/elasticsearch/lucene-queries-%%LUCENEVER%%.jar lib/elasticsearch/lucene-queryparser-%%LUCENEVER%%.jar lib/elasticsearch/lucene-sandbox-%%LUCENEVER%%.jar @@ -36,3 +28,17 @@ @dirrmtry etc/elasticsearch @dirrm lib/elasticsearch/sigar @dirrm lib/elasticsearch +@exec chmod 750 %D/etc/elasticsearch +@owner %%SEARCHUSER%% +@group %%SEARCHUSER%% +@unexec if cmp -s %D/etc/elasticsearch/elasticsearch.yml.sample %D/etc/elasticsearch/elasticsearch.yml; then rm -f %D/etc/elasticsearch/elasticsearch.yml; fi +etc/elasticsearch/elasticsearch.yml.sample +@exec if [ ! -f %D/etc/elasticsearch/elasticsearch.yml ] ; then cp -p %D/%F %B/elasticsearch.yml; fi +@unexec if cmp -s %D/etc/elasticsearch/logging.yml.sample %D/etc/elasticsearch/logging.yml; then rm -f %D/etc/elasticsearch/logging.yml; fi +etc/elasticsearch/logging.yml.sample +@exec if [ ! -f %D/etc/elasticsearch/logging.yml ] ; then cp -p %D/%F %B/logging.yml; fi +@group %%SEARCHGROUP%% +@exec install -d -o %%SEARCHUSER%% -g %%SEARCHGROUP%% %%ELASTIC_DBDIR%% +@exec install -d -o %%SEARCHUSER%% -g %%SEARCHGROUP%% %%ELASTIC_LOGDIR%% +@dirrmtry %%ELASTIC_DBDIR%% +@dirrmtry %%ELASTIC_LOGDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401241201.s0OC1MBV020114>