4 files changed, 32 insertions, 28 deletions

diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index c344dbb7398f..c062fd7e0385 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	davmail
-PORTVERSION=	3.9.0
+PORTVERSION=	3.9.1
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1630
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1646
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	john.c.prather@gmail.com
@@ -17,8 +17,6 @@ COMMENT=	POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway
 
 RUN_DEPENDS=	swt>=3.5:${PORTSDIR}/x11-toolkits/swt
 
-BROKEN=		fails to package
-
 USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -28,8 +26,7 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 USE_RC_SUBR=	davmail
 SUB_FILES=	davmail.sh
 SUB_LIST=	JAVASHAREDIR=${JAVASHAREDIR} \
-		JAVAJARDIR=${JAVAJARDIR} \
-		PORTNAME=${PORTNAME}
+		JAVAJARDIR=${JAVAJARDIR}
 
 do-install:
 	@cd ${WRKSRC}/dist && ${FIND} . -type d \
@@ -43,8 +40,8 @@ do-install:
 		-not -name "*.war" \
 		-not -name "*.rpm" \
 		-exec ${INSTALL_DATA} \{} ${DATADIR}/\{} \;
-	@@${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${PREFIX}/bin/davmail
-	@@${INSTALL_DATA} ${FILESDIR}/davmail.properties.sample \
+	@${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${PREFIX}/bin/davmail
+	@${INSTALL_DATA} ${FILESDIR}/davmail.properties.sample \
 		${PREFIX}/etc
 
 post-install:
diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo
index 44028b63ec64..b14cd5be1247 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (davmail-src-3.9.0-1630.tgz) = 970c041881a16cc4d2f79b04d2ad083ca84040b5ca2fa679b5d6add352c1681e
-SIZE (davmail-src-3.9.0-1630.tgz) = 17293146
+SHA256 (davmail-src-3.9.1-1646.tgz) = 69a3a544643c4b19aa7c104a1b92e46fefcf122ce7ab406a659a7d65960ca9b1
+SIZE (davmail-src-3.9.1-1646.tgz) = 17293888
diff --git a/mail/davmail/files/davmail.in b/mail/davmail/files/davmail.in
index ae25f9037b83..24415bf85ba9 100644
--- a/mail/davmail/files/davmail.in
+++ b/mail/davmail/files/davmail.in
@@ -2,33 +2,34 @@
 
 # $FreeBSD$
 #
-# PROVIDE: %%PORTNAME%%
+# PROVIDE: davmail
 # REQUIRE: LOGIN
+# KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf or /etc/rc.conf.local to
-# enable %%PORTNAME%%:
-# %%PORTNAME%%_enable (bool):	Set to "NO" by default.
-# %%PORTNAME%%_config (path):	Set to 
-#				"%%PREFIX%%/etc/%%PORTNAME%%.properties"
+# enable davmail:
+# davmail_enable (bool):	Set to "NO" by default.
+# davmail_config (path):	Set to 
+#				"%%PREFIX%%/etc/davmail.properties"
 #				by default
 
 . /etc/rc.subr
 
-name="%%PORTNAME%%"
+name="davmail"
 rcvar=`set_rcvar`
 
 load_rc_config $name
 
-: ${%%PORTNAME%%_enable="NO"}
-: ${%%PORTNAME%%_config="%%PREFIX%%/etc/%%PORTNAME%%.properties"}
+: ${davmail_enable="NO"}
+: ${davmail_config="%%PREFIX%%/etc/davmail.properties"}
 
 start_cmd="${name}_start"
 
 procname="java"
-pidfile="/var/run/%%PORTNAME%%.pid"
-required_files=${%%PORTNAME%%_config}
+pidfile="/var/run/davmail.pid"
+required_files=${davmail_config}
 
-%%PORTNAME%%_start()
+davmail_start()
 {
 	if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
 		echo 1>&2 "${name} already running? (pid=$rc_pid)."
@@ -36,7 +37,7 @@ required_files=${%%PORTNAME%%_config}
 	fi
 	echo "Starting ${name}."
 	for i in %%DATADIR%%/lib/*; do export CLASSPATH=$CLASSPATH:$i; done
-	java -cp %%DATADIR%%/%%PORTNAME%%.jar:$CLASSPATH:%%JAVAJARDIR%%/swt.jar %%PORTNAME%%.DavGateway ${davmail_config} >> /var/log/%%PORTNAME%%-error.log 2>&1 &
+	java -cp %%DATADIR%%/davmail.jar:$CLASSPATH:%%JAVAJARDIR%%/swt.jar davmail.DavGateway ${davmail_config} >> /var/log/davmail-error.log 2>&1 &
 	echo -n $! > ${pidfile}
 }
 
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index 0d65bc9583e8..3c9e9d050c33 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -9,10 +9,11 @@ etc/davmail.properties.sample
 %%JAVASHAREDIR%%/davmail/lib/jackrabbit-webdav-1.4.jar
 %%JAVASHAREDIR%%/davmail/lib/commons-codec-1.3.jar
 %%JAVASHAREDIR%%/davmail/lib/libgrowl-0.2.jar
-%%JAVASHAREDIR%%/davmail/lib/mail-1.4.1.jar
+%%JAVASHAREDIR%%/davmail/lib/mail-1.4.3.jar
 %%JAVASHAREDIR%%/davmail/lib/commons-logging-1.0.4.jar
-%%JAVASHAREDIR%%/davmail/lib/activation-1.1.jar
+%%JAVASHAREDIR%%/davmail/lib/activation-1.1.1.jar
 %%JAVASHAREDIR%%/davmail/lib/libgrowl.jnilib
+%%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/slf4j-api-1.3.1.jar
@@ -20,12 +21,14 @@ etc/davmail.properties.sample
 %%JAVASHAREDIR%%/davmail/lib/xercesImpl-2.8.1.jar
 %%JAVASHAREDIR%%/davmail/lib/commons-httpclient-3.1.jar
 %%JAVASHAREDIR%%/davmail/lib/woodstox-core-asl-4.0.9.jar
+%%JAVASHAREDIR%%/davmail/lib/stax-api-1.0.1.jar
 %%JAVASHAREDIR%%/davmail/lib/stax2-api-3.0.3.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/classes/davmail.properties
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/davmail.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/libgrowl-0.2.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/mail-1.4.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/activation-1.1.jar
+%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/mail-1.4.3.jar
+%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/activation-1.1.1.jar
+%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcharset-1.3.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/junit-3.8.1.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jdom-1.0.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/log4j-1.2.15.jar
@@ -39,28 +42,31 @@ etc/davmail.properties.sample
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcifs-1.3.14.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-codec-1.3.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-logging-1.0.4.jar
+%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/stax-api-1.0.1.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/stax2-api-3.0.3.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/woodstox-core-asl-4.0.9.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/web.xml
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/activation-1.1.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/activation-1.1.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-codec-1.3.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-collections-3.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-httpclient-3.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-logging-1.0.4.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/htmlcleaner-2.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jackrabbit-webdav-1.4.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jcharset-1.3.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jcifs-1.3.14.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jdom-1.0.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/junit-3.8.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/libgrowl-0.2.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/libgrowl.jnilib
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/log4j-1.2.15.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/mail-1.4.1.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/mail-1.4.3.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/slf4j-api-1.3.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/slf4j-log4j12-1.3.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/xercesImpl-2.8.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/davmail.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/stax-api-1.0.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/stax2-api-3.0.3.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/woodstox-core-asl-4.0.9.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns