Update to 2.4.1

Make sure modules are installed. Changes: https://www.elastic.co/guide/en/elasticsearch/reference/2.4/release-notes-2.4.1.html PR: 210133, 211197, 209256
nivit · Oct 6, 2016 · dfddd51 · dfddd51
1 parent f9548bc
commit dfddd51
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/textproc/elasticsearch2/Makefile b/textproc/elasticsearch2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
@@ -27,7 +26,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-LUCENEVER=	5.5.0
+LUCENEVER=	5.5.2
 CONFIG_FILES=	elasticsearch.yml logging.yml
 BINS=		elasticsearch.in.sh \
 		elasticsearch \
@@ -73,6 +72,7 @@ do-install:
 	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar")
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules
+	(cd ${WRKSRC}/modules && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules/ "-name *\.jar")
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
 	@${MKDIR} ${STAGEDIR}${ELASTIC_DBDIR} ${STAGEDIR}${ELASTIC_LOGDIR}

diff --git a/textproc/elasticsearch2/distinfo b/textproc/elasticsearch2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (elasticsearch-2.3.0.tar.gz) = d68482c7633f2986263bc5f11f93b8a58c54c6cf5e337b615446d0a7c6fdcd8b
-SIZE (elasticsearch-2.3.0.tar.gz) = 27556947
+TIMESTAMP = 1475512897
+SHA256 (elasticsearch-2.4.1.tar.gz) = 23a369ef42955c19aaaf9e34891eea3a055ed217d7fbe76da0998a7a54bbe167
+SIZE (elasticsearch-2.4.1.tar.gz) = 27364109
diff --git a/textproc/elasticsearch2/pkg-plist b/textproc/elasticsearch2/pkg-plist
@@ -11,13 +11,13 @@ 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.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/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/joda-convert-1.2.jar
-lib/elasticsearch/lib/joda-time-2.8.2.jar
+lib/elasticsearch/lib/joda-time-2.9.4.jar
 lib/elasticsearch/lib/jsr166e-1.1.0.jar
 lib/elasticsearch/lib/jts-1.13.jar
 lib/elasticsearch/lib/log4j-1.2.17.jar
@@ -35,14 +35,22 @@ 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/netty-3.10.6.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
 lib/elasticsearch/bin/elasticsearch.in.sh
 lib/elasticsearch/bin/elasticsearch
 lib/elasticsearch/bin/plugin
+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/lang-expression-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/lang-expression/lucene-expressions-%%LUCENEVER%%.jar
+lib/elasticsearch/modules/lang-groovy/groovy-2.4.6-indy.jar
+lib/elasticsearch/modules/lang-groovy/lang-groovy-%%PORTVERSION%%.jar
+lib/elasticsearch/modules/reindex/reindex-%%PORTVERSION%%.jar
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.textile