Index: head/mail/davmail/Makefile
===================================================================
--- head/mail/davmail/Makefile	(revision 387178)
+++ head/mail/davmail/Makefile	(revision 387179)
@@ -1,54 +1,55 @@
 # Created by: John Prather
 # $FreeBSD$
 
 PORTNAME=	davmail
-PORTVERSION=	4.5.1
+PORTVERSION=	4.6.1
 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=	2303
+REVISION=	2343
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 USE_RC_SUBR=	davmail
 SUB_FILES=	davmail.sh
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#exec=\"davmail\"#exec=\"${PREFIX}/bin/davmail\"#' \
 		-e 's#icon=\"/usr/share/davmail/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 "*.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}/\{} \;
-	@${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail
-	@${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \
+	${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}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/
 
 .include <bsd.port.mk>
Index: head/mail/davmail/distinfo
===================================================================
--- head/mail/davmail/distinfo	(revision 387178)
+++ head/mail/davmail/distinfo	(revision 387179)
@@ -1,2 +1,2 @@
-SHA256 (davmail-src-4.5.1-2303.tgz) = 2621a5cbc81c06d0345ec05c93664a052e2e9d2d2bfda8e731a8fb94fd70f752
-SIZE (davmail-src-4.5.1-2303.tgz) = 22670415
+SHA256 (davmail-src-4.6.1-2343.tgz) = 1e6f5c88469416276fd7301990ddaa048dd177eb90e3348ae8d54b22df38997e
+SIZE (davmail-src-4.6.1-2343.tgz) = 22659201
Index: head/mail/davmail/files/patch-src__etc__davmail.properties
===================================================================
--- head/mail/davmail/files/patch-src__etc__davmail.properties	(revision 387178)
+++ head/mail/davmail/files/patch-src__etc__davmail.properties	(nonexistent)
@@ -1,11 +0,0 @@
---- src/etc/davmail.properties.orig	2014-06-03 18:17:10.000000000 -0400
-+++ src/etc/davmail.properties	2014-06-10 18:06:05.000000000 -0400
-@@ -58,7 +58,7 @@
- davmail.disableUpdateCheck=false
- 
- # Send keepalive character during large folder and messages download
--davmail.enableKeepalive=false
-+davmail.enableKeepAlive=false
- # Message count limit on folder retrieval
- davmail.folderSizeLimit=0
- # Default windows domain for NTLM and basic authentication

Property changes on: head/mail/davmail/files/patch-src__etc__davmail.properties
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/davmail/files/patch-build.xml
===================================================================
--- head/mail/davmail/files/patch-build.xml	(revision 387178)
+++ head/mail/davmail/files/patch-build.xml	(revision 387179)
@@ -1,11 +1,22 @@
---- build.xml.orig	2013-04-23 16:50:41.883412959 +0200
-+++ build.xml	2013-04-23 16:51:32.230415374 +0200
-@@ -58,7 +58,7 @@
+--- build.xml.orig	2015-05-23 02:27:12 UTC
++++ build.xml
+@@ -59,7 +59,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">
+@@ -138,8 +138,8 @@
+                 toFile="dist/davmail.desktop"
+                 name="DavMail"
+                 comment="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
+-                exec="davmail"
+-                icon="/usr/share/davmail/davmail.png"
++                exec="/usr/local/bin/davmail"
++                icon="/usr/local/share/java/davmail/davmail.png"
+                 categories="Network;"
+                 genericname="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
+                 />
Index: head/mail/davmail/pkg-plist
===================================================================
--- head/mail/davmail/pkg-plist	(revision 387178)
+++ head/mail/davmail/pkg-plist	(revision 387179)
@@ -1,77 +1,76 @@
 bin/davmail
 @sample etc/davmail.properties.sample
 share/applications/davmail.desktop
 %%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.2.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.3.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-log4j12-1.3.1.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/PkgInfo
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/en.lproj/Localizable.strings
 %%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.2.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.3.1.jar
 %%JAVASHAREDIR%%/davmail/lib/slf4j-log4j12-1.3.1.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.2.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.3.1.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-log4j12-1.3.1.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