From nobody Tue Jul 18 17:49:04 2023 X-Original-To: dev-commits-ports-branches@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 4R55zj0w5Lz4nmsj; Tue, 18 Jul 2023 17:49:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R55zh4drfz42jJ; Tue, 18 Jul 2023 17:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689702544; 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=1RZ+JH0CetrU2Dop8FIenmu3uS0LkK4TGlHSmbFlEQg=; b=jVAF9lLa+Z401odPJd17Qz41Y+GYuZ9DmJsyn6MKSfpcs6yRzk/fWOtawWyTNdDIXppM9h aZQSXbP1Qz/VWKcGSUnhgakiJCpE7odfDD8HcJ4FJlCu5xUe+otx6hrSL0QF2/vxeys2wL MEVVT0O6qMRBuvKOrzIYqa7oDA06mJhKU3sTyE98HWtKKCtjbs/5oVxKpDWw8z0eWW7Dfo 05nvXA+dEYatyTwNcihWDtZXZx4ybrksH3/TjwqXqArDnkUXwn35DfqzSzct5Z3s7PLTIe oMqpd0rTkWn+mXczVCNc7DMUC4xE1vLW7/8WAGwLiFjsOwvVrFd4GgJRW8G4UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689702544; 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=1RZ+JH0CetrU2Dop8FIenmu3uS0LkK4TGlHSmbFlEQg=; b=LqwR6MfYOyTF8Vx4XhO/jzf5FhWUh6gDTmG+Y+A86eF8dbcHn7kmnCyzQTepj0hCuK+KgO TGYnKx8NXZkfAD27yUdUCQeaR+2yyAmvdPpn8WJJIwvbZzWjvXPdtpUq/GhhTzEv/LL3v+ h8Khd1vqx/eaIlRUBOSEntHpAoGJ9panD7n7Vs/tdthDjQBoAguUGAIJ+ZnMjhcFwPJMTN Jc2iURqAmXyMAn2+KpDu2IWdI5HI5hXWt3Rm1VxOU4LH2vGCmNl8x0Tgdkp3LUiDgA0CnX Gd9xyZZ7JGXz6eGe4aDqeYlTPbJ/UJRchXOG7GpSzfbjjmdYKi4vjXMgwhRJYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689702544; a=rsa-sha256; cv=none; b=avW7VRusdTKn8ZAjGoiW+VvU994HOO4672U9s7Xph6l/UMdTDxa1SMXnNIkPWITQpjMqVc ji0JzkMvHCaKkejc1gYdPuduSQMqHiXJDLconUdavvBSdFZ3rjHY/mssp2FLmtTuOg5FDH VubTklIq9OyCRHmgyD7+/SSE+NKgx2kMVCmg9x0Wpp1s0/Cjvzb3vA5Hsepr5HvByOyola H+FovBP1HNDVsDAXXoPbAeDycjrGJXx4ha/zdJaSN9HZ0NKDs4WQ96/yFmmXnQo24RzGvl /sByxeiveQIkVf55C0UxJqUoWLedI3iWqng+AA1/zCs8OQkM+tI+2DsCtMr2PQ== 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 4R55zh2xRnzFHj; Tue, 18 Jul 2023 17:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36IHn4l7064303; Tue, 18 Jul 2023 17:49:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36IHn4at064302; Tue, 18 Jul 2023 17:49:04 GMT (envelope-from git) Date: Tue, 18 Jul 2023 17:49:04 GMT Message-Id: <202307181749.36IHn4at064302@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 6b4cf064eae2 - 2023Q3 - Mk/bsd.options.desc.mk: sort out TOMCAT options List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 6b4cf064eae204ab58a366f17c1d7be764c98f35 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b4cf064eae204ab58a366f17c1d7be764c98f35 commit 6b4cf064eae204ab58a366f17c1d7be764c98f35 Author: Vladimir Druzenko AuthorDate: 2023-07-18 17:45:19 +0000 Commit: Vladimir Druzenko CommitDate: 2023-07-18 17:48:56 +0000 Mk/bsd.options.desc.mk: sort out TOMCAT options 1. Removed EOLed tomcat 6, 7 and 8. 2. Replaced tomcat10 with tomcat101. 3. Changed TOMCAT*_DESC to more correct. Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D41054 MFH: 2023Q3 (cherry picked from commit b98c2f83e60b77415828b53df653c69e71a58d40) --- Mk/bsd.options.desc.mk | 9 +++------ devel/opengrok/Makefile | 10 +++++----- www/axis2/Makefile | 9 +++------ www/madsonic/Makefile | 1 - 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk index 6c586ca2a04a..abd179370899 100644 --- a/Mk/bsd.options.desc.mk +++ b/Mk/bsd.options.desc.mk @@ -498,12 +498,9 @@ TIFF_DESC?= TIFF image format support TINYXML_DESC?= XML parser support via TinyXML TK_DESC?= Tk GUI toolkit support TLS_DESC?= Secure network connection support via TLS -TOMCAT6_DESC?= Tomcat 6.x support -TOMCAT7_DESC?= Tomcat 7.x support -TOMCAT8_DESC?= Tomcat 8.x support -TOMCAT85_DESC?= Tomcat 8.5.x support -TOMCAT9_DESC?= Tomcat 9.x support -TOMCAT10_DESC?= Tomcat 10.x support +TOMCAT85_DESC?= Use Tomcat 8.5.x +TOMCAT9_DESC?= Use Tomcat 9.0.x +TOMCAT101_DESC?= Use Tomcat 10.1.x TOOLAME_DESC?= TooLAME MP2 audio encoder support TREMOR_DESC?= Tremor audio decoder support TTA_DESC?= TTA lossless audio format support diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile index 105e64ed9ae3..a34f3014f7ab 100644 --- a/devel/opengrok/Makefile +++ b/devel/opengrok/Makefile @@ -39,18 +39,18 @@ PLIST_SUB= T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \ OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= GLASSFISH TOMCAT10 -OPTIONS_DEFAULT= TOMCAT10 +OPTIONS_SINGLE_AS= GLASSFISH TOMCAT101 +OPTIONS_DEFAULT= TOMCAT101 GLASSFISH_DESC?= Glassfish support GLASSFISH_VARS= WEBAPP_HOME=${LOCALBASE}/glassfish-5.1.0/glassfish -TOMCAT10_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-10.1 +TOMCAT101_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-10.1 GLASSFISH_BUILD_DEPENDS=${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish GLASSFISH_RUN_DEPENDS= ${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish -TOMCAT10_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101 -TOMCAT10_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101 +TOMCAT101_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101 +TOMCAT101_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101 WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps JARFILE= ${LOCALBASE}/${WEBAPPS_DIR}/opengrok/WEB-INF/lib/opengrok-${PORTVERSION}.jar diff --git a/www/axis2/Makefile b/www/axis2/Makefile index 6291833ca6ac..765b8c2d1666 100644 --- a/www/axis2/Makefile +++ b/www/axis2/Makefile @@ -18,22 +18,19 @@ NO_BUILD= yes NO_ARCH= yes OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT7 TOMCAT85 TOMCAT9 TOMCAT10 +OPTIONS_SINGLE_AS= TOMCAT85 TOMCAT9 TOMCAT101 OPTIONS_DEFAULT= TOMCAT85 OPTIONS_DEFINE= EXAMPLES -TOMCAT7_VARS= APPHOME=${LOCALBASE}/apache-tomcat-7.0 -TOMCAT7_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 - TOMCAT85_VARS= APPHOME=${LOCALBASE}/apache-tomcat-8.5 TOMCAT85_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat85 TOMCAT9_VARS= APPHOME=${LOCALBASE}/apache-tomcat-9.0 TOMCAT9_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat9 -TOMCAT10_VARS= APPHOME=${LOCALBASE}/apache-tomcat-10.0 -TOMCAT10_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat10 +TOMCAT101_VARS= APPHOME=${LOCALBASE}/apache-tomcat-10.1 +TOMCAT101_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat101 USE_JAVA= yes SHAREOWN= www diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile index e67b3c6f2cab..544b5bb81d20 100644 --- a/www/madsonic/Makefile +++ b/www/madsonic/Makefile @@ -44,7 +44,6 @@ FLAC_DESC= Depend on FLAC for transcoding JETTY8_DESC= Use Jetty 8.x LAME_DESC= Depend on LAME for MP3 transcoding MPC_DESC= Depend on mpcdec for MPC transcoding -TOMCAT85_DESC= Use Tomcat 8.5.x TRANSCODING_DESC= Transcoding support VORBIS_DESC= Depend on oggenc/oggdec for Vorbis transcoding XMP_DESC= Depend on XMP for module file transcoding