diff -ur www/tomcat85.orig/Makefile www/tomcat85/Makefile
--- www/tomcat85.orig/Makefile
+++ www/tomcat85/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/tomcat85/Makefile 541384 2020-07-07 03:48:57Z lwhsu $
 
 PORTNAME=	tomcat
-PORTVERSION=	8.5.57
+PORTVERSION=	8.5.58
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	85
diff -ur www/tomcat85.orig/distinfo www/tomcat85/distinfo
--- www/tomcat85.orig/distinfo
+++ www/tomcat85/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594069938
-SHA256 (apache-tomcat-8.5.57.tar.gz) = 2615839daf1899cd705f9b82f2df6bd21adb29a93a05afdea0a6192ce54025c4
-SIZE (apache-tomcat-8.5.57.tar.gz) = 10379806
+TIMESTAMP = 1600781909
+SHA256 (apache-tomcat-8.5.58.tar.gz) = af53606de49ab01287127bbc366bebcc596a5cf3119b4817467142dbf18ac053
+SIZE (apache-tomcat-8.5.58.tar.gz) = 10420837
diff -ur www/tomcat85.orig/pkg-plist www/tomcat85/pkg-plist
--- www/tomcat85.orig/pkg-plist
+++ www/tomcat85/pkg-plist
@@ -149,15 +149,6 @@
 %%DOCS%%%%T%%/webapps/docs/developers.html
 %%DOCS%%%%T%%/webapps/docs/elapi/index.html
 %%DOCS%%%%T%%/webapps/docs/extras.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-apps.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-objects.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-opers.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-default.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-jdbc-realm.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-jndi-realm.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-memory-realm.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/index.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/mbean-names.html
 %%DOCS%%%%T%%/webapps/docs/host-manager-howto.html
 %%DOCS%%%%T%%/webapps/docs/html-host-manager-howto.html
 %%DOCS%%%%T%%/webapps/docs/html-manager-howto.html
@@ -610,8 +601,9 @@
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
 %%MANAGER%%@sample %%T%%/webapps/manager/WEB-INF/web.xml.sample
+%%MANAGER%%%%T%%/webapps/manager/css/manager.css
 %%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg
-%%MANAGER%%%%T%%/webapps/manager/images/tomcat.gif
+%%MANAGER%%%%T%%/webapps/manager/images/tomcat.svg
 %%MANAGER%%%%T%%/webapps/manager/index.jsp
 %%MANAGER%%%%T%%/webapps/manager/status.xsd
 %%MANAGER%%%%T%%/webapps/manager/xform.xsl
diff -ur www/tomcat9.orig/Makefile www/tomcat9/Makefile
--- www/tomcat9.orig/Makefile
+++ www/tomcat9/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/tomcat9/Makefile 541385 2020-07-07 03:50:24Z lwhsu $
 
 PORTNAME=	tomcat
-PORTVERSION=	9.0.37
+PORTVERSION=	9.0.38
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	9
diff -ur www/tomcat9.orig/distinfo www/tomcat9/distinfo
--- www/tomcat9.orig/distinfo
+++ www/tomcat9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594070040
-SHA256 (apache-tomcat-9.0.37.tar.gz) = 8fb4cfa459a3f027b855334fbdc7197fa5378e504853a98009281d8e149b1bc7
-SIZE (apache-tomcat-9.0.37.tar.gz) = 11211292
+TIMESTAMP = 1600781478
+SHA256 (apache-tomcat-9.0.38.tar.gz) = bec04c20f95e6a4c86dc4d85bb554c04067c32830acdffa92082ba421e0bf1a9
+SIZE (apache-tomcat-9.0.38.tar.gz) = 11264531
diff -ur www/tomcat9.orig/pkg-plist www/tomcat9/pkg-plist
--- www/tomcat9.orig/pkg-plist
+++ www/tomcat9/pkg-plist
@@ -153,15 +153,6 @@
 %%DOCS%%%%T%%/webapps/docs/deployer-howto.html
 %%DOCS%%%%T%%/webapps/docs/developers.html
 %%DOCS%%%%T%%/webapps/docs/elapi/index.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-apps.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-objects.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-opers.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-default.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-jdbc-realm.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-jndi-realm.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-memory-realm.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/index.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/mbean-names.html
 %%DOCS%%%%T%%/webapps/docs/graal.html
 %%DOCS%%%%T%%/webapps/docs/host-manager-howto.html
 %%DOCS%%%%T%%/webapps/docs/html-host-manager-howto.html
@@ -623,8 +614,9 @@
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
 %%MANAGER%%@sample %%T%%/webapps/manager/WEB-INF/web.xml.sample
+%%MANAGER%%%%T%%/webapps/manager/css/manager.css
 %%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg
-%%MANAGER%%%%T%%/webapps/manager/images/tomcat.gif
+%%MANAGER%%%%T%%/webapps/manager/images/tomcat.svg
 %%MANAGER%%%%T%%/webapps/manager/index.jsp
 %%MANAGER%%%%T%%/webapps/manager/status.xsd
 %%MANAGER%%%%T%%/webapps/manager/xform.xsl
diff -ur www/tomcat-devel.orig/Makefile www/tomcat-devel/Makefile
--- www/tomcat-devel.orig/Makefile
+++ www/tomcat-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/tomcat-devel/Makefile 541386 2020-07-07 03:50:58Z lwhsu $
 
 PORTNAME=	tomcat
-PORTVERSION=	10.0.0.M7
+PORTVERSION=	10.0.0.M8
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9]+)(.*)/\1/}/v${PORTVERSION:C/.M/-M/}/bin
 PKGNAMESUFFIX=	-devel
diff -ur www/tomcat-devel.orig/distinfo www/tomcat-devel/distinfo
--- www/tomcat-devel.orig/distinfo
+++ www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594070159
-SHA256 (apache-tomcat-10.0.0-M7.tar.gz) = 0a83311b75e40be9841c2501e9c9eaedac5a9767f5dcdf8b2ad9ad528da3a3e1
-SIZE (apache-tomcat-10.0.0-M7.tar.gz) = 11100954
+TIMESTAMP = 1600782201
+SHA256 (apache-tomcat-10.0.0-M8.tar.gz) = 3050662baaa5415b773b84ac7448fc2068ddd739357461e8f8168120761415d4
+SIZE (apache-tomcat-10.0.0-M8.tar.gz) = 11151916
diff -ur www/tomcat-devel.orig/pkg-plist www/tomcat-devel/pkg-plist
--- www/tomcat-devel.orig/pkg-plist
+++ www/tomcat-devel/pkg-plist
@@ -153,15 +153,6 @@
 %%DOCS%%%%T%%/webapps/docs/deployer-howto.html
 %%DOCS%%%%T%%/webapps/docs/developers.html
 %%DOCS%%%%T%%/webapps/docs/elapi/index.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-apps.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-objects.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-admin-opers.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-default.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-jdbc-realm.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-jndi-realm.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/fs-memory-realm.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/index.html
-%%DOCS%%%%T%%/webapps/docs/funcspecs/mbean-names.html
 %%DOCS%%%%T%%/webapps/docs/graal.html
 %%DOCS%%%%T%%/webapps/docs/host-manager-howto.html
 %%DOCS%%%%T%%/webapps/docs/html-host-manager-howto.html
@@ -623,8 +614,9 @@
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
 %%MANAGER%%@sample %%T%%/webapps/manager/WEB-INF/web.xml.sample
+%%MANAGER%%%%T%%/webapps/manager/css/manager.css
 %%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg
-%%MANAGER%%%%T%%/webapps/manager/images/tomcat.gif
+%%MANAGER%%%%T%%/webapps/manager/images/tomcat.svg
 %%MANAGER%%%%T%%/webapps/manager/index.jsp
 %%MANAGER%%%%T%%/webapps/manager/status.xsd
 %%MANAGER%%%%T%%/webapps/manager/xform.xsl