diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile
index 31bdc74473b7..c2be7d8b0a9c 100644
--- a/www/unit-java/Makefile
+++ b/www/unit-java/Makefile
@@ -1,99 +1,106 @@
 # Created by: Sergey Osokin <osa@FreeBSD.org>
 
 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}
+PORTREVISION=	1
 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.112
 ECJ_VERSION=	3.26.0
 JETTY_VERSION=	9.4.43.v20210629
 TOMCAT_VERSION=	9.0.52
 
 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} && \
-	${CONFIGURE_CMD} java --module=${UNIT_MODNAME} \
+	${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} java \
+		--module=${UNIT_MODNAME} \
 		--local-repo=${DISTDIR} \
 		--jars=${JAVAJARDIR}
 
 do-build:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+	cd ${CONFIGURE_WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+			${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
 
 do-install:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}-install DESTDIR=${STAGEDIR}
+	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-perl/Makefile b/www/unit-perl/Makefile
index 725afb62fefb..d62dfe12ffd7 100644
--- a/www/unit-perl/Makefile
+++ b/www/unit-perl/Makefile
@@ -1,35 +1,39 @@
 # Created by: Sergey Osokin <osa@FreeBSD.org>
 
 PKGNAMESUFFIX=	-${UNIT_MODNAME}
+PORTREVISION=	1
 
 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}
+	${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} perl \
+		--module=${UNIT_MODNAME}
 
 do-build:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+	cd ${CONFIGURE_WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+			${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
 	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
 post-install:
 	@${DO_NADA}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/unit-php/Makefile b/www/unit-php/Makefile
index 2687b25da951..a662d2b30f32 100644
--- a/www/unit-php/Makefile
+++ b/www/unit-php/Makefile
@@ -1,36 +1,40 @@
 # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
 
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
+PORTREVISION=	1
 
 UNIT_MODNAME=	php${PHP_VER}
 
 COMMENT=	PHP module for NGINX Unit
 
 PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 RUN_DEPENDS=	unitd:www/unit
 
 USES=		php:build,embed,flavors
 
 USE_RC_SUBR=	# reset to empty
 
 MASTERDIR=	${.CURDIR}/../unit
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
-	${CONFIGURE_CMD} php --lib-path=${LOCALBASE}/lib \
-			--module=${UNIT_MODNAME}
+	${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} php \
+		--lib-path=${LOCALBASE}/lib \
+		--module=${UNIT_MODNAME}
 
 do-build:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+	cd ${CONFIGURE_WRKSRC} && \
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
 	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
 post-install:
 	@${DO_NADA}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/unit-python/Makefile b/www/unit-python/Makefile
index 60968e67d707..7fde75ab0906 100644
--- a/www/unit-python/Makefile
+++ b/www/unit-python/Makefile
@@ -1,37 +1,41 @@
 # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
 
 PKGNAMESUFFIX=	-${UNIT_MODNAME}
+PORTREVISION=	1
 
 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
+	${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} python \
+		--module=${UNIT_MODNAME} \
+		--config=${PYTHON_CMD}-config
 
 do-build:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+	cd ${CONFIGURE_WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+			${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
 	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
 post-install:
 	@${DO_NADA}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/unit-ruby/Makefile b/www/unit-ruby/Makefile
index 0afdf124f385..f4afe176045c 100644
--- a/www/unit-ruby/Makefile
+++ b/www/unit-ruby/Makefile
@@ -1,36 +1,40 @@
 # Created by: Sergey Osokin <osa@FreeBSD.org>
 
 PKGNAMESUFFIX=	-${UNIT_MODNAME}
+PORTREVISION=	1
 
 UNIT_MODNAME=	ruby${RUBY_VER}
 
 COMMENT=	Ruby module for NGINX Unit
 
 RUN_DEPENDS=	rackup:www/rubygem-rack \
 		unitd:www/unit
 
 PLIST_FILES=	libexec/unit/modules/${UNIT_MODNAME}.unit.so
 
 USE_RUBY=	yes
 
 USE_RC_SUBR?=	# reset to empty
 
 MASTERDIR=	${.CURDIR}/../unit
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
-	${CONFIGURE_CMD} ruby --module=${UNIT_MODNAME}
+	${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ruby \
+		--module=${UNIT_MODNAME}
 
 do-build:
-	cd ${CONFIGURE_WRKSRC} && ${MAKE} ${UNIT_MODNAME}
+	cd ${CONFIGURE_WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+			${MAKEFILE} ${MAKE_ARGS} ${UNIT_MODNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules/
 	${INSTALL_LIB} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
 		${STAGEDIR}${PREFIX}/libexec/unit/modules/
 
 # Overwrite the target in the ${MASTERDIR}/Makefile
 post-install:
 	@${DO_NADA}
 
 .include "${MASTERDIR}/Makefile"