git: 31a6364f7394 - main - sysutils/logstash*: Fix rc script: use LS_JAVA_HOME/LS_JAVA_OPTS instead of JAVA_HOME/JAVA_OPTS

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Wed, 23 Sep 2026 12:44:14 UTC
The branch main has been updated by vvd:

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

commit 31a6364f7394018750707cf4171cfc3a375b398d
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-09-23 12:39:00 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-09-23 12:39:00 +0000

    sysutils/logstash*: Fix rc script: use LS_JAVA_HOME/LS_JAVA_OPTS instead of JAVA_HOME/JAVA_OPTS
    
    The use of JAVA_HOME and JAVA_OPTS is deprecated.
    
    PR:             297679
    Approved by:    blanket (fix runtime)
    Sponsored by:   UNIS Labs
    Co-authored-by: Boris Korzun <drtr0jan@yandex.ru>
---
 sysutils/logstash8/Makefile           |  1 +
 sysutils/logstash8/files/logstash.in  | 12 ++++++------
 sysutils/logstash91/Makefile          |  2 +-
 sysutils/logstash91/files/logstash.in | 12 ++++++------
 sysutils/logstash92/Makefile          |  1 +
 sysutils/logstash92/files/logstash.in | 12 ++++++------
 sysutils/logstash93/Makefile          |  1 +
 sysutils/logstash93/files/logstash.in | 12 ++++++------
 sysutils/logstash94/Makefile          |  2 +-
 sysutils/logstash94/files/logstash.in | 12 ++++++------
 sysutils/logstash95/Makefile          |  2 +-
 sysutils/logstash95/files/logstash.in | 12 ++++++------
 12 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/sysutils/logstash8/Makefile b/sysutils/logstash8/Makefile
index 3c2a9bb3656c..104e0a34ffa0 100644
--- a/sysutils/logstash8/Makefile
+++ b/sysutils/logstash8/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	logstash
 DISTVERSION=	8.19.21
 DISTVERSIONSUFFIX=	-darwin-x86_64
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/ \
 		LOCAL/vvd/elastic
diff --git a/sysutils/logstash8/files/logstash.in b/sysutils/logstash8/files/logstash.in
index ba42ae85f5b3..fe523eb3ba5a 100644
--- a/sysutils/logstash8/files/logstash.in
+++ b/sysutils/logstash8/files/logstash.in
@@ -30,13 +30,13 @@
 # logstash_java_home (string):
 #   Default value: "%%JAVA_HOME%%"
 #   Root directory of the desired Java SDK.
-#   The JAVA_HOME environment variable is set with the contents of this
+#   The LS_JAVA_HOME environment variable is set with the contents of this
 #   variable.
 #
 # logstash_java_opts (string):
 #   Default value: ""
 #   Options to pass to the Java Virtual Machine.
-#   The JAVA_OPTS environment variable is set with the contents of this
+#   The LS_JAVA_OPTS environment variable is set with the contents of this
 #   variable.
 #
 # logstash_opts (string):
@@ -82,10 +82,10 @@ fi
 
 logstash_args="--path.settings ${logstash_config} ${logstash_log_options} ${logstash_opts}"
 
-JAVA_OPTS="${logstash_java_opts}"
-JAVA_HOME="${logstash_java_home}"
-export JAVA_OPTS
-export JAVA_HOME
+LS_JAVA_OPTS="${logstash_java_opts}"
+LS_JAVA_HOME="${logstash_java_home}"
+export LS_JAVA_OPTS
+export LS_JAVA_HOME
 
 command="/usr/sbin/daemon"
 command_args="-f -p ${pidfile} ${logstash_cmd} ${logstash_args}"
diff --git a/sysutils/logstash91/Makefile b/sysutils/logstash91/Makefile
index 11c788c34009..e648fab3169b 100644
--- a/sysutils/logstash91/Makefile
+++ b/sysutils/logstash91/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	logstash
 DISTVERSION=	9.1.10
-PORTREVISION=	1
 DISTVERSIONSUFFIX=	-darwin-x86_64
+PORTREVISION=	2
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/ \
 		LOCAL/vvd/elastic
diff --git a/sysutils/logstash91/files/logstash.in b/sysutils/logstash91/files/logstash.in
index ba42ae85f5b3..fe523eb3ba5a 100644
--- a/sysutils/logstash91/files/logstash.in
+++ b/sysutils/logstash91/files/logstash.in
@@ -30,13 +30,13 @@
 # logstash_java_home (string):
 #   Default value: "%%JAVA_HOME%%"
 #   Root directory of the desired Java SDK.
-#   The JAVA_HOME environment variable is set with the contents of this
+#   The LS_JAVA_HOME environment variable is set with the contents of this
 #   variable.
 #
 # logstash_java_opts (string):
 #   Default value: ""
 #   Options to pass to the Java Virtual Machine.
-#   The JAVA_OPTS environment variable is set with the contents of this
+#   The LS_JAVA_OPTS environment variable is set with the contents of this
 #   variable.
 #
 # logstash_opts (string):
@@ -82,10 +82,10 @@ fi
 
 logstash_args="--path.settings ${logstash_config} ${logstash_log_options} ${logstash_opts}"
 
-JAVA_OPTS="${logstash_java_opts}"
-JAVA_HOME="${logstash_java_home}"
-export JAVA_OPTS
-export JAVA_HOME
+LS_JAVA_OPTS="${logstash_java_opts}"
+LS_JAVA_HOME="${logstash_java_home}"
+export LS_JAVA_OPTS
+export LS_JAVA_HOME
 
 command="/usr/sbin/daemon"
 command_args="-f -p ${pidfile} ${logstash_cmd} ${logstash_args}"
diff --git a/sysutils/logstash92/Makefile b/sysutils/logstash92/Makefile
index 409f4157e34e..773cfa724b7a 100644
--- a/sysutils/logstash92/Makefile
+++ b/sysutils/logstash92/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	logstash
 DISTVERSION=	9.2.8
 DISTVERSIONSUFFIX=	-darwin-x86_64
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/ \
 		LOCAL/vvd/elastic
diff --git a/sysutils/logstash92/files/logstash.in b/sysutils/logstash92/files/logstash.in
index ba42ae85f5b3..fe523eb3ba5a 100644
--- a/sysutils/logstash92/files/logstash.in
+++ b/sysutils/logstash92/files/logstash.in
@@ -30,13 +30,13 @@
 # logstash_java_home (string):
 #   Default value: "%%JAVA_HOME%%"
 #   Root directory of the desired Java SDK.
-#   The JAVA_HOME environment variable is set with the contents of this
+#   The LS_JAVA_HOME environment variable is set with the contents of this
 #   variable.
 #
 # logstash_java_opts (string):
 #   Default value: ""
 #   Options to pass to the Java Virtual Machine.
-#   The JAVA_OPTS environment variable is set with the contents of this
+#   The LS_JAVA_OPTS environment variable is set with the contents of this
 #   variable.
 #
 # logstash_opts (string):
@@ -82,10 +82,10 @@ fi
 
 logstash_args="--path.settings ${logstash_config} ${logstash_log_options} ${logstash_opts}"
 
-JAVA_OPTS="${logstash_java_opts}"
-JAVA_HOME="${logstash_java_home}"
-export JAVA_OPTS
-export JAVA_HOME
+LS_JAVA_OPTS="${logstash_java_opts}"
+LS_JAVA_HOME="${logstash_java_home}"
+export LS_JAVA_OPTS
+export LS_JAVA_HOME
 
 command="/usr/sbin/daemon"
 command_args="-f -p ${pidfile} ${logstash_cmd} ${logstash_args}"
diff --git a/sysutils/logstash93/Makefile b/sysutils/logstash93/Makefile
index 7a7ff6ee2ece..0acd5f06f8b4 100644
--- a/sysutils/logstash93/Makefile
+++ b/sysutils/logstash93/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	logstash
 DISTVERSION=	9.3.8
 DISTVERSIONSUFFIX=	-darwin-x86_64
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/ \
 		LOCAL/vvd/elastic
diff --git a/sysutils/logstash93/files/logstash.in b/sysutils/logstash93/files/logstash.in
index ba42ae85f5b3..fe523eb3ba5a 100644
--- a/sysutils/logstash93/files/logstash.in
+++ b/sysutils/logstash93/files/logstash.in
@@ -30,13 +30,13 @@
 # logstash_java_home (string):
 #   Default value: "%%JAVA_HOME%%"
 #   Root directory of the desired Java SDK.
-#   The JAVA_HOME environment variable is set with the contents of this
+#   The LS_JAVA_HOME environment variable is set with the contents of this
 #   variable.
 #
 # logstash_java_opts (string):
 #   Default value: ""
 #   Options to pass to the Java Virtual Machine.
-#   The JAVA_OPTS environment variable is set with the contents of this
+#   The LS_JAVA_OPTS environment variable is set with the contents of this
 #   variable.
 #
 # logstash_opts (string):
@@ -82,10 +82,10 @@ fi
 
 logstash_args="--path.settings ${logstash_config} ${logstash_log_options} ${logstash_opts}"
 
-JAVA_OPTS="${logstash_java_opts}"
-JAVA_HOME="${logstash_java_home}"
-export JAVA_OPTS
-export JAVA_HOME
+LS_JAVA_OPTS="${logstash_java_opts}"
+LS_JAVA_HOME="${logstash_java_home}"
+export LS_JAVA_OPTS
+export LS_JAVA_HOME
 
 command="/usr/sbin/daemon"
 command_args="-f -p ${pidfile} ${logstash_cmd} ${logstash_args}"
diff --git a/sysutils/logstash94/Makefile b/sysutils/logstash94/Makefile
index 0de6d35b148a..5cd2cce32e26 100644
--- a/sysutils/logstash94/Makefile
+++ b/sysutils/logstash94/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	logstash
 DISTVERSION=	9.4.7
 DISTVERSIONSUFFIX=	-darwin-x86_64
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/ \
 		LOCAL/vvd/elastic
diff --git a/sysutils/logstash94/files/logstash.in b/sysutils/logstash94/files/logstash.in
index ba42ae85f5b3..fe523eb3ba5a 100644
--- a/sysutils/logstash94/files/logstash.in
+++ b/sysutils/logstash94/files/logstash.in
@@ -30,13 +30,13 @@
 # logstash_java_home (string):
 #   Default value: "%%JAVA_HOME%%"
 #   Root directory of the desired Java SDK.
-#   The JAVA_HOME environment variable is set with the contents of this
+#   The LS_JAVA_HOME environment variable is set with the contents of this
 #   variable.
 #
 # logstash_java_opts (string):
 #   Default value: ""
 #   Options to pass to the Java Virtual Machine.
-#   The JAVA_OPTS environment variable is set with the contents of this
+#   The LS_JAVA_OPTS environment variable is set with the contents of this
 #   variable.
 #
 # logstash_opts (string):
@@ -82,10 +82,10 @@ fi
 
 logstash_args="--path.settings ${logstash_config} ${logstash_log_options} ${logstash_opts}"
 
-JAVA_OPTS="${logstash_java_opts}"
-JAVA_HOME="${logstash_java_home}"
-export JAVA_OPTS
-export JAVA_HOME
+LS_JAVA_OPTS="${logstash_java_opts}"
+LS_JAVA_HOME="${logstash_java_home}"
+export LS_JAVA_OPTS
+export LS_JAVA_HOME
 
 command="/usr/sbin/daemon"
 command_args="-f -p ${pidfile} ${logstash_cmd} ${logstash_args}"
diff --git a/sysutils/logstash95/Makefile b/sysutils/logstash95/Makefile
index 1ef182635180..10b909ecb7d7 100644
--- a/sysutils/logstash95/Makefile
+++ b/sysutils/logstash95/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	logstash
 DISTVERSION=	9.5.4
 DISTVERSIONSUFFIX=	-darwin-x86_64
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/ \
 		LOCAL/vvd/elastic
diff --git a/sysutils/logstash95/files/logstash.in b/sysutils/logstash95/files/logstash.in
index ba42ae85f5b3..fe523eb3ba5a 100644
--- a/sysutils/logstash95/files/logstash.in
+++ b/sysutils/logstash95/files/logstash.in
@@ -30,13 +30,13 @@
 # logstash_java_home (string):
 #   Default value: "%%JAVA_HOME%%"
 #   Root directory of the desired Java SDK.
-#   The JAVA_HOME environment variable is set with the contents of this
+#   The LS_JAVA_HOME environment variable is set with the contents of this
 #   variable.
 #
 # logstash_java_opts (string):
 #   Default value: ""
 #   Options to pass to the Java Virtual Machine.
-#   The JAVA_OPTS environment variable is set with the contents of this
+#   The LS_JAVA_OPTS environment variable is set with the contents of this
 #   variable.
 #
 # logstash_opts (string):
@@ -82,10 +82,10 @@ fi
 
 logstash_args="--path.settings ${logstash_config} ${logstash_log_options} ${logstash_opts}"
 
-JAVA_OPTS="${logstash_java_opts}"
-JAVA_HOME="${logstash_java_home}"
-export JAVA_OPTS
-export JAVA_HOME
+LS_JAVA_OPTS="${logstash_java_opts}"
+LS_JAVA_HOME="${logstash_java_home}"
+export LS_JAVA_OPTS
+export LS_JAVA_HOME
 
 command="/usr/sbin/daemon"
 command_args="-f -p ${pidfile} ${logstash_cmd} ${logstash_args}"