Index: head/www/unit/Makefile
===================================================================
--- head/www/unit/Makefile	(revision 555713)
+++ head/www/unit/Makefile	(revision 555714)
@@ -1,120 +1,128 @@
 # Created by: Sergey A. Osokin <osa@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	unit
-PORTVERSION=	1.20.0
+PORTVERSION=	1.21.0
 CATEGORIES=	www
 MASTER_SITES?=	https://unit.nginx.org/download/
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT?=	Dynamic web application server
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES+=		compiler:c11 cpe
 
 CPE_VENDOR=	nginx
 CPE_PRODUCT=	unit
 
 OPTIONS_DEFINE?=	\
 	DEBUG \
 	DEVKIT \
 	IPV6 \
+	PCRE2 \
 	SSL \
 	UNIXSOCK
 OPTIONS_DEFAULT?=UNIXSOCK
 
 DEBUG_DESC=	Enable debug logging
 DEVKIT_DESC=	Install headers and library
+PCRE2_DESC=	Enable PCRE2 support
 SSL_DESC=	Enable SSL/TLS
 UNIXSOCK_DESC=	Enable unix sockets
 
 .include <bsd.port.options.mk>
 
 HAS_CONFIGURE=	yes
 
 UNIT_VARDIR?=	/var
 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} \
 		--modules=libexec/unit/modules \
 		--pid=${UNIT_PIDFILE} \
 		--state=libexec/unit \
 		--tmp=${UNIT_TMPDIR} \
 		--user=${WWWOWN} --group=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 ALL_TARGET=
 
 PLIST_DIRS?=	libexec/unit/modules \
 		libexec/unit
 PLIST_FILES?=	sbin/unitd
 
 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 ${PORT_OPTIONS:MDEVKIT}
 PLIST_FILES+=	include/nxt_unit_field.h \
 		include/nxt_unit_request.h \
 		include/nxt_unit_response.h \
 		include/nxt_unit_sptr.h \
 		include/nxt_unit_typedefs.h \
 		include/nxt_unit_websocket.h \
 		include/nxt_unit.h \
 		include/nxt_version.h \
 		include/nxt_websocket_header.h \
 		lib/libunit.a
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--no-ipv6
+.endif
+
+.if empty(PORT_OPTIONS:MPCRE2)
+CONFIGURE_ARGS+=--no-pcre2
+.else
+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
 
 post-build-DEVKIT-on:
 	@cd ${WRKSRC} && ${MAKE} build/libunit.a
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${UNIT_LOGDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_RUNDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_TMPDIR}
 	${ECHO_CMD} @dir ${UNIT_LOGDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST}
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules
 
 post-install-DEVKIT-on:
 	${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${STAGEDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/www/unit/distinfo
===================================================================
--- head/www/unit/distinfo	(revision 555713)
+++ head/www/unit/distinfo	(revision 555714)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602178468
-SHA256 (unit-1.20.0.tar.gz) = ee39a801f83aff5dfff94336f688fd9cfbd02fee270edd8711b10be4fe298d32
-SIZE (unit-1.20.0.tar.gz) = 787607
+TIMESTAMP = 1605816182
+SHA256 (unit-1.21.0.tar.gz) = 9830b66f55fbcb5ef4ee514e558831350e680c0240349541050eee2f6f6ba70d
+SIZE (unit-1.21.0.tar.gz) = 802826
Index: head/www/unit-java/Makefile
===================================================================
--- head/www/unit-java/Makefile	(revision 555713)
+++ head/www/unit-java/Makefile	(revision 555714)
@@ -1,100 +1,101 @@
 # Created by: Sergey Osokin <osa@FreeBSD.org>
 # $FreeBSD$
 
 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.4.11
-ECJ_VERSION=	3.13.102
-JETTY_VERSION=	9.4.12.v20180830
-TOMCAT_VERSION=	9.0.13
-UNIT_VERSION=	1.20.0
+CLASSGRAPH_VERSION=	4.8.90
+ECJ_VERSION=	3.23.0
+JETTY_VERSION=	9.4.33.v20201020
+TOMCAT_VERSION=	9.0.39
+UNIT_VERSION=	1.21.0
 
 PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so \
 		%%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-scan-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/tomcat-util-${TOMCAT_VERSION}.jar \
 		%%JAVAJARDIR%%/websocket-api-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar
 
 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} && \
 	${CONFIGURE_CMD} java --module=${UNIT_MODNAME} \
 		--local-repo=${DISTDIR} \
 		--jars=${JAVAJARDIR}
 
 do-build:
 	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
 
 do-install:
 	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}-install DESTDIR=${STAGEDIR}
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
 post-install:
 	@${DO_NADA}
 
 .include "${MASTERDIR}/Makefile"
Index: head/www/unit-java/distinfo
===================================================================
--- head/www/unit-java/distinfo	(revision 555713)
+++ head/www/unit-java/distinfo	(revision 555714)
@@ -1,31 +1,31 @@
-TIMESTAMP = 1603377477
-SHA256 (unit-1.20.0.tar.gz) = ee39a801f83aff5dfff94336f688fd9cfbd02fee270edd8711b10be4fe298d32
-SIZE (unit-1.20.0.tar.gz) = 787607
-SHA256 (tomcat-servlet-api-9.0.13.jar) = fa3a1033f9dc667ee9ebd73730c7a77d4d4fc0be308ab9bfce4712bd8b53a230
-SIZE (tomcat-servlet-api-9.0.13.jar) = 282576
-SHA256 (tomcat-el-api-9.0.13.jar) = dca3f1ea1c74d0405dc878756a5220504158e4e12d5fd1f6e04b9e816859736c
-SIZE (tomcat-el-api-9.0.13.jar) = 87515
-SHA256 (tomcat-jsp-api-9.0.13.jar) = adbd132ea8e3fb9e5ae8f4e3e6a7e5f1165334dbaaeef21df448e72d5682240d
-SIZE (tomcat-jsp-api-9.0.13.jar) = 63167
-SHA256 (tomcat-jasper-9.0.13.jar) = 75857eb4f272a0b9ebacc613ac206bbfae2bc0206f4dc436af9e9aef49434b60
-SIZE (tomcat-jasper-9.0.13.jar) = 557374
-SHA256 (tomcat-jasper-el-9.0.13.jar) = c5c4adf83900eb254933ab18bec442050241324143a80339c9a11dafa83d85fe
-SIZE (tomcat-jasper-el-9.0.13.jar) = 167490
-SHA256 (tomcat-juli-9.0.13.jar) = a5dbeb4cb972ab2b48e74ada1248a88baccade811b4c3d1a93b5f2dcdeb405b2
-SIZE (tomcat-juli-9.0.13.jar) = 47122
-SHA256 (tomcat-api-9.0.13.jar) = 90d6dc48bccaeab1c9ffcb745e439344cd4d5c234a9ea33d58a9ef313b186179
-SIZE (tomcat-api-9.0.13.jar) = 11212
-SHA256 (tomcat-util-scan-9.0.13.jar) = 18a13ec3f8d0a1511babf4f97b357f379da5b7efb9a92694b2dfa8aa85067252
-SIZE (tomcat-util-scan-9.0.13.jar) = 208966
-SHA256 (tomcat-util-9.0.13.jar) = 44d57b3a4ea8500fd43cc60c6e07ebd8f2024204fe6c9ac9b03022a5c8835986
-SIZE (tomcat-util-9.0.13.jar) = 165171
-SHA256 (ecj-3.13.102.jar) = e6b938338b7bb12388ca32ba8dfe91c6ab1c56bf5bd8dab6d6e6265fec3b9be3
-SIZE (ecj-3.13.102.jar) = 2769774
-SHA256 (jetty-http-9.4.12.v20180830.jar) = 20547da653be9942cc63f57e632a732608559aebde69753bc7312cfe16e8d9c0
-SIZE (jetty-http-9.4.12.v20180830.jar) = 195664
-SHA256 (jetty-server-9.4.12.v20180830.jar) = 4833644e5c5a09bbddc85f75c53e0c8ed750de120ba248fffd8508028528252d
-SIZE (jetty-server-9.4.12.v20180830.jar) = 609290
-SHA256 (jetty-util-9.4.12.v20180830.jar) = 60ad53e118a3e7d10418b155b9944d90b2e4e4c732e53ef4f419473288d3f48c
-SIZE (jetty-util-9.4.12.v20180830.jar) = 502985
-SHA256 (classgraph-4.4.11.jar) = 8942c74972f682fcc515e7b4d36ffe7962cbb89cc28a24cc28ea764e870b7bd1
-SIZE (classgraph-4.4.11.jar) = 385664
+TIMESTAMP = 1605817236
+SHA256 (unit-1.21.0.tar.gz) = 9830b66f55fbcb5ef4ee514e558831350e680c0240349541050eee2f6f6ba70d
+SIZE (unit-1.21.0.tar.gz) = 802826
+SHA256 (classgraph-4.8.90.jar) = 8c371cf781d7bf1c6f3e38715a0c89cab387d940f07f8d4eeb90caa665b2acb0
+SIZE (classgraph-4.8.90.jar) = 508342
+SHA256 (ecj-3.23.0.jar) = 6ab0535758e324fad3e7c976685bcf87d1d584fe6196194e54edd9fd94da713c
+SIZE (ecj-3.23.0.jar) = 3083084
+SHA256 (jetty-http-9.4.33.v20201020.jar) = cd276f1499beda609ed7d7f9dcf254f1b279303fd0af4df891d9ff8ebcacc688
+SIZE (jetty-http-9.4.33.v20201020.jar) = 214249
+SHA256 (jetty-server-9.4.33.v20201020.jar) = 2e4992b669c3c30677c8d1619dd1053050c5886dae6192fa2e6da472eb229fdc
+SIZE (jetty-server-9.4.33.v20201020.jar) = 706442
+SHA256 (jetty-util-9.4.33.v20201020.jar) = ba22ac5bc1adfd571fdfa12f17b87941b13709f861ee7e65fcea623b44529e64
+SIZE (jetty-util-9.4.33.v20201020.jar) = 565436
+SHA256 (tomcat-api-9.0.39.jar) = 1974bed6b086101daf821d6dd96d8a4d8421de238f0004564e880af2e4cbe463
+SIZE (tomcat-api-9.0.39.jar) = 11651
+SHA256 (tomcat-el-api-9.0.39.jar) = fc965b181d8a3b67a8d048ce811560cef0655494a220b7b0ece6c29f09f801ef
+SIZE (tomcat-el-api-9.0.39.jar) = 91195
+SHA256 (tomcat-jsp-api-9.0.39.jar) = ff5d850539b2e07735e9d91da467d4d88261a8f4cf2fa56fb950140c4fd8ad2a
+SIZE (tomcat-jsp-api-9.0.39.jar) = 63812
+SHA256 (tomcat-jasper-9.0.39.jar) = 264eeecd0312ee6e74f6e09faed329fd24cb8161da8dec6b9e95e5905d890c60
+SIZE (tomcat-jasper-9.0.39.jar) = 564686
+SHA256 (tomcat-jasper-el-9.0.39.jar) = e2155f4e52b3d66fb3f9cf6bf9e318b7337c64040959de2ce1337b5260a8fc89
+SIZE (tomcat-jasper-el-9.0.39.jar) = 171359
+SHA256 (tomcat-juli-9.0.39.jar) = 50abdb2f4a5775f5125e354dea986d0497d8bb0527c614817b7bdb63b392fc0b
+SIZE (tomcat-juli-9.0.39.jar) = 49769
+SHA256 (tomcat-servlet-api-9.0.39.jar) = 0da705690cf9f2c31c8142b8abcb5fd0183cc989a8dcda9abcfa22e4c38a1c28
+SIZE (tomcat-servlet-api-9.0.39.jar) = 283771
+SHA256 (tomcat-util-9.0.39.jar) = 2eae96699792f18d4f5f5692c21a44b130a0dde8d0bd953975cc976fee82350b
+SIZE (tomcat-util-9.0.39.jar) = 197175
+SHA256 (tomcat-util-scan-9.0.39.jar) = c1b26d6628e6ee474e0e40283ea49eef7a5b11c951c7eaea19ce33730920521c
+SIZE (tomcat-util-scan-9.0.39.jar) = 224504
Index: head/www/unit-perl/Makefile
===================================================================
--- head/www/unit-perl/Makefile	(revision 555713)
+++ head/www/unit-perl/Makefile	(revision 555714)
@@ -1,33 +1,32 @@
 # Created by: Sergey Osokin <osa@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
 PKGNAMESUFFIX=	-${UNIT_MODNAME}
 
 UNIT_MODNAME=	perl${PERL_VER}
 
 COMMENT=	Perl module for NGINX Unit
 
 PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 RUN_DEPENDS=	unitd:www/unit
 
 USES=		perl5
 
 USE_RC_SUBR?=	# reset to empty
 
 MASTERDIR=	${.CURDIR}/../unit
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
 	${CONFIGURE_CMD} perl --module=${UNIT_MODNAME}
 
 do-build:
 	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
 	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 .include "${MASTERDIR}/Makefile"
Index: head/www/unit-python/Makefile
===================================================================
--- head/www/unit-python/Makefile	(revision 555713)
+++ head/www/unit-python/Makefile	(revision 555714)
@@ -1,35 +1,34 @@
 # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
 PKGNAMESUFFIX=	-${UNIT_MODNAME}
 
 UNIT_MODNAME=	python${PYTHON_SUFFIX}
 
 COMMENT=	Python module for NGINX Unit
 
 USES=		python gettext-runtime
 USE_PYTHON=	flavors
 
 PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 RUN_DEPENDS=	unitd:www/unit
 
 USE_RC_SUBR?=	# reset to empty
 
 MASTERDIR=	${.CURDIR}/../unit
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
 	${CONFIGURE_CMD} python --module=${UNIT_MODNAME} \
 			--config=${PYTHON_CMD}-config
 
 do-build:
 	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
 	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 .include "${MASTERDIR}/Makefile"