Index: head/www/tomcat9/Makefile
===================================================================
--- head/www/tomcat9/Makefile	(revision 504502)
+++ head/www/tomcat9/Makefile	(revision 504503)
@@ -1,86 +1,86 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	9.0.20
+PORTVERSION=	9.0.21
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	9
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vvd@unislabs.com
 COMMENT=	Open-source Java web server by Apache, 9.0.x branch
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:devel/jakarta-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 PLIST_SUB=	T=${TOMCAT_SUBDIR} \
 		WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
 		TOMCAT_USER=${WWWOWN} \
 		JAVA_HOME=${JAVA_HOME}
 
 OPTIONS_DEFINE=		HOST_MANAGER MANAGER DOCS EXAMPLES ROOT
 OPTIONS_DEFAULT=	HOST_MANAGER MANAGER ROOT
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Install Documentation web application
 EXAMPLES_DESC=		Install Examples web application
 HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
 TOMCAT_SUBDIR?=	${DISTNAME:R}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh
 	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
 	${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 
 post-install:
 	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
 	(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
 		for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-on:
 	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager
 
 post-install-MANAGER-on:
 	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-MANAGER-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager
 
 post-install-DOCS-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/docs
 
 post-install-EXAMPLES-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/examples
 
 post-install-ROOT-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/ROOT
 
 .include <bsd.port.mk>
Index: head/www/tomcat9/distinfo
===================================================================
--- head/www/tomcat9/distinfo	(revision 504502)
+++ head/www/tomcat9/distinfo	(revision 504503)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558565419
-SHA256 (apache-tomcat-9.0.20.tar.gz) = e9f18587eda41fefd7f749717dc903a4ddf70582ecd453ee47522e5189f57d19
-SIZE (apache-tomcat-9.0.20.tar.gz) = 10851264
+TIMESTAMP = 1560891724
+SHA256 (apache-tomcat-9.0.21.tar.gz) = 50ee20a573d80c93a6a4f50caf429a7cd38256126a747df97097f8b9f1a25e5b
+SIZE (apache-tomcat-9.0.21.tar.gz) = 10874669