svn commit: r425294 - in head/textproc: . elasticsearch elasticsearch2 elasticsearch5 elasticsearch5/files
Tom Judge
tj at FreeBSD.org
Fri Nov 4 07:28:37 UTC 2016
Author: tj
Date: Fri Nov 4 07:28:35 2016
New Revision: 425294
URL: https://svnweb.freebsd.org/changeset/ports/425294
Log:
Add Elasticsearch 5.0.0.
Added:
head/textproc/elasticsearch5/
- copied from r425280, head/textproc/elasticsearch2/
head/textproc/elasticsearch5/files/patch-bin_elasticsearch.in.sh
- copied, changed from r425280, head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh
head/textproc/elasticsearch5/files/patch-config_elasticsearch.yml
- copied, changed from r425280, head/textproc/elasticsearch2/files/patch-config-elasticsearch.yml
Deleted:
head/textproc/elasticsearch5/files/patch-bin-elasticsearch.in.sh
head/textproc/elasticsearch5/files/patch-config-elasticsearch.yml
Modified:
head/textproc/Makefile
head/textproc/elasticsearch/Makefile
head/textproc/elasticsearch2/Makefile
head/textproc/elasticsearch5/Makefile
head/textproc/elasticsearch5/distinfo
head/textproc/elasticsearch5/pkg-plist
Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile Fri Nov 4 07:25:36 2016 (r425293)
+++ head/textproc/Makefile Fri Nov 4 07:28:35 2016 (r425294)
@@ -161,6 +161,7 @@
SUBDIR += elasticsearch2-plugin-marvel
SUBDIR += elasticsearch2-plugin-migration
SUBDIR += elasticsearch2-plugin-sql
+ SUBDIR += elasticsearch5
SUBDIR += elixir-earmark
SUBDIR += elixir-ex_doc
SUBDIR += elixir-funnel
Modified: head/textproc/elasticsearch/Makefile
==============================================================================
--- head/textproc/elasticsearch/Makefile Fri Nov 4 07:25:36 2016 (r425293)
+++ head/textproc/elasticsearch/Makefile Fri Nov 4 07:28:35 2016 (r425294)
@@ -14,7 +14,7 @@ LICENSE= APACHE20
RUN_DEPENDS= java-sigar>=0:java/sigar
-CONFLICTS= elasticsearch2-[0-9]*
+CONFLICTS= elasticsearch[0-9]-[0-9]*
USES= cpe
NO_ARCH= yes
Modified: head/textproc/elasticsearch2/Makefile
==============================================================================
--- head/textproc/elasticsearch2/Makefile Fri Nov 4 07:25:36 2016 (r425293)
+++ head/textproc/elasticsearch2/Makefile Fri Nov 4 07:28:35 2016 (r425294)
@@ -14,7 +14,7 @@ COMMENT= Full-text search engine for Jav
LICENSE= APACHE20
-CONFLICTS= elasticsearch-[0-9]*
+CONFLICTS= elasticsearch-[0-9]* elasticsearch5-[0-9]*
USES= cpe
NO_ARCH= yes
@@ -85,5 +85,4 @@ do-install-DOCS-on:
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
-
.include <bsd.port.mk>
Modified: head/textproc/elasticsearch5/Makefile
==============================================================================
--- head/textproc/elasticsearch2/Makefile Fri Nov 4 00:09:51 2016 (r425280)
+++ head/textproc/elasticsearch5/Makefile Fri Nov 4 07:28:35 2016 (r425294)
@@ -2,36 +2,39 @@
# $FreeBSD$
PORTNAME= elasticsearch
-PORTVERSION= 2.4.1
-PORTREVISION= 1
+PORTVERSION= 5.0.0
CATEGORIES= textproc java devel
-MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
+MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \
http://mirrors.rit.edu/zi/
-PKGNAMESUFFIX= 2
+PKGNAMESUFFIX= 5
MAINTAINER= tj at FreeBSD.org
COMMENT= Full-text search engine for Java
LICENSE= APACHE20
-CONFLICTS= elasticsearch-[0-9]*
+RUN_DEPENDS= bash>0:shells/bash
-USES= cpe
+CONFLICTS= elasticsearch-[0-9]* elasticsearch2-[0-9]*
+
+USES= cpe shebangfix
NO_ARCH= yes
USE_JAVA= yes
NO_BUILD= yes
-JAVA_VERSION= 1.7+
+JAVA_VERSION= 1.8+
USE_RC_SUBR= ${PORTNAME}
+SHEBANG_FILES= bin/elasticsearch-plugin \
+ bin/elasticsearch
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
-LUCENEVER= 5.5.2
-CONFIG_FILES= elasticsearch.yml logging.yml
+LUCENEVER= 6.2.0
+CONFIG_FILES= elasticsearch.yml log4j2.properties jvm.options
BINS= elasticsearch.in.sh \
elasticsearch \
- plugin
+ elasticsearch-plugin
DOCS= LICENSE.txt \
NOTICE.txt \
@@ -77,7 +80,7 @@ do-install:
@${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
+ cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/elasticsearch-plugin elasticsearch-plugin
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -85,5 +88,4 @@ do-install-DOCS-on:
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
-
.include <bsd.port.mk>
Modified: head/textproc/elasticsearch5/distinfo
==============================================================================
--- head/textproc/elasticsearch2/distinfo Fri Nov 4 00:09:51 2016 (r425280)
+++ head/textproc/elasticsearch5/distinfo Fri Nov 4 07:28:35 2016 (r425294)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475512897
-SHA256 (elasticsearch-2.4.1.tar.gz) = 23a369ef42955c19aaaf9e34891eea3a055ed217d7fbe76da0998a7a54bbe167
-SIZE (elasticsearch-2.4.1.tar.gz) = 27364109
+TIMESTAMP = 1478218577
+SHA256 (elasticsearch-5.0.0.tar.gz) = a866534f0fa7428e980c985d712024feef1dee04709add6e360fc7b73bb1e7ae
+SIZE (elasticsearch-5.0.0.tar.gz) = 32968292
Copied and modified: head/textproc/elasticsearch5/files/patch-bin_elasticsearch.in.sh (from r425280, head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh)
==============================================================================
--- head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh Fri Nov 4 00:09:51 2016 (r425280, copy source)
+++ head/textproc/elasticsearch5/files/patch-bin_elasticsearch.in.sh Fri Nov 4 07:28:35 2016 (r425294)
@@ -1,7 +1,7 @@
---- 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
+--- bin/elasticsearch.in.sh.orig 2016-10-26 04:35:54 UTC
++++ bin/elasticsearch.in.sh
+@@ -1,5 +1,19 @@
+ #!/bin/bash
+if [ `uname -o` == "FreeBSD" ]; then
+ . /etc/rc.subr
@@ -13,8 +13,7 @@
+ 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:="/usr/local/etc/elasticsearch"}"
-+ JAVA_OPTS="$JAVA_OPTS -Des.path.scripts=${elasticsearch_scripts:="/usr/local/libexec/elasticsearch"}"
++ ES_JAVA_OPTS="$ES_JAVA_OPTS -Des.path.conf=${elasticsearch_config:="/usr/local/etc/elasticsearch"}"
+ PATH=${PATH}:/usr/local/bin
+fi
+
Copied and modified: head/textproc/elasticsearch5/files/patch-config_elasticsearch.yml (from r425280, head/textproc/elasticsearch2/files/patch-config-elasticsearch.yml)
==============================================================================
--- head/textproc/elasticsearch2/files/patch-config-elasticsearch.yml Fri Nov 4 00:09:51 2016 (r425280, copy source)
+++ head/textproc/elasticsearch5/files/patch-config_elasticsearch.yml Fri Nov 4 07:28:35 2016 (r425294)
@@ -1,15 +1,18 @@
---- config/elasticsearch.yml.orig 2015-10-21 04:41:12.000000000 -0400
-+++ config/elasticsearch.yml 2015-11-19 12:34:39.766910803 -0500
-@@ -31,10 +31,12 @@
+--- config/elasticsearch.yml.orig 2016-10-26 04:35:54 UTC
++++ config/elasticsearch.yml
+@@ -31,10 +31,15 @@
# Path to directory where to store the data (separate multiple locations by comma):
#
- # path.data: /path/to/data
+ #path.data: /path/to/data
+path.data: /var/db/elasticsearch
#
# Path to log files:
#
- # path.logs: /path/to/logs
+ #path.logs: /path/to/logs
+path.logs: /var/log/elasticsearch
++#
++# Path to scripts dir:
++path.scripts: /usr/local/libexec/elasticsearch
#
# ----------------------------------- Memory -----------------------------------
#
Modified: head/textproc/elasticsearch5/pkg-plist
==============================================================================
--- head/textproc/elasticsearch2/pkg-plist Fri Nov 4 00:09:51 2016 (r425280)
+++ head/textproc/elasticsearch5/pkg-plist Fri Nov 4 07:28:35 2016 (r425294)
@@ -1,26 +1,24 @@
@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample
- at sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/logging.yml.sample
+ at sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/log4j2.properties.sample
+ at sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/jvm.options.sample
@unexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi
@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/apache-log4j-extras-1.2.17.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/guava-18.0.jar
lib/elasticsearch/lib/hppc-0.7.1.jar
lib/elasticsearch/lib/jackson-core-2.8.1.jar
lib/elasticsearch/lib/jackson-dataformat-cbor-2.8.1.jar
lib/elasticsearch/lib/jackson-dataformat-smile-2.8.1.jar
lib/elasticsearch/lib/jackson-dataformat-yaml-2.8.1.jar
-lib/elasticsearch/lib/jna-4.1.0.jar
+lib/elasticsearch/lib/jna-4.2.2.jar
lib/elasticsearch/lib/joda-convert-1.2.jar
lib/elasticsearch/lib/joda-time-2.9.4.jar
-lib/elasticsearch/lib/jsr166e-1.1.0.jar
+lib/elasticsearch/lib/jopt-simple-5.0.2.jar
lib/elasticsearch/lib/jts-1.13.jar
-lib/elasticsearch/lib/log4j-1.2.17.jar
+lib/elasticsearch/lib/log4j-1.2-api-2.6.2.jar
+lib/elasticsearch/lib/log4j-api-2.6.2.jar
+lib/elasticsearch/lib/log4j-core-2.6.2.jar
lib/elasticsearch/lib/lucene-analyzers-common-%%LUCENEVER%%.jar
lib/elasticsearch/lib/lucene-backward-codecs-%%LUCENEVER%%.jar
lib/elasticsearch/lib/lucene-core-%%LUCENEVER%%.jar
@@ -33,19 +31,26 @@ 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-spatial-extras-%%LUCENEVER%%.jar
lib/elasticsearch/lib/lucene-spatial3d-%%LUCENEVER%%.jar
lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/netty-3.10.6.Final.jar
-lib/elasticsearch/lib/securesm-1.0.jar
+lib/elasticsearch/lib/securesm-1.1.jar
lib/elasticsearch/lib/snakeyaml-1.15.jar
-lib/elasticsearch/lib/spatial4j-0.5.jar
+lib/elasticsearch/lib/spatial4j-0.6.jar
lib/elasticsearch/lib/t-digest-3.0.jar
lib/elasticsearch/bin/elasticsearch.in.sh
lib/elasticsearch/bin/elasticsearch
-lib/elasticsearch/bin/plugin
+lib/elasticsearch/bin/elasticsearch-plugin
+lib/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/aggs-matrix-stats/plugin-descriptor.properties
+lib/elasticsearch/modules/ingest-common/ingest-common-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/ingest-common/jcodings-1.0.12.jar
+lib/elasticsearch/modules/ingest-common/joni-2.1.6.jar
+lib/elasticsearch/modules/ingest-common/plugin-descriptor.properties
lib/elasticsearch/modules/lang-expression/antlr4-runtime-4.5.1-1.jar
lib/elasticsearch/modules/lang-expression/asm-5.0.4.jar
lib/elasticsearch/modules/lang-expression/asm-commons-5.0.4.jar
+lib/elasticsearch/modules/lang-expression/asm-tree-5.0.4.jar
lib/elasticsearch/modules/lang-expression/lang-expression-%%PORTVERSION%%.jar
lib/elasticsearch/modules/lang-expression/lucene-expressions-%%LUCENEVER%%.jar
lib/elasticsearch/modules/lang-expression/plugin-descriptor.properties
@@ -54,8 +59,40 @@ lib/elasticsearch/modules/lang-groovy/gr
lib/elasticsearch/modules/lang-groovy/lang-groovy-%%PORTVERSION%%.jar
lib/elasticsearch/modules/lang-groovy/plugin-descriptor.properties
lib/elasticsearch/modules/lang-groovy/plugin-security.policy
+lib/elasticsearch/modules/lang-mustache/compiler-0.9.3.jar
+lib/elasticsearch/modules/lang-mustache/lang-mustache-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/lang-mustache/plugin-descriptor.properties
+lib/elasticsearch/modules/lang-mustache/plugin-security.policy
+lib/elasticsearch/modules/lang-painless/antlr4-runtime-4.5.1-1.jar
+lib/elasticsearch/modules/lang-painless/asm-debug-all-5.1.jar
+lib/elasticsearch/modules/lang-painless/lang-painless-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/lang-painless/plugin-descriptor.properties
+lib/elasticsearch/modules/lang-painless/plugin-security.policy
+lib/elasticsearch/modules/percolator/percolator-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/percolator/plugin-descriptor.properties
+lib/elasticsearch/modules/reindex/commons-codec-1.10.jar
+lib/elasticsearch/modules/reindex/commons-logging-1.1.3.jar
+lib/elasticsearch/modules/reindex/httpasyncclient-4.1.2.jar
+lib/elasticsearch/modules/reindex/httpclient-4.5.2.jar
+lib/elasticsearch/modules/reindex/httpcore-4.4.5.jar
+lib/elasticsearch/modules/reindex/httpcore-nio-4.4.5.jar
lib/elasticsearch/modules/reindex/plugin-descriptor.properties
lib/elasticsearch/modules/reindex/reindex-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/reindex/rest-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/transport-netty3/netty-3.10.6.Final.jar
+lib/elasticsearch/modules/transport-netty3/plugin-descriptor.properties
+lib/elasticsearch/modules/transport-netty3/plugin-security.policy
+lib/elasticsearch/modules/transport-netty3/transport-netty3-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/transport-netty4/netty-buffer-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-codec-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-codec-http-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-common-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-handler-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-resolver-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/netty-transport-4.1.5.Final.jar
+lib/elasticsearch/modules/transport-netty4/plugin-descriptor.properties
+lib/elasticsearch/modules/transport-netty4/plugin-security.policy
+lib/elasticsearch/modules/transport-netty4/transport-netty4-%%PORTVERSION%%.jar
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
%%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
%%PORTDOCS%%%%DOCSDIR%%/README.textile
More information about the svn-ports-all
mailing list