@@ -, +, @@ 
---
 mail/davmail/Makefile  |  6 +++---
 mail/davmail/distinfo  |  6 +++---
 mail/davmail/pkg-plist | 13 ++++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)
--- b/mail/davmail/Makefile	
+++ b/mail/davmail/Makefile	
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	davmail
-PORTVERSION=	4.9.0
+PORTVERSION=	5.1.0
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -20,7 +20,7 @@ USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 ALL_TARGET=	release
-REVISION=	2652  # 4.9.0
+REVISION=	2891  # 4.9.0
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
@@ -58,6 +58,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>
--- b/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 = 1549110079
+SHA256 (davmail-src-5.1.0-2891.tgz) = 36234835a62ce18d534c130b225589257b8476810c0f60e9c44a45a450c34a83
+SIZE (davmail-src-5.1.0-2891.tgz) = 17279451
--- b/mail/davmail/pkg-plist	
+++ b/mail/davmail/pkg-plist	
@@ -1,7 +1,7 @@ 
 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
@@ -15,6 +15,7 @@ share/applications/davmail.desktop
 %%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
@@ -22,13 +23,13 @@ share/applications/davmail.desktop
 %%DATADIR%%/DavMail.app/Contents/Java/slf4j-log4j12-1.7.25.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-%%PORTVERSION%%.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%%/davmail.sh
 %%DATADIR%%/lib/activation-1.1.1.jar
 %%DATADIR%%/lib/commons-codec-1.3.jar
 %%DATADIR%%/lib/commons-collections-3.1.jar
@@ -40,6 +41,7 @@ share/applications/davmail.desktop
 %%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
@@ -49,7 +51,7 @@ share/applications/davmail.desktop
 %%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-%%PORTVERSION%%.jar
 %%DATADIR%%/version.txt
 %%DATADIR%%/web/WEB-INF/classes/davmail.properties
 %%DATADIR%%/web/WEB-INF/lib/activation-1.1.1.jar
@@ -64,11 +66,12 @@ share/applications/davmail.desktop
 %%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
 %%DATADIR%%/web/WEB-INF/lib/slf4j-log4j12-1.7.25.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-%%PORTVERSION%%.jar
 %%DATADIR%%/web/WEB-INF/web.xml
--