diff options
| author | garga <garga@FreeBSD.org> | 2006-08-18 03:32:46 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2006-08-18 03:32:46 +0800 |
| commit | e728372c395df1aa8f4eca3e1b6b822357bc78da (patch) | |
| tree | b89b0b2f9c25bcdfb735c4f15320df12629d2bb8 /net-im/jabber-pyaim | |
| parent | 3372c111d3617893f6594aa33b77c66c01904546 (diff) | |
| download | freebsd-ports-gnome-e728372c395df1aa8f4eca3e1b6b822357bc78da.tar.gz freebsd-ports-gnome-e728372c395df1aa8f4eca3e1b6b822357bc78da.tar.zst freebsd-ports-gnome-e728372c395df1aa8f4eca3e1b6b822357bc78da.zip | |
- Use Twisted 2.x as default
- Add an OPTION to still use Twisted 1.x
- Bump PORTREVISION
- Add the same hack of pymsn to prevent to have different PYTHON_CMD on script
and on rc.d script
- Move execution of compileall.py outside .if NOPORTDOCS
PR: ports/102192
Submitted by: garga
Approved by: Derek Kulinski <takeda@takeda.tk> (maintainer)
Diffstat (limited to 'net-im/jabber-pyaim')
| -rw-r--r-- | net-im/jabber-pyaim/Makefile | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/net-im/jabber-pyaim/Makefile b/net-im/jabber-pyaim/Makefile index 0ce6ab01c0cc..cea7805ddbb1 100644 --- a/net-im/jabber-pyaim/Makefile +++ b/net-im/jabber-pyaim/Makefile @@ -7,6 +7,7 @@ PORTNAME= pyaim PORTVERSION= 0.7d +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.blathersource.org/download.php/${PORTNAME}-t/ PKGNAMEPREFIX= jabber- @@ -17,15 +18,15 @@ DIST_SUBDIR= jabber MAINTAINER= takeda@takeda.tk COMMENT= Python AIM-Transport for Jabber -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted - -OPTIONS= EJABBERD "Use transport with ejabberd" off +OPTIONS= EJABBERD "Use transport with ejabberd" off \ + TWISTED1 "Use old py-twisted 1.x" off NO_BUILD= yes USE_PYTHON= yes USE_RC_SUBR= jabber-pyaim-transport.sh +LOCAL_PYTHON= ${PYTHON_CMD} -SUB_LIST= PYTHON_CMD=${PYTHON_CMD} +SUB_LIST= PYTHON_CMD=${LOCAL_PYTHON} INST_DIR= ${PREFIX}/lib/jabber/${PORTNAME} @@ -41,6 +42,14 @@ JABBER_USER?= jabber SUB_LIST+= JABBER_REQUIRE=jabberd .endif +.if defined(WITH_TWISTED1) +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted +.else +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore \ + ${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb \ + ${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords +.endif + SUB_LIST+= JABBER_USER=${JABBER_USER} post-patch: @@ -52,7 +61,7 @@ post-patch: ${WRKSRC}/src/config.py @${REINPLACE_CMD} -i "" 's|"config\.xml"|"${PREFIX}/etc/jabber-pyaim.xml"|' \ ${WRKSRC}/src/main.py - @${REINPLACE_CMD} -i "" 's|/usr/bin/env python|${PYTHON_CMD}|' \ + @${REINPLACE_CMD} -i "" 's|#!.*$$|#!${LOCAL_PYTHON}|' \ ${WRKSRC}/PyAIMt.py do-install: @@ -68,8 +77,8 @@ do-install: .for portdoc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${portdoc} ${DOCSDIR}/ .endfor - ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${INST_DIR}/src .endif + ${LOCAL_PYTHON} ${PYTHON_LIBDIR}/compileall.py ${INST_DIR}/src post-install: @${ECHO_CMD} |