diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index 96313d21f708..2efae7b8c3a0 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -1,66 +1,66 @@
PORTNAME= davmail
-PORTVERSION= 6.0.1
+PORTVERSION= 6.1.0
CATEGORIES= mail java
MASTER_SITES= SF/davmail/davmail/${PORTVERSION}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION}
MAINTAINER= ports@FreeBSD.org
COMMENT= POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway
WWW= http://davmail.sourceforge.net/
LICENSE= GPLv2
USES= dos2unix tar:tgz
DOS2UNIX_FILES= build.xml
USE_ANT= yes
USE_JAVA= yes
USE_RC_SUBR= davmail
-# 6.0.1
-REVISION= 3390
+# 6.1.0
+REVISION= 3423
# port build number, same as on DISTNAME
MAKE_ARGS= -Drevision=${REVISION}
MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8"
ALL_TARGET= release
NO_ARCH= yes
SUB_FILES= davmail.sh pkg-message
USERS= davmail
GROUPS= davmail
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
post-patch:
@${REINPLACE_CMD} -e 's#prefix=\"usr#prefix=\"${PREFIX}#' \
${WRKSRC}/build.xml
# Azul JRE FX has been disabled by removing the target:
#
# 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
diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo
index a0443dfa8baf..9177f4b8b78c 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639155768
-SHA256 (davmail-src-6.0.1-3390.tgz) = ce3b33cd187787a30ccc136e75f1cdf197b0a2874c20ab3f3ea3e426b32b9ab1
-SIZE (davmail-src-6.0.1-3390.tgz) = 21330154
+TIMESTAMP = 1687354803
+SHA256 (davmail-src-6.1.0-3423.tgz) = 08e7103d14e9f05ec269caceef7585dcf8be202a35c471fa6fc12729cf99ef2f
+SIZE (davmail-src-6.1.0-3423.tgz) = 21347199
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index 9fe45d8075f5..4bce9325c4c5 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -1,83 +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-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/log4j-1.2.16.jar
+%%DATADIR%%/DavMail.app/Contents/Java/jettison-1.5.3.jar
+%%DATADIR%%/DavMail.app/Contents/Java/log4j-1.2.17.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-6.2.0.jar
+%%DATADIR%%/DavMail.app/Contents/Java/woodstox-core-6.4.0.jar
%%DATADIR%%/DavMail.app/Contents/MacOS/davmail
%%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-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/jettison-1.5.3.jar
%%DATADIR%%/lib/junit-4.13.1.jar
-%%DATADIR%%/lib/log4j-1.2.16.jar
+%%DATADIR%%/lib/log4j-1.2.17.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-6.2.0.jar
+%%DATADIR%%/lib/woodstox-core-6.4.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-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/jettison-1.5.3.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/log4j-1.2.17.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-6.2.0.jar
+%%DATADIR%%/web/WEB-INF/lib/woodstox-core-6.4.0.jar
%%DATADIR%%/web/WEB-INF/web.xml