Date: Tue, 24 Jan 2006 09:32:07 -0200 (BRDT) From: Renato Botelho <garga@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: martijn@pacno.net Subject: ports/92259: [PATCH] net-im/jabber-pymsn-transport: Some fixes about rc.d script Message-ID: <200601241132.k0OBW71p044719@data.galle.com.br> Resent-Message-ID: <200601241140.k0OBe3Tp066344@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92259 >Category: ports >Synopsis: [PATCH] net-im/jabber-pymsn-transport: Some fixes about rc.d script >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: Tue Jan 24 11:40:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD data.galle.com.br 6.0-STABLE FreeBSD 6.0-STABLE #6: Fri Nov 4 15:09:42 BRDT >Description: - Fix wrong rc.d script that doesn't respect rc.conf vars - Bump PORTREVISION - Fix rc.d script installation - Remove obsolete USE_REINPLACE Port maintainer (martijn@pacno.net) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- jabber-pymsn-transport-0.10.2_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/jabber-pymsn/Makefile,v retrieving revision 1.6 diff -u -u -r1.6 Makefile --- Makefile 6 Dec 2005 15:05:54 -0000 1.6 +++ Makefile 24 Jan 2006 11:28:05 -0000 @@ -6,6 +6,7 @@ PORTNAME= pymsn PORTVERSION= 0.10.2 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://msn-transport.jabberstudio.org/tarballs/ PKGNAMEPREFIX= jabber- @@ -21,7 +22,6 @@ NO_BUILD= yes USE_PYTHON= yes -USE_REINPLACE= yes USE_RC_SUBR= jabber-pymsn-transport.sh SUB_FILES= pkg-message @@ -55,7 +55,6 @@ ${CP} -pPR ${WRKSRC}/src/* ${INST_DIR}/ ${CHMOD} 755 ${INST_DIR}/main.py [ -f ${INST_DIR}/config.py ] || ${CP} ${INST_DIR}/config.py.sample ${INST_DIR}/config.py - ${INSTALL_SCRIPT} -m 751 ${WRKDIR}/${PKGBASE}.sh ${PREFIX}/etc/rc.d/${PKGBASE}.sh @${MKDIR} ${EXAMPLESDIR}/etc ${INSTALL_DATA} ${WRKSRC}/config-example.xml ${EXAMPLESDIR}/etc/jabber-pymsn.xml [ -f ${PREFIX}/etc/jabber-pymsn.xml ] || ${CP} ${EXAMPLESDIR}/etc/jabber-pymsn.xml ${PREFIX}/etc/jabber-pymsn.xml Index: files/jabber-pymsn-transport.sh.in =================================================================== RCS file: /home/pcvs/ports/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in,v retrieving revision 1.2 diff -u -u -r1.2 jabber-pymsn-transport.sh.in --- files/jabber-pymsn-transport.sh.in 6 Dec 2005 15:05:55 -0000 1.2 +++ files/jabber-pymsn-transport.sh.in 24 Jan 2006 11:28:05 -0000 @@ -1,8 +1,7 @@ #!/bin/sh - -# Start or stop jabber-pymsn +# # $FreeBSD: ports/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in,v 1.2 2005/12/06 15:05:55 garga Exp $ - +# # PROVIDE: jabber_pymsn # REQUIRE: DAEMON # BEFORE: LOGIN @@ -12,22 +11,23 @@ # /etc/rc.conf # /etc/rc.conf.local # -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -jabber_pymsn_dir=${jabberd_pymsn_dir-"%%PREFIX%%/lib/jabber/pymsn"} -jabber_pymsn_piddir=${jabberd_pymsn_piddir-"/var/jabberd/pid"} -jabber_pymsn_enable=${jabberd_pymsn_enable-"NO"} . %%RC_SUBR%% name="jabber_pymsn" rcvar=`set_rcvar` -command_interpreter="%%PYTHON_CMD%%" -command="${jabber_pymsn_dir}/main.py" -command_args="&" + +load_rc_config $name + +: ${jabber_pymsn_dir="%%PREFIX%%/lib/jabber/pymsn"} +: ${jabber_pymsn_piddir="/var/jabberd/pid"} +: ${jabber_pymsn_enable="NO"} + jabber_pymsn_chdir=${jabber_pymsn_dir} +command_interpreter="%%PYTHON_CMD%%" +command="${jabber_pymsn_dir}/main.py" +command_args="-o pid=${pidfile} &" pidfile="${jabber_pymsn_piddir}/pymsn.pid" -load_rc_config $name run_rc_command "$1" --- jabber-pymsn-transport-0.10.2_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?200601241132.k0OBW71p044719>