Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Jul 2014 23:53:21 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360324 - head/mail/davmail/files
Message-ID:  <201407022353.s62NrLiI077317@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 "$@"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407022353.s62NrLiI077317>