svn commit: r401977 - in head/textproc: . elasticsearch elasticsearch2 elasticsearch2/files
Tom Judge
tj at FreeBSD.org
Thu Nov 19 21:50:20 UTC 2015
Author: tj
Date: Thu Nov 19 21:50:18 2015
New Revision: 401977
URL: https://svnweb.freebsd.org/changeset/ports/401977
Log:
New port for Elasticsearch 2.0.0 which is not fully backwards compt with 1.X.
Changes: https://www.elastic.co/downloads/past-releases/elasticsearch-2-0-0
Added:
head/textproc/elasticsearch2/
- copied from r401956, head/textproc/elasticsearch/
head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh (contents, props changed)
Deleted:
head/textproc/elasticsearch2/files/elasticsearch-plugin.in
Modified:
head/textproc/Makefile
head/textproc/elasticsearch/Makefile
head/textproc/elasticsearch2/Makefile
head/textproc/elasticsearch2/distinfo
head/textproc/elasticsearch2/files/elasticsearch.in
head/textproc/elasticsearch2/files/patch-config-elasticsearch.yml
head/textproc/elasticsearch2/pkg-plist
Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile Thu Nov 19 21:34:06 2015 (r401976)
+++ head/textproc/Makefile Thu Nov 19 21:50:18 2015 (r401977)
@@ -158,6 +158,7 @@
SUBDIR += elasticsearch-plugin-marvel
SUBDIR += elasticsearch-plugin-sql
SUBDIR += elasticsearch-river-rabbitmq
+ SUBDIR += elasticsearch2
SUBDIR += elixir-earmark
SUBDIR += elixir-ex_doc
SUBDIR += elixir-funnel
Modified: head/textproc/elasticsearch/Makefile
==============================================================================
--- head/textproc/elasticsearch/Makefile Thu Nov 19 21:34:06 2015 (r401976)
+++ head/textproc/elasticsearch/Makefile Thu Nov 19 21:50:18 2015 (r401977)
@@ -3,6 +3,7 @@
PORTNAME= elasticsearch
PORTVERSION= 1.7.3
+PORTREVISION= 1
CATEGORIES= textproc java devel
MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
http://mirrors.rit.edu/zi/
@@ -14,6 +15,8 @@ LICENSE= APACHE20
RUN_DEPENDS= java-sigar>=0:${PORTSDIR}/java/sigar
+CONFLICTS= elasticsearch2-[0-9]*
+
USES= cpe
NO_ARCH= yes
USE_JAVA= yes
Modified: head/textproc/elasticsearch2/Makefile
==============================================================================
--- head/textproc/elasticsearch/Makefile Thu Nov 19 17:23:57 2015 (r401956)
+++ head/textproc/elasticsearch2/Makefile Thu Nov 19 21:50:18 2015 (r401977)
@@ -2,56 +2,75 @@
# $FreeBSD$
PORTNAME= elasticsearch
-PORTVERSION= 1.7.3
+PORTVERSION= 2.0.0
CATEGORIES= textproc java devel
MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
http://mirrors.rit.edu/zi/
+PKGNAMESUFFIX= 2
MAINTAINER= tj at FreeBSD.org
COMMENT= Full-text search engine for Java
LICENSE= APACHE20
-RUN_DEPENDS= java-sigar>=0:${PORTSDIR}/java/sigar
+CONFLICTS= elasticsearch-[0-9]*
USES= cpe
NO_ARCH= yes
USE_JAVA= yes
NO_BUILD= yes
JAVA_VERSION= 1.7+
-ONLY_FOR_ARCHS= i386 amd64
USE_RC_SUBR= ${PORTNAME}
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
-LUCENEVER= 4.10.4
+LUCENEVER= 5.2.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 \
- apache-log4j-extras-1.2.17.jar \
- antlr-runtime-3.5.jar \
- groovy-all-2.4.4.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-queries-${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 \
- spatial4j-0.4.1.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
DOCS= LICENSE.txt \
NOTICE.txt \
@@ -65,50 +84,37 @@ GROUPS= ${SEARCHGROUP}
ELASTIC_DBDIR= /var/db/elasticsearch
ELASTIC_LOGDIR= /var/log/elasticsearch
-.if ${OPSYS} == FreeBSD
-. if ${OSVERSION} >= 1000000
-PLATFORM_VER= 1
-. else
-PLATFORM_VER= 9
-. endif
-.else
-BROKEN= ${OPSYS} platform is not supported
-.endif
-
-SIGAR_LIBNAME= libsigar-${ARCH:S,i386,x86,}-freebsd-${PLATFORM_VER}.so
-
SUB_LIST= SEARCHUSER=${SEARCHUSER} \
SEARCHGROUP=${SEARCHGROUP} \
PORTVERSION=${PORTVERSION}
-SUB_FILES= elasticsearch-plugin pkg-message
-PLIST_SUB= SIGAR_ARCH=${SIGAR_ARCH} \
- SEARCHUSER=${SEARCHUSER} \
+SUB_FILES= pkg-message
+PLIST_SUB= SEARCHUSER=${SEARCHUSER} \
SEARCHGROUP=${SEARCHGROUP} \
LUCENEVER=${LUCENEVER} \
PORTVERSION=${PORTVERSION} \
ELASTIC_DBDIR=${ELASTIC_DBDIR} \
- ELASTIC_LOGDIR=${ELASTIC_LOGDIR} \
- SIGAR_LIBNAME=${SIGAR_LIBNAME}
+ 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
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
.for f in ${CONFIG_FILES}
${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
.endfor
- ${INSTALL_SCRIPT} ${WRKDIR}/elasticsearch-plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin
- ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch
+ ${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/
+ ${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib
.endfor
${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
- ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar
-# ${INSTALL_DATA} ${WRKSRC}/lib/sigar/sigar-1.6.4.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar/
- cd ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar && ${LN} -s ${JAVAJARDIR}/sigar.jar
- cd ${STAGEDIR}${PREFIX}/lib/elasticsearch/sigar && ${LN} -s ${JAVAJARDIR}/${SIGAR_LIBNAME}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -116,4 +122,6 @@ 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 <bsd.port.mk>
Modified: head/textproc/elasticsearch2/distinfo
==============================================================================
--- head/textproc/elasticsearch/distinfo Thu Nov 19 17:23:57 2015 (r401956)
+++ head/textproc/elasticsearch2/distinfo Thu Nov 19 21:50:18 2015 (r401977)
@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-1.7.3.tar.gz) = af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca
-SIZE (elasticsearch-1.7.3.tar.gz) = 28510917
+SHA256 (elasticsearch-2.0.0.tar.gz) = b25f13f615337c2072964fd9fc5c7250f8a2a983b22198daf93548285d5d16df
+SIZE (elasticsearch-2.0.0.tar.gz) = 28576708
Modified: head/textproc/elasticsearch2/files/elasticsearch.in
==============================================================================
--- head/textproc/elasticsearch/files/elasticsearch.in Thu Nov 19 17:23:57 2015 (r401956)
+++ head/textproc/elasticsearch2/files/elasticsearch.in Thu Nov 19 21:50:18 2015 (r401977)
@@ -33,43 +33,19 @@ load_rc_config ${name}
: ${elasticsearch_enable:="NO"}
: ${elasticsearch_user:=%%SEARCHUSER%%}
: ${elasticsearch_group:=%%SEARCHGROUP%%}
-: ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch/elasticsearch.yml"}
-: ${elasticsearch_min_mem:="256m"}
-: ${elasticsearch_max_mem:="1g"}
-: ${elasticsearch_props:=""}
+: ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch"}
: ${elasticsearch_tmp:="/var/tmp/elasticsearch"}
-# Force the JVM to use IPv4 stack
-# elasticshearch_props"-Djava.net.preferIPv4Stack=true"
-
-required_files="${elasticsearch_config}"
+required_files="${elasticsearch_config}/elasticsearch.yml"
pidfile="/var/run/${name}.pid"
-ES_LIB="%%PREFIX%%/lib/elasticsearch"
-ES_CLASSPATH=$ES_LIB/elasticsearch-%%PORTVERSION%%.jar:$ES_LIB/*:$ES_LIB/sigar/*
-
-java_options=" -server \
- -Xms${elasticsearch_min_mem} \
- -Xmx${elasticsearch_max_mem} \
- -Xss256k \
- -Djava.awt.headless=true \
- -XX:+UseParNewGC \
- -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=75 \
- -XX:+UseCMSInitiatingOccupancyOnly \
- -XX:+HeapDumpOnOutOfMemoryError \
- -XX:+DisableExplicitGC \
- -Delasticsearch \
- -Des.config=${elasticsearch_config} \
- -cp ${ES_CLASSPATH}"
-
extra_commands="console status"
console_cmd="elasticsearch_console"
start_precmd="elasticsearch_precmd"
status_cmd="elasticsearch_status"
stop_cmd="elasticsearch_stop"
-command="/usr/sbin/daemon"
-command_args="-f %%LOCALBASE%%/bin/java -Des.pidfile=${pidfile} ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch"
+command="%%PREFIX%%/lib/elasticsearch/bin/elasticsearch"
+command_args="-d --pidfile=${pidfile}"
elasticsearch_precmd()
{
@@ -82,7 +58,8 @@ elasticsearch_precmd()
elasticsearch_console()
{
- %%LOCALBASE%%/bin/java -Des.foreground=yes ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch
+ command_args=""
+ run_rc_command "start"
}
Added: head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh Thu Nov 19 21:50:18 2015 (r401977)
@@ -0,0 +1,22 @@
+--- 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/sh
+
++if [ `uname -o` == "FreeBSD" ]; then
++ . /etc/rc.subr
++ load_rc_config elasticsearch
++ ES_MIN_MEM=${elasticsearch_min_mem}
++ ES_MAX_MEM=${elasticsearch_max_mem}
++ ES_HEAP_NEW_SIZE=${elasticsearch_heap_newsize}
++ ES_DIRECT_SIZE=${elasticsearch_direct_size}
++ 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"}"
++fi
++
+ # check in case a user was using this mechanism
+ if [ "x$ES_CLASSPATH" != "x" ]; then
+ cat >&2 << EOF
Modified: head/textproc/elasticsearch2/files/patch-config-elasticsearch.yml
==============================================================================
--- head/textproc/elasticsearch/files/patch-config-elasticsearch.yml Thu Nov 19 17:23:57 2015 (r401956)
+++ head/textproc/elasticsearch2/files/patch-config-elasticsearch.yml Thu Nov 19 21:50:18 2015 (r401977)
@@ -1,33 +1,15 @@
---- config/elasticsearch.yml.orig 2014-06-03 10:23:18.000000000 -0400
-+++ config/elasticsearch.yml 2014-06-12 11:18:03.477171350 -0400
-@@ -143,10 +143,12 @@
- # Path to directory containing configuration (this file and logging.yml):
+--- 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 @@
+ # Path to directory where to store the data (separate multiple locations by comma):
#
- #path.conf: /path/to/conf
-+path.conf: %%PREFIX%%/etc/elasticsearch
-
- # Path to directory where to store index data allocated for this node.
- #
- #path.data: /path/to/data
+ # path.data: /path/to/data
+path.data: /var/db/elasticsearch
#
- # Can optionally include more than one location, causing data to be striped across
- # the locations (a la RAID 0) on a file level, favouring locations with most free
-@@ -157,14 +159,17 @@
- # Path to temporary files:
- #
- #path.work: /path/to/work
-+path.work: /var/tmp/elasticsearch
-
# Path to log files:
#
- #path.logs: /path/to/logs
+ # path.logs: /path/to/logs
+path.logs: /var/log/elasticsearch
-
- # Path to where plugins are installed:
#
- #path.plugins: /path/to/plugins
-+path.plugins: %%PREFIX%%/lib/elasticsearch/plugins
-
-
- #################################### Plugin ###################################
+ # ----------------------------------- Memory -----------------------------------
+ #
Modified: head/textproc/elasticsearch2/pkg-plist
==============================================================================
--- head/textproc/elasticsearch/pkg-plist Thu Nov 19 17:23:57 2015 (r401956)
+++ head/textproc/elasticsearch2/pkg-plist Thu Nov 19 21:50:18 2015 (r401977)
@@ -3,32 +3,54 @@
@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/antlr-runtime-3.5.jar
-lib/elasticsearch/apache-log4j-extras-1.2.17.jar
-lib/elasticsearch/asm-4.1.jar
-lib/elasticsearch/asm-commons-4.1.jar
-lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar
-lib/elasticsearch/groovy-all-2.4.4.jar
-lib/elasticsearch/jna-4.1.0.jar
-lib/elasticsearch/jts-1.13.jar
-lib/elasticsearch/log4j-1.2.17.jar
-lib/elasticsearch/lucene-analyzers-common-%%LUCENEVER%%.jar
-lib/elasticsearch/lucene-core-%%LUCENEVER%%.jar
-lib/elasticsearch/lucene-expressions-%%LUCENEVER%%.jar
-lib/elasticsearch/lucene-grouping-%%LUCENEVER%%.jar
-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
-lib/elasticsearch/lucene-spatial-%%LUCENEVER%%.jar
-lib/elasticsearch/lucene-suggest-%%LUCENEVER%%.jar
-lib/elasticsearch/spatial4j-0.4.1.jar
-lib/elasticsearch/sigar/sigar.jar
-lib/elasticsearch/sigar/%%SIGAR_LIBNAME%%
+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.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/jna-4.1.0.jar
+lib/elasticsearch/lib/joda-convert-1.2.jar
+lib/elasticsearch/lib/joda-time-2.8.2.jar
+lib/elasticsearch/lib/jsr166e-1.1.0.jar
+lib/elasticsearch/lib/jts-1.13.jar
+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
+lib/elasticsearch/lib/lucene-memory-%%LUCENEVER%%.jar
+lib/elasticsearch/lib/lucene-misc-%%LUCENEVER%%.jar
+lib/elasticsearch/lib/lucene-queries-%%LUCENEVER%%.jar
+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-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/t-digest-3.0.jar
+lib/elasticsearch/bin/elasticsearch.in.sh
+lib/elasticsearch/bin/elasticsearch
+lib/elasticsearch/bin/plugin
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
%%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
%%PORTDOCS%%%%DOCSDIR%%/README.textile
+ at dir lib/elasticsearch/lib
+ at dir lib/elasticsearch/bin
@dir lib/elasticsearch/plugins
+ at dir lib/elasticsearch
+ at dir libexec/elasticsearch
More information about the svn-ports-all
mailing list