15 files changed, 116 insertions, 55 deletions
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index eb1c2bda90f8..bb4f18db5594 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE_GPLv2=		${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2+ =		${WRKSRC}/vendor/geshi/geshi/LICENSE
 LICENSE_FILE_MIT=		${WRKSRC}/vendor/composer/LICENSE
 
-DIST_VER=	${PORTNAME}-2024-02-06b
+DIST_VER=	${PORTNAME}-2025-05-14
 USES=		cpe php:web,flavors shebangfix tar:tgz
 USE_PHP=	ctype filter gd iconv mbstring ldap pdo_mysql session simplexml xml zlib
 NO_ARCH=	YES
diff --git a/www/dokuwiki/distinfo b/www/dokuwiki/distinfo
index 4761b07e5644..68ad36c6e7b1 100644
--- a/www/dokuwiki/distinfo
+++ b/www/dokuwiki/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722925621
-SHA256 (dokuwiki-2024-02-06b.tgz) = 7ac919bc298c049af15764f3563ec3012cd158945ef2a22348684df701a19ba3
-SIZE (dokuwiki-2024-02-06b.tgz) = 4206676
+TIMESTAMP = 1747474694
+SHA256 (dokuwiki-2025-05-14.tgz) = b913bf2cbea6fe9956c32572837617d4d8ee766d122155eb4722b24d526dacd4
+SIZE (dokuwiki-2025-05-14.tgz) = 4251299
diff --git a/www/dokuwiki/pkg-plist b/www/dokuwiki/pkg-plist
index 21f45af86def..d4dab2c95ada 100644
--- a/www/dokuwiki/pkg-plist
+++ b/www/dokuwiki/pkg-plist
@@ -131,8 +131,9 @@
 %%WWWDIR%%/inc/Feed/FeedItemProcessor.php
 %%WWWDIR%%/inc/Feed/FeedMediaProcessor.php
 %%WWWDIR%%/inc/Feed/FeedPageProcessor.php
-%%WWWDIR%%/inc/FeedParser.php
-%%WWWDIR%%/inc/FeedParserFile.php
+%%WWWDIR%%/inc/Feed/FeedParser.php
+%%WWWDIR%%/inc/Feed/FeedParserFile.php
+%%WWWDIR%%/inc/Feed/FeedParserItem.php
 %%WWWDIR%%/inc/File/MediaFile.php
 %%WWWDIR%%/inc/File/MediaResolver.php
 %%WWWDIR%%/inc/File/PageFile.php
@@ -164,6 +165,7 @@
 %%WWWDIR%%/inc/Input/Input.php
 %%WWWDIR%%/inc/Input/Post.php
 %%WWWDIR%%/inc/Input/Server.php
+%%WWWDIR%%/inc/Ip.php
 %%WWWDIR%%/inc/JWT.php
 %%WWWDIR%%/inc/JpegMeta.php
 %%WWWDIR%%/inc/Logger.php
@@ -279,6 +281,16 @@
 %%WWWDIR%%/inc/Subscriptions/SubscriberRegexBuilder.php
 %%WWWDIR%%/inc/Subscriptions/SubscriptionSender.php
 %%WWWDIR%%/inc/TaskRunner.php
+%%WWWDIR%%/inc/TreeBuilder/AbstractBuilder.php
+%%WWWDIR%%/inc/TreeBuilder/ControlPageBuilder.php
+%%WWWDIR%%/inc/TreeBuilder/Node/AbstractNode.php
+%%WWWDIR%%/inc/TreeBuilder/Node/ExternalLink.php
+%%WWWDIR%%/inc/TreeBuilder/Node/Top.php
+%%WWWDIR%%/inc/TreeBuilder/Node/WikiNamespace.php
+%%WWWDIR%%/inc/TreeBuilder/Node/WikiPage.php
+%%WWWDIR%%/inc/TreeBuilder/Node/WikiStartpage.php
+%%WWWDIR%%/inc/TreeBuilder/PageTreeBuilder.php
+%%WWWDIR%%/inc/TreeBuilder/TreeSort.php
 %%WWWDIR%%/inc/Ui/Admin.php
 %%WWWDIR%%/inc/Ui/Backlinks.php
 %%WWWDIR%%/inc/Ui/Diff.php
@@ -497,6 +509,10 @@
 %%WWWDIR%%/inc/lang/bn/editrev.txt
 %%WWWDIR%%/inc/lang/bn/index.txt
 %%WWWDIR%%/inc/lang/bn/lang.php
+%%WWWDIR%%/inc/lang/br/admin.txt
+%%WWWDIR%%/inc/lang/br/adminplugins.txt
+%%WWWDIR%%/inc/lang/br/backlinks.txt
+%%WWWDIR%%/inc/lang/br/conflict.txt
 %%WWWDIR%%/inc/lang/ca-valencia/admin.txt
 %%WWWDIR%%/inc/lang/ca-valencia/adminplugins.txt
 %%WWWDIR%%/inc/lang/ca-valencia/backlinks.txt
@@ -1742,6 +1758,9 @@
 %%WWWDIR%%/inc/lang/mk/recent.txt
 %%WWWDIR%%/inc/lang/mk/showrev.txt
 %%WWWDIR%%/inc/lang/ml/admin.txt
+%%WWWDIR%%/inc/lang/ml/adminplugins.txt
+%%WWWDIR%%/inc/lang/ml/backlinks.txt
+%%WWWDIR%%/inc/lang/ml/conflict.txt
 %%WWWDIR%%/inc/lang/ml/jquery.ui.datepicker.js
 %%WWWDIR%%/inc/lang/mr/admin.txt
 %%WWWDIR%%/inc/lang/mr/backlinks.txt
@@ -3277,6 +3296,7 @@
 %%WWWDIR%%/lib/plugins/authpdo/lang/uk/settings.php
 %%WWWDIR%%/lib/plugins/authpdo/lang/vi/lang.php
 %%WWWDIR%%/lib/plugins/authpdo/lang/vi/settings.php
+%%WWWDIR%%/lib/plugins/authpdo/lang/zh-tw/lang.php
 %%WWWDIR%%/lib/plugins/authpdo/lang/zh/lang.php
 %%WWWDIR%%/lib/plugins/authpdo/lang/zh/settings.php
 %%WWWDIR%%/lib/plugins/authpdo/plugin.info.txt
@@ -3507,9 +3527,27 @@
 %%WWWDIR%%/lib/plugins/config/plugin.info.txt
 %%WWWDIR%%/lib/plugins/config/settings/config.metadata.php
 %%WWWDIR%%/lib/plugins/config/style.css
-%%WWWDIR%%/lib/plugins/extension/_test/extension.test.php
+%%WWWDIR%%/lib/plugins/extension/Exception.php
+%%WWWDIR%%/lib/plugins/extension/Extension.php
+%%WWWDIR%%/lib/plugins/extension/Gui.php
+%%WWWDIR%%/lib/plugins/extension/GuiAdmin.php
+%%WWWDIR%%/lib/plugins/extension/GuiExtension.php
+%%WWWDIR%%/lib/plugins/extension/Installer.php
+%%WWWDIR%%/lib/plugins/extension/Local.php
+%%WWWDIR%%/lib/plugins/extension/Manager.php
+%%WWWDIR%%/lib/plugins/extension/Notice.php
+%%WWWDIR%%/lib/plugins/extension/Repository.php
+%%WWWDIR%%/lib/plugins/extension/_test/ExtensionTest.php
+%%WWWDIR%%/lib/plugins/extension/_test/InstallerTest.php
+%%WWWDIR%%/lib/plugins/extension/_test/LocalTest.php
+%%WWWDIR%%/lib/plugins/extension/_test/ManagerTest.php
 %%WWWDIR%%/lib/plugins/extension/_test/testdata/either1/script.js
 %%WWWDIR%%/lib/plugins/extension/_test/testdata/eithersub2/either2/script.js
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mpl1/plugin.info.txt
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mpl2/plugin.info.txt
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mpl3/plugin.info.txt
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mtpl4/template.info.txt
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mtpl5/template.info.txt
 %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgfoo5/plugin.info.txt
 %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub3/plugin3/syntax.php
 %%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub4/plugin4/plugin.info.txt
@@ -3527,25 +3565,20 @@
 %%WWWDIR%%/lib/plugins/extension/action.php
 %%WWWDIR%%/lib/plugins/extension/admin.php
 %%WWWDIR%%/lib/plugins/extension/admin.svg
-%%WWWDIR%%/lib/plugins/extension/all.less
 %%WWWDIR%%/lib/plugins/extension/cli.php
-%%WWWDIR%%/lib/plugins/extension/helper/extension.php
-%%WWWDIR%%/lib/plugins/extension/helper/gui.php
-%%WWWDIR%%/lib/plugins/extension/helper/list.php
-%%WWWDIR%%/lib/plugins/extension/helper/repository.php
-%%WWWDIR%%/lib/plugins/extension/images/bug.gif
-%%WWWDIR%%/lib/plugins/extension/images/disabled.png
-%%WWWDIR%%/lib/plugins/extension/images/donate.png
-%%WWWDIR%%/lib/plugins/extension/images/down.png
-%%WWWDIR%%/lib/plugins/extension/images/enabled.png
+%%WWWDIR%%/lib/plugins/extension/helper.php
+%%WWWDIR%%/lib/plugins/extension/images/bug.svg
+%%WWWDIR%%/lib/plugins/extension/images/coffee.svg
+%%WWWDIR%%/lib/plugins/extension/images/error.svg
+%%WWWDIR%%/lib/plugins/extension/images/fire.svg
 %%WWWDIR%%/lib/plugins/extension/images/icons.xcf
+%%WWWDIR%%/lib/plugins/extension/images/info.svg
 %%WWWDIR%%/lib/plugins/extension/images/license.txt
 %%WWWDIR%%/lib/plugins/extension/images/overlay.png
 %%WWWDIR%%/lib/plugins/extension/images/plugin.png
-%%WWWDIR%%/lib/plugins/extension/images/tag.png
+%%WWWDIR%%/lib/plugins/extension/images/security.svg
 %%WWWDIR%%/lib/plugins/extension/images/template.png
-%%WWWDIR%%/lib/plugins/extension/images/up.png
-%%WWWDIR%%/lib/plugins/extension/images/warning.png
+%%WWWDIR%%/lib/plugins/extension/images/warning.svg
 %%WWWDIR%%/lib/plugins/extension/lang/bg/intro_install.txt
 %%WWWDIR%%/lib/plugins/extension/lang/bg/intro_plugins.txt
 %%WWWDIR%%/lib/plugins/extension/lang/bg/intro_search.txt
@@ -3639,6 +3672,7 @@
 %%WWWDIR%%/lib/plugins/extension/lang/ko/intro_search.txt
 %%WWWDIR%%/lib/plugins/extension/lang/ko/intro_templates.txt
 %%WWWDIR%%/lib/plugins/extension/lang/ko/lang.php
+%%WWWDIR%%/lib/plugins/extension/lang/lt/lang.php
 %%WWWDIR%%/lib/plugins/extension/lang/lv/intro_templates.txt
 %%WWWDIR%%/lib/plugins/extension/lang/lv/lang.php
 %%WWWDIR%%/lib/plugins/extension/lang/nl/intro_install.txt
@@ -3718,9 +3752,13 @@
 %%WWWDIR%%/lib/plugins/logviewer/lang/fr/intro.txt
 %%WWWDIR%%/lib/plugins/logviewer/lang/fr/lang.php
 %%WWWDIR%%/lib/plugins/logviewer/lang/fr/nolog.txt
+%%WWWDIR%%/lib/plugins/logviewer/lang/hu/intro.txt
 %%WWWDIR%%/lib/plugins/logviewer/lang/hu/lang.php
+%%WWWDIR%%/lib/plugins/logviewer/lang/hu/nolog.txt
 %%WWWDIR%%/lib/plugins/logviewer/lang/it/lang.php
 %%WWWDIR%%/lib/plugins/logviewer/lang/ja/lang.php
+%%WWWDIR%%/lib/plugins/logviewer/lang/ko/intro.txt
+%%WWWDIR%%/lib/plugins/logviewer/lang/ko/lang.php
 %%WWWDIR%%/lib/plugins/logviewer/lang/pl/intro.txt
 %%WWWDIR%%/lib/plugins/logviewer/lang/pl/lang.php
 %%WWWDIR%%/lib/plugins/logviewer/lang/pl/nolog.txt
@@ -3733,6 +3771,7 @@
 %%WWWDIR%%/lib/plugins/logviewer/lang/ru/intro.txt
 %%WWWDIR%%/lib/plugins/logviewer/lang/ru/lang.php
 %%WWWDIR%%/lib/plugins/logviewer/lang/ru/nolog.txt
+%%WWWDIR%%/lib/plugins/logviewer/lang/sk/lang.php
 %%WWWDIR%%/lib/plugins/logviewer/lang/vi/intro.txt
 %%WWWDIR%%/lib/plugins/logviewer/lang/vi/lang.php
 %%WWWDIR%%/lib/plugins/logviewer/lang/vi/nolog.txt
@@ -4441,6 +4480,7 @@
 %%WWWDIR%%/lib/scripts/jquery/update.sh
 %%WWWDIR%%/lib/scripts/jquery/versions
 %%WWWDIR%%/lib/scripts/linkwiz.js
+%%WWWDIR%%/lib/scripts/linkwiz.test.js
 %%WWWDIR%%/lib/scripts/locktimer.js
 %%WWWDIR%%/lib/scripts/media.js
 %%WWWDIR%%/lib/scripts/page.js
@@ -4562,6 +4602,8 @@
 %%WWWDIR%%/lib/tpl/dokuwiki/lang/sk/lang.php
 %%WWWDIR%%/lib/tpl/dokuwiki/lang/sk/style.txt
 %%WWWDIR%%/lib/tpl/dokuwiki/lang/sv/lang.php
+%%WWWDIR%%/lib/tpl/dokuwiki/lang/uk/lang.php
+%%WWWDIR%%/lib/tpl/dokuwiki/lang/uk/style.txt
 %%WWWDIR%%/lib/tpl/dokuwiki/lang/vi/lang.php
 %%WWWDIR%%/lib/tpl/dokuwiki/lang/vi/style.txt
 %%WWWDIR%%/lib/tpl/dokuwiki/lang/zh-tw/style.txt
@@ -4753,7 +4795,7 @@
 %%WWWDIR%%/vendor/geshi/geshi/src/geshi/netrexx.php
 %%WWWDIR%%/vendor/geshi/geshi/src/geshi/newlisp.php
 %%WWWDIR%%/vendor/geshi/geshi/src/geshi/nginx.php
-%%WWWDIR%%/vendor/geshi/geshi/src/geshi/nimrod.php
+%%WWWDIR%%/vendor/geshi/geshi/src/geshi/nim.php
 %%WWWDIR%%/vendor/geshi/geshi/src/geshi/nsis.php
 %%WWWDIR%%/vendor/geshi/geshi/src/geshi/oberon2.php
 %%WWWDIR%%/vendor/geshi/geshi/src/geshi/objc.php
@@ -4893,6 +4935,7 @@
 %%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/GPXCreator.php
 %%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/HTMLCreator.php
 %%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/JSCreator.php
+%%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/JSONCreator.php
 %%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/KMLCreator.php
 %%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/MBOXCreator.php
 %%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/OPMLCreator.php
@@ -4927,6 +4970,16 @@
 %%WWWDIR%%/vendor/paragonie/random_compat/lib/random.php
 %%WWWDIR%%/vendor/paragonie/random_compat/psalm-autoload.php
 %%WWWDIR%%/vendor/paragonie/random_compat/psalm.xml
+%%WWWDIR%%/vendor/php81_bc/strftime/.editorconfig
+%%WWWDIR%%/vendor/php81_bc/strftime/LICENSE
+%%WWWDIR%%/vendor/php81_bc/strftime/README.md
+%%WWWDIR%%/vendor/php81_bc/strftime/autoload.php
+%%WWWDIR%%/vendor/php81_bc/strftime/composer.json
+%%WWWDIR%%/vendor/php81_bc/strftime/example.php
+%%WWWDIR%%/vendor/php81_bc/strftime/src/AbstractLocaleFormatter.php
+%%WWWDIR%%/vendor/php81_bc/strftime/src/DateLocaleFormatter.php
+%%WWWDIR%%/vendor/php81_bc/strftime/src/IntlLocaleFormatter.php
+%%WWWDIR%%/vendor/php81_bc/strftime/src/php-8.1-strftime.php
 %%WWWDIR%%/vendor/phpseclib/phpseclib/AUTHORS
 %%WWWDIR%%/vendor/phpseclib/phpseclib/BACKERS.md
 %%WWWDIR%%/vendor/phpseclib/phpseclib/LICENSE
@@ -5093,8 +5146,10 @@
 %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/FileNotFoundException.php
 %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/InconsistentSetupException.php
 %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/InsufficientSetupException.php
+%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/InvalidPacketLengthException.php
 %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/NoKeyLoadedException.php
 %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/NoSupportedAlgorithmsException.php
+%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/TimeoutException.php
 %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/UnableToConnectException.php
 %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedAlgorithmException.php
 %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedCurveException.php
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index b5ab046e1fed..0c1192ce1e7f 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	firefox
-DISTVERSION=	138.0.3
+DISTVERSION=	138.0.4
 PORTEPOCH=	2
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 86a1320a3b71..f2b3b71e35a3 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747069313
-SHA256 (firefox-138.0.3.source.tar.xz) = a27f3ab41d635b2a1d8418289d1dedcd6cb532148c7d63d3f8b97c66445513e4
-SIZE (firefox-138.0.3.source.tar.xz) = 632959048
+TIMESTAMP = 1747504074
+SHA256 (firefox-138.0.4.source.tar.xz) = 3fd30db08dad90b339e08d27db1e3aab03a174817d336314327dc5305c145056
+SIZE (firefox-138.0.4.source.tar.xz) = 623414956
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
index 44fbd991ff76..5370d98555c3 100644
--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=		sogo
-PORTVERSION=		5.12.0
+PORTVERSION=		5.12.1
 CATEGORIES=		www gnustep
 MASTER_SITES=		https://packages.sogo.nu/sources/
 DISTNAME=		SOGo-${PORTVERSION}
diff --git a/www/sogo/distinfo b/www/sogo/distinfo
index 230d2fe0b8cd..678df0747647 100644
--- a/www/sogo/distinfo
+++ b/www/sogo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742970033
-SHA256 (SOGo-5.12.0.tar.gz) = f5c17371ad6e6442b3fc8e1c3149710033d5c61aa3f2a7a3f090b7f51cbec83a
-SIZE (SOGo-5.12.0.tar.gz) = 37238251
+TIMESTAMP = 1747459352
+SHA256 (SOGo-5.12.1.tar.gz) = b51d39b31af9a6059db79a18201f3c6cfd584468e369eebe286f8181804bcd99
+SIZE (SOGo-5.12.1.tar.gz) = 37738293
diff --git a/www/sogo/files/patch-SoObjects_SOGo_SOGoMailer.m b/www/sogo/files/patch-SoObjects_SOGo_SOGoMailer.m
deleted file mode 100644
index f204575eb042..000000000000
--- a/www/sogo/files/patch-SoObjects_SOGo_SOGoMailer.m
+++ /dev/null
@@ -1,11 +0,0 @@
---- SoObjects/SOGo/SOGoMailer.m	2025-03-25 23:34:20.921308000 -0700
-+++ SoObjects/SOGo/SOGoMailer.m	2025-03-25 23:34:50.890963000 -0700
-@@ -325,7 +325,7 @@
-           {
-             login = [currentAcount objectForKey: @"userName"];
-             password = [currentAcount objectForKey: @"password"];
--            smtpAuthMethod = "plain"; //Only support plain for auxiliary account
-+            smtpAuthMethod = @"plain"; //Only support plain for auxiliary account
-           }
-           else
-           {
diff --git a/www/sogo/pkg-plist b/www/sogo/pkg-plist
index 042b1934d44c..e3f23632b021 100644
--- a/www/sogo/pkg-plist
+++ b/www/sogo/pkg-plist
@@ -751,7 +751,7 @@ GNUstep/Local/Library/Libraries/sogo/libSOGo.so.5
 GNUstep/Local/Library/Libraries/sogo/libSOGo.so.%%VERSION%%
 GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so
 GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.12
-GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.%%VERSION%%
+GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.12.0
 GNUstep/Local/Library/OCSTypeModels/appointment-oracle.ocs
 GNUstep/Local/Library/OCSTypeModels/appointment.ocs
 GNUstep/Local/Library/OCSTypeModels/contact-oracle.ocs
@@ -2092,6 +2092,13 @@ GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-file-upload.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-file-upload.js.map
 GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-file-upload.min.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-file-upload.min.js.map
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/angular-material-mocks.js
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/angular-material.js
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/angular-material.min.js
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/angular-material.scss
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/layouts/angular-material.layout-attributes.scss
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/layouts/angular-material.layouts.scss
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/package.json
 GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material.min.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-messages.js
diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index d643c6982b9d..56a5046ab6cb 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	11.0.6
-PORTREVISION=	2
+DISTVERSION=	11.0.7
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
index e344328ff6a6..805285ec7f65 100644
--- a/www/tomcat-devel/distinfo
+++ b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744195573
-SHA256 (apache-tomcat-11.0.6.tar.gz) = 864458f646bf938d3feb5773456199819b91d52670e4d724b9866ccfd4761cef
-SIZE (apache-tomcat-11.0.6.tar.gz) = 13878198
+TIMESTAMP = 1747453588
+SHA256 (apache-tomcat-11.0.7.tar.gz) = 2fcece641c62ba1f28e1d7b257493151fc44f161fb391015ee6a95fa71632fb9
+SIZE (apache-tomcat-11.0.7.tar.gz) = 14091809
diff --git a/www/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist
index 28bd1cee81f1..ee68e1b0d4fd 100644
--- a/www/tomcat-devel/pkg-plist
+++ b/www/tomcat-devel/pkg-plist
@@ -103,8 +103,14 @@
 %%DOCS%%%%T%%/webapps/docs/architecture/index.html
 %%DOCS%%%%T%%/webapps/docs/architecture/overview.html
 %%DOCS%%%%T%%/webapps/docs/architecture/requestProcess.html
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.png
 %%DOCS%%%%T%%/webapps/docs/architecture/startup.html
 %%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.plantuml
 %%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.png
diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile
index a35009afb7e2..6c8fa8250802 100644
--- a/www/tomcat110/Makefile
+++ b/www/tomcat110/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	11.0.6
-PORTREVISION=	2
+DISTVERSION=	11.0.7
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	110
diff --git a/www/tomcat110/distinfo b/www/tomcat110/distinfo
index e344328ff6a6..805285ec7f65 100644
--- a/www/tomcat110/distinfo
+++ b/www/tomcat110/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744195573
-SHA256 (apache-tomcat-11.0.6.tar.gz) = 864458f646bf938d3feb5773456199819b91d52670e4d724b9866ccfd4761cef
-SIZE (apache-tomcat-11.0.6.tar.gz) = 13878198
+TIMESTAMP = 1747453588
+SHA256 (apache-tomcat-11.0.7.tar.gz) = 2fcece641c62ba1f28e1d7b257493151fc44f161fb391015ee6a95fa71632fb9
+SIZE (apache-tomcat-11.0.7.tar.gz) = 14091809
diff --git a/www/tomcat110/pkg-plist b/www/tomcat110/pkg-plist
index 28bd1cee81f1..ee68e1b0d4fd 100644
--- a/www/tomcat110/pkg-plist
+++ b/www/tomcat110/pkg-plist
@@ -103,8 +103,14 @@
 %%DOCS%%%%T%%/webapps/docs/architecture/index.html
 %%DOCS%%%%T%%/webapps/docs/architecture/overview.html
 %%DOCS%%%%T%%/webapps/docs/architecture/requestProcess.html
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.png
 %%DOCS%%%%T%%/webapps/docs/architecture/startup.html
 %%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.plantuml
 %%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.png