- Fix rc.d script installation [1]

- Rework rc.d script accordingly handbook
- Remove obsolete USE_REINPLACE

Reported by:	krismail [1]

2 files changed, 7 insertions, 10 deletions

diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index 8336b4b5abf1..5c6cbbf31a1f 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-op
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
-USE_REINPLACE=	yes
 USE_RC_SUBR=	jabber-pyicq-transport.sh
 
 SUB_FILES=	pkg-message
@@ -50,7 +49,6 @@ do-install:
 	${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-pyicq.xml
 	[ -f ${PREFIX}/etc/jabber-pyicq.xml ] || ${CP} ${EXAMPLESDIR}/etc/jabber-pyicq.xml ${PREFIX}/etc/jabber-pyicq.xml
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 4f9de7d401f0..a7ad4d531cd8 100644
--- a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
+++ b/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
@@ -1,8 +1,7 @@
 #!/bin/sh
-
-# Start or stop jabber-pyicq
+#
 # $FreeBSD$
-
+#
 # PROVIDE: jabber_pyicq
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
@@ -12,18 +11,18 @@
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-jabber_pyicq_dir=${jabber_pyicq_dir:-"%%PREFIX%%/lib/jabber/pyicq"}
-jabber_pyicq_piddir=${jabber_pyicq_piddir:-"/var/jabberd/pid"}
-jabber_pyicq_enable=${jabber_pyicq_enable:-"NO"}
 
 . %%RC_SUBR%%
 
 name="jabber_pyicq"
 rcvar=`set_rcvar`
+
 load_rc_config $name
 
+: ${jabber_pyicq_enable="NO"}
+: ${jabber_pyicq_dir="%%PREFIX%%/lib/jabber/pyicq"}
+: ${jabber_pyicq_piddir="/var/jabberd/pid"}
+
 pidfile="${jabber_pyicq_piddir}/pyicq.pid"
 command_interpreter="%%PYTHON_CMD%%"
 command="${jabber_pyicq_dir}/main.py"