diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile
index a972cbe90029..5a62cf4b1eec 100644
--- a/security/zaproxy/Makefile
+++ b/security/zaproxy/Makefile
@@ -1,74 +1,77 @@
 PORTNAME=	zaproxy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	security java
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	The OWASP zed attack proxy
 WWW=		https://www.zaproxy.org/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	gradle:devel/gradle
 
 USES=		gettext-runtime
 USE_JAVA=	yes
 
 USE_GITHUB=	yes
 
 JAVA_VERSION=	11
 
 NO_ARCH=	yes
 
 MAKE_ENV+=	GRADLE_USER_HOME=${WRKDIR}
 
 DESKTOP_ENTRIES="ZAP" "OWASP ZAP" "${PREFIX}/share/pixmaps/zaproxy.png" "${PORTNAME}" \
 		"System;Security;" true
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
 #   3. upload the *-deps archive
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 
 DEPS_CACHE_DIR=	${WRKDIR}
+EXCLUDE_TASK=	--exclude-task :zap:downloadMainAddOns
 
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 .if (${DEV_UPDATE_MODE} == "yes")
+EXCLUDE_TASK=	#
 post-build:
 	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} gradle-${PORTNAME}
 	@cd ${WRKSRC}/zap/build && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-plugins${EXTRACT_SUFX} mainAddOns
 	@${ECHO} "(!!!) Please upload the deps archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 	@${ECHO} "(!!!) Please upload the plugins archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-plugins${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/acm/${PORTNAME}:deps
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:deps \
 		${PORTNAME}-${DISTVERSION}-plugins${EXTRACT_SUFX}:deps
 GRADLE_ARGS=	--offline
 
 post-extract: # need a separate extract step because the cache is in /tmp, and not under work/ like with maven
 	@cd ${DEPS_CACHE_DIR} && ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g' \
 		-e 's|%%JAVA_HOME%%|${JAVA_HOME}|g' \
 		-e 's|%%VERSION%%|${DISTVERSION}|g' ${WRKSRC}/zap/src/main/dist/zap.sh
 .endif
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \
 		--gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \
-		${GRADLE_ARGS} --build-cache :zap:distCore --exclude-task :zap:downloadMainAddOns
+		${GRADLE_ARGS} --build-cache :zap:distCore ${EXCLUDE_TASK}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/zap/build/distFiles/zap.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	cd ${WRKSRC}/zap/build/distFiles/ && ${COPYTREE_SHARE} "db lang lib license plugin README scripts xml zap-${DISTVERSION}.jar" ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
 	cd ${WRKDIR}/mainAddOns && ${COPYTREE_SHARE} ./ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/plugin
 	${INSTALL_DATA} ${WRKSRC}/zap/src/main/resources/resource/zap64x64.png ${STAGEDIR}${PREFIX}/share/pixmaps/zaproxy.png
 
 .include <bsd.port.mk>
diff --git a/security/zaproxy/distinfo b/security/zaproxy/distinfo
index eb03a80126a5..2fe760372a9b 100644
--- a/security/zaproxy/distinfo
+++ b/security/zaproxy/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1667261004
-SHA256 (zaproxy-2.12.0-deps.tar.gz) = 7a7e4839a25f883f91bcabfe836b022819947af6f39be6c6dd9bd4e27fd17704
-SIZE (zaproxy-2.12.0-deps.tar.gz) = 374388136
-SHA256 (zaproxy-2.12.0-plugins.tar.gz) = 2d6dc11846aa82df4f2452da91280b45a1266ea2149a58442c4005a346c1d1e2
-SIZE (zaproxy-2.12.0-plugins.tar.gz) = 256334454
+TIMESTAMP = 1671479878
+SHA256 (zaproxy-2.12.0-deps.tar.gz) = cde40f1763645ce0380098dde0638f8e76ec27a4eff35d04b7e075a3e66fb6a8
+SIZE (zaproxy-2.12.0-deps.tar.gz) = 331125479
+SHA256 (zaproxy-2.12.0-plugins.tar.gz) = 5b22706fee46203944c3667e5c490ff0af27bba20360d2f4390fe2062a9e390c
+SIZE (zaproxy-2.12.0-plugins.tar.gz) = 256337831
 SHA256 (zaproxy-zaproxy-v2.12.0_GH0.tar.gz) = caae3ad419d9ea6f327cc4d3a4450748aba9dedc0377d052381c352ec7976fac
 SIZE (zaproxy-zaproxy-v2.12.0_GH0.tar.gz) = 7442143
diff --git a/security/zaproxy/files/patch-buildSrc-src-main-java-org-zaproxy-zap-tasks_GradleBuildWithGitRepos.java b/security/zaproxy/files/patch-buildSrc-src-main-java-org-zaproxy-zap-tasks_GradleBuildWithGitRepos.java
new file mode 100644
index 000000000000..6650874c4130
--- /dev/null
+++ b/security/zaproxy/files/patch-buildSrc-src-main-java-org-zaproxy-zap-tasks_GradleBuildWithGitRepos.java
@@ -0,0 +1,19 @@
+--- buildSrc/src/main/java/org/zaproxy/zap/tasks/GradleBuildWithGitRepos.java	2022-12-19 14:49:43.923955000 -0500
++++ buildSrc/src/main/java/org/zaproxy/zap/tasks/GradleBuildWithGitRepos.java	2022-12-19 14:49:59.270410000 -0500
+@@ -48,6 +48,7 @@
+ import org.gradle.api.provider.Property;
+ import org.gradle.api.tasks.Console;
+ import org.gradle.api.tasks.Input;
++import org.gradle.api.tasks.InputDirectory;
+ import org.gradle.api.tasks.InputFile;
+ import org.gradle.api.tasks.Nested;
+ import org.gradle.api.tasks.TaskAction;
+@@ -80,7 +81,7 @@
+         return repositoriesDataFile;
+     }
+ 
+-    @Input
++    @InputDirectory
+     public DirectoryProperty getRepositoriesDirectory() {
+         return repositoriesDirectory;
+     }