update to init system

5 files changed, 54 insertions, 5 deletions

diff --git a/net-im/mu-conference/ChangeLog b/net-im/mu-conference/ChangeLog
index 9bb083e212db..a6078613cfb3 100644
--- a/net-im/mu-conference/ChangeLog
+++ b/net-im/mu-conference/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/mu-conference
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.13 2004/07/05 16:38:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.14 2004/07/06 18:07:27 humpback Exp $
+
+  06 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/mu-conference-conf.d, +files/muc-transport.init-r2,
+  mu-conference-0.6.0-r2.ebuild:
+  Now it gets the config file and pid from the configuration in conf.d
 
   05 Jul 2004; David Holm <dholm@gentoo.org> mu-conference-0.6.0-r2.ebuild:
   Added to ~ppc.
diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest
index f6f76a302d71..ae39463582bc 100644
--- a/net-im/mu-conference/Manifest
+++ b/net-im/mu-conference/Manifest
@@ -1,10 +1,12 @@
-MD5 cc6f1f351df208aa68734676f57e6eff ChangeLog 2261
+MD5 c2f99a304d9d03d3769310c3e1cdfe37 ChangeLog 2487
 MD5 5d032797cb26e7105194d6156f0dae09 metadata.xml 327
 MD5 fd5e5272dca1912c7caab94b217d27a8 mu-conference-0.6.0-r1.ebuild 1362
-MD5 35a7aa820c3eef4cadf3554d896d67be mu-conference-0.6.0-r2.ebuild 1364
+MD5 14e643051c892ca64ad224fea6392eb6 mu-conference-0.6.0-r2.ebuild 1448
 MD5 95d0e1126a3c7d35a21f43cd01095323 files/README.Gentoo 1483
 MD5 f88abce484cd1607dc473ea266ea57f9 files/digest-mu-conference-0.6.0-r1 70
 MD5 34c298326722258d9f0ad798afb32cb1 files/mu-conference-makefile.patch 430
 MD5 34f38216da5355bb7d24145b50d39bfd files/muc-transport.init 529
 MD5 5d92cc782339ac08100c8a4068f24b92 files/muctrans.xml 908
 MD5 f88abce484cd1607dc473ea266ea57f9 files/digest-mu-conference-0.6.0-r2 70
+MD5 7cce4004c009a77f05918d683aba3542 files/muc-transport.init-r2 531
+MD5 5d5e544963b45a19d4f2b9e7fdc2c4fb files/mu-conference-conf.d 346
diff --git a/net-im/mu-conference/files/mu-conference-conf.d b/net-im/mu-conference/files/mu-conference-conf.d
new file mode 100644
index 000000000000..ba7892969386
--- /dev/null
+++ b/net-im/mu-conference/files/mu-conference-conf.d
@@ -0,0 +1,7 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/files/mu-conference-conf.d,v 1.1 2004/07/06 18:07:27 humpback Exp $
+
+CONFIG= "/etc/jabber/muctrans.xml"
+PIDFILE= grep pid ${CONFIG} | sed -e 's/<[^>]*>//g' | sed s/' '//g
+	
diff --git a/net-im/mu-conference/files/muc-transport.init-r2 b/net-im/mu-conference/files/muc-transport.init-r2
new file mode 100644
index 000000000000..6d1a749f6223
--- /dev/null
+++ b/net-im/mu-conference/files/muc-transport.init-r2
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting MUC Jabber Transport"
+	if [ -f ${PIDFILE} ] then
+		if [ -z $(ps ax | grep `cat ${PIDFILE}` | grep -v grep ) ]
+		then
+			rm -f ${PIDFILE}
+		fi
+	fi
+
+	jabberd -B -c ${CONFIG} -H /var/spool/jabber >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping MUC Jabber Transport"
+	if [ -f ${PIDFILE} ]; then
+		kill `cat ${PIDFILE}`
+	fi
+	sleep 2
+	if [ -f ${PIDFILE} ]; then
+		kill -9 `cat ${PIDFILE}`
+		rm -f ${PIDFILE}
+	fi
+	rm -f ${PIDFILE}
+	eend $?
+}
diff --git a/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild b/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild
index 15f9c3af7712..e92f6dc3196d 100644
--- a/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild
+++ b/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild,v 1.2 2004/07/05 16:38:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild,v 1.3 2004/07/06 18:07:27 humpback Exp $
 
 inherit eutils
 
@@ -37,8 +37,10 @@ src_install() {
 	insinto /etc/jabber
 	doins  ${FILESDIR}/muctrans.xml
 
+	insinto /etc/conf.d ; newins ${FILESDIR}/mu-conference-conf.d muc-transport
+
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/muc-transport.init muc-transport
+	newexe ${FILESDIR}/muc-transport.init-r2 muc-transport
 
 	dodoc README FAQ README.jcr ${FILESDIR}/README.Gentoo