diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index 8df08d9cb081..02523fdbb723 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -1,62 +1,64 @@
 # Created by: John Prather
 
 PORTNAME=	davmail
-PORTVERSION=	5.5.1
+PORTVERSION=	6.0.0
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
 
 MAINTAINER=	jjuanino@gmail.com
 COMMENT=	POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway
 
 LICENSE=	GPLv2
 
 USES=		dos2unix tar:tgz
 
 DOS2UNIX_FILES=	build.xml
 NO_ARCH=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
 ALL_TARGET=	release
-# 5.4.0
-REVISION=	3299
+# 6.0.0
+REVISION=	3375
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
 
 USERS=		davmail
 GROUPS=		davmail
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 USE_RC_SUBR=	davmail
 SUB_FILES=	davmail.sh pkg-message
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#exec=\".*/davmail\"#exec=\"${PREFIX}/bin/davmail\"#' \
-		-e 's#icon=\".*/davmail.png\"#icon=\"${DATADIR}/davmail.png\"#' \
+	@${REINPLACE_CMD} -e 's#prefix=\"usr#prefix=\"${PREFIX}#' \
 		${WRKSRC}/build.xml
 
+# Azul JRE FX has been disabled by removing the target:
+# <antcall target="download-jre"/>
+# in files/patch-build.xml patch.
 do-install:
 	@cd ${WRKSRC}/dist && ${FIND} . -type d \
 		-exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \;
 	@cd ${WRKSRC}/dist && ${FIND} . -type f \
 		-not -name "*.deb" \
 		-not -name "*.md5" \
 		-not -name "*.MD5" \
 		-not -name "*.tgz" \
 		-not -name "*.exe" \
 		-not -name "swt-*.jar" \
 		-not -name "*.zip" \
 		-not -name "*.war" \
 		-not -name "*.rpm" \
 		-not -name "*.desktop" \
 		-exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \;
 	@${FIND} ${STAGEDIR}/${DATADIR} -depth -empty -type d -delete
 	${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail
 	${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \
 		${STAGEDIR}${PREFIX}/etc/davmail.properties.sample
 	${INSTALL_DATA} ${WRKSRC}/src/desktop/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/
 
 .include <bsd.port.mk>
diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo
index e40329a20adc..c5c95413eb30 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600772850
-SHA256 (davmail-src-5.5.1-3299.tgz) = 63e14eeda3fed2a1a5c55f864a8832f8842d597e797ca1e8874c9b66b811f508
-SIZE (davmail-src-5.5.1-3299.tgz) = 20780537
+TIMESTAMP = 1636219585
+SHA256 (davmail-src-6.0.0-3375.tgz) = 2d719188671f7a621c82ce7bc6d1d781ed18c8d52a9af23e7bc5288df2b649a5
+SIZE (davmail-src-6.0.0-3375.tgz) = 21329359
diff --git a/mail/davmail/files/patch-build.xml b/mail/davmail/files/patch-build.xml
index 5602f6ff7983..4684f60df625 100644
--- a/mail/davmail/files/patch-build.xml
+++ b/mail/davmail/files/patch-build.xml
@@ -1,11 +1,19 @@
---- build.xml.orig	2016-04-09 15:14:49 UTC
+--- build.xml.orig	2021-11-06 18:00:46 UTC
 +++ build.xml
-@@ -61,7 +61,7 @@
+@@ -88,7 +88,7 @@
      </target>
  
      <target name="defaultrelease" unless="is.svn">
 -        <property name="release" value="${version}"/>
 +	<property name="release" value="${version}-${revision}"/>
      </target>
  
-     <target name="init" depends="check-encoding, check-java6, svnrelease, defaultrelease">
+     <target name="init" depends="check-encoding, check-java8, svnrelease, gitsvnrelease, defaultrelease">
+@@ -412,7 +412,6 @@
+                 <exclude name="lib/hamcrest-core-*.jar"/>
+             </fileset>
+         </zip>
+-        <antcall target="download-jre"/>
+         <zip file="dist/davmail-${release-name}-windows-standalone.zip">
+             <fileset dir="dist">
+                 <include name="jre/**"/>
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index 274e6513e486..9fe45d8075f5 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -1,91 +1,83 @@
 bin/davmail
 @sample etc/davmail.properties.sample
 share/applications/davmail.desktop
 %%DATADIR%%/%%PORTVERSION%%/RELEASE-NOTES.md
 %%DATADIR%%/DavMail.app/Contents/Info.plist
 %%DATADIR%%/DavMail.app/Contents/Java/activation-1.1.1.jar
 %%DATADIR%%/DavMail.app/Contents/Java/commons-codec-1.11.jar
 %%DATADIR%%/DavMail.app/Contents/Java/commons-collections-3.1.jar
-%%DATADIR%%/DavMail.app/Contents/Java/commons-httpclient-3.1.jar
 %%DATADIR%%/DavMail.app/Contents/Java/commons-logging-1.0.4.jar
 %%DATADIR%%/DavMail.app/Contents/Java/davmail.jar
 %%DATADIR%%/DavMail.app/Contents/Java/htmlcleaner-2.21.jar
 %%DATADIR%%/DavMail.app/Contents/Java/httpclient-4.5.6.jar
 %%DATADIR%%/DavMail.app/Contents/Java/httpcore-4.4.10.jar
 %%DATADIR%%/DavMail.app/Contents/Java/jackrabbit-webdav-2.14.6.jar
 %%DATADIR%%/DavMail.app/Contents/Java/jacocoant-0.8.5.jar
 %%DATADIR%%/DavMail.app/Contents/Java/javax.mail-1.5.6.jar
 %%DATADIR%%/DavMail.app/Contents/Java/jcharset-2.0.jar
 %%DATADIR%%/DavMail.app/Contents/Java/jcifs-1.3.14.jar
 %%DATADIR%%/DavMail.app/Contents/Java/jdom-1.0.jar
 %%DATADIR%%/DavMail.app/Contents/Java/jettison-1.4.0.jar
-%%DATADIR%%/DavMail.app/Contents/Java/libgrowl-0.2.jar
-%%DATADIR%%/DavMail.app/Contents/Java/libgrowl.jnilib
 %%DATADIR%%/DavMail.app/Contents/Java/log4j-1.2.16.jar
 %%DATADIR%%/DavMail.app/Contents/Java/slf4j-api-1.7.25.jar
 %%DATADIR%%/DavMail.app/Contents/Java/slf4j-log4j12-1.7.25.jar
 %%DATADIR%%/DavMail.app/Contents/Java/sonarqube-ant-task-2.7.0.1612.jar
 %%DATADIR%%/DavMail.app/Contents/Java/stax-api-1.0.1.jar
 %%DATADIR%%/DavMail.app/Contents/Java/stax2-api-3.1.1.jar
-%%DATADIR%%/DavMail.app/Contents/Java/woodstox-core-5.1.0.jar
+%%DATADIR%%/DavMail.app/Contents/Java/woodstox-core-6.2.0.jar
 %%DATADIR%%/DavMail.app/Contents/MacOS/davmail
-%%DATADIR%%/DavMail.app/Contents/MacOS/libgrowl.jnilib
 %%DATADIR%%/DavMail.app/Contents/Resources/tray.icns
 %%DATADIR%%/davmail
 %%DATADIR%%/davmail.jar
 %%DATADIR%%/davmail.png
 %%DATADIR%%/lib/activation-1.1.1.jar
 %%DATADIR%%/lib/commons-codec-1.11.jar
 %%DATADIR%%/lib/commons-collections-3.1.jar
-%%DATADIR%%/lib/commons-httpclient-3.1.jar
 %%DATADIR%%/lib/commons-logging-1.0.4.jar
 %%DATADIR%%/lib/hamcrest-core-1.3.jar
 %%DATADIR%%/lib/htmlcleaner-2.21.jar
 %%DATADIR%%/lib/httpclient-4.5.6.jar
 %%DATADIR%%/lib/httpcore-4.4.10.jar
 %%DATADIR%%/lib/jackrabbit-webdav-2.14.6.jar
 %%DATADIR%%/lib/jacocoant-0.8.5.jar
 %%DATADIR%%/lib/javax.mail-1.5.6.jar
 %%DATADIR%%/lib/jcharset-2.0.jar
 %%DATADIR%%/lib/jcifs-1.3.14.jar
 %%DATADIR%%/lib/jdom-1.0.jar
 %%DATADIR%%/lib/jettison-1.4.0.jar
-%%DATADIR%%/lib/junit-4.12.jar
-%%DATADIR%%/lib/libgrowl-0.2.jar
-%%DATADIR%%/lib/libgrowl.jnilib
+%%DATADIR%%/lib/junit-4.13.1.jar
 %%DATADIR%%/lib/log4j-1.2.16.jar
 %%DATADIR%%/lib/slf4j-api-1.7.25.jar
 %%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar
 %%DATADIR%%/lib/sonarqube-ant-task-2.7.0.1612.jar
 %%DATADIR%%/lib/stax-api-1.0.1.jar
 %%DATADIR%%/lib/stax2-api-3.1.1.jar
 %%DATADIR%%/lib/winrun4j-0.4.5.jar
-%%DATADIR%%/lib/woodstox-core-5.1.0.jar
+%%DATADIR%%/lib/woodstox-core-6.2.0.jar
 %%DATADIR%%/version.txt
 %%DATADIR%%/web/WEB-INF/classes/davmail.properties
 %%DATADIR%%/web/WEB-INF/lib/activation-1.1.1.jar
 %%DATADIR%%/web/WEB-INF/lib/commons-codec-1.11.jar
 %%DATADIR%%/web/WEB-INF/lib/commons-collections-3.1.jar
-%%DATADIR%%/web/WEB-INF/lib/commons-httpclient-3.1.jar
 %%DATADIR%%/web/WEB-INF/lib/commons-logging-1.0.4.jar
 %%DATADIR%%/web/WEB-INF/lib/davmail.jar
 %%DATADIR%%/web/WEB-INF/lib/hamcrest-core-1.3.jar
 %%DATADIR%%/web/WEB-INF/lib/htmlcleaner-2.21.jar
 %%DATADIR%%/web/WEB-INF/lib/httpclient-4.5.6.jar
 %%DATADIR%%/web/WEB-INF/lib/httpcore-4.4.10.jar
 %%DATADIR%%/web/WEB-INF/lib/jackrabbit-webdav-2.14.6.jar
 %%DATADIR%%/web/WEB-INF/lib/jacocoant-0.8.5.jar
 %%DATADIR%%/web/WEB-INF/lib/javax.mail-1.5.6.jar
 %%DATADIR%%/web/WEB-INF/lib/jcharset-2.0.jar
 %%DATADIR%%/web/WEB-INF/lib/jcifs-1.3.14.jar
 %%DATADIR%%/web/WEB-INF/lib/jdom-1.0.jar
 %%DATADIR%%/web/WEB-INF/lib/jettison-1.4.0.jar
-%%DATADIR%%/web/WEB-INF/lib/junit-4.12.jar
+%%DATADIR%%/web/WEB-INF/lib/junit-4.13.1.jar
 %%DATADIR%%/web/WEB-INF/lib/log4j-1.2.16.jar
 %%DATADIR%%/web/WEB-INF/lib/slf4j-api-1.7.25.jar
 %%DATADIR%%/web/WEB-INF/lib/slf4j-log4j12-1.7.25.jar
 %%DATADIR%%/web/WEB-INF/lib/sonarqube-ant-task-2.7.0.1612.jar
 %%DATADIR%%/web/WEB-INF/lib/stax-api-1.0.1.jar
 %%DATADIR%%/web/WEB-INF/lib/stax2-api-3.1.1.jar
-%%DATADIR%%/web/WEB-INF/lib/woodstox-core-5.1.0.jar
+%%DATADIR%%/web/WEB-INF/lib/woodstox-core-6.2.0.jar
 %%DATADIR%%/web/WEB-INF/web.xml