Index: head/textproc/elasticsearch2/Makefile
===================================================================
--- head/textproc/elasticsearch2/Makefile	(revision 411847)
+++ head/textproc/elasticsearch2/Makefile	(revision 411848)
@@ -1,86 +1,87 @@
 # Created by: Tom Judge <tj@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2.1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Full-text search engine for Java
 
 LICENSE=	APACHE20
 
 CONFLICTS=	elasticsearch-[0-9]*
 
 USES=		cpe
 NO_ARCH=	yes
 USE_JAVA=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.7+
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-LUCENEVER=	5.3.1
+LUCENEVER=	5.4.1
 CONFIG_FILES=	elasticsearch.yml logging.yml
 BINS=		elasticsearch.in.sh \
 		elasticsearch \
 		plugin
 
 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
 
 SUB_LIST=	SEARCHUSER=${SEARCHUSER} \
 		SEARCHGROUP=${SEARCHGROUP} \
 		PORTVERSION=${PORTVERSION}
 SUB_FILES=	pkg-message
 PLIST_SUB=	SEARCHUSER=${SEARCHUSER} \
 		SEARCHGROUP=${SEARCHGROUP} \
 		LUCENEVER=${LUCENEVER} \
 		PORTVERSION=${PORTVERSION} \
 		ELASTIC_DBDIR=${ELASTIC_DBDIR} \
 		ELASTIC_LOGDIR=${ELASTIC_LOGDIR}
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
 .for f in ${CONFIG_FILES}
 	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
 .for f in ${BINS}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib
 	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar")
 
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
 	@${MKDIR} ${STAGEDIR}${ELASTIC_DBDIR} ${STAGEDIR}${ELASTIC_LOGDIR}
 	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 
 .include <bsd.port.mk>
Index: head/textproc/elasticsearch2/distinfo
===================================================================
--- head/textproc/elasticsearch2/distinfo	(revision 411847)
+++ head/textproc/elasticsearch2/distinfo	(revision 411848)
@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-2.1.1.tar.gz) = ebd69c0483f20ba7e51caa9606d4e3ce5fe2667e1216c799f0cdbb815c317ce6
-SIZE (elasticsearch-2.1.1.tar.gz) = 29007342
+SHA256 (elasticsearch-2.2.1.tar.gz) = 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03
+SIZE (elasticsearch-2.2.1.tar.gz) = 29424648
Index: head/textproc/elasticsearch2/files/elasticsearch.in
===================================================================
--- head/textproc/elasticsearch2/files/elasticsearch.in	(revision 411847)
+++ head/textproc/elasticsearch2/files/elasticsearch.in	(revision 411848)
@@ -1,112 +1,128 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: elasticsearch
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable elasticsearch:
 #
 # elasticsearch_enable="YES"
 #
 # elasticsearch_user (username): Set to elasticsearch by default.
 #               Set it to required username.
 # elasticsearch_group (group):   Set to elasticsearch by default.
 #               Set it to required group.
 # elasticsearch_config (path):   Set to /usr/local/etc/elasticsearch/elasticsearch.yml by default.
 #               Set it to the config file location.
 # elasticsearch_min_mem (num): Minumum JVM heap size, 256m by default.
 # elasticsearch_max_mem (num): Maximum JVM heap size, 1g by default.
 # elasticsearch_props (args):  Additional java properties or arguments.
 # elasticsearch_tmp (path):  Set to /var/tmp/elasticsearch by default.
 #		Set it to the path to be used for temp files.
 #
 . /etc/rc.subr
 
 name=elasticsearch
 rcvar=elasticsearch_enable
 
 load_rc_config ${name}
 
 : ${elasticsearch_enable:="NO"}
 : ${elasticsearch_user:=%%SEARCHUSER%%}
 : ${elasticsearch_group:=%%SEARCHGROUP%%}
 : ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch"}
 : ${elasticsearch_tmp:="/var/tmp/elasticsearch"}
 
 required_files="${elasticsearch_config}/elasticsearch.yml"
 pidfile="/var/run/${name}.pid"
 
 extra_commands="console status"
 console_cmd="elasticsearch_console"
 start_precmd="elasticsearch_precmd"
 status_cmd="elasticsearch_status"
 stop_cmd="elasticsearch_stop"
 command="%%PREFIX%%/lib/elasticsearch/bin/elasticsearch"
 command_args="-d --pidfile=${pidfile}"
 
 elasticsearch_precmd()
 {
+	rc_pid=$(elasticsearch_check_pidfile $pidfile)
+
+	if [ -n "$rc_pid" ]; then
+		[ -n "$rc_fast" ] && return 0
+		echo "${name} is already running: $rc_pid."
+		return 1
+	fi
         touch ${pidfile}
         chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile}
 	/usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp}
 	/usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/db/elasticsearch
 	/usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch
 }
 
+
 elasticsearch_console()
 {
+	rc_pid=$(elasticsearch_check_pidfile $pidfile)
+
+	if [ -n "$rc_pid" ]; then
+		[ -n "$rc_fast" ] && return 0
+		echo "${name} is already running: $rc_pid."
+		return 1
+	fi
+
 	command_args=""
 	run_rc_command "start"
 }
 
 
 elasticsearch_stop()
 {
 	rc_pid=$(elasticsearch_check_pidfile $pidfile)
 
 	if [ -z "$rc_pid" ]; then
 		[ -n "$rc_fast" ] && return 0
 		echo "${name} not running? (check $pidfile)."
 		return 1
 	fi
 
 	echo "Stopping ${name}."
 	kill ${rc_pid} 2> /dev/null
 }
 
 elasticsearch_status()
 {
 	rc_pid=$(elasticsearch_check_pidfile $pidfile)
 
 	if [ -z "$rc_pid" ]; then
 		[ -n "$rc_fast" ] && return 0
 		echo "${name} not running? (check $pidfile)."
 		return 1
 	fi
 	echo "${name} is running as pid ${rc_pid}."
 }
 
 elasticsearch_check_pidfile()
 {
 	_pidfile=$1
 	if [ -z "$_pidfile" ]; then
 		err 3 'USAGE: elasticsearch_check_pidfile pidfile'
 	fi
 	if [ ! -f $_pidfile ]; then
 		debug "pid file ($_pidfile): not readable."
 		return
 	fi
 	read _pid _junk < $_pidfile
 	if [ -z "$_pid" ]; then
 		debug "pid file ($_pidfile): no pid in file."
 		return
 	fi
-	if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid"`" ]; then
+	if [ -n "`/usr/bin/su -m ${elasticsearch_user} -c '%%LOCALBASE%%/bin/jps -l' | grep -e "^$_pid"`" ]; then
 		echo -n $_pid
 	fi
 }
 
 run_rc_command "$1"
Index: head/textproc/elasticsearch2/pkg-plist
===================================================================
--- head/textproc/elasticsearch2/pkg-plist	(revision 411847)
+++ head/textproc/elasticsearch2/pkg-plist	(revision 411848)
@@ -1,61 +1,58 @@
 @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
 bin/elasticsearch-plugin
 lib/elasticsearch/lib/HdrHistogram-2.1.6.jar
-lib/elasticsearch/lib/antlr-runtime-3.5.jar
 lib/elasticsearch/lib/apache-log4j-extras-1.2.17.jar
-lib/elasticsearch/lib/asm-4.1.jar
-lib/elasticsearch/lib/asm-commons-4.1.jar
 lib/elasticsearch/lib/commons-cli-1.3.1.jar
 lib/elasticsearch/lib/compiler-0.8.13.jar
 lib/elasticsearch/lib/compress-lzf-1.0.2.jar
 lib/elasticsearch/lib/elasticsearch-%%PORTVERSION%%.jar
-lib/elasticsearch/lib/groovy-all-2.4.4-indy.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/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/jsr166e-1.1.0.jar
 lib/elasticsearch/lib/jts-1.13.jar
 lib/elasticsearch/lib/log4j-1.2.17.jar
 lib/elasticsearch/lib/lucene-analyzers-common-%%LUCENEVER%%.jar
 lib/elasticsearch/lib/lucene-backward-codecs-%%LUCENEVER%%.jar
 lib/elasticsearch/lib/lucene-core-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-expressions-%%LUCENEVER%%.jar
 lib/elasticsearch/lib/lucene-grouping-%%LUCENEVER%%.jar
 lib/elasticsearch/lib/lucene-highlighter-%%LUCENEVER%%.jar
 lib/elasticsearch/lib/lucene-join-%%LUCENEVER%%.jar
 lib/elasticsearch/lib/lucene-memory-%%LUCENEVER%%.jar
 lib/elasticsearch/lib/lucene-misc-%%LUCENEVER%%.jar
 lib/elasticsearch/lib/lucene-queries-%%LUCENEVER%%.jar
 lib/elasticsearch/lib/lucene-queryparser-%%LUCENEVER%%.jar
 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/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
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.textile
 @dir lib/elasticsearch/lib
 @dir lib/elasticsearch/bin
+@dir lib/elasticsearch/modules
 @dir lib/elasticsearch/plugins
 @dir lib/elasticsearch
 @dir libexec/elasticsearch
 @dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_LOGDIR%%
 @dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_DBDIR%%
 @postunexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi
 @postunexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi