From nobody Wed Oct 09 18:18:35 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XP1NW6PJ9z5YqvK; Wed, 09 Oct 2024 18:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XP1NW5Rtlz4DrM; Wed, 9 Oct 2024 18:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728497915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uTvhxgdUnPAWC3Nim1IxA1XlpI8BGz7Rcrw6zpHetCc=; b=BgMb45JXcPVeP2QSqaa6ch2IXpfg5xfwQHqNGgW22WacgqqzUDmK9MURUAqWgtRSzleWV9 6LtLYdPTKYG0KqQlNnDvYKxBvmhV3TyQ5RpqJNneozovljUv8rQU/W57T1uhnMhQ5OtaMm W8+3c26z0dWbZIIhK++6C3QgDfClN0eR66I3xrCj8MGp+JcZArCtsPJJak5IG9BzqIBDR2 z3kmV2OszeRTaBBqGPMU35DThCUMLC0Ddjk/3oShcNCoelMb3MPmSB2CRsMfatmMRj6ncX Vb5abMoByJ2Cyg+gwBYDkfDiyEg5O2dYWx30al1p4q3rpzYDMEyrJ5xWAkrwTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728497915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uTvhxgdUnPAWC3Nim1IxA1XlpI8BGz7Rcrw6zpHetCc=; b=NLqdbN5VvVlqLH2IAmqGxIQ7qYH0zIp4sgkSk0x1W+ccdiWU8b291w3y4881s9ArjMoCb8 qI4ody7ffZlb4qTS1betErI/9v2x8du7Pnszx1dF6gRbIjCszFvdzMjLaxAMLFjjtz9sXp e3f6rP8e+ARqwj91HNx9bAf4nzvynl8vWZZE9sgk/Tmoh8Z5qNSstPuBLZ3kGeGz1Exe5a niz5qMtsn66J6SPEtEWBJhvLCKfZw0FgBjuA0Ghalc/eFy3aV1Kl6jDhYR7wqNR3Xm+jcU eGGjkg4SLydu3fwxdWZcjXPR117z6uGrNGzWIeVHTzmOgmcyG4LKOerhS4eQ1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728497915; a=rsa-sha256; cv=none; b=kA/2bUxBYVXD/aKz8vPeZ9gp1q2BvP2LYT/f10Qn1FW7jsOXZstgD9WDgk/gnQbFeu7YNq +eXQv1hpD2p/tf+iXCpnohCgoW/ffVrjRkXo7c5blb788nBgPrstZnw3eqzHZ6gN6e7KuB nL9EdOZO6v6A5WY5U58gCGynA7L2WWDTjwv1JpB33w1McO2Sbz/I5qCS3L1G/eU6NZFSe/ 3hjsYAVA5ZVshp+v3IZHnm95D3jloyXtDc1mXvWzJTPnLxfeI6weWiXbvNq7K16F2Ttqve zJwRF7mWnisr+7I8lY7Nr4GfkrJRAA/FSMhMM3KfGJ7yGp1fURVol6G1GQh0JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XP1NW4MbDzPLC; Wed, 9 Oct 2024 18:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499IIZBr036018; Wed, 9 Oct 2024 18:18:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499IIZ5O036015; Wed, 9 Oct 2024 18:18:35 GMT (envelope-from git) Date: Wed, 9 Oct 2024 18:18:35 GMT Message-Id: <202410091818.499IIZ5O036015@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 91b69a8a09f9 - main - www/tomcat110: Necessary corrections after copying from www/tomcat-devel List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91b69a8a09f99a28f1f778b35de7547ce95ff25f Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=91b69a8a09f99a28f1f778b35de7547ce95ff25f commit 91b69a8a09f99a28f1f778b35de7547ce95ff25f Author: Vladimir Druzenko AuthorDate: 2024-10-09 18:15:10 +0000 Commit: Vladimir Druzenko CommitDate: 2024-10-09 18:17:54 +0000 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(-) 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