fix spectrum rc script, and remove the SPECTRUM_PATH variable there.

tell spectrumctl where spectrum gets installed, so that there is no need to
rely on SPECTRUM_PATH.
Updated rc script was done by ajacoutot@

OK ajacoutot@

net/spectrum/Makefile

@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2011/01/10 18:34:31 sebastia Exp $
+# $OpenBSD: Makefile,v 1.7 2011/03/07 10:14:01 sebastia Exp $
 
 COMMENT=        XMPP transport/gateway
 
 DISTNAME=       spectrum-1.4.6
 CATEGORIES=     net
 
+REVISION=	0
+
 HOMEPAGE=       http://spectrum.im/
 MASTER_SITES=   ${HOMEPAGE}/attachments/download/34/
 MAINTAINER=     Sebastian Reitenbach <sebastia@openbsd.org>
@@ -35,7 +37,8 @@ SUBST_VARS=    	SPVARDIR
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/spectrumctl/spectrumctl.py \
-		${WRKSRC}/spectrumctl/spectrum/env.py ${WRKSRC}/spectrum.cfg
+		${WRKSRC}/spectrumctl/spectrum/env.py ${WRKSRC}/spectrum.cfg \
+		${WRKSRC}/spectrumctl/spectrum/spectrum.py
 
 post-configure:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/cmake .
@@ -45,6 +48,7 @@ post-install:
 		${PREFIX}/share/examples/spectrum
 	rm -f ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/spectrum/env.py.*
 	rm -f ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/spectrum/spectrum.py.orig
+	rm -f ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/spectrum/spectrum.py.beforesubst
 	${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
 		${PREFIX}/lib/python${MODPY_VERSION}/site-packages/spectrum
 

net/spectrum/patches/patch-spectrumctl_spectrum_spectrum_py

@@ -1,9 +1,9 @@
-$OpenBSD: patch-spectrumctl_spectrum_spectrum_py,v 1.2 2011/01/10 18:34:31 sebastia Exp $
+$OpenBSD: patch-spectrumctl_spectrum_spectrum_py,v 1.3 2011/03/07 10:14:01 sebastia Exp $
 
 Import errno, to prevent error
 
 --- spectrumctl/spectrum/spectrum.py.orig	Tue Dec 28 17:58:40 2010
-+++ spectrumctl/spectrum/spectrum.py	Thu Jan  6 17:13:52 2011
++++ spectrumctl/spectrum/spectrum.py	Mon Mar  7 09:24:57 2011
 @@ -19,7 +19,7 @@
  Represents a single spectrum instance, see L{spectrum.spectrum}.
  """
@@ -13,3 +13,12 @@ Import errno, to prevent error
  from subprocess import call, Popen, PIPE, STDOUT
  import spectrumconfigparser, config_interface, env
  from ExistsError import ExistsError
+@@ -56,7 +56,7 @@ class spectrum:
+ 		try:
+ 			return os.environ['SPECTRUM_PATH']
+ 		except KeyError:
+-			return 'spectrum'
++			return '${TRUEPREFIX}/sbin/spectrum'
+ 
+ 	def get_jid( self ):
+ 		"""

net/spectrum/pkg/spectrum.rc

@@ -1,20 +1,19 @@
 #!/bin/sh
 #
-# $OpenBSD: spectrum.rc,v 1.1 2011/01/10 18:34:31 sebastia Exp $
+# $OpenBSD: spectrum.rc,v 1.2 2011/03/07 10:14:01 sebastia Exp $
+
+daemon="${TRUEPREFIX}/sbin/spectrumctl"
 
 . /etc/rc.d/rc.subr
 
-daemon="${TRUEPREFIX}/sbin/spectrumctl"
-SPECTRUM_PATH=${TRUEPREFIX}/sbin/spectrum
-
 rc_start() {
-        ${daemon} start
+	${daemon} start
 }
 rc_stop() {
-        ${daemon} stop
+	${daemon} stop
 }
 rc_reload() {
-        ${daemon} reload
+	${daemon} reload
 }
 
 rc_cmd $1