Index: textproc/elasticsearch6/Makefile
===================================================================
--- textproc/elasticsearch6/Makefile
+++ textproc/elasticsearch6/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	6.8.4
-PORTREVISION=	0
+PORTVERSION=	6.8.5
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
 PKGNAMESUFFIX=	6
 
-MAINTAINER=	feld@FreeBSD.org
+MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Full-text search engine for Java
 
 LICENSE=	APACHE20
@@ -18,9 +17,10 @@
 RUN_DEPENDS=	bash>0:shells/bash \
 		jna>0:devel/jna
 
+USES=		cpe shebangfix
+
 CONFLICTS=	elasticsearch-[0-9]* elasticsearch2-[0-9]* elasticsearch5-[0-9]*
 
-USES=		cpe shebangfix
 NO_ARCH=	yes
 USE_JAVA=	yes
 NO_BUILD=	yes
Index: textproc/elasticsearch6/distinfo
===================================================================
--- textproc/elasticsearch6/distinfo
+++ textproc/elasticsearch6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574467525
-SHA256 (elasticsearch-6.8.4.tar.gz) = b8a545cc6d5fc3bd4be7adbe7057faa68fc548cf1923b30a2d90f328c6da96c9
-SIZE (elasticsearch-6.8.4.tar.gz) = 148628251
+TIMESTAMP = 1574585124
+SHA256 (elasticsearch-6.8.5.tar.gz) = 5fe84fa84a0ca0136aad9bbdfc2053f8dda9a3e166ddf34e947bb1fe24e4ce6d
+SIZE (elasticsearch-6.8.5.tar.gz) = 149499945
Index: textproc/elasticsearch6/files/patch-config_jvm.options
===================================================================
--- textproc/elasticsearch6/files/patch-config_jvm.options
+++ textproc/elasticsearch6/files/patch-config_jvm.options
@@ -1,5 +1,5 @@
---- config/jvm.options.orig	2019-07-24 08:21:42.000000000 -0700
-+++ config/jvm.options	2019-08-16 13:41:33.818798000 -0700
+--- config/jvm.options.orig	2019-11-13 20:02:23 UTC
++++ config/jvm.options
 @@ -107,13 +107,13 @@
  8:-XX:+PrintGCDateStamps
  8:-XX:+PrintTenuringDistribution