From nobody Tue Jul 18 17:47:43 2023 X-Original-To: dev-commits-ports-all@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 4R55y72tGxz4nmCt; Tue, 18 Jul 2023 17:47:43 +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 4R55y72Lr1z42Mq; Tue, 18 Jul 2023 17:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689702463; 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=eKwHEjfp0ALYyE7HnZfolDwmhOQVBRJwfgPB9nNwjVk=; b=Av9jxpAl00KPJCf0NRhWoLSK6e2lOUvvauWgm7DqjvLa3XC3rioIxmES1ikyk9EMj22hln 7zqxF70hjq7z163S+szIyFOaOHXfHS8zO3bfFGFadYlobo2A8GqIcOi8uFebSFxdz9SjhZ M5LSXIHKmnQMVJjLxcLmSY3Dlydj9qnVxqHCnFeWNA0RkbYw8uzlV+BHvQZeWfcft7bmx3 VWhSehueFd8HS9dz+2se112f2hibWpsvyZKX8RK9r3iXTffmlUdyJeacmyzTtrcRJaw6eF ykNLXo2vCRSBXrsVqYXnjhO3A84xnpuV/Jba2In7ww9tOWrBj4zYrnPgpJ++eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689702463; 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=eKwHEjfp0ALYyE7HnZfolDwmhOQVBRJwfgPB9nNwjVk=; b=azlAYfnht0O+xWSdgDfTKsOtugLbBXGIccC4LOVFZxgnC0rzI9itJ2mLfH1JoeR0wAMnUb CD1d9sVxUgon4lAhPvgLZGv7EpOC1X4hIkQ1fZ8889E6xzgxwRgNr6kTRXSDbY88D8sWG7 ZYjUjgfqvkhLFCX++iayKfaQiiD1yUphVMvNj6Y+NHrMXveLtc3eTj3VBFoRB56E1aFaXR SBMJyx8rWGLShmf02YmTI6mezVyMPoYG+7cZ5dmbszBFkju1IS65jmJhziwZpBUY1gxTfM +1ucRRMVpMps6PhvqlNs3XUHph+DQvWKybd9WvKqQ+ga938T6QhTOiFoCutNWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689702463; a=rsa-sha256; cv=none; b=UQh+3BY+i0PQIIzFm2j5yuvO0Di5imCki9MhwFsFXuCj9ehkXVbhK4J7zv+CBaAWLc/ouo QrpHDVL60gGZETGiHxicO/TaipSoz74X7hZqNb1gXHQuvuftPLf31ur7xtTOIRK3DrMcnv 7FhQWVeLXQwQ+TnOn3nLg3UgO3d86XV/r2FV7BNR4mcBI4kjDTi9tjbNiv2vVMscS0ot/t WpKvnF6ohdK3EzUaJVM9AR7Uo7NGPvPlITfPZi10sJHZAuycz8buBGtYhvLTS18Q7nRdka JmRR2A9784mGpfk4Sc5yD9u7Ct7qVQgZemv2eYx+Epe7p1suIThuWHmqNUzYBg== 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 4R55y715TXzFNr; Tue, 18 Jul 2023 17:47:43 +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 36IHlh22064017; Tue, 18 Jul 2023 17:47:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36IHlh3s064016; Tue, 18 Jul 2023 17:47:43 GMT (envelope-from git) Date: Tue, 18 Jul 2023 17:47:43 GMT Message-Id: <202307181747.36IHlh3s064016@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: b98c2f83e60b - main - Mk/bsd.options.desc.mk: sort out TOMCAT options List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: b98c2f83e60b77415828b53df653c69e71a58d40 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b98c2f83e60b77415828b53df653c69e71a58d40 commit b98c2f83e60b77415828b53df653c69e71a58d40 Author: Vladimir Druzenko AuthorDate: 2023-07-18 17:45:19 +0000 Commit: Vladimir Druzenko CommitDate: 2023-07-18 17:45:19 +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 --- 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