Date: Wed, 12 Feb 2014 16:48:32 +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: r343943 - in head/textproc/elasticsearch: . files Message-ID: <201402121648.s1CGmWi0081684@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tj Date: Wed Feb 12 16:48:32 2014 New Revision: 343943 URL: http://svnweb.freebsd.org/changeset/ports/343943 QAT: https://qat.redports.org/buildarchive/r343943/ Log: Update to 0.9.11. Changes: http://www.elasticsearch.org/downloads/0-90-11/ Modified: head/textproc/elasticsearch/Makefile head/textproc/elasticsearch/distinfo head/textproc/elasticsearch/files/elasticsearch.in head/textproc/elasticsearch/pkg-plist Modified: head/textproc/elasticsearch/Makefile ============================================================================== --- head/textproc/elasticsearch/Makefile Wed Feb 12 16:44:25 2014 (r343942) +++ head/textproc/elasticsearch/Makefile Wed Feb 12 16:48:32 2014 (r343943) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 0.90.0 +PORTVERSION= 0.90.11 CATEGORIES= textproc java devel MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ @@ -18,13 +18,12 @@ JAVA_VERSION= 1.7+ ONLY_FOR_ARCHS= i386 amd64 USE_RC_SUBR= ${PORTNAME} -NO_STAGE= yes OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -LUCENEVER= 4.2.1 +LUCENEVER= 4.6.1 CONFIG_FILES= elasticsearch.yml logging.yml JARS= elasticsearch-${PORTVERSION}.jar \ jna-3.3.0.jar \ @@ -71,26 +70,23 @@ post-patch: ${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}${PREFIX}/etc/elasticsearch .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} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${PREFIX}/etc/elasticsearch/${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/elasticsearch .for f in ${JARS} - ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${PREFIX}/lib/elasticsearch/ + ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/ .endfor - ${MKDIR} ${PREFIX}/lib/elasticsearch/sigar - ${INSTALL_DATA} ${WRKSRC}/lib/sigar/sigar-1.6.4.jar ${PREFIX}/lib/elasticsearch/sigar/ + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar + ${INSTALL_DATA} ${WRKSRC}/lib/sigar/sigar-1.6.4.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar/ .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/textproc/elasticsearch/distinfo ============================================================================== --- head/textproc/elasticsearch/distinfo Wed Feb 12 16:44:25 2014 (r343942) +++ head/textproc/elasticsearch/distinfo Wed Feb 12 16:48:32 2014 (r343943) @@ -1,2 +1,2 @@ -SHA256 (elasticsearch-0.90.0.tar.gz) = 168864fed1a7b9f11c3e144b881cf7f2c3021e68dd71819f87f02b06b0edc24c -SIZE (elasticsearch-0.90.0.tar.gz) = 17743635 +SHA256 (elasticsearch-0.90.11.tar.gz) = cff503078fcb3e1b1d2b966e9173599be38a1a451278f587415c7f2311fd5697 +SIZE (elasticsearch-0.90.11.tar.gz) = 18147996 Modified: head/textproc/elasticsearch/files/elasticsearch.in ============================================================================== --- head/textproc/elasticsearch/files/elasticsearch.in Wed Feb 12 16:44:25 2014 (r343942) +++ head/textproc/elasticsearch/files/elasticsearch.in Wed Feb 12 16:48:32 2014 (r343943) @@ -73,7 +73,9 @@ command_args="-f %%LOCALBASE%%/bin/java elasticsearch_precmd() { touch ${pidfile} chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile} - /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp} + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp} + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/db/elasticsearch + /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch } elasticsearch_console () { Modified: head/textproc/elasticsearch/pkg-plist ============================================================================== --- head/textproc/elasticsearch/pkg-plist Wed Feb 12 16:44:25 2014 (r343942) +++ head/textproc/elasticsearch/pkg-plist Wed Feb 12 16:48:32 2014 (r343943) @@ -1,15 +1,15 @@ +@owner %%SEARCHUSER%% +@group %%SEARCHGROUP%% @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 +@owner +@group bin/elasticsearch-plugin lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar lib/elasticsearch/jna-3.3.0.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402121648.s1CGmWi0081684>