From d53cd310e87ad5efa74a6256e9fb1e9d0adbe2f7 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 30 Jun 2014 17:52:27 +0000
Subject: - Update to 4.5.0. - Fix rc script to properly start and stop. -
 Install a real sample file for davmail.properties. - Fix a minor typo in the
 sample file. - Use @sample for plist instead of rolling our own.

PR:		190973
Approved by:	john.c.prather@gmail.com (maintainer, timeout > 2 weeks)
---
 mail/davmail/files/davmail.in | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'mail/davmail/files/davmail.in')

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"
-- 
cgit v1.2.3