Index: head/mail/davmail/Makefile
===================================================================
--- head/mail/davmail/Makefile	(revision 483766)
+++ head/mail/davmail/Makefile	(revision 483767)
@@ -1,63 +1,63 @@
 # Created by: John Prather
 # $FreeBSD$
 
 PORTNAME=	davmail
-PORTVERSION=	4.8.6
+PORTVERSION=	4.9.0
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
 
 MAINTAINER=	john.c.prather@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
 JAVA_VERSION=	1.6+
 ALL_TARGET=	release
-REVISION=	2600  # 4.8.6
+REVISION=	2652  # 4.9.0
 # 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=\"/usr/share/davmail/davmail.png\"#icon=\"${DATADIR}/davmail.png\"#' \
+	@${REINPLACE_CMD} -e 's#exec=\".*/davmail\"#exec=\"${PREFIX}/bin/davmail\"#' \
+		-e 's#icon=\".*/davmail.png\"#icon=\"${DATADIR}/davmail.png\"#' \
 		${WRKSRC}/build.xml
 
 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}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/
 
 .include <bsd.port.mk>
Index: head/mail/davmail/distinfo
===================================================================
--- head/mail/davmail/distinfo	(revision 483766)
+++ head/mail/davmail/distinfo	(revision 483767)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532270260
-SHA256 (davmail-src-4.8.6-2600.tgz) = cd5730ec03b9c02151e0ee5e3fc6fefa386ddf919d3b469328ea4f5b0fd42d98
-SIZE (davmail-src-4.8.6-2600.tgz) = 18216201
+TIMESTAMP = 1536366912
+SHA256 (davmail-src-4.9.0-2652.tgz) = b812a33b2d8cb9a45e57be0625fd8441b912d1053d545d5012251d5fe6fc9fb9
+SIZE (davmail-src-4.9.0-2652.tgz) = 16930933
Index: head/mail/davmail/pkg-plist
===================================================================
--- head/mail/davmail/pkg-plist	(revision 483766)
+++ head/mail/davmail/pkg-plist	(revision 483767)
@@ -1,77 +1,74 @@
 bin/davmail
 @sample etc/davmail.properties.sample
 share/applications/davmail.desktop
 %%DATADIR%%/%%PORTVERSION%%/releasenotes.txt
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Info.plist
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/activation-1.1.1.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-codec-1.3.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-collections-3.1.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-httpclient-3.1.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-logging-1.0.4.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/davmail.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/htmlcleaner-2.21.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jackrabbit-webdav-2.4.3.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcharset-1.3.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcifs-1.3.14.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jdom-1.0.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl-0.2.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl.jnilib
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/log4j-1.2.16.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/mail-1.4.3.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-api-1.7.25.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-log4j12-1.7.25.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/stax-api-1.0.1.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/stax2-api-3.1.1.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/woodstox-core-asl-4.1.2.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/xercesImpl-2.8.1.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/libgrowl.jnilib
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns
-%%JAVASHAREDIR%%/davmail/davmail.jar
-%%JAVASHAREDIR%%/davmail/davmail.png
-%%JAVASHAREDIR%%/davmail/davmail.sh
-%%JAVASHAREDIR%%/davmail/lib/activation-1.1.1.jar
-%%JAVASHAREDIR%%/davmail/lib/commons-codec-1.3.jar
-%%JAVASHAREDIR%%/davmail/lib/commons-collections-3.1.jar
-%%JAVASHAREDIR%%/davmail/lib/commons-httpclient-3.1.jar
-%%JAVASHAREDIR%%/davmail/lib/commons-logging-1.0.4.jar
-%%JAVASHAREDIR%%/davmail/lib/htmlcleaner-2.21.jar
-%%JAVASHAREDIR%%/davmail/lib/jackrabbit-webdav-2.4.3.jar
-%%JAVASHAREDIR%%/davmail/lib/jcharset-1.3.jar
-%%JAVASHAREDIR%%/davmail/lib/jcifs-1.3.14.jar
-%%JAVASHAREDIR%%/davmail/lib/jdom-1.0.jar
-%%JAVASHAREDIR%%/davmail/lib/junit-3.8.1.jar
-%%JAVASHAREDIR%%/davmail/lib/libgrowl-0.2.jar
-%%JAVASHAREDIR%%/davmail/lib/libgrowl.jnilib
-%%JAVASHAREDIR%%/davmail/lib/log4j-1.2.16.jar
-%%JAVASHAREDIR%%/davmail/lib/mail-1.4.3.jar
-%%JAVASHAREDIR%%/davmail/lib/slf4j-api-1.7.25.jar
-%%JAVASHAREDIR%%/davmail/lib/slf4j-log4j12-1.7.25.jar
-%%JAVASHAREDIR%%/davmail/lib/stax-api-1.0.1.jar
-%%JAVASHAREDIR%%/davmail/lib/stax2-api-3.1.1.jar
-%%JAVASHAREDIR%%/davmail/lib/winrun4j-0.4.5.jar
-%%JAVASHAREDIR%%/davmail/lib/woodstox-core-asl-4.1.2.jar
-%%JAVASHAREDIR%%/davmail/lib/xercesImpl-2.8.1.jar
-%%JAVASHAREDIR%%/davmail/version.txt
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/classes/davmail.properties
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/activation-1.1.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-codec-1.3.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-collections-3.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-httpclient-3.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-logging-1.0.4.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/davmail.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/htmlcleaner-2.21.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jackrabbit-webdav-2.4.3.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcharset-1.3.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcifs-1.3.14.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jdom-1.0.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/junit-3.8.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/log4j-1.2.16.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/mail-1.4.3.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-api-1.7.25.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-log4j12-1.7.25.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/stax-api-1.0.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/stax2-api-3.1.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/woodstox-core-asl-4.1.2.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/xercesImpl-2.8.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/web.xml
+%%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-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/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/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/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/MacOS/davmail
+%%DATADIR%%/DavMail.app/Contents/MacOS/libgrowl.jnilib
+%%DATADIR%%/DavMail.app/Contents/Resources/tray.icns
+%%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
+%%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/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/junit-3.8.1.jar
+%%DATADIR%%/lib/libgrowl-0.2.jar
+%%DATADIR%%/lib/libgrowl.jnilib
+%%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/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%%/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-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/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/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/web.xml