Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 04 Apr 2026 19:15:51 +0000
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 462a109fd516 - main - www/tomcat{-devel,101,110,9}: Improve ports (no functional changes)
Message-ID:  <69d16367.27cb8.954ce1d@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=462a109fd516cce1bb3090571ea6ec3a40aabbf7

commit 462a109fd516cce1bb3090571ea6ec3a40aabbf7
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-04-04 19:14:28 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-04-04 19:14:28 +0000

    www/tomcat{-devel,101,110,9}: Improve ports (no functional changes)
    
    Simplify MASTER_SITES and parametrize COMMENT.
    
    Sponsored by:   UNIS Labs
---
 www/tomcat-devel/Makefile | 4 ++--
 www/tomcat101/Makefile    | 4 ++--
 www/tomcat110/Makefile    | 4 ++--
 www/tomcat9/Makefile      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index 0540c25ec397..8d7401e07097 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	tomcat
 DISTVERSION=	11.0.21
 CATEGORIES=	www java
-MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:R:R}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
-COMMENT=	Open-source Java web server by Apache, 11.0.x branch
+COMMENT=	Open-source Java web server by Apache, ${DISTVERSION:R}.x branch
 WWW=		https://tomcat.apache.org/
 
 LICENSE=	APACHE20
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index cbe1bfc8fdcb..34f933711530 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	tomcat
 DISTVERSION=	10.1.54
 CATEGORIES=	www java
-MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:R:R}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	101
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
-COMMENT=	Open-source Java web server by Apache, 10.1.x branch
+COMMENT=	Open-source Java web server by Apache, ${DISTVERSION:R}.x branch
 WWW=		https://tomcat.apache.org/
 
 LICENSE=	APACHE20
diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile
index b41ed3df03f7..b71e28ef627e 100644
--- a/www/tomcat110/Makefile
+++ b/www/tomcat110/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	tomcat
 DISTVERSION=	11.0.21
 CATEGORIES=	www java
-MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:R:R}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	110
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
-COMMENT=	Open-source Java web server by Apache, 11.0.x branch
+COMMENT=	Open-source Java web server by Apache, ${DISTVERSION:R}.x branch
 WWW=		https://tomcat.apache.org/
 
 LICENSE=	APACHE20
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index 98cf0547620f..09d7dda44836 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	tomcat
 DISTVERSION=	9.0.117
 CATEGORIES=	www java
-MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9])(.*)/\1/}/v${DISTVERSION}/bin
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:R:R}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	9
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
-COMMENT=	Open-source Java web server by Apache, 9.0.x branch
+COMMENT=	Open-source Java web server by Apache, ${DISTVERSION:R}.x branch
 WWW=		https://tomcat.apache.org/
 
 LICENSE=	APACHE20


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d16367.27cb8.954ce1d>