diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile
index 6430636ec5ce..3dd0def364b3 100644
--- a/www/unit-java/Makefile
+++ b/www/unit-java/Makefile
@@ -1,103 +1,103 @@
 MASTER_SITES=	https://unit.nginx.org/download/:unit \
 	https://repo1.maven.org/maven2/io/github/classgraph/classgraph/${CLASSGRAPH_VERSION}/:classgraph \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-api/${TOMCAT_VERSION}/:api \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-el-api/${TOMCAT_VERSION}/:elapi \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper/${TOMCAT_VERSION}/:jasper \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/${TOMCAT_VERSION}/:jasperel \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jsp-api/${TOMCAT_VERSION}/:jsp \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-juli/${TOMCAT_VERSION}/:juli \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-servlet-api/${TOMCAT_VERSION}/:servlet \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-util/${TOMCAT_VERSION}/:tutil \
 	https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-util-scan/${TOMCAT_VERSION}/:utilscan \
 	https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/${ECJ_VERSION}/:ecj \
 	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/${JETTY_VERSION}/:http \
 	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/${JETTY_VERSION}/:server \
 	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/${JETTY_VERSION}/:jutil
 PKGNAMESUFFIX=	-${UNIT_MODNAME}
 DISTFILES=	unit-${UNIT_VERSION}.tar.gz:unit \
 	classgraph-${CLASSGRAPH_VERSION}.jar:classgraph \
 	ecj-${ECJ_VERSION}.jar:ecj \
 	jetty-http-${JETTY_VERSION}.jar:http \
 	jetty-server-${JETTY_VERSION}.jar:server \
 	jetty-util-${JETTY_VERSION}.jar:jutil \
 	tomcat-api-${TOMCAT_VERSION}.jar:api \
 	tomcat-el-api-${TOMCAT_VERSION}.jar:elapi \
 	tomcat-jsp-api-${TOMCAT_VERSION}.jar:jsp \
 	tomcat-jasper-${TOMCAT_VERSION}.jar:jasper \
 	tomcat-jasper-el-${TOMCAT_VERSION}.jar:jasperel \
 	tomcat-juli-${TOMCAT_VERSION}.jar:juli \
 	tomcat-servlet-api-${TOMCAT_VERSION}.jar:servlet \
 	tomcat-util-${TOMCAT_VERSION}.jar:tutil \
 	tomcat-util-scan-${TOMCAT_VERSION}.jar:utilscan
 EXTRACT_ONLY=	unit-${UNIT_VERSION}.tar.gz
 
 DISTINFO_FILE=	${.CURDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
 
 COMMENT=	Java module for NGINX Unit
 
 RUN_DEPENDS=	unitd:www/unit
 
 UNIT_MODNAME=	java${JAVA_PORT_VERSION}
-CLASSGRAPH_VERSION=	4.8.158
+CLASSGRAPH_VERSION=	4.8.162
 ECJ_VERSION=	3.26.0
-JETTY_VERSION=	9.4.51.v20230217
-TOMCAT_VERSION=	9.0.75
+JETTY_VERSION=	9.4.53.v20231009
+TOMCAT_VERSION=	9.0.82
 
 PLIST_FILES=	%%JAVAJARDIR%%/classgraph-${CLASSGRAPH_VERSION}.jar \
 		%%JAVAJARDIR%%/ecj-${ECJ_VERSION}.jar \
 		%%JAVAJARDIR%%/jetty-http-${JETTY_VERSION}.jar \
 		%%JAVAJARDIR%%/jetty-server-${JETTY_VERSION}.jar \
 		%%JAVAJARDIR%%/jetty-util-${JETTY_VERSION}.jar \
 		%%JAVAJARDIR%%/nginx-unit-jsc-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-api-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-el-api-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-jasper-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-jasper-el-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-jsp-api-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-juli-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-servlet-api-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-util-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-util-scan-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/websocket-api-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar \
 		libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 USE_JAVA=	yes
 JAVA_VERSION=	8+
 #JAVA_VERSION=	8 11 12 13 14 15
 
 USE_RC_SUBR?=	# reset to empty
 
 MASTERDIR=	${.CURDIR}/../unit
 
 # Do not run the sha512 checker because:
 # - it tries to create a checksum file in ${DISTDIR} and in case
 #   of failure build also fails;
 # - the checker can be useful when the NGINX Unit Java module
 #   downloads those jars by itself.
 post-extract:
 	${CP} /dev/null ${WRKSRC}/auto/modules/java_chk_sha512
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
 	${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} java \
 		--module=${UNIT_MODNAME} \
 		--local-repo=${DISTDIR} \
 		--jars=${JAVAJARDIR}
 
 do-build:
 	cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 			${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
 
 do-install:
 	cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 			${MAKEFILE} ${MAKE_ARGS} \
 			${UNIT_MODNAME}-install DESTDIR=${STAGEDIR}
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
 post-install:
 	@${DO_NADA}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/unit-java/distinfo b/www/unit-java/distinfo
index 7c5cb406466c..3aeb56d7b9e5 100644
--- a/www/unit-java/distinfo
+++ b/www/unit-java/distinfo
@@ -1,31 +1,31 @@
-TIMESTAMP = 1693513582
-SHA256 (unit-1.31.0.tar.gz) = 268b1800bc4e030667e67967d052817437dff03f780ac0a985909aa225de61ed
-SIZE (unit-1.31.0.tar.gz) = 905152
-SHA256 (classgraph-4.8.158.jar) = fb99167dc45bf34f9e40141069f68583a53104c45ffca410642255d1ca81343f
-SIZE (classgraph-4.8.158.jar) = 564035
+TIMESTAMP = 1697732146
+SHA256 (unit-1.31.1.tar.gz) = 9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71
+SIZE (unit-1.31.1.tar.gz) = 907165
+SHA256 (classgraph-4.8.162.jar) = ea30b2d5e29e89d52706bcecf7a6ae3b44682d4a1566a5f22b9453f9be2a970c
+SIZE (classgraph-4.8.162.jar) = 567746
 SHA256 (ecj-3.26.0.jar) = ac0ba5876eaf7ebb47749a0d1be179c51f194b9dd0b875d1c09e1b530f5a2db5
 SIZE (ecj-3.26.0.jar) = 3133846
-SHA256 (jetty-http-9.4.51.v20230217.jar) = 924d254a7e4dcbb699b722940b005bfe1bd4a68a8d44d7dcf3e0a935faafbba2
-SIZE (jetty-http-9.4.51.v20230217.jar) = 235225
-SHA256 (jetty-server-9.4.51.v20230217.jar) = 72f19a7f88e91244d5170045d7d44143508845b01196f87b2a1b56a5ad16d378
-SIZE (jetty-server-9.4.51.v20230217.jar) = 736865
-SHA256 (jetty-util-9.4.51.v20230217.jar) = 9fac4168b1ae543c5c29f48008cd118c70779aa701d60f37f52b57c104b6536e
-SIZE (jetty-util-9.4.51.v20230217.jar) = 583590
-SHA256 (tomcat-api-9.0.75.jar) = 098bd878785c1de70a379ca164c3edd89f4f97ef6c16dd258100de1086399c5f
-SIZE (tomcat-api-9.0.75.jar) = 11517
-SHA256 (tomcat-el-api-9.0.75.jar) = 022682f6964ed31c81b262fa3990f0718ba4845b1f03054a9ae10a9c5f977917
-SIZE (tomcat-el-api-9.0.75.jar) = 88006
-SHA256 (tomcat-jsp-api-9.0.75.jar) = 3b1a321c03f3d78f0021e350e6c0343132240991ae7a29a68c651fe1f8ebca63
-SIZE (tomcat-jsp-api-9.0.75.jar) = 63660
-SHA256 (tomcat-jasper-9.0.75.jar) = d6a345560c4eab0ca18a67265aa616362c0c157cf586be580c0cea19030be7c3
-SIZE (tomcat-jasper-9.0.75.jar) = 568141
-SHA256 (tomcat-jasper-el-9.0.75.jar) = b28d837c0c59009a952c5cfd109b0a87feb51bbecc3045a456b7fb91d7199622
-SIZE (tomcat-jasper-el-9.0.75.jar) = 172408
-SHA256 (tomcat-juli-9.0.75.jar) = 9e72c08c3e81964f7833644d5b3098ca5548cd6e6c87ae7e75173ed6b4b23865
-SIZE (tomcat-juli-9.0.75.jar) = 48970
-SHA256 (tomcat-servlet-api-9.0.75.jar) = d9029d4da9c3c3201a969e353250155c64add905611127e2d98867f4dd179894
-SIZE (tomcat-servlet-api-9.0.75.jar) = 284810
-SHA256 (tomcat-util-9.0.75.jar) = 2c4c9364ebb65ca4589807b057af4719c2ea49b25afc1326084746b6dcf39ad2
-SIZE (tomcat-util-9.0.75.jar) = 218301
-SHA256 (tomcat-util-scan-9.0.75.jar) = 7ef34d01fbf27044ec2fa122bf8c19346a815995a8ba152919f3218e964f8976
-SIZE (tomcat-util-scan-9.0.75.jar) = 224900
+SHA256 (jetty-http-9.4.53.v20231009.jar) = c0a0cbd25998a13ce68481d6002757e6489ea0253463db761fec0cb30d15d612
+SIZE (jetty-http-9.4.53.v20231009.jar) = 249062
+SHA256 (jetty-server-9.4.53.v20231009.jar) = 9c4e9c6cb0a7a541031500af0823b678f65d809f481efa9cadd1ff81bda19f78
+SIZE (jetty-server-9.4.53.v20231009.jar) = 736758
+SHA256 (jetty-util-9.4.53.v20231009.jar) = 7e5370022ecd1f682653641169a33e62e26730dd1e786433bed506cb0dcb1abc
+SIZE (jetty-util-9.4.53.v20231009.jar) = 588870
+SHA256 (tomcat-api-9.0.82.jar) = 4b2dc46719481059fa4ea620a68aba25704e04067adee02ffcdefcefdd213df4
+SIZE (tomcat-api-9.0.82.jar) = 11552
+SHA256 (tomcat-el-api-9.0.82.jar) = dd32e91ddd5f0687fc33bd5375eabda6b5e435274a6de3b71c69b3888780ed1e
+SIZE (tomcat-el-api-9.0.82.jar) = 88142
+SHA256 (tomcat-jsp-api-9.0.82.jar) = 2a68cda78d829e0651a7d7728aee7e68ed9e2e75667b2fb4744948e5396b2f14
+SIZE (tomcat-jsp-api-9.0.82.jar) = 73323
+SHA256 (tomcat-jasper-9.0.82.jar) = b1b58ed96a44406a23c6792b2044aed5524d534f4f78399690d716fac43aec01
+SIZE (tomcat-jasper-9.0.82.jar) = 568639
+SHA256 (tomcat-jasper-el-9.0.82.jar) = 6da7eea13ff78d0c12c084eb896e7cab2b867ac0f7dc6679352483a833cee755
+SIZE (tomcat-jasper-el-9.0.82.jar) = 172481
+SHA256 (tomcat-juli-9.0.82.jar) = df7a83cee5b548e3e3368716859fa17ae17ec1b84f0eae3a4c83b6b4e2e0daf7
+SIZE (tomcat-juli-9.0.82.jar) = 48962
+SHA256 (tomcat-servlet-api-9.0.82.jar) = f9302305269e2e88754642a47949b1b7403f18430e11155cb411b67006327666
+SIZE (tomcat-servlet-api-9.0.82.jar) = 284842
+SHA256 (tomcat-util-9.0.82.jar) = b9f1498233f3f32f688e777806c26bfd003ba8e57a56e7a7d5d2a747db7bf6dc
+SIZE (tomcat-util-9.0.82.jar) = 224435
+SHA256 (tomcat-util-scan-9.0.82.jar) = 0ae6d8e1ac8f937104da8287ea4c8ae2da1b29615fac2b3b7ad7b8797db9c75f
+SIZE (tomcat-util-scan-9.0.82.jar) = 224927
diff --git a/www/unit/Makefile b/www/unit/Makefile
index 58fb92677c01..761f2eefaf91 100644
--- a/www/unit/Makefile
+++ b/www/unit/Makefile
@@ -1,142 +1,141 @@
 PORTNAME=	unit
 PORTVERSION=	${UNIT_VERSION}
-PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES?=	https://unit.nginx.org/download/
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT?=	Dynamic web application server
 WWW=		https://unit.nginx.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES+=		compiler:c11 cpe
 
 CPE_VENDOR=	nginx
 CPE_PRODUCT=	unit
 
 OPTIONS_DEFINE?=	\
 	DEBUG \
 	IPV6 \
 	NJS \
 	SSL \
 	UNIXSOCK
 OPTIONS_DEFAULT?=	IPV6 PCRE2 SSL UNIXSOCK
 
 OPTIONS_RADIO+=		REGEX
 OPTIONS_RADIO_REGEX=	NOPCRE PCRE PCRE2
 
 DEBUG_DESC=	Enable debug logging
 REGEX_DESC=	Support regular expressions
 NJS_DESC=	Enable NGINX JavaScript
 NOPCRE_DESC=	No support for Regular Expressions
 PCRE_DESC=	Regular Expressions via devel/pcre
 PCRE2_DESC=	Regular Expressions via devel/pcre2
 SSL_DESC=	Enable SSL/TLS
 UNIXSOCK_DESC=	Enable unix sockets
 
 .include <bsd.port.options.mk>
 
 HAS_CONFIGURE=	yes
 
 UNIT_VARDIR?=	/var
 UNIT_DBDIR?=	${UNIT_VARDIR}/db/${PORTNAME}
 UNIT_LOGDIR?=	${UNIT_VARDIR}/log/${PORTNAME}
 UNIT_LOGFILE?=	${UNIT_LOGDIR}/${PORTNAME}.log
 UNIT_PIDFILE?=	${UNIT_RUNDIR}/${PORTNAME}.pid
 UNIT_RUNDIR?=	${UNIT_VARDIR}/run/unit
 UNIT_SOCK?=	${UNIT_RUNDIR}/control.unit.sock
 UNIT_TMPDIR?=	${UNIT_VARDIR}/tmp/unit
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--ld-opt="-L${LOCALBASE}/lib" \
 		--log=${UNIT_LOGFILE} \
 		--logdir=${UNIT_LOGDIR} \
 		--modulesdir=${PREFIX}/libexec/unit/modules \
 		--pid=${UNIT_PIDFILE} \
 		--runstatedir=${UNIT_RUNDIR} \
 		--statedir=${UNIT_DBDIR} \
 		--tmpdir=${UNIT_TMPDIR} \
 		--user=${WWWOWN} --group=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 ALL_TARGET=
 
 PLIST_DIRS?=	libexec/unit/modules \
 		libexec/unit
 PLIST_FILES?=	sbin/unitd \
 		share/man/man8/unitd.8.gz
 
 USE_RC_SUBR?=	unitd
 SUB_LIST=	PREFIX=${PREFIX} \
 		UNIT_PIDFILE=${UNIT_PIDFILE} \
 		UNIT_SOCK=${UNIT_SOCK} \
 		UNIT_TMPDIR=${UNIT_TMPDIR} \
 		WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--debug
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--no-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MNJS}
 USES+=	pkgconfig
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libnjs.a:devel/libnjs
 CONFIGURE_ARGS+=--njs \
 	--cc-opt="-I${LOCALBASE}/include" \
 	--ld-opt="-L${LOCALBASE}/lib"
 .endif
 
 .if ${PORT_OPTIONS:MNOPCRE}
 CONFIGURE_ARGS+=--no-regex
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=--no-pcre2
 LIB_DEPENDS+=	libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MPCRE2}
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=--openssl
 USES+=		ssl
 .endif
 
 .if empty(PORT_OPTIONS:MUNIXSOCK)
 CONFIGURE_ARGS+=--no-unix-sockets
 .else
 CONFIGURE_ARGS+=--control=unix:${UNIT_SOCK}
 .endif
 
 .if defined(UNIT_MODNAME) && ${UNIT_MODNAME:Mperl*}
 # Fix build failure on clang >= 12
 CFLAGS+=	-Wno-compound-token-split-by-macro
 .endif
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${UNIT_DBDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_LOGDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_RUNDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_TMPDIR}
 	${ECHO_CMD} @dir ${UNIT_DBDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_LOGDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST}
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules
 	${INSTALL_MAN} ${WRKSRC}/build/share/man/man8/unitd.8 \
 		${STAGEDIR}${MAN8PREFIX}/share/man/man8
 .endif
 
 .include "../../www/unit/version.mk"
 .include <bsd.port.mk>
diff --git a/www/unit/distinfo b/www/unit/distinfo
index 3c39f7922b67..eaad38e5d8b2 100644
--- a/www/unit/distinfo
+++ b/www/unit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693512212
-SHA256 (unit-1.31.0.tar.gz) = 268b1800bc4e030667e67967d052817437dff03f780ac0a985909aa225de61ed
-SIZE (unit-1.31.0.tar.gz) = 905152
+TIMESTAMP = 1697731692
+SHA256 (unit-1.31.1.tar.gz) = 9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71
+SIZE (unit-1.31.1.tar.gz) = 907165
diff --git a/www/unit/version.mk b/www/unit/version.mk
index cd0159d38cca..cbf1ae7a2ec7 100644
--- a/www/unit/version.mk
+++ b/www/unit/version.mk
@@ -1,7 +1,7 @@
 .if !defined(UNITVERSION_MK)
 UNITVERSION_MK= defined
 
 # Define NGINX Unit's version.
-UNIT_VERSION=   1.31.0
+UNIT_VERSION=   1.31.1
 
 .endif	# UNITVERSION_MK
diff --git a/www/unitc/Makefile b/www/unitc/Makefile
index 76da7b01de7a..621a36109502 100644
--- a/www/unitc/Makefile
+++ b/www/unitc/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	unitc
 PORTVERSION=	${UNIT_VERSION}
 CATEGORIES=	www
 MASTER_SITES?=	https://unit.nginx.org/download/
 DISTNAME=	unit-${PORTVERSION}
+DISTINFO_FILE=	${.CURDIR}/../../www/unit/distinfo
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Command-line management tool for NGINX Unit
 WWW=		https://unit.nginx.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	bash>0:shells/bash \
 		curl:ftp/curl
 
 CPE_VENDOR=	nginx
 CPE_PRODUCT=	unit
 
 USES+=		cpe shebangfix
 SHEBANG_FILES=	tools/unitc
 
 NO_BUILD=	yes
 
 PLIST_FILES?=	bin/unitc
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/unitc ${STAGEDIR}${PREFIX}/bin/
 
 .include "../../www/unit/version.mk"
 .include <bsd.port.mk>
diff --git a/www/unitc/distinfo b/www/unitc/distinfo
deleted file mode 100644
index e2f033b79a09..000000000000
--- a/www/unitc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1693517200
-SHA256 (unit-1.31.0.tar.gz) = 268b1800bc4e030667e67967d052817437dff03f780ac0a985909aa225de61ed
-SIZE (unit-1.31.0.tar.gz) = 905152