git: a8fa2a6da486 - main - sysutils/logstash8: Update to 8.5.2

The branch main has been updated by otis:

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

commit a8fa2a6da4860ac8ccef7a9bad9c478471dfbad2
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2022-11-25 23:33:12 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2022-11-26 21:03:18 +0000

    sysutils/logstash8: Update to 8.5.2
    
    Release notes:
    https://www.elastic.co/guide/en/logstash/8.5/logstash-8-5-2.html
---
 sysutils/logstash8/Makefile | 13 +++++++++----
 sysutils/logstash8/distinfo |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sysutils/logstash8/Makefile b/sysutils/logstash8/Makefile
index d6e6f06faf1c..b4e7bf0144c0 100644
--- a/sysutils/logstash8/Makefile
+++ b/sysutils/logstash8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	logstash
-PORTVERSION=	8.4.3
+PORTVERSION=	8.5.2
 DISTVERSIONSUFFIX=	-darwin-x86_64
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/
@@ -11,7 +11,7 @@ WWW=		https://www.elastic.co/products/logstash
 
 LICENSE=	APACHE20
 
-ONLY_FOR_ARCHS= aarch64 amd64
+ONLY_FOR_ARCHS=	aarch64 amd64
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
@@ -19,7 +19,7 @@ USES=		cpe shebangfix
 
 CPE_VENDOR=	elastic
 USE_JAVA=	yes
-JAVA_VERSION=	11+
+JAVA_VERSION=	17+
 JAVA_RUN=	yes
 USE_RC_SUBR=	logstash
 
@@ -28,6 +28,9 @@ SHEBANG_FILES=	bin/*
 CONFLICTS=	logstash6 logstash7
 
 NO_BUILD=	yes
+
+PORTSCOUT=	limit:^8
+
 SUB_FILES=	pkg-message
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		LOGSTASH_HOME=${LOGSTASH_HOME}
@@ -62,10 +65,12 @@ do-install:
 	${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/${LOGSTASH_JRUBY_SUBDIR}/${x}
 .endfor
 	${FIND} ${STAGEDIR}${LOGSTASH_HOME}/vendor/bundle/jruby/2.6.0/gems \
+	        ${STAGEDIR}${LOGSTASH_HOME}/vendor/bundle/jruby/2.6.0/plugins \
 		${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/ruby/gems/shared/gems \
 		-type d -empty -delete
 	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGSTASH_HOME}/config
 	${RM} -rf ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/jni
+	${RM} -rf ${STAGEDIR}${LOGSTASH_HOME}/jdk.app
 	${MKDIR} ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/jni
 	(cd ${WRKSRC}/vendor/jruby/lib/jni && \
 	 ${COPYTREE_SHARE} ${ARCH:S/amd64/x86_64/}-FreeBSD \
@@ -81,7 +86,7 @@ post-install:
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.6.0/doc" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.6.0/extensions" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/jruby/lib/ruby/gems/shared/cache" >> ${TMPPLIST}
-	${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d | ${SORT} | \
+	${FIND} -s ${STAGEDIR}${LOGSTASH_HOME} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
 
diff --git a/sysutils/logstash8/distinfo b/sysutils/logstash8/distinfo
index 87b23b68fbe4..14fb66f2d142 100644
--- a/sysutils/logstash8/distinfo
+++ b/sysutils/logstash8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667021643
-SHA256 (logstash-8.4.3-darwin-x86_64.tar.gz) = 26e33334840f1fcb108247ff613d0c2d6384e82c61a76b0de47bb560fa877357
-SIZE (logstash-8.4.3-darwin-x86_64.tar.gz) = 327228472
+TIMESTAMP = 1669418274
+SHA256 (logstash-8.5.2-darwin-x86_64.tar.gz) = 6fb1ef25a4078a385b62910e01c685ca23014eb4aa5d40dbb9afd33f9febc316
+SIZE (logstash-8.5.2-darwin-x86_64.tar.gz) = 336612337