diff --git a/sysutils/logstash7/Makefile b/sysutils/logstash7/Makefile
index 3e99ac4873d6..0ee87a5e8c5c 100644
--- a/sysutils/logstash7/Makefile
+++ b/sysutils/logstash7/Makefile
@@ -1,90 +1,95 @@
 PORTNAME=	logstash
-PORTVERSION=	7.17.11
+DISTVERSION=	7.17.29
 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=	7
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Server-side data ingestion and transformation tool
 WWW=		https://www.elastic.co/products/logstash
 
 LICENSE=	APACHE20
 
-ONLY_FOR_ARCHS= aarch64 amd64
+DEPRECATED=	7.x reached EoL on 15 Jan 2026 - use sysutils/logstash8 or sysutils/logstash9*
+EXPIRATION_DATE=	2026-06-30
+
+ONLY_FOR_ARCHS=	aarch64 amd64
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		cpe java shebangfix
 CPE_VENDOR=	elastic
-JAVA_VERSION=	11+
-USE_RC_SUBR=	logstash
+JAVA_VERSION=	17 11 8
+USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	bin/*
 
-CONFLICTS=	logstash6
+CONFLICTS=	${PORTNAME}8 ${PORTNAME}9*
 
 NO_BUILD=	yes
-
 PORTSCOUT=	limit:^7
-
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		LOGSTASH_HOME=${LOGSTASH_HOME}
 
 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
 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-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}
 	${INSTALL_DATA} ${WRKSRC}/config/${x} ${STAGEDIR}${ETCDIR}/${x}.sample
 .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/2.5.0/gems \
-        	${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/ruby/gems/shared/gems \
+		${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
-	${MKDIR} ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/jni
 	(cd ${WRKSRC}/vendor/jruby/lib/jni && \
 	 ${COPYTREE_SHARE} ${ARCH:S/amd64/x86_64/}-FreeBSD \
 	 ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/jni)
 
 post-install:
 	${ECHO} "@sample ${ETCDIR}/logstash.conf.sample" >> ${TMPPLIST}
 .for x in ${LOGSTASH_CONF_FILES}
 	${ECHO} "@sample ${ETCDIR}/${x}.sample" >> ${TMPPLIST}
 .endfor
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.5.0/build_info" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.5.0/cache" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.5.0/doc" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.5.0/extensions" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/jruby/lib/ruby/gems/shared/cache" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/sysutils/logstash7/distinfo b/sysutils/logstash7/distinfo
index 73b52f14b48d..09b9513e11d3 100644
--- a/sysutils/logstash7/distinfo
+++ b/sysutils/logstash7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688931081
-SHA256 (logstash-7.17.11-darwin-x86_64.tar.gz) = 32325d8bd59d5930f1240c9ff58cd0030f5443c0bd50d82df2bc304537431c55
-SIZE (logstash-7.17.11-darwin-x86_64.tar.gz) = 358486631
+TIMESTAMP = 1773333333
+SHA256 (logstash-7.17.29-darwin-x86_64.tar.gz) = 30d3624f6e42dc0e9a5c7e5385ec13ddb2ad6bd97e52ad9af0217478c30bb803
+SIZE (logstash-7.17.29-darwin-x86_64.tar.gz) = 366408007