From owner-svn-ports-all@FreeBSD.ORG  Wed Jul  2 23:53:21 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8F991AD3;
 Wed,  2 Jul 2014 23:53:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7CEF3214D;
 Wed,  2 Jul 2014 23:53:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62NrL9B077319;
 Wed, 2 Jul 2014 23:53:21 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62NrLiI077317;
 Wed, 2 Jul 2014 23:53:21 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201407022353.s62NrLiI077317@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 2 Jul 2014 23:53:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360324 - head/mail/davmail/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jul 2014 23:53:21 -0000

Author: jkim
Date: Wed Jul  2 23:53:20 2014
New Revision: 360324
URL: http://svnweb.freebsd.org/changeset/ports/360324
QAT: https://qat.redports.org/buildarchive/r360324/

Log:
  Properly prefix java with LOCALBASE.
  
  Submitted by:	John Hein <z7dr6ut7gs@snkmail.com>

Modified:
  head/mail/davmail/files/davmail.in
  head/mail/davmail/files/davmail.sh.in

Modified: head/mail/davmail/files/davmail.in
==============================================================================
--- head/mail/davmail/files/davmail.in	Wed Jul  2 23:46:28 2014	(r360323)
+++ head/mail/davmail/files/davmail.in	Wed Jul  2 23:53:20 2014	(r360324)
@@ -27,7 +27,7 @@ start_cmd="${name}_start"
 
 davmail_procname()
 {
-	JAVAVM_DRYRUN=yes "%%PREFIX%%/bin/java" | \
+	JAVAVM_DRYRUN=yes "%%LOCALBASE%%/bin/java" | \
 	    /usr/bin/awk -F= '{if ($1=="JAVAVM_PROG") print $2}' 2> /dev/null
 }
 
@@ -37,7 +37,7 @@ required_files=${davmail_config}
 
 davmail_daemon()
 {
-	%%PREFIX%%/bin/java \
+	%%LOCALBASE%%/bin/java \
 	    -cp "%%DATADIR%%/davmail.jar:%%DATADIR%%/lib/*" \
 	    davmail.DavGateway "${davmail_config}" & echo -n $! > ${pidfile}
 }

Modified: head/mail/davmail/files/davmail.sh.in
==============================================================================
--- head/mail/davmail/files/davmail.sh.in	Wed Jul  2 23:46:28 2014	(r360323)
+++ head/mail/davmail/files/davmail.sh.in	Wed Jul  2 23:53:20 2014	(r360324)
@@ -1,5 +1,5 @@
 #!/bin/sh
 # $FreeBSD$
-exec %%PREFIX%%/bin/java \
+exec %%LOCALBASE%%/bin/java \
     -cp "%%DATADIR%%/davmail.jar:%%DATADIR%%/lib/*" \
     davmail.DavGateway "$@"