7 files changed, 37 insertions, 50 deletions

diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index c061270ea95a..19729c917ed5 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	davmail
-PORTVERSION=	4.4.1
+PORTVERSION=	4.5.0
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -19,7 +19,7 @@ USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 ALL_TARGET=	release
-REVISION=	2225
+REVISION=	2292
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
@@ -48,8 +48,8 @@ do-install:
 		-not -name "*.desktop" \
 		-exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \;
 	@${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail
-	@${INSTALL_DATA} ${FILESDIR}/davmail.properties.sample \
-		${STAGEDIR}${PREFIX}/etc
+	@${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>
diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo
index c46100c884fa..716fbcf37546 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (davmail-src-4.4.1-2225.tgz) = 76c4957d45f8b968543407c1ea4512eecb5d63a57b84bbc679851bc15d939132
-SIZE (davmail-src-4.4.1-2225.tgz) = 22229902
+SHA256 (davmail-src-4.5.0-2292.tgz) = dfcdcd9cee39651bbaa3de750bc79277db09a13d1f19a5d970aaca3054782b57
+SIZE (davmail-src-4.5.0-2292.tgz) = 22669968
diff --git a/mail/davmail/files/davmail.in b/mail/davmail/files/davmail.in
index ebbbc370792c..1bad204d9812 100644
--- a/mail/davmail/files/davmail.in
+++ b/mail/davmail/files/davmail.in
@@ -25,10 +25,23 @@ load_rc_config $name
 
 start_cmd="${name}_start"
 
-procname="*/java"
+davmail_procname()
+{
+	JAVAVM_DRYRUN=yes "%%PREFIX%%/bin/java" | \
+	    /usr/bin/awk -F= '{if ($1=="JAVAVM_PROG") print $2}' 2> /dev/null
+}
+
+procname="$(davmail_procname)"
 pidfile="/var/run/davmail.pid"
 required_files=${davmail_config}
 
+davmail_daemon()
+{
+	%%PREFIX%%/bin/java \
+	    -cp "%%DATADIR%%/davmail.jar:%%DATADIR%%/lib/*" \
+	    davmail.DavGateway "${davmail_config}" & echo -n $! > ${pidfile}
+}
+
 davmail_start()
 {
 	if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
@@ -36,8 +49,7 @@ davmail_start()
 		return 1
 	fi
 	echo "Starting ${name}."
-	CLASSPATH="$BASE/lib/*"
-	((java -cp "%%DATADIR%%/davmail.jar:$CLASSPATH" davmail.DavGateway ${davmail_config} & echo -n $! > ${pidfile}) 2>&1 | logger -p daemon.info -t davmail) &
+	{ davmail_daemon 2>&1 | /usr/bin/logger -p daemon.info -t davmail; } &
 }
 
 run_rc_command "$1"
diff --git a/mail/davmail/files/davmail.properties.sample b/mail/davmail/files/davmail.properties.sample
deleted file mode 100644
index 112100078654..000000000000
--- a/mail/davmail/files/davmail.properties.sample
+++ /dev/null
@@ -1,34 +0,0 @@
-# Sample davmail properties file
-#
-# $FreeBSD$
-#
-davmail.url=https://--your-exchange-server-uri--/owa
-davmail.popPort=1110
-davmail.imapPort=1143
-davmail.smtpPort=1025
-davmail.caldavPort=1080
-davmail.ldapPort=1389
-davmail.keepDelay=30
-davmail.sentKeepDelay=90
-davmail.caldavPastDelay=90
-davmail.imapIdleDelay=
-davmail.useSystemProxies=false
-davmail.enableProxy=false
-davmail.proxyHost=
-davmail.proxyPort=
-davmail.proxyUser=
-davmail.proxyPassword=
-davmail.ssl.keystoreType=JKS
-davmail.ssl.keyPass=
-davmail.ssl.keystoreFile=
-davmail.ssl.keystorePass=
-davmail.server=true
-davmail.server.certificate.hash=
-davmail.bindAddress=
-davmail.allowRemote=true
-davmail.disableUpdateCheck=false
-log4j.rootLogger=WARN
-log4j.logger.davmail=DEBUG
-log4j.logger.org.apache.commons.httpclient=WARN
-log4j.logger.httpclient.wire=WARN
-davmail.logFilePath=/var/log/davmail.log
diff --git a/mail/davmail/files/davmail.sh.in b/mail/davmail/files/davmail.sh.in
index 1f9ad2ec173c..fe38b949fee8 100644
--- a/mail/davmail/files/davmail.sh.in
+++ b/mail/davmail/files/davmail.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
 # $FreeBSD$
-BASE="%%DATADIR%%"
-CLASSPATH="$BASE/lib/*"
-exec java -cp $BASE/davmail.jar:$CLASSPATH davmail.DavGateway $1
+exec %%PREFIX%%/bin/java \
+    -cp "%%DATADIR%%/davmail.jar:%%DATADIR%%/lib/*" \
+    davmail.DavGateway "$@"
diff --git a/mail/davmail/files/patch-src__etc__davmail.properties b/mail/davmail/files/patch-src__etc__davmail.properties
new file mode 100644
index 000000000000..75761bf13a2b
--- /dev/null
+++ b/mail/davmail/files/patch-src__etc__davmail.properties
@@ -0,0 +1,11 @@
+--- 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
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index e702402ecf57..d1a4e393a0d3 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -1,7 +1,5 @@
 bin/davmail
-@unexec if cmp -s %D/etc/davmail.properties.sample %D/etc/davmail.properties; then rm -f %D/etc/davmail.properties ; fi
-etc/davmail.properties.sample
-@exec if [ ! -f %D/etc/davmail.properties ] ; then cp -p %D/%F %B/davmail.properties; fi
+@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
@@ -51,7 +49,7 @@ share/applications/davmail.desktop
 %%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.4.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