git: 2fdb6fb45908 - main - www/tomcat{85,9,101}: adjust rc.d script to support Java versions 20+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 Oct 2023 10:30:23 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2fdb6fb459089fdb15101c5974b3fa45baef1775
commit 2fdb6fb459089fdb15101c5974b3fa45baef1775
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2023-10-24 10:28:14 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2023-10-24 10:30:03 +0000
www/tomcat{85,9,101}: adjust rc.d script to support Java versions 20+
Approved by: arrowd (mentor, implicit)
MFH: 2023Q4
---
www/tomcat101/files/tomcat101.in | 2 +-
www/tomcat85/files/tomcat85.in | 2 +-
www/tomcat9/files/tomcat9.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/tomcat101/files/tomcat101.in b/www/tomcat101/files/tomcat101.in
index f6d5e2a62086..e83791d09bcd 100644
--- a/www/tomcat101/files/tomcat101.in
+++ b/www/tomcat101/files/tomcat101.in
@@ -111,7 +111,7 @@ extra_commands="reload"
_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
case "${_tomcat_java_version}" in
- 9* | 1[0-9]* )
+ 9* | [1-2][0-9]* )
_tomcat_endorsed_dirs_option=
;;
*)
diff --git a/www/tomcat85/files/tomcat85.in b/www/tomcat85/files/tomcat85.in
index 800b32067024..e627d7a05e23 100644
--- a/www/tomcat85/files/tomcat85.in
+++ b/www/tomcat85/files/tomcat85.in
@@ -111,7 +111,7 @@ extra_commands="reload"
_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
case "${_tomcat_java_version}" in
- 9* | 1[0-9]* )
+ 9* | [1-2][0-9]* )
_tomcat_endorsed_dirs_option=
;;
*)
diff --git a/www/tomcat9/files/tomcat9.in b/www/tomcat9/files/tomcat9.in
index 2ba67023889f..36b33fa6a628 100644
--- a/www/tomcat9/files/tomcat9.in
+++ b/www/tomcat9/files/tomcat9.in
@@ -111,7 +111,7 @@ extra_commands="reload"
_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
case "${_tomcat_java_version}" in
- 9* | 1[0-9]* )
+ 9* | [1-2][0-9]* )
_tomcat_endorsed_dirs_option=
;;
*)