Add an OPTION WITH_EJABBERD that set jabber_pymsn_user to "ejabberd" as default

2 files changed, 14 insertions, 2 deletions

diff --git a/net-im/jabber-pymsn/Makefile b/net-im/jabber-pymsn/Makefile
index 4752b1a33bac..9013c5c8dcce 100644
--- a/net-im/jabber-pymsn/Makefile
+++ b/net-im/jabber-pymsn/Makefile
@@ -22,6 +22,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-op
 
 WRKSRC=		${WRKDIR}/${PORTNAME}t-0.11
 
+OPTIONS=	EJABBERD "Use transport with ejabberd" off
+
 NO_BUILD=	yes
 USE_PYTHON=	yes
 USE_RC_SUBR=	jabber-pymsn-transport.sh
@@ -33,6 +35,16 @@ INST_DIR=	${PREFIX}/lib/jabber/${PORTNAME}
 
 PORTDOCS=	COPYING README TODO
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_EJABBERD)
+JABBER_USER?=	ejabberd
+.else
+JABBER_USER?=	jabber
+.endif
+
+SUB_LIST+=	JABBER_USER=${JABBER_USER}
+
 post-extract:
 	@${FIND} ${WRKSRC}/ -type d \( -name CVS -or -name .svn \) | ${XARGS} ${RM} -rf
 
@@ -72,4 +84,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in b/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
index 9d286a93cd01..657b94772a80 100644
--- a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
+++ b/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
@@ -22,7 +22,7 @@ load_rc_config $name
 : ${jabber_pymsn_enable="NO"}
 : ${jabber_pymsn_dir="%%PREFIX%%/lib/jabber/pymsn"}
 : ${jabber_pymsn_piddir="/var/jabberd/pid"}
-: ${jabber_pymsn_user="jabber"}
+: ${jabber_pymsn_user="%%JABBER_USER%%"}
 
 pidfile="${jabber_pymsn_piddir}/PyMSNt.pid"
 command_interpreter="%%PYTHON_CMD%%"