- Fix rc.d script, setting REQUIRE: [e]jabberd

- Bump PORTREVISION

2 files changed, 6 insertions, 3 deletions

diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index 13fcf2b38fef..a1b0a3a71e48 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	pyicq
 PORTVERSION=	0.7a
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.blathersource.org/download.php/pyicq-t/
 PKGNAMEPREFIX=	jabber-
@@ -37,16 +38,18 @@ PORTDOCS=	COPYING README NEWS
 
 .if defined(WITH_EJABBERD)
 JABBER_USER?=	ejabberd
+SUB_LIST+=	JABBER_REQUIRE=ejabberd
 .else
 JABBER_USER?=	jabber
+SUB_LIST+=	JABBER_REQUIRE=jabberd
 .endif
 
+SUB_LIST+=	JABBER_USER=${JABBER_USER}
+
 .if !defined(WITHOUT_X11)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
 .endif
 
-SUB_LIST+=	JABBER_USER=${JABBER_USER}
-
 post-extract:
 	@${FIND} ${WRKSRC}/src -type d -name '.svn' | ${XARGS} ${RM} -rf
 
diff --git a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in b/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
index 11c95414e19b..1f1367cacea8 100644
--- a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
+++ b/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: jabber_pyicq
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON %%JABBER_REQUIRE%%
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 #