Upgrade to 1.4.0.

Changes: http://www.elasticsearch.org/downloads/1-4-0/

Fix logging configuration examples.

PR:		193467
Submitted by:	zi

4 files changed, 20 insertions, 16 deletions

diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile
index 507e60ab40f7..b9a6e8d11c22 100644
--- a/textproc/elasticsearch/Makefile
+++ b/textproc/elasticsearch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
@@ -18,12 +18,11 @@ JAVA_VERSION=	1.7+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_RC_SUBR=	${PORTNAME}
 
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-LUCENEVER=	4.9.0
+LUCENEVER=	4.10.2
 CONFIG_FILES=	elasticsearch.yml logging.yml
 JARS=		elasticsearch-${PORTVERSION}.jar \
 		asm-4.1.jar \
@@ -34,7 +33,6 @@ JARS=		elasticsearch-${PORTVERSION}.jar \
 		jts-1.13.jar \
 		log4j-1.2.17.jar \
 		lucene-analyzers-common-${LUCENEVER}.jar \
-		lucene-codecs-${LUCENEVER}.jar \
 		lucene-core-${LUCENEVER}.jar \
 		lucene-expressions-${LUCENEVER}.jar \
 		lucene-grouping-${LUCENEVER}.jar \
@@ -65,7 +63,7 @@ ELASTIC_LOGDIR=	/var/log/elasticsearch
 SUB_LIST=	SEARCHUSER=${SEARCHUSER} \
 		SEARCHGROUP=${SEARCHGROUP} \
 		PORTVERSION=${PORTVERSION}
-SUB_FILES=	elasticsearch-plugin
+SUB_FILES=	elasticsearch-plugin pkg-message
 PLIST_SUB=	SIGAR_ARCH=${SIGAR_ARCH} \
 		SEARCHUSER=${SEARCHUSER} \
 		SEARCHGROUP=${SEARCHGROUP} \
@@ -78,9 +76,9 @@ post-patch:
 	${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch ${STAGEDIR}${DATADIR}
 .for f in ${CONFIG_FILES}
-	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${PREFIX}/etc/elasticsearch/${f}.sample
+	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${DATADIR}/${f}.sample
 .endfor
 	${INSTALL_SCRIPT} ${WRKDIR}/elasticsearch-plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch
diff --git a/textproc/elasticsearch/distinfo b/textproc/elasticsearch/distinfo
index 5c96a9b70507..fbe4af5f215d 100644
--- a/textproc/elasticsearch/distinfo
+++ b/textproc/elasticsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-1.3.2.tar.gz) = 7525d0a4db4f7eb791a1f8da97b081a5d8b44a2b232d8324877177bdee992ea4
-SIZE (elasticsearch-1.3.2.tar.gz) = 27949096
+SHA256 (elasticsearch-1.4.0.tar.gz) = b317966befa50c22595477f9bad8ce67932e4d33e08ee8fb1c6e9690afa5064a
+SIZE (elasticsearch-1.4.0.tar.gz) = 27730896
diff --git a/textproc/elasticsearch/files/pkg-message.in b/textproc/elasticsearch/files/pkg-message.in
new file mode 100644
index 000000000000..94a939511b54
--- /dev/null
+++ b/textproc/elasticsearch/files/pkg-message.in
@@ -0,0 +1,6 @@
+======================================================================
+
+Please see %%DATADIR%% for sample versions of
+elasticsearch.yml and logging.yml.
+
+======================================================================
diff --git a/textproc/elasticsearch/pkg-plist b/textproc/elasticsearch/pkg-plist
index e63357efcef1..3a3abf63f24e 100644
--- a/textproc/elasticsearch/pkg-plist
+++ b/textproc/elasticsearch/pkg-plist
@@ -1,11 +1,11 @@
 @owner %%SEARCHUSER%%
 @group %%SEARCHGROUP%%
-@unexec if cmp  -s %D/etc/elasticsearch/elasticsearch.yml.sample %D/etc/elasticsearch/elasticsearch.yml; then rm -f %D/etc/elasticsearch/elasticsearch.yml; fi
-etc/elasticsearch/elasticsearch.yml.sample
-@exec if [ ! -f %D/etc/elasticsearch/elasticsearch.yml ] ; then cp -p %D/%F %B/elasticsearch.yml; fi
-@unexec if cmp  -s %D/etc/elasticsearch/logging.yml.sample %D/etc/elasticsearch/logging.yml; then rm -f %D/etc/elasticsearch/logging.yml; fi
-etc/elasticsearch/logging.yml.sample
-@exec if [ ! -f %D/etc/elasticsearch/logging.yml ] ; then cp -p %D/%F %B/logging.yml; fi
+@unexec if cmp  -s %D/%%DATADIR%%/elasticsearch.yml.sample %D/etc/elasticsearch/elasticsearch.yml; then rm -f %D/etc/elasticsearch/elasticsearch.yml; fi
+%%DATADIR%%/elasticsearch.yml.sample
+@exec if [ ! -f %D/etc/elasticsearch/elasticsearch.yml ] ; then cp -p %D/%F %D/etc/elasticsearch/elasticsearch.yml; fi
+@unexec if cmp  -s %D/%%DATADIR%%/logging.yml.sample %D/etc/elasticsearch/logging.yml; then rm -f %D/etc/elasticsearch/logging.yml; fi
+%%DATADIR%%/logging.yml.sample
+@exec if [ ! -f %D/etc/elasticsearch/logging.yml ] ; then cp -p %D/%F %D/etc/elasticsearch/logging.yml; fi
 @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
 @owner root
@@ -20,7 +20,6 @@ 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-codecs-%%LUCENEVER%%.jar
 lib/elasticsearch/lucene-core-%%LUCENEVER%%.jar
 lib/elasticsearch/lucene-expressions-%%LUCENEVER%%.jar
 lib/elasticsearch/lucene-grouping-%%LUCENEVER%%.jar
@@ -39,6 +38,7 @@ lib/elasticsearch/spatial4j-0.4.1.jar
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.textile
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry %%DATADIR%%
 @dirrmtry etc/elasticsearch
 @dirrm lib/elasticsearch/sigar
 @dirrm lib/elasticsearch