Date: Thu, 17 Aug 2006 12:47:20 -0300 (BRST) From: Renato Botelho <garga@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: takeda@takeda.tk Subject: ports/102192: [PATCH] net-im/jabber-pyaim-transport: User py-twisted 2.x as dependency Message-ID: <200608171547.k7HFlKGe046731@data.galle.com.br> Resent-Message-ID: <200608171550.k7HFoEHu024812@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102192 >Category: ports >Synopsis: [PATCH] net-im/jabber-pyaim-transport: User py-twisted 2.x as dependency >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Aug 17 15:50:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD data.galle.com.br 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue May 23 18:08:29 BRST 2006 >Description: - Use twisted 2.x as dependency - Add an OPTION to still use twisted 1.x - Bump PORTREVISION - Set PYTHON_CMD to LOCAL_PYTHON and use this on another places, i don't know why, but sometimes, PYTHON_CMD has one value on REINPLACE_CMD and another on rc.d script (i.e. python and python2.4). It causes warnings on rc.d stop Port maintainer (takeda@takeda.tk) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- jabber-pyaim-transport-0.7d_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/jabber-pyaim/Makefile,v retrieving revision 1.1 diff -u -u -r1.1 Makefile --- Makefile 5 Jul 2006 15:28:07 -0000 1.1 +++ Makefile 17 Aug 2006 15:42:50 -0000 @@ -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 @@ 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 @@ 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 @@ ${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,7 +77,7 @@ .for portdoc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${portdoc} ${DOCSDIR}/ .endfor - ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${INST_DIR}/src + ${LOCAL_PYTHON} ${PYTHON_LIBDIR}/compileall.py ${INST_DIR}/src .endif post-install: --- jabber-pyaim-transport-0.7d_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608171547.k7HFlKGe046731>