Index: branches/2020Q3/textproc/elasticsearch6/Makefile
===================================================================
--- branches/2020Q3/textproc/elasticsearch6/Makefile	(revision 545548)
+++ branches/2020Q3/textproc/elasticsearch6/Makefile	(revision 545549)
@@ -1,134 +1,134 @@
 # Created by: Tom Judge <tj@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	6.8.10
+PORTVERSION=	6.8.12
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
 		https://ftp.sk.freebsd.org/pub/local/distfiles/
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	elastic@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
 
 USES=		cpe shebangfix
 
 CONFLICTS=	elasticsearch-[0-9]* elasticsearch2* elasticsearch5* elasticsearch7*
 
 NO_ARCH=	yes
 USE_JAVA=	yes
 NO_BUILD=	yes
 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-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 \
 		jvm.options \
 		log4j2.properties \
 		role_mapping.yml \
 		roles.yml
 BINS=		elasticsearch \
 		elasticsearch-certgen \
 		elasticsearch-certutil \
 		elasticsearch-cli \
 		elasticsearch-croneval \
 		elasticsearch-env \
 		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_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
 post-patch:
 	${RM} ${WRKSRC}/lib/jna-*.jar
 	# ML plugin not supported on FreeBSD
 	${RM} -rf ${WRKSRC}/modules/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}
 	${ECHO} "@sample ${ETCDIR}/roles.yml.sample" >> ${TMPPLIST}
 	${ECHO} "@sample ${ETCDIR}/role_mapping.yml.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: branches/2020Q3/textproc/elasticsearch6/distinfo
===================================================================
--- branches/2020Q3/textproc/elasticsearch6/distinfo	(revision 545548)
+++ branches/2020Q3/textproc/elasticsearch6/distinfo	(revision 545549)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591263359
-SHA256 (elasticsearch-6.8.10.tar.gz) = 3fde306b078871fed5d1b9b30cb235a1333ee847f81f9b00558926570dcc2713
-SIZE (elasticsearch-6.8.10.tar.gz) = 149954794
+TIMESTAMP = 1597841297
+SHA256 (elasticsearch-6.8.12.tar.gz) = e7710bff2a2ab867f7538caddd009abaca90e0e33666d30e6e8acb480838d23c
+SIZE (elasticsearch-6.8.12.tar.gz) = 149091869
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 545548)
+++ branches/2020Q3	(revision 545549)

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