Index: branches/2015Q3/textproc/elasticsearch/Makefile
===================================================================
--- branches/2015Q3/textproc/elasticsearch/Makefile	(revision 393624)
+++ branches/2015Q3/textproc/elasticsearch/Makefile	(revision 393625)
@@ -1,121 +1,122 @@
 # Created by: Tom Judge <tj@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	1.6.0
+PORTVERSION=	1.7.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
+NO_ARCH=	yes
 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 \
+		groovy-all-2.4.4.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
 .for f in ${CONFIG_FILES}
 	${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: branches/2015Q3/textproc/elasticsearch/distinfo
===================================================================
--- branches/2015Q3/textproc/elasticsearch/distinfo	(revision 393624)
+++ branches/2015Q3/textproc/elasticsearch/distinfo	(revision 393625)
@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-1.6.0.tar.gz) = dc336c83394b2f2f72f362e0f959a4cfdec2109aa3de15668401afeab0b02d2e
-SIZE (elasticsearch-1.6.0.tar.gz) = 28401477
+SHA256 (elasticsearch-1.7.0.tar.gz) = 6fabed2db09e1b88587df15269df328ecef33e155b3c675a2a6d2299bda09c95
+SIZE (elasticsearch-1.7.0.tar.gz) = 28501532
Index: branches/2015Q3/textproc/elasticsearch/files/elasticsearch-plugin.in
===================================================================
--- branches/2015Q3/textproc/elasticsearch/files/elasticsearch-plugin.in	(revision 393624)
+++ branches/2015Q3/textproc/elasticsearch/files/elasticsearch-plugin.in	(revision 393625)
@@ -1,17 +1,18 @@
 #!/bin/sh
 #
 # $FreeBSD$
 . /etc/rc.subr
 
 name=elasticsearch
 rcvar=elasticsearch_enable
-load_rc_config $name
+
+load_rc_config ${name}
 
 : ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch/elasticsearch.yml"}
 
 ES_LIB="%%PREFIX%%/lib/elasticsearch"
 ES_CLASSPATH=$ES_LIB/elasticsearch-%%PORTVERSION%%.jar:$ES_LIB/*:$ES_LIB/sigar/*
 
 JAVA=%%LOCALBASE%%/bin/java
 
 exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.config=${elasticsearch_config} -cp $ES_CLASSPATH org.elasticsearch.plugins.PluginManager $*
Index: branches/2015Q3/textproc/elasticsearch/files/elasticsearch.in
===================================================================
--- branches/2015Q3/textproc/elasticsearch/files/elasticsearch.in	(revision 393624)
+++ branches/2015Q3/textproc/elasticsearch/files/elasticsearch.in	(revision 393625)
@@ -1,130 +1,135 @@
 #!/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
 
+load_rc_config ${name}
+
 : ${elasticsearch_enable:="NO"}
 : ${elasticsearch_user:=%%SEARCHUSER%%}
 : ${elasticsearch_group:=%%SEARCHGROUP%%}
 : ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch/elasticsearch.yml"}
 : ${elasticsearch_min_mem:="256m"}
 : ${elasticsearch_max_mem:="1g"}
 : ${elasticsearch_props:=""}
 : ${elasticsearch_tmp:="/var/tmp/elasticsearch"}
 
 # Force the JVM to use IPv4 stack
 # elasticshearch_props"-Djava.net.preferIPv4Stack=true"
 
 required_files="${elasticsearch_config}"
 pidfile="/var/run/${name}.pid"
 
 ES_LIB="%%PREFIX%%/lib/elasticsearch"
 ES_CLASSPATH=$ES_LIB/elasticsearch-%%PORTVERSION%%.jar:$ES_LIB/*:$ES_LIB/sigar/*
 
-
 java_options=" 	-server \
 		-Xms${elasticsearch_min_mem} \
 		-Xmx${elasticsearch_max_mem} \
 		-Xss256k \
 		-Djava.awt.headless=true \
 		-XX:+UseParNewGC \
 		-XX:+UseConcMarkSweepGC \
 		-XX:CMSInitiatingOccupancyFraction=75 \
 		-XX:+UseCMSInitiatingOccupancyOnly \
 		-XX:+HeapDumpOnOutOfMemoryError \
 		-XX:+DisableExplicitGC \
 		-Delasticsearch	\
 		-Des.config=${elasticsearch_config} \
 		-cp ${ES_CLASSPATH}"
 
 extra_commands="console status"
 console_cmd="elasticsearch_console"
 start_precmd="elasticsearch_precmd"
 status_cmd="elasticsearch_status"
 stop_cmd="elasticsearch_stop"
 command="/usr/sbin/daemon"
 command_args="-f %%LOCALBASE%%/bin/java -Des.pidfile=${pidfile} ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch"
 
-elasticsearch_precmd() {
+elasticsearch_precmd()
+{
         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 () {
+elasticsearch_console()
+{
 	%%LOCALBASE%%/bin/java -Des.foreground=yes ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch
 }
 
 
-elasticsearch_stop() {
+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() {
+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() {
+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
 		echo -n $_pid
 	fi
 }
-load_rc_config ${name}
+
 run_rc_command "$1"
Index: branches/2015Q3/textproc/elasticsearch/pkg-plist
===================================================================
--- branches/2015Q3/textproc/elasticsearch/pkg-plist	(revision 393624)
+++ branches/2015Q3/textproc/elasticsearch/pkg-plist	(revision 393625)
@@ -1,34 +1,34 @@
 @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/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/elasticsearch-%%PORTVERSION%%.jar
-lib/elasticsearch/groovy-all-2.4.0.jar
+lib/elasticsearch/groovy-all-2.4.4.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
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 393624)
+++ branches/2015Q3	(revision 393625)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r393624