From owner-svn-ports-head@freebsd.org Tue Dec 15 17:06:13 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1EB7A48D27; Tue, 15 Dec 2015 17:06:12 +0000 (UTC) (envelope-from tj@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 mx1.freebsd.org (Postfix) with ESMTPS id C98AC175E; Tue, 15 Dec 2015 17:06:12 +0000 (UTC) (envelope-from tj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBFH6BX5009120; Tue, 15 Dec 2015 17:06:11 GMT (envelope-from tj@FreeBSD.org) Received: (from tj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFH6BN9009115; Tue, 15 Dec 2015 17:06:11 GMT (envelope-from tj@FreeBSD.org) Message-Id: <201512151706.tBFH6BN9009115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tj set sender to tj@FreeBSD.org using -f From: Tom Judge Date: Tue, 15 Dec 2015 17:06:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403794 - in head/textproc/elasticsearch2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2015 17:06:13 -0000 Author: tj Date: Tue Dec 15 17:06:11 2015 New Revision: 403794 URL: https://svnweb.freebsd.org/changeset/ports/403794 Log: Update to 2.1. Changes: https://www.elastic.co/guide/en/elasticsearch/reference/2.1/release-notes-2.1.0.html - Fix path to allow service to start at boot - Misc cleanup from ohauer PR: 195861, 204821, 204902, 204910 Modified: head/textproc/elasticsearch2/Makefile head/textproc/elasticsearch2/distinfo head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh head/textproc/elasticsearch2/pkg-descr head/textproc/elasticsearch2/pkg-plist Modified: head/textproc/elasticsearch2/Makefile ============================================================================== --- head/textproc/elasticsearch2/Makefile Tue Dec 15 16:48:52 2015 (r403793) +++ head/textproc/elasticsearch2/Makefile Tue Dec 15 17:06:11 2015 (r403794) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 2.0.0 +PORTVERSION= 2.1.0 CATEGORIES= textproc java devel MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ @@ -26,48 +26,8 @@ OPTIONS_DEFINE= DOCS .include -LUCENEVER= 5.2.1 +LUCENEVER= 5.3.1 CONFIG_FILES= elasticsearch.yml logging.yml -JARS= elasticsearch-${PORTVERSION}.jar \ - HdrHistogram-2.1.6.jar \ - antlr-runtime-3.5.jar \ - apache-log4j-extras-1.2.17.jar \ - asm-4.1.jar \ - asm-commons-4.1.jar \ - commons-cli-1.3.1.jar \ - compiler-0.8.13.jar \ - compress-lzf-1.0.2.jar \ - groovy-all-2.4.4-indy.jar \ - guava-18.0.jar \ - hppc-0.7.1.jar \ - jackson-core-2.5.3.jar \ - jackson-dataformat-cbor-2.5.3.jar \ - jackson-dataformat-smile-2.5.3.jar \ - jackson-dataformat-yaml-2.5.3.jar \ - jna-4.1.0.jar \ - joda-convert-1.2.jar \ - joda-time-2.8.2.jar \ - jsr166e-1.1.0.jar \ - jts-1.13.jar \ - log4j-1.2.17.jar \ - lucene-analyzers-common-${LUCENEVER}.jar \ - lucene-backward-codecs-${LUCENEVER}.jar \ - lucene-core-${LUCENEVER}.jar \ - lucene-expressions-${LUCENEVER}.jar \ - lucene-grouping-${LUCENEVER}.jar \ - 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 \ - lucene-spatial-${LUCENEVER}.jar \ - lucene-suggest-${LUCENEVER}.jar \ - netty-3.10.5.Final.jar \ - snakeyaml-1.12.jar \ - spatial4j-0.4.1.jar \ - t-digest-3.0.jar BINS= elasticsearch.in.sh \ elasticsearch \ plugin @@ -96,25 +56,25 @@ PLIST_SUB= SEARCHUSER=${SEARCHUSER} \ ELASTIC_LOGDIR=${ELASTIC_LOGDIR} post-patch: - ${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml - ${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh + ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml + ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch .for f in ${CONFIG_FILES} ${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin .for f in ${BINS} ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin .endfor - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib -.for f in ${JARS} - ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib -.endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib + (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar") - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins - ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch + @${MKDIR} ${STAGEDIR}${ELASTIC_DBDIR} ${STAGEDIR}${ELASTIC_LOGDIR} + cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -122,6 +82,5 @@ do-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor - cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin .include Modified: head/textproc/elasticsearch2/distinfo ============================================================================== --- head/textproc/elasticsearch2/distinfo Tue Dec 15 16:48:52 2015 (r403793) +++ head/textproc/elasticsearch2/distinfo Tue Dec 15 17:06:11 2015 (r403794) @@ -1,2 +1,2 @@ -SHA256 (elasticsearch-2.0.0.tar.gz) = b25f13f615337c2072964fd9fc5c7250f8a2a983b22198daf93548285d5d16df -SIZE (elasticsearch-2.0.0.tar.gz) = 28576708 +SHA256 (elasticsearch-2.1.0.tar.gz) = 8a4e85bcb506daa369651506af1cbc55c09fd7ff387d111142ae14d0a85d4d14 +SIZE (elasticsearch-2.1.0.tar.gz) = 28994631 Modified: head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh ============================================================================== --- head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh Tue Dec 15 16:48:52 2015 (r403793) +++ head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh Tue Dec 15 17:06:11 2015 (r403794) @@ -1,6 +1,6 @@ ---- bin/elasticsearch.in.sh.orig 2015-11-19 16:02:28.386051810 -0500 -+++ bin/elasticsearch.in.sh 2015-11-19 16:02:56.618049877 -0500 -@@ -1,5 +1,19 @@ +--- bin/elasticsearch.in.sh.orig 2015-10-21 04:41:12.000000000 -0400 ++++ bin/elasticsearch.in.sh 2015-12-15 12:00:37.323441838 -0500 +@@ -1,5 +1,20 @@ #!/bin/sh +if [ `uname -o` == "FreeBSD" ]; then @@ -13,8 +13,9 @@ + ES_USE_IPV4=${elasticsearch_use_ipv4} + ES_GC_OPTS=${elasticsearch_gc_opts} + ES_GC_LOG_FILE=${elasticsearch_gc_logfile} -+ JAVA_OPTS="$JAVA_OPTS -Des.path.conf=${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch"}" -+ JAVA_OPTS="$JAVA_OPTS -Des.path.scripts=${elasticsearch_scripts:="%%PREFIX%%/libexec/elasticsearch"}" ++ JAVA_OPTS="$JAVA_OPTS -Des.path.conf=${elasticsearch_config:="/usr/local/etc/elasticsearch"}" ++ JAVA_OPTS="$JAVA_OPTS -Des.path.scripts=${elasticsearch_scripts:="/usr/local/libexec/elasticsearch"}" ++ PATH=${PATH}:/usr/local/bin +fi + # check in case a user was using this mechanism Modified: head/textproc/elasticsearch2/pkg-descr ============================================================================== --- head/textproc/elasticsearch2/pkg-descr Tue Dec 15 16:48:52 2015 (r403793) +++ head/textproc/elasticsearch2/pkg-descr Tue Dec 15 17:06:11 2015 (r403794) @@ -1,4 +1,4 @@ Elasticsearch aims to be a Distributed, RESTful, Search Engine built on top of Apache Lucene. -WWW: http://www.elasticsearch.org/ +WWW: http://www.elastic.co/ Modified: head/textproc/elasticsearch2/pkg-plist ============================================================================== --- head/textproc/elasticsearch2/pkg-plist Tue Dec 15 16:48:52 2015 (r403793) +++ head/textproc/elasticsearch2/pkg-plist Tue Dec 15 17:06:11 2015 (r403794) @@ -15,10 +15,10 @@ lib/elasticsearch/lib/elasticsearch-%%PO 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.5.3.jar -lib/elasticsearch/lib/jackson-dataformat-cbor-2.5.3.jar -lib/elasticsearch/lib/jackson-dataformat-smile-2.5.3.jar -lib/elasticsearch/lib/jackson-dataformat-yaml-2.5.3.jar +lib/elasticsearch/lib/jackson-core-2.6.2.jar +lib/elasticsearch/lib/jackson-dataformat-cbor-2.6.2.jar +lib/elasticsearch/lib/jackson-dataformat-smile-2.6.2.jar +lib/elasticsearch/lib/jackson-dataformat-yaml-2.6.2.jar lib/elasticsearch/lib/jna-4.1.0.jar lib/elasticsearch/lib/joda-convert-1.2.jar lib/elasticsearch/lib/joda-time-2.8.2.jar @@ -38,10 +38,11 @@ lib/elasticsearch/lib/lucene-queries-%%L lib/elasticsearch/lib/lucene-queryparser-%%LUCENEVER%%.jar lib/elasticsearch/lib/lucene-sandbox-%%LUCENEVER%%.jar lib/elasticsearch/lib/lucene-spatial-%%LUCENEVER%%.jar +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/snakeyaml-1.12.jar -lib/elasticsearch/lib/spatial4j-0.4.1.jar +lib/elasticsearch/lib/snakeyaml-1.15.jar +lib/elasticsearch/lib/spatial4j-0.5.jar lib/elasticsearch/lib/t-digest-3.0.jar lib/elasticsearch/bin/elasticsearch.in.sh lib/elasticsearch/bin/elasticsearch @@ -54,3 +55,7 @@ lib/elasticsearch/bin/plugin @dir lib/elasticsearch/plugins @dir lib/elasticsearch @dir libexec/elasticsearch +@dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_LOGDIR%% +@dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_DBDIR%% +@postunexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi +@postunexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi