4 files changed, 33 insertions, 32 deletions
diff --git a/databases/elasticsearch/Makefile b/databases/elasticsearch/Makefile
index ab7530063ab..d68a192cce4 100644
--- a/databases/elasticsearch/Makefile
+++ b/databases/elasticsearch/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2015/11/12 15:37:07 fhajny Exp $
+# $NetBSD: Makefile,v 1.14 2015/12/31 09:57:31 fhajny Exp $
 
-DISTNAME=	elasticsearch-2.0.0
+DISTNAME=	elasticsearch-2.1.1
 CATEGORIES=	textproc
 MASTER_SITES=	https://download.elasticsearch.org/elasticsearch/elasticsearch/
 
diff --git a/databases/elasticsearch/PLIST b/databases/elasticsearch/PLIST
index f40771ce2c5..6c8b041b25f 100644
--- a/databases/elasticsearch/PLIST
+++ b/databases/elasticsearch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2015/11/12 15:37:07 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/12/31 09:57:31 fhajny Exp $
 lib/elasticsearch/HdrHistogram-2.1.6.jar
 lib/elasticsearch/antlr-runtime-3.5.jar
 lib/elasticsearch/apache-log4j-extras-1.2.17.jar
@@ -11,33 +11,34 @@ lib/elasticsearch/${PKGNAME}.jar
 lib/elasticsearch/groovy-all-2.4.4-indy.jar
 lib/elasticsearch/guava-18.0.jar
 lib/elasticsearch/hppc-0.7.1.jar
-lib/elasticsearch/jackson-core-2.5.3.jar
-lib/elasticsearch/jackson-dataformat-cbor-2.5.3.jar
-lib/elasticsearch/jackson-dataformat-smile-2.5.3.jar
-lib/elasticsearch/jackson-dataformat-yaml-2.5.3.jar
+lib/elasticsearch/jackson-core-2.6.2.jar
+lib/elasticsearch/jackson-dataformat-cbor-2.6.2.jar
+lib/elasticsearch/jackson-dataformat-smile-2.6.2.jar
+lib/elasticsearch/jackson-dataformat-yaml-2.6.2.jar
 lib/elasticsearch/jna-4.1.0.jar
 lib/elasticsearch/joda-convert-1.2.jar
 lib/elasticsearch/joda-time-2.8.2.jar
 lib/elasticsearch/jsr166e-1.1.0.jar
 lib/elasticsearch/jts-1.13.jar
 lib/elasticsearch/log4j-1.2.17.jar
-lib/elasticsearch/lucene-analyzers-common-5.2.1.jar
-lib/elasticsearch/lucene-backward-codecs-5.2.1.jar
-lib/elasticsearch/lucene-core-5.2.1.jar
-lib/elasticsearch/lucene-expressions-5.2.1.jar
-lib/elasticsearch/lucene-grouping-5.2.1.jar
-lib/elasticsearch/lucene-highlighter-5.2.1.jar
-lib/elasticsearch/lucene-join-5.2.1.jar
-lib/elasticsearch/lucene-memory-5.2.1.jar
-lib/elasticsearch/lucene-misc-5.2.1.jar
-lib/elasticsearch/lucene-queries-5.2.1.jar
-lib/elasticsearch/lucene-queryparser-5.2.1.jar
-lib/elasticsearch/lucene-sandbox-5.2.1.jar
-lib/elasticsearch/lucene-spatial-5.2.1.jar
-lib/elasticsearch/lucene-suggest-5.2.1.jar
+lib/elasticsearch/lucene-analyzers-common-5.3.1.jar
+lib/elasticsearch/lucene-backward-codecs-5.3.1.jar
+lib/elasticsearch/lucene-core-5.3.1.jar
+lib/elasticsearch/lucene-expressions-5.3.1.jar
+lib/elasticsearch/lucene-grouping-5.3.1.jar
+lib/elasticsearch/lucene-highlighter-5.3.1.jar
+lib/elasticsearch/lucene-join-5.3.1.jar
+lib/elasticsearch/lucene-memory-5.3.1.jar
+lib/elasticsearch/lucene-misc-5.3.1.jar
+lib/elasticsearch/lucene-queries-5.3.1.jar
+lib/elasticsearch/lucene-queryparser-5.3.1.jar
+lib/elasticsearch/lucene-sandbox-5.3.1.jar
+lib/elasticsearch/lucene-spatial-5.3.1.jar
+lib/elasticsearch/lucene-spatial3d-5.3.1.jar
+lib/elasticsearch/lucene-suggest-5.3.1.jar
 lib/elasticsearch/netty-3.10.5.Final.jar
-lib/elasticsearch/snakeyaml-1.12.jar
-lib/elasticsearch/spatial4j-0.4.1.jar
+lib/elasticsearch/snakeyaml-1.15.jar
+lib/elasticsearch/spatial4j-0.5.jar
 lib/elasticsearch/t-digest-3.0.jar
 libexec/elasticsearch/elasticsearch
 libexec/elasticsearch/elasticsearch.in.sh
diff --git a/databases/elasticsearch/distinfo b/databases/elasticsearch/distinfo
index 1228d6a190f..75940f32fab 100644
--- a/databases/elasticsearch/distinfo
+++ b/databases/elasticsearch/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2015/11/12 15:37:07 fhajny Exp $
+$NetBSD: distinfo,v 1.15 2015/12/31 09:57:31 fhajny Exp $
 
-SHA1 (elasticsearch-2.0.0.tar.gz) = e369d8579bd3a2e8b5344278d5043f19f14cac88
-RMD160 (elasticsearch-2.0.0.tar.gz) = 37a956c5a6392e41a7ea42c48557616491415936
-SHA512 (elasticsearch-2.0.0.tar.gz) = 23473b658d68c07b65f66e04cdac07c0b88ac3a2a9ca1d5e700b5b17ebc1b23b77a5b0fa32959d30d8e0267ec186be42de0c11ce86864fe55d0e353c27d0003a
-Size (elasticsearch-2.0.0.tar.gz) = 28576708 bytes
-SHA1 (patch-bin_elasticsearch.in.sh) = 323f1007f041eae2e094a82282edebc55d8522cd
+SHA1 (elasticsearch-2.1.1.tar.gz) = 360ca8e329b8b0c34b1cd6012c452951f8d3e137
+RMD160 (elasticsearch-2.1.1.tar.gz) = 7f6f6f6d642178e5c1d6b666d135fa32f37f1c89
+SHA512 (elasticsearch-2.1.1.tar.gz) = eff12cd7342dc0036dc88f03ced9c7cc90d284222efeca86adfd9e4cf254cb8f96105c58673b239cfc9eb9764a2a669d2cd171ca73eb43b1ec1470a13c5e1776
+Size (elasticsearch-2.1.1.tar.gz) = 29007342 bytes
+SHA1 (patch-bin_elasticsearch.in.sh) = 984c9fe74383f724932a6c1b9d88b1158fe4bbde
 SHA1 (patch-bin_plugin) = 5ddd9b55797305c2c1e77b174ae410c00ecb7b89
 SHA1 (patch-config_elasticsearch.yml) = 7729dfb1ed106f0a34e6daaf7a46d0352d42f1f1
diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh b/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh
index f758155e802..46bb2934cd9 100644
--- a/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh
+++ b/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_elasticsearch.in.sh,v 1.1 2015/11/12 15:37:08 fhajny Exp $
+$NetBSD: patch-bin_elasticsearch.in.sh,v 1.2 2015/12/31 09:57:31 fhajny Exp $
 
 Fix paths.
 
@@ -8,8 +8,8 @@ Fix paths.
      exit 1
  fi
  
--ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.0.0.jar:$ES_HOME/lib/*"
-+ES_CLASSPATH="@ES_LIBDIR@/elasticsearch-2.0.0.jar:@ES_LIBDIR@/*"
+-ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.1.1.jar:$ES_HOME/lib/*"
++ES_CLASSPATH="@ES_LIBDIR@/elasticsearch-2.1.1.jar:@ES_LIBDIR@/*"
  
  if [ "x$ES_MIN_MEM" = "x" ]; then
      ES_MIN_MEM=256m