Index: head/textproc/elasticsearch/Makefile
===================================================================
--- head/textproc/elasticsearch/Makefile	(revision 390978)
+++ head/textproc/elasticsearch/Makefile	(revision 390979)
@@ -1,122 +1,121 @@
 # Created by: Tom Judge <tj@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	1.5.2
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
 
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Full-text search engine for Java
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	java-sigar>=0:${PORTSDIR}/java/sigar
 
 USES=		cpe
 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
 CONFIG_FILES=	elasticsearch.yml logging.yml
 JARS=		elasticsearch-${PORTVERSION}.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.0.jar \
 		jna-4.1.0.jar \
 		jts-1.13.jar \
 		log4j-1.2.17.jar \
 		lucene-analyzers-common-${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
 
 DOCS=		LICENSE.txt \
 		NOTICE.txt \
 		README.textile
 
 SIGAR_ARCH=	${ARCH:S|i386|x86|}
 SEARCHUSER?=	elasticsearch
 SEARCHGROUP?=	${SEARCHUSER}
 USERS=		${SEARCHUSER}
 GROUPS=		${SEARCHGROUP}
 ELASTIC_DBDIR=	/var/db/elasticsearch
 ELASTIC_LOGDIR=	/var/log/elasticsearch
 
 .if ${OPSYS} == FreeBSD
 .  if ${OSVERSION} >= 1000000
 PLATFORM_VER=	1
 .  elif ${OSVERSION} >= 900000
 PLATFORM_VER=	9
 .  else
 PLATFORM_VER=	8
 .  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} \
 		SEARCHGROUP=${SEARCHGROUP} \
 		LUCENEVER=${LUCENEVER} \
 		PORTVERSION=${PORTVERSION} \
 		ELASTIC_DBDIR=${ELASTIC_DBDIR} \
 		ELASTIC_LOGDIR=${ELASTIC_LOGDIR} \
 		SIGAR_LIBNAME=${SIGAR_LIBNAME}
 
 post-patch:
 	${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
 .for f in ${CONFIG_FILES}
-	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${DATADIR}/${f}.sample
+	${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
 .for f in ${JARS}
 	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/
 .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}
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/textproc/elasticsearch/distinfo
===================================================================
--- head/textproc/elasticsearch/distinfo	(revision 390978)
+++ head/textproc/elasticsearch/distinfo	(revision 390979)
@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-1.5.2.tar.gz) = efae7897367ac3fa8057d02fad31c72e215b6edef599b63e373d3ce0c1049a14
-SIZE (elasticsearch-1.5.2.tar.gz) = 28173132
+SHA256 (elasticsearch-1.6.0.tar.gz) = dc336c83394b2f2f72f362e0f959a4cfdec2109aa3de15668401afeab0b02d2e
+SIZE (elasticsearch-1.6.0.tar.gz) = 28401477
Index: head/textproc/elasticsearch/files/pkg-message.in
===================================================================
--- head/textproc/elasticsearch/files/pkg-message.in	(revision 390978)
+++ head/textproc/elasticsearch/files/pkg-message.in	(revision 390979)
@@ -1,6 +1,6 @@
 ======================================================================
 
-Please see %%DATADIR%% for sample versions of
+Please see %%ETCDIR%% for sample versions of
 elasticsearch.yml and logging.yml.
 
 ======================================================================
Index: head/textproc/elasticsearch/pkg-plist
===================================================================
--- head/textproc/elasticsearch/pkg-plist	(revision 390978)
+++ head/textproc/elasticsearch/pkg-plist	(revision 390979)
@@ -1,43 +1,34 @@
-@owner %%SEARCHUSER%%
-@group %%SEARCHGROUP%%
-@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
+@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample
+@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/logging.yml.sample
 @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
-@group wheel
 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/apache-log4j-extras-1.2.17.jar
 lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar
 lib/elasticsearch/groovy-all-2.4.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
 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%%
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.textile
 @dir lib/elasticsearch/plugins
-@dir %%ETCDIR%%

Property changes on: head/textproc/elasticsearch/pkg-plist
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-1
\ No newline at end of property
+yes
\ No newline at end of property