Index: Makefile
===================================================================
--- Makefile	(revision 509159)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	6.5.4
+PORTVERSION=	6.8.2
 PORTREVISION=	0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
@@ -24,22 +24,57 @@
 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 \
Index: distinfo
===================================================================
--- distinfo	(revision 509159)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548195078
-SHA256 (elasticsearch-6.5.4.tar.gz) = 762e25c036fa2e882cb7e91d83868fa15a1cad8549d279a8c5826a005bb31877
-SIZE (elasticsearch-6.5.4.tar.gz) = 113322649
+TIMESTAMP = 1565898113
+SHA256 (elasticsearch-6.8.2.tar.gz) = 2dc3107475659dfd21afa74612a43d5ccbcf4942ab679e8e4e77167cafe27c94
+SIZE (elasticsearch-6.8.2.tar.gz) = 148601605
Index: files/patch-config_jvm.options
===================================================================
--- files/patch-config_jvm.options	(revision 509159)
+++ files/patch-config_jvm.options	(working copy)
@@ -1,6 +1,6 @@
---- 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
@@ -9,3 +9,10 @@
  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: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(revision 509159)
+++ files/pkg-message.in	(working copy)
@@ -14,7 +14,7 @@
 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.