From 91b69a8a09f99a28f1f778b35de7547ce95ff25f Mon Sep 17 00:00:00 2001
From: Vladimir Druzenko <vvd@FreeBSD.org>
Date: Wed, 9 Oct 2024 21:15:10 +0300
Subject: [PATCH] www/tomcat110: Necessary corrections after copying from
 www/tomcat-devel

Rename start script, PKGNAMESUFFIX, TOMCAT_SUBDIR.
---
 www/tomcat110/Makefile                        |  4 +--
 .../files/{tomcat_devel.in => tomcat110.in}   | 36 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)
 rename www/tomcat110/files/{tomcat_devel.in => tomcat110.in} (85%)

diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile
index a72fbe0045c3..85384a96f855 100644
--- a/www/tomcat110/Makefile
+++ b/www/tomcat110/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	tomcat
 DISTVERSION=	11.0.0
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
-PKGNAMESUFFIX=	-devel
+PKGNAMESUFFIX=	110
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
@@ -38,7 +38,7 @@ HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
-TOMCAT_SUBDIR?=	${DISTNAME:R}${PKGNAMESUFFIX}
+TOMCAT_SUBDIR?=	${DISTNAME:R}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
diff --git a/www/tomcat110/files/tomcat_devel.in b/www/tomcat110/files/tomcat110.in
similarity index 85%
rename from www/tomcat110/files/tomcat_devel.in
rename to www/tomcat110/files/tomcat110.in
index ba526b0f60b5..106ba8add9c3 100644
--- a/www/tomcat110/files/tomcat_devel.in
+++ b/www/tomcat110/files/tomcat110.in
@@ -1,70 +1,70 @@
 #!/bin/sh
 
-# PROVIDE: tomcat_devel
+# PROVIDE: tomcat110
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
-# Configuration settings for tomcat_devel in /etc/rc.conf:
+# Configuration settings for tomcat110 in /etc/rc.conf:
 #
-# tomcat_devel_enable (bool):
+# tomcat110_enable (bool):
 #   Set to "NO" by default.
-#   Set it to "YES" to enable tomcat_devel
+#   Set it to "YES" to enable tomcat110
 #
-# tomcat_devel_catalina_home (str)
+# tomcat110_catalina_home (str)
 #   Set to "%%TOMCAT_HOME%%" by default.
 #   Set the CATALINA_HOME variable for the Tomcat process
 #
-# tomcat_devel_catalina_base (str)
+# tomcat110_catalina_base (str)
 #   Set to "${catalina.home}" by default.
 #   Set the CATALINA_BASE variable for the Tomcat process
 #
-# tomcat_devel_catalina_tmpdir (str)
+# tomcat110_catalina_tmpdir (str)
 #   Set to "${catalina.base}/temp" by default.
 #   Set the CATALINA_TMPDIR variable for the Tomcat process
 #
-# tomcat_devel_stdout (str)
+# tomcat110_stdout (str)
 #   Set to "${catalina.base}/logs/catalina.out" by default.
 #   Set the stdout redirection. It may also be '/dev/null', '&1' or '&2'
 #
-# tomcat_devel_stderr (str)
+# tomcat110_stderr (str)
 #   Set to "&1" by default.
 #   Set the stderr redirection. It may also be '/dev/null', '&1' or '&2'
 #
-# tomcat_devel_pipe_cmd (str):
+# tomcat110_pipe_cmd (str):
 #   Set to "" by default.
 #   Set a piped command to process stdout/stderr when passthru
 #
-# tomcat_devel_logging_manager (str):
+# tomcat110_logging_manager (str):
 #   Set to "org.apache.juli.ClassLoaderLogManager" by default.
 #   Set the JUL log manager
 #
-# tomcat_devel_logging_config (str):
+# tomcat110_logging_config (str):
 #   Set to "${catalina.base}/conf/logging.properties" by default.
 #   Set the JUL config file
 #
-# tomcat_devel_java_home (str):
+# tomcat110_java_home (str):
 #   Set to "%%JAVA_HOME%%" by default.
 #   Specify the Java VM to use.
 #
-# tomcat_devel_classpath (str):
+# tomcat110_classpath (str):
 #   Set to "" by default.
 #   Addtional classes to add to the CLASSPATH. If set, must start with ':'
 #
-# tomcat_devel_java_opts (str):
+# tomcat110_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
-# tomcat_devel_wait (int):
+# tomcat110_wait (int):
 #   Set to "30" by default.
 #   Set the wait time (in seconds) for Tomcat process startup
 #
-# tomcat_devel_umask (str):
+# tomcat110_umask (str):
 #   Set to "0077" by default.
 #   Sets the umask for Tomcat process.
 #
 # You may symlink this script with other names to run multiple
-# instances of tomcat_devel with different configurations.
+# instances of tomcat110 with different configurations.
 #
 
 . /etc/rc.subr