Update to 1.2.1.

Changes: http://www.elasticsearch.org/downloads/1-2-1/

4 files changed, 16 insertions, 18 deletions

diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile
index 7de748ffc4f3..e5d85eb58130 100644
--- a/textproc/elasticsearch/Makefile
+++ b/textproc/elasticsearch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
@@ -23,10 +23,10 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-LUCENEVER=	4.7.0
+LUCENEVER=	4.8.1
 CONFIG_FILES=	elasticsearch.yml logging.yml
 JARS=		elasticsearch-${PORTVERSION}.jar \
-		jna-3.3.0.jar \
+		jna-4.1.0.jar \
 		jts-1.13.jar \
 		log4j-1.2.17.jar \
 		lucene-analyzers-common-${LUCENEVER}.jar \
diff --git a/textproc/elasticsearch/distinfo b/textproc/elasticsearch/distinfo
index 790014b2f7ca..c3a50b37fbcd 100644
--- a/textproc/elasticsearch/distinfo
+++ b/textproc/elasticsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-1.1.0.tar.gz) = 8f409517e027f1497f3690bf4dc9967a75212089792a32994f8ce47fd4a549cc
-SIZE (elasticsearch-1.1.0.tar.gz) = 19867444
+SHA256 (elasticsearch-1.2.1.tar.gz) = b2b270de2b520b4a2510454c75d3a6b9a9801b7d9a31754a731d2c0868cf9186
+SIZE (elasticsearch-1.2.1.tar.gz) = 19849249
diff --git a/textproc/elasticsearch/files/patch-config-elasticsearch.yml b/textproc/elasticsearch/files/patch-config-elasticsearch.yml
index 1c23ab037ead..ac6ffb112b25 100644
--- a/textproc/elasticsearch/files/patch-config-elasticsearch.yml
+++ b/textproc/elasticsearch/files/patch-config-elasticsearch.yml
@@ -1,34 +1,32 @@
---- config/elasticsearch.yml.orig	2012-10-26 11:18:09.000000000 -0400
-+++ config/elasticsearch.yml	2012-10-26 11:25:29.000000000 -0400
-@@ -140,11 +140,11 @@
- 
+--- 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):
  #
--# path.conf: /path/to/conf
+ #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 (à la RAID 0) on a file level, favouring locations with most free
-@@ -154,15 +154,15 @@
- 
+ # 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: /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: /path/to/plugins
 +path.plugins: %%PREFIX%%/lib/elasticsearch/plugins
  
  
diff --git a/textproc/elasticsearch/pkg-plist b/textproc/elasticsearch/pkg-plist
index c33e416ae704..429c738abbc4 100644
--- a/textproc/elasticsearch/pkg-plist
+++ b/textproc/elasticsearch/pkg-plist
@@ -12,7 +12,7 @@ etc/elasticsearch/logging.yml.sample
 @group wheel
 bin/elasticsearch-plugin
 lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar
-lib/elasticsearch/jna-3.3.0.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