Date: Fri, 25 Mar 2016 15:12:51 +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: r411848 - in head/textproc/elasticsearch2: . files Message-ID: <201603251512.u2PFCpDv085607@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tj Date: Fri Mar 25 15:12:51 2016 New Revision: 411848 URL: https://svnweb.freebsd.org/changeset/ports/411848 Log: Update to 2.2.1 Changes: https://www.elastic.co/guide/en/elasticsearch/reference/2.2/release-notes-2.2.1.html PR: 206918 Modified: head/textproc/elasticsearch2/Makefile head/textproc/elasticsearch2/distinfo head/textproc/elasticsearch2/files/elasticsearch.in head/textproc/elasticsearch2/pkg-plist Modified: head/textproc/elasticsearch2/Makefile ============================================================================== --- head/textproc/elasticsearch2/Makefile Fri Mar 25 15:10:24 2016 (r411847) +++ head/textproc/elasticsearch2/Makefile Fri Mar 25 15:12:51 2016 (r411848) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.1 CATEGORIES= textproc java devel MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -LUCENEVER= 5.3.1 +LUCENEVER= 5.4.1 CONFIG_FILES= elasticsearch.yml logging.yml BINS= elasticsearch.in.sh \ elasticsearch \ @@ -71,6 +71,7 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar") + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch @${MKDIR} ${STAGEDIR}${ELASTIC_DBDIR} ${STAGEDIR}${ELASTIC_LOGDIR} Modified: head/textproc/elasticsearch2/distinfo ============================================================================== --- head/textproc/elasticsearch2/distinfo Fri Mar 25 15:10:24 2016 (r411847) +++ head/textproc/elasticsearch2/distinfo Fri Mar 25 15:12:51 2016 (r411848) @@ -1,2 +1,2 @@ -SHA256 (elasticsearch-2.1.1.tar.gz) = ebd69c0483f20ba7e51caa9606d4e3ce5fe2667e1216c799f0cdbb815c317ce6 -SIZE (elasticsearch-2.1.1.tar.gz) = 29007342 +SHA256 (elasticsearch-2.2.1.tar.gz) = 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 +SIZE (elasticsearch-2.2.1.tar.gz) = 29424648 Modified: head/textproc/elasticsearch2/files/elasticsearch.in ============================================================================== --- head/textproc/elasticsearch2/files/elasticsearch.in Fri Mar 25 15:10:24 2016 (r411847) +++ head/textproc/elasticsearch2/files/elasticsearch.in Fri Mar 25 15:12:51 2016 (r411848) @@ -49,6 +49,13 @@ command_args="-d --pidfile=${pidfile}" elasticsearch_precmd() { + rc_pid=$(elasticsearch_check_pidfile $pidfile) + + if [ -n "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + echo "${name} is already running: $rc_pid." + return 1 + fi touch ${pidfile} chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile} /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp} @@ -56,8 +63,17 @@ elasticsearch_precmd() /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch } + elasticsearch_console() { + rc_pid=$(elasticsearch_check_pidfile $pidfile) + + if [ -n "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + echo "${name} is already running: $rc_pid." + return 1 + fi + command_args="" run_rc_command "start" } @@ -104,7 +120,7 @@ elasticsearch_check_pidfile() debug "pid file ($_pidfile): no pid in file." return fi - if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid"`" ]; then + if [ -n "`/usr/bin/su -m ${elasticsearch_user} -c '%%LOCALBASE%%/bin/jps -l' | grep -e "^$_pid"`" ]; then echo -n $_pid fi } Modified: head/textproc/elasticsearch2/pkg-plist ============================================================================== --- head/textproc/elasticsearch2/pkg-plist Fri Mar 25 15:10:24 2016 (r411847) +++ head/textproc/elasticsearch2/pkg-plist Fri Mar 25 15:12:51 2016 (r411848) @@ -4,15 +4,11 @@ @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/lib/HdrHistogram-2.1.6.jar -lib/elasticsearch/lib/antlr-runtime-3.5.jar lib/elasticsearch/lib/apache-log4j-extras-1.2.17.jar -lib/elasticsearch/lib/asm-4.1.jar -lib/elasticsearch/lib/asm-commons-4.1.jar lib/elasticsearch/lib/commons-cli-1.3.1.jar lib/elasticsearch/lib/compiler-0.8.13.jar lib/elasticsearch/lib/compress-lzf-1.0.2.jar lib/elasticsearch/lib/elasticsearch-%%PORTVERSION%%.jar -lib/elasticsearch/lib/groovy-all-2.4.4-indy.jar lib/elasticsearch/lib/guava-18.0.jar lib/elasticsearch/lib/hppc-0.7.1.jar lib/elasticsearch/lib/jackson-core-2.6.2.jar @@ -28,7 +24,6 @@ lib/elasticsearch/lib/log4j-1.2.17.jar lib/elasticsearch/lib/lucene-analyzers-common-%%LUCENEVER%%.jar lib/elasticsearch/lib/lucene-backward-codecs-%%LUCENEVER%%.jar lib/elasticsearch/lib/lucene-core-%%LUCENEVER%%.jar -lib/elasticsearch/lib/lucene-expressions-%%LUCENEVER%%.jar lib/elasticsearch/lib/lucene-grouping-%%LUCENEVER%%.jar lib/elasticsearch/lib/lucene-highlighter-%%LUCENEVER%%.jar lib/elasticsearch/lib/lucene-join-%%LUCENEVER%%.jar @@ -41,6 +36,7 @@ lib/elasticsearch/lib/lucene-spatial-%%L lib/elasticsearch/lib/lucene-spatial3d-%%LUCENEVER%%.jar lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar lib/elasticsearch/lib/netty-3.10.5.Final.jar +lib/elasticsearch/lib/securesm-1.0.jar lib/elasticsearch/lib/snakeyaml-1.15.jar lib/elasticsearch/lib/spatial4j-0.5.jar lib/elasticsearch/lib/t-digest-3.0.jar @@ -52,6 +48,7 @@ lib/elasticsearch/bin/plugin %%PORTDOCS%%%%DOCSDIR%%/README.textile @dir lib/elasticsearch/lib @dir lib/elasticsearch/bin +@dir lib/elasticsearch/modules @dir lib/elasticsearch/plugins @dir lib/elasticsearch @dir libexec/elasticsearch
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603251512.u2PFCpDv085607>