3 files changed, 31 insertions, 29 deletions

diff --git a/sysutils/logstash8/Makefile b/sysutils/logstash8/Makefile
index 48ec67c9aac8..004a8db51806 100644
--- a/sysutils/logstash8/Makefile
+++ b/sysutils/logstash8/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	logstash
-PORTVERSION=	8.19.9
-PORTREVISION=	1
+DISTVERSION=	8.19.12
 DISTVERSIONSUFFIX=	-darwin-x86_64
 CATEGORIES=	sysutils java
-MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/
+MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/ \
+		LOCAL/vvd/elastic
 PKGNAMESUFFIX=	8
 
 MAINTAINER=	elastic@FreeBSD.org
@@ -14,31 +14,39 @@ LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
-
-USES=		cpe shebangfix java:run
+RUN_DEPENDS=	bash:shells/bash
 
+USES=		cpe java:run shebangfix
 CPE_VENDOR=	elastic
-JAVA_VERSION=	21+
-
-USE_RC_SUBR=	logstash
+JAVA_VERSION=	25 21 17
+USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	bin/*
 
-CONFLICTS=	logstash6 logstash7 logstash91 logstash92
+CONFLICTS=	${PORTNAME}7 ${PORTNAME}9*
 
-NO_BUILD=	yes
+EXTRACT_AFTER_ARGS=	--exclude jdk.app \
+			--exclude *.bat \
+			--no-same-owner --no-same-permissions
 
+NO_BUILD=	yes
 PORTSCOUT=	limit:^8
-
 SUB_FILES=	pkg-message
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
-		LOGSTASH_HOME=${LOGSTASH_HOME}
+		LOGSTASH_HOME=${LOGSTASH_HOME} \
+		LOGUSER=${LOGUSER} \
+		LOGGROUP=${LOGGROUP}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-USERS=		logstash
-GROUPS=		logstash
+LOGUSER?=	${PORTNAME}
+LOGGROUP?=	${LOGUSER}
+.if ${LOGUSER} == ${PORTNAME}
+USERS=		${LOGUSER}
+.endif
+.if ${LOGGROUP} == ${PORTNAME}
+GROUPS=		${LOGGROUP}
+.endif
 
 LOGSTASH_CONF_FILES=		jvm.options log4j2.properties logstash.yml \
 				pipelines.yml startup.options
@@ -47,15 +55,11 @@ LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
 				jruby.sh jrubyc rake rdoc ri
 LOGSTASH_JRUBY_SUBDIR=		vendor/jruby/bin
 
-post-extract:
-	${RM} -rf ${WRKSRC}/jdk.app
-
 post-patch:
 	${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 
 do-install:
-	${FIND} ${WRKSRC} -name '*.bat' -delete
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR}
 .for x in ${LOGSTASH_CONF_FILES}
@@ -63,10 +67,8 @@ do-install:
 .endfor
 	${RM} -rf ${WRKSRC}/config
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_HOME})
-	${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/bin/*
-.for x in ${LOGSTASH_JRUBY_BIN_FILES}
-	${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/${LOGSTASH_JRUBY_SUBDIR}/${x}
-.endfor
+	${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/bin/* \
+		${LOGSTASH_JRUBY_BIN_FILES:S|^|${STAGEDIR}${LOGSTASH_HOME}/${LOGSTASH_JRUBY_SUBDIR}/|}
 	${FIND} ${STAGEDIR}${LOGSTASH_HOME}/vendor/bundle/jruby/3.1.0/gems \
 	        ${STAGEDIR}${LOGSTASH_HOME}/vendor/bundle/jruby/3.1.0/plugins \
 		${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/ruby/gems/shared/gems \
@@ -85,6 +87,6 @@ post-install:
 	${ECHO} "@dir logstash/vendor/jruby/lib/ruby/gems/shared/cache" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${LOGSTASH_HOME} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
-	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
+	${ECHO} "@dir(${LOGUSER},${LOGGROUP},) logstash/data" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/sysutils/logstash8/distinfo b/sysutils/logstash8/distinfo
index d913d2aeec80..4629fdf794e2 100644
--- a/sysutils/logstash8/distinfo
+++ b/sysutils/logstash8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1767131346
-SHA256 (logstash-8.19.9-darwin-x86_64.tar.gz) = 197391163a26a3b02a8285f217227c3c6f69b0c90750447676555f874a0260f9
-SIZE (logstash-8.19.9-darwin-x86_64.tar.gz) = 426132563
+TIMESTAMP = 1773063949
+SHA256 (logstash-8.19.12-darwin-x86_64.tar.gz) = dd46b7b0ec74620e0e9a0eb31ce0344dcbf82222b16d6056f95ce1eb67335550
+SIZE (logstash-8.19.12-darwin-x86_64.tar.gz) = 436067757
diff --git a/sysutils/logstash8/files/logstash.in b/sysutils/logstash8/files/logstash.in
index 3fa2dc28d9aa..ba42ae85f5b3 100644
--- a/sysutils/logstash8/files/logstash.in
+++ b/sysutils/logstash8/files/logstash.in
@@ -54,8 +54,8 @@ load_rc_config ${name}
 logdir="/var/log"
 
 : ${logstash_enable="NO"}
-: ${logstash_user="logstash"}
-: ${logstash_group="logstash"}
+: ${logstash_user="%%LOGUSER%%"}
+: ${logstash_group="%%LOGGROUP%%"}
 : ${logstash_home="%%LOGSTASH_HOME%%"}
 : ${logstash_config="%%ETCDIR%%"}
 : ${logstash_log="YES"}