Index: head/textproc/elasticsearch6/Makefile
===================================================================
--- head/textproc/elasticsearch6/Makefile	(revision 513795)
+++ head/textproc/elasticsearch6/Makefile	(revision 513796)
@@ -1,99 +1,134 @@
 # Created by: Tom Judge <tj@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	6.5.4
+PORTVERSION=	6.8.3
 PORTREVISION=	0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Full-text search engine for Java
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash>0:shells/bash \
 		jna>0:devel/jna
 
 CONFLICTS=	elasticsearch-[0-9]* elasticsearch2-[0-9]* elasticsearch5-[0-9]*
 
 USES=		cpe shebangfix
 NO_ARCH=	yes
 USE_JAVA=	yes
 NO_BUILD=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	8+
 USE_RC_SUBR=	${PORTNAME}
 SHEBANG_FILES=	bin/elasticsearch \
+		bin/elasticsearch-certgen \
+		bin/elasticsearch-certutil \
 		bin/elasticsearch-cli \
+		bin/elasticsearch-croneval \
 		bin/elasticsearch-env \
-		bin/elasticsearch-plugin
+		bin/elasticsearch-keystore \
+		bin/elasticsearch-migrate \
+		bin/elasticsearch-plugin \
+		bin/elasticsearch-saml-metadata \
+		bin/elasticsearch-setup-passwords \
+		bin/elasticsearch-shard \
+		bin/elasticsearch-sql-cli \
+		bin/elasticsearch-syskeygen \
+		bin/elasticsearch-translog \
+		bin/elasticsearch-users \
+		bin/x-pack-env \
+		bin/x-pack-security-env \
+		bin/x-pack-watcher-env
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-CONFIG_FILES=	elasticsearch.yml log4j2.properties jvm.options
+CONFIG_FILES=	elasticsearch.yml \
+		log4j2.properties \
+		jvm.options \
+		role_mapping.yml \
+		roles.yml
 BINS=		elasticsearch \
+		elasticsearch-certgen \
+		elasticsearch-certutil \
 		elasticsearch-cli \
+		elasticsearch-croneval \
 		elasticsearch-env \
-		elasticsearch-plugin
+		elasticsearch-keystore \
+		elasticsearch-migrate \
+		elasticsearch-plugin \
+		elasticsearch-saml-metadata \
+		elasticsearch-setup-passwords \
+		elasticsearch-shard \
+		elasticsearch-sql-cli \
+		elasticsearch-sql-cli-${PORTVERSION}.jar \
+		elasticsearch-syskeygen \
+		elasticsearch-translog \
+		elasticsearch-users \
+		x-pack-env \
+		x-pack-security-env \
+		x-pack-watcher-env
 
 PORTDOCS=	LICENSE.txt \
 		NOTICE.txt \
 		README.textile
 
 SIGAR_ARCH=	${ARCH:S|i386|x86|}
 SEARCHUSER?=	elasticsearch
 SEARCHGROUP?=	${SEARCHUSER}
 USERS=		${SEARCHUSER}
 GROUPS=		${SEARCHGROUP}
 
-SUB_LIST=	ETCDIR=${ETCDIR} JAVA=${JAVA}
+SUB_LIST=	ETCDIR=${ETCDIR} JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch
 	${RM} ${WRKSRC}/lib/jna-*.jar
 	# ML plugin not supported on FreeBSD
 	${RM} -rf ${WRKSRC}/modules/x-pack/x-pack-ml
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
 .for f in ${CONFIG_FILES}
 	${INSTALL} ${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
 	(cd ${WRKSRC}/modules && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules/)
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
 	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/config
 	${LN} -s ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/jna.jar
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install:
 	${ECHO} "@sample ${ETCDIR}/elasticsearch.yml.sample" >> ${TMPPLIST}
 	${ECHO} "@sample ${ETCDIR}/log4j2.properties.sample" >> ${TMPPLIST}
 	${ECHO} "@sample ${ETCDIR}/jvm.options.sample" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/lib/elasticsearch -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir lib/elasticsearch/plugins" >> ${TMPPLIST}
 	${ECHO} "@dir libexec/elasticsearch" >> ${TMPPLIST}
 	${ECHO} "@dir(elasticsearch,elasticsearch,0755) ${ETCDIR}" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/textproc/elasticsearch6/distinfo
===================================================================
--- head/textproc/elasticsearch6/distinfo	(revision 513795)
+++ head/textproc/elasticsearch6/distinfo	(revision 513796)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548195078
-SHA256 (elasticsearch-6.5.4.tar.gz) = 762e25c036fa2e882cb7e91d83868fa15a1cad8549d279a8c5826a005bb31877
-SIZE (elasticsearch-6.5.4.tar.gz) = 113322649
+TIMESTAMP = 1568794150
+SHA256 (elasticsearch-6.8.3.tar.gz) = 824078e421c9f7e5ab9c875e4019d9ebfe3ada99db286b54dec090f97d1cbe25
+SIZE (elasticsearch-6.8.3.tar.gz) = 148609846
Index: head/textproc/elasticsearch6/files/elasticsearch.in
===================================================================
--- head/textproc/elasticsearch6/files/elasticsearch.in	(revision 513795)
+++ head/textproc/elasticsearch6/files/elasticsearch.in	(revision 513796)
@@ -1,126 +1,130 @@
 #!/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 %%PREFIX%%/etc/elasticsearch/elasticsearch.yml by default.
 #               Set it to the config file location.
+# elasticsearch_java_home (path): Set to %%JAVA_HOME%% by default.
+#               Set it to the root of the JDK to use.
 #
 . /etc/rc.subr
 
 name=elasticsearch
 rcvar=elasticsearch_enable
 
 load_rc_config ${name}
 
 : ${elasticsearch_enable:=NO}
 : ${elasticsearch_user=elasticsearch}
 : ${elasticsearch_group=elasticsearch}
 : ${elasticsearch_config=%%PREFIX%%/etc/elasticsearch}
 : ${elasticsearch_login_class=root}
+: ${elasticsearch_java_home="%%JAVA_HOME%%"}
 
 required_files="${elasticsearch_config}/elasticsearch.yml"
 _pidprefix=/var/run/elasticsearch/elasticsearch
 pidfile=${_pidprefix}.pid
-procname=%%JAVA%%
+procname=${elasticsearch_java_home}/bin/java
 
 extra_commands="console status"
 console_cmd=elasticsearch_console
 start_precmd=elasticsearch_precmd
 command=%%PREFIX%%/lib/elasticsearch/bin/elasticsearch
 command_args="-d --pidfile=${pidfile}"
 
 export ES_PATH_CONF=${elasticsearch_config}
+export JAVA_HOME=${elasticsearch_java_home}
 
 elasticsearch_precmd()
 {
     /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 ${pidfile%/*}
     /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/db/elasticsearch
     /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/log/elasticsearch
 }
 
 elasticsearch_console()
 {
     command_args=""
     run_rc_command "start"
 }
 
 if [ -n "$2" ]; then
     profile="$2"
     if [ "x${elasticsearch_profiles}" != "x" ]; then
         eval elasticsearch_config="\${elasticsearch_${profile}_config:-}"
         if [ "x${elasticsearch_config}" = "x" ]; then
             echo "You must define a configuration  (elasticsearch_${profile}_config)"
             exit 1
         fi
 	export ES_PATH_CONF=${elasticsearch_config}
         required_files="${elasticsearch_config}/elasticsearch.yml"
         required_files="${elasticsearch_config}/jvm.options"
         eval elasticsearch_enable="\${elasticsearch_${profile}_enable:-${elasticsearch_enable}}"
         pidfile="${_pidprefix}.${profile}.pid"
 	command_args="-d --pidfile=${pidfile}"
 	echo "===> elasticsearch profile: ${profile}"
     else
         echo "$0: extra argument ignored"
     fi
 else
     if [ "x${elasticsearch_profiles}" != "x" -a "x$1" != "x" ]; then
         for profile in ${elasticsearch_profiles}; do
             eval _enable="\${elasticsearch_${profile}_enable}"
             case "x${_enable:-${elasticsearch_enable}}" in
             x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee])
                 continue
                 ;;
             x[Yy][Ee][Ss])
                 ;;
             *)
                 if test -z "$_enable"; then
                     _var=elasticsearch_enable
                 else
                     _var=elasticsearch_"${profile}"_enable
                 fi
                 echo "Bad value" \
                     "'${_enable:-${elasticsearch_enable}}'" \
                     "for ${_var}. " \
                     "Profile ${profile} skipped."
                 continue
                 ;;
             esac
             %%PREFIX%%/etc/rc.d/elasticsearch $1 ${profile}
             retcode="$?"
             if [ "0${retcode}" -ne 0 ]; then
                 failed="${profile} (${retcode}) ${failed:-}"
             else
                 success="${profile} ${success:-}"
             fi
         done
         exit 0
     fi
 fi
 
 if [ "x${elasticsearch_mem_min}" != "x" ]; then
     echo "The elasticsearch_mem_min variable is no longer supported please set this in %%PREFIX%%/etc/jvm.options"
     exit 1;
 fi
 if [ "x${elasticsearch_mem_max}" != "x" ]; then
     echo "The elasticsearch_mem_max variable is no longer supported please set this in %%PREFIX%%/etc/jvm.options"
     exit 1;
 fi
 if [ "x${elasticsearch_props}" != "x" ]; then
     echo "The elasticsearch_props variable is no longer supported please set this in %%PREFIX%%/etc/jvm.options"
     exit 1;
 fi
 
 run_rc_command "$1"
Index: head/textproc/elasticsearch6/files/patch-config_jvm.options
===================================================================
--- head/textproc/elasticsearch6/files/patch-config_jvm.options	(revision 513795)
+++ head/textproc/elasticsearch6/files/patch-config_jvm.options	(revision 513796)
@@ -1,11 +1,18 @@
---- config/jvm.options.orig	2018-03-01 23:04:45 UTC
-+++ config/jvm.options
-@@ -87,7 +87,7 @@
+--- config/jvm.options.orig	2019-07-24 08:21:42.000000000 -0700
++++ config/jvm.options	2019-08-16 13:41:33.818798000 -0700
+@@ -107,13 +107,13 @@
  8:-XX:+PrintGCDateStamps
  8:-XX:+PrintTenuringDistribution
  8:-XX:+PrintGCApplicationStoppedTime
 -8:-Xloggc:logs/gc.log
 +8:-Xloggc:${ES_TMPDIR}/gc.log
  8:-XX:+UseGCLogFileRotation
  8:-XX:NumberOfGCLogFiles=32
  8:-XX:GCLogFileSize=64m
+ 
+ # JDK 9+ GC logging
+-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
++9-:-Xlog:gc*,gc+age=trace,safepoint:file=${ES_TMPDIR}/gc.log:utctime,pid,tags:filecount=32,filesize=64m
+ # due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
+ # time/date parsing will break in an incompatible way for some date patterns and locals
+ 9-:-Djava.locale.providers=COMPAT
Index: head/textproc/elasticsearch6/files/pkg-message.in
===================================================================
--- head/textproc/elasticsearch6/files/pkg-message.in	(revision 513795)
+++ head/textproc/elasticsearch6/files/pkg-message.in	(revision 513796)
@@ -1,34 +1,34 @@
 [
 { type: install
   message: <<EOM
 Please see %%ETCDIR%% for sample versions of
 elasticsearch.yml and logging.yml.
 
 ElasticSearch requires memory locking of large amounts of RAM.
 You may need to set:
 
 sysctl security.bsd.unprivileged_mlock=1
 
 !!! PLUGINS NOTICE !!!
 
 ElasticSearch plugins should only be installed via the elasticsearch-plugin
 included with this software. As we strive to provide a minimum semblance
 of security, the files installed by the package are owned by root:wheel.
-This is different than upstream hich expects all of the files to be
+This is different than upstream which expects all of the files to be
 owned by the user and for you to execute the elasticsearch-plugin script
 as said user.
 
 You will encounter permissions errors with configuration files and
 directories created by plugins which you will have to manually correct.
 This is the price we have to pay to protect ourselves in the face of
 a poorly designed security model.
 
 e.g., after installing X-Pack you will have to correct:
 
 %%ETCDIR%%/elasticsearch.keystore file to be owned by elasticsearch:elasticsearch
 %%ETCDIR%%/x-pack directory/files to be owned by elasticsearch:elasticsearch
 
 !!! PLUGINS NOTICE !!!
 EOM
 }
 ]