3 files changed, 24 insertions, 14 deletions

diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index 0291b51dae3b..611288abbd23 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	davmail
-PORTVERSION=	4.9.0
+PORTVERSION=	5.2.0
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -20,7 +20,8 @@ USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 ALL_TARGET=	release
-REVISION=	2652  # 4.9.0
+# 5.2.0
+REVISION=	2961
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
@@ -58,6 +59,6 @@ do-install:
 	${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}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	${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 8931cc8f3a50..603e85d7a255 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536366912
-SHA256 (davmail-src-4.9.0-2652.tgz) = b812a33b2d8cb9a45e57be0625fd8441b912d1053d545d5012251d5fe6fc9fb9
-SIZE (davmail-src-4.9.0-2652.tgz) = 16930933
+TIMESTAMP = 1557004771
+SHA256 (davmail-src-5.2.0-2961.tgz) = 017887959d2969e16a105ce7d71c669dcc9a955a79ba67a783767e8c1dd61d8f
+SIZE (davmail-src-5.2.0-2961.tgz) = 19260758
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index 6a947a374e1d..ac4c9109e919 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -1,20 +1,23 @@
 bin/davmail
 @sample etc/davmail.properties.sample
 share/applications/davmail.desktop
-%%DATADIR%%/%%PORTVERSION%%/releasenotes.txt
+%%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.3.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/jackrabbit-webdav-2.4.3.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/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
@@ -26,20 +29,23 @@ share/applications/davmail.desktop
 %%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%%/davmail.sh
 %%DATADIR%%/lib/activation-1.1.1.jar
-%%DATADIR%%/lib/commons-codec-1.3.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/htmlcleaner-2.21.jar
-%%DATADIR%%/lib/jackrabbit-webdav-2.4.3.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/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-3.8.1.jar
 %%DATADIR%%/lib/libgrowl-0.2.jar
 %%DATADIR%%/lib/libgrowl.jnilib
@@ -53,17 +59,20 @@ share/applications/davmail.desktop
 %%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.3.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/htmlcleaner-2.21.jar
-%%DATADIR%%/web/WEB-INF/lib/jackrabbit-webdav-2.4.3.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/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-3.8.1.jar
 %%DATADIR%%/web/WEB-INF/lib/log4j-1.2.16.jar
 %%DATADIR%%/web/WEB-INF/lib/slf4j-api-1.7.25.jar