From 3c1fa65ec8eb3788ebc40be6423f13c998514ad4 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 4 Mar 2013 15:56:13 +0000
Subject: [PATCH] Explicitely set path to javaPathHelper; we do not want to
 rely whether LOCALBASE/bin is in the PATH or not and this is consistent with
 what other java rc scripts do.

prodded by Marc Peters
---
 net/openfire/Makefile        | 3 ++-
 net/openfire/pkg/openfire.rc | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/openfire/Makefile b/net/openfire/Makefile
index 27dcc26a99f..fe427b2ce01 100644
--- a/net/openfire/Makefile
+++ b/net/openfire/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2012/10/23 20:43:52 jasper Exp $
+# $OpenBSD: Makefile,v 1.26 2013/03/04 15:56:13 ajacoutot Exp $
 
 COMMENT=	XMPP real time collaboration server
 DISTNAME=	openfire_src_3_7_1
 PKGNAME=	openfire-3.7.1
 CATEGORIES=	net
+REVISION=	0
 
 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
 
diff --git a/net/openfire/pkg/openfire.rc b/net/openfire/pkg/openfire.rc
index 386f2c514fc..53055b613fc 100755
--- a/net/openfire/pkg/openfire.rc
+++ b/net/openfire/pkg/openfire.rc
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: openfire.rc,v 1.2 2011/03/09 17:08:00 ajacoutot Exp $
+# $OpenBSD: openfire.rc,v 1.3 2013/03/04 15:56:13 ajacoutot Exp $
 
 OPENFIRE_HOME="${TRUEPREFIX}/openfire"
 OPENFIRE_LIB="${OPENFIRE_HOME}/lib"
 
-JAVACMD="$(javaPathHelper -c openfire)"
-JAVA_HOME="$(javaPathHelper -h openfire)"
+JAVACMD="$(${LOCALBASE}/bin/javaPathHelper -c openfire)"
+JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h openfire)"
 
 daemon="${JAVACMD}"
 daemon_flags="-server -DopenfireHome=${OPENFIRE_HOME} -Dopenfire.lib.dir=${OPENFIRE_LIB} -jar ${OPENFIRE_LIB}/startup.jar"