Index: head/biology/gatk/Makefile
===================================================================
--- head/biology/gatk/Makefile	(revision 525624)
+++ head/biology/gatk/Makefile	(revision 525625)
@@ -1,63 +1,64 @@
 # $FreeBSD$
 
 PORTNAME=	gatk
 DISTVERSION=	4.1.4.1
+PORTREVISION=	1
 CATEGORIES=	biology java
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Variant discovery in high-throughput sequencing data
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-BUILD_DEPENDS=	gradle5:devel/gradle5
+BUILD_DEPENDS=	gradle:devel/gradle
 
 USES=		gettext-runtime
 USE_GITHUB=	yes
 GH_ACCOUNT=	broadinstitute
 USE_JAVA=	yes
 
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	PORTVERSION=${PORTVERSION} JAVA=${JAVA}
 
 NO_ARCH=	yes
 
-DEPS_CACHE_DIR=	/tmp # should be ${WRKDIR}, but workaround for the gradle bug that dependency cache is not relocable: https://github.com/gradle/gradle/issues/1338
+DEPS_CACHE_DIR=	${WRKDIR}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		${JAVAJARDIR}/GenomeAnalysisTK-${PORTVERSION}.jar
 
 # 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
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} gradle-${PORTNAME}
 	@${ECHO} "(!!!) Please upload the gradle deps archive: ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES=	LOCAL/yuri/:deps
 DISTFILES=	${PORTNAME}-${DISTVERSION}-deps${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}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}
 .endif
 
 
 do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle5 \
+	@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 localJar
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/build/libs/gatk-package-1.0-SNAPSHOT-local.jar ${STAGEDIR}${JAVAJARDIR}/GenomeAnalysisTK-${PORTVERSION}.jar
 
 .include <bsd.port.mk>
Index: head/biology/gatk/distinfo
===================================================================
--- head/biology/gatk/distinfo	(revision 525624)
+++ head/biology/gatk/distinfo	(revision 525625)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1579483921
-SHA256 (gatk-4.1.4.1-deps.tar.gz) = b634903f674aa1550039c4434e0ef0efab75d509e80d5073a2b5f3a0120fd68e
-SIZE (gatk-4.1.4.1-deps.tar.gz) = 253677476
+TIMESTAMP = 1581225116
+SHA256 (gatk-4.1.4.1-deps.tar.gz) = 498a0f827531b122ed8f7e789232548a6a4e61c0629ef103d90d06bed787db9e
+SIZE (gatk-4.1.4.1-deps.tar.gz) = 253086649
 SHA256 (broadinstitute-gatk-4.1.4.1_GH0.tar.gz) = 54129c3973ad7f1c501ecd7c841d15cd09fdd0d5ca3057810c17d7b7b9d88eb7
 SIZE (broadinstitute-gatk-4.1.4.1_GH0.tar.gz) = 64600068