git: 7a387b714197 - main - sysutils/logstash6: Update to 6.8.16

[Juraj Lutter]

The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7a387b714197b459b79cc79edda733b401fdffda

commit 7a387b714197b459b79cc79edda733b401fdffda
Author:     Juraj Lutter <otis at FreeBSD.org>
AuthorDate: 2021-05-27 14:54:25 +0000
Commit:     Juraj Lutter <otis at FreeBSD.org>
CommitDate: 2021-06-02 18:39:21 +0000

    sysutils/logstash6: Update to 6.8.16
    
    Also reformat Makefile a bit.
---
 sysutils/logstash6/Makefile | 30 ++++++++++++------------------
 sysutils/logstash6/distinfo |  6 +++---
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/sysutils/logstash6/Makefile b/sysutils/logstash6/Makefile
index 909be9dcd966..201fe618a7de 100644
--- a/sysutils/logstash6/Makefile
+++ b/sysutils/logstash6/Makefile
@@ -1,7 +1,5 @@
-# Created by: Daniel Solsona <daniel at ish.com.au>, Guido Falsi <madpilot at FreeBSD.org>
-
 PORTNAME=	logstash
-PORTVERSION=	6.8.15
+PORTVERSION=	6.8.16
 CATEGORIES=	sysutils java
 MASTER_SITES=	http://artifacts.elastic.co/downloads/logstash/
 PKGNAMESUFFIX=	6
@@ -15,32 +13,28 @@ RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		cpe shebangfix
 
-CONFLICTS=	logstash-[0-9]* logstash5* logstash7*
-
-SHEBANG_FILES=	bin/*
 CPE_VENDOR=	elasticsearch
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 JAVA_RUN=	yes
-NO_BUILD=	yes
-
-USERS=	logstash
-GROUPS=	logstash
-
-LOGSTASH_DIR=	${PREFIX}/${PORTNAME}
-
 USE_RC_SUBR=	logstash
+SHEBANG_FILES=	bin/*
+CONFLICTS=	logstash-[0-9]* logstash5* logstash7*
 
-LOGSTASH_HOME?=	${PREFIX}/${PORTNAME}
-
+NO_BUILD=	yes
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		LOGSTASH_HOME=${LOGSTASH_HOME}
 
-LOGSTASH_CONF_FILES=	jvm.options log4j2.properties logstash.yml \
-			pipelines.yml startup.options
-LOGSTASH_JRUBY_SUBDIR=	vendor/jruby/bin
+USERS=		logstash
+GROUPS=		logstash
+
+LOGSTASH_CONF_FILES=		jvm.options log4j2.properties logstash.yml \
+				pipelines.yml startup.options
+LOGSTASH_DIR=	${PREFIX}/${PORTNAME}
+LOGSTASH_HOME?=	${PREFIX}/${PORTNAME}
 LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
 				jruby.bash jruby.sh jrubyc rake rdoc ri testrb
+LOGSTASH_JRUBY_SUBDIR=		vendor/jruby/bin
 
 post-patch:
 	${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
diff --git a/sysutils/logstash6/distinfo b/sysutils/logstash6/distinfo
index 3296dcc72c81..54cbe6bfa7ea 100644
--- a/sysutils/logstash6/distinfo
+++ b/sysutils/logstash6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617804522
-SHA256 (logstash-6.8.15.tar.gz) = 63e8d53f99a83b2f20b6c21d8d4be9f55e9a7418b4f56dc496c4c7c2679bbb9e
-SIZE (logstash-6.8.15.tar.gz) = 176912362
+TIMESTAMP = 1622123656
+SHA256 (logstash-6.8.16.tar.gz) = 50668772d1e10187261782b2af803375a49257edb950e0fb82de997fe5c9243a
+SIZE (logstash-6.8.16.tar.gz) = 176912473