fixed init script

----------------------------------------------------------------------

6 files changed, 103 insertions, 1 deletions

diff --git a/net-im/msn-transport/ChangeLog b/net-im/msn-transport/ChangeLog
index 6681d842c159..fd9ec87c3cc2 100644
--- a/net-im/msn-transport/ChangeLog
+++ b/net-im/msn-transport/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/msn-transport
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/ChangeLog,v 1.12 2004/07/07 19:15:05 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/ChangeLog,v 1.13 2004/07/09 18:07:04 humpback Exp $
+
+*msn-transport-20040531-r1 (09 Jul 2004)
+
+  09 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/msn-transport-conf.d, +files/msn-transport.init-r2,
+  +msn-transport-20040531-r1.ebuild:
+  New revision that installs more stable init.d script
 
   07 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
   msn-transport-20040531.ebuild:
diff --git a/net-im/msn-transport/Manifest b/net-im/msn-transport/Manifest
index 4447903f91b6..03ba3b039487 100644
--- a/net-im/msn-transport/Manifest
+++ b/net-im/msn-transport/Manifest
@@ -1,8 +1,12 @@
 MD5 1bba14b70f246271b51a01114337a8c4 ChangeLog 1941
 MD5 d76a7c620d2b4630a7f3f6d6a0f4e353 metadata.xml 319
+MD5 ccd7f8df6d029a078d3bf6dc9bc4e06e msn-transport-20040531-r1.ebuild 1392
 MD5 e3a39683542d05f68ac8bf4c42743de5 msn-transport-20040531.ebuild 1311
 MD5 052318a7b8dfc18122569ed5aac82ab2 files/README.Gentoo 1495
+MD5 24baea5afe908664d6f3bbe45ba373fe files/msn-transport.init-r2 696
+MD5 6b5eaadda94bd02fb01ef8ae6631c7fd files/digest-msn-transport-20040531-r1 75
 MD5 6b5eaadda94bd02fb01ef8ae6631c7fd files/digest-msn-transport-20040531 75
 MD5 2bb7338640063281eeef587f8ce0fd5e files/msn-configure-patch-00 805
 MD5 1a17bb67fdeeb80bc939d27e87750290 files/msn-transport.init 422
 MD5 5fd3cce8c18bc9ca1aa9ff085bcb3f7e files/msnt.xml 3328
+MD5 b683c5c99f2b4ae436f1ff8a11da8a1a files/msn-transport-conf.d 427
diff --git a/net-im/msn-transport/files/digest-msn-transport-20040531-r1 b/net-im/msn-transport/files/digest-msn-transport-20040531-r1
new file mode 100644
index 000000000000..4d62a4371e6a
--- /dev/null
+++ b/net-im/msn-transport/files/digest-msn-transport-20040531-r1
@@ -0,0 +1 @@
+MD5 d9ab03d18659303bcd0b3871bee1aa6e msn-transport-2004-05-31.tar.gz 71985
diff --git a/net-im/msn-transport/files/msn-transport-conf.d b/net-im/msn-transport/files/msn-transport-conf.d
new file mode 100644
index 000000000000..3f4a06c84e34
--- /dev/null
+++ b/net-im/msn-transport/files/msn-transport-conf.d
@@ -0,0 +1,9 @@
+# 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/msn-transport/files/msn-transport-conf.d,v 1.1 2004/07/09 18:07:04 humpback Exp $
+
+CONFIG="/etc/jabber/msnt.xml"
+
+#Need to find a way to fix the "double" expansion 
+#PIDFILE= grep pid ${CONFIG} | sed -e 's/<[^>]*>//g' | sed s/' '//g
+PIDFILE="/var/log/jabber/msnt.pid"
diff --git a/net-im/msn-transport/files/msn-transport.init-r2 b/net-im/msn-transport/files/msn-transport.init-r2
new file mode 100644
index 000000000000..faf0e1d40996
--- /dev/null
+++ b/net-im/msn-transport/files/msn-transport.init-r2
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	use jabber-server
+}
+
+start() {
+	ebegin "Starting MSN Jabber Transport"
+	if [ -f ${PIDFILE} ]; then
+                if [ -z $(ps ax | grep `cat ${PIDFILE}` | grep -v grep ) ]
+                then
+                        rm -f ${PIDFILE}
+                fi
+        fi
+
+	/usr/sbin/jabberd -B -c ${CONFIG} -H /var/spool/jabber >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping MSN 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/msn-transport/msn-transport-20040531-r1.ebuild b/net-im/msn-transport/msn-transport-20040531-r1.ebuild
new file mode 100644
index 000000000000..2570e7362d19
--- /dev/null
+++ b/net-im/msn-transport/msn-transport-20040531-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/msn-transport-20040531-r1.ebuild,v 1.1 2004/07/09 18:07:04 humpback Exp $
+
+MY_PV="2004-05-31"
+#Ugly, msn-transport weired version numbers
+MY_SDIR="1.3-cvs"
+S="${WORKDIR}/${PN}-${MY_PV}"
+DESCRIPTION="MSN transport for jabberd"
+HOMEPAGE="http://msn-transport.jabberstudio.org/"
+SRC_URI="http://msn-transport.jabberstudio.org/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc hppa ~sparc"
+IUSE=""
+SLOT="0"
+
+DEPEND=">=net-im/jabberd-1.4*
+		net-misc/curl"
+
+src_compile() {
+		cd ${WORKDIR}/${PN}-${MY_SDIR}
+		econf \
+				--with-jabberd=/usr/include/jabberd \
+				--with-pth=/usr/include \
+				|| die
+		emake || die
+}
+
+src_install() {
+		dodir /etc/jabber /usr/lib/jabberd
+		insinto /usr/lib/jabberd
+		doins ${WORKDIR}/${PN}-${MY_SDIR}/src/msntrans.so
+		insinto /etc/jabber
+		doins  ${FILESDIR}/msnt.xml
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/msn-transport.init-r2 msn-transport
+		insinto /etc/conf.d ; newins ${FILESDIR}/msn-transport-conf.d msn-transport
+		dodoc README ${FILESDIR}/README.Gentoo msnt.xml
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please read /usr/share/doc/${P}/README.Gentoo.gz"
+	einfo "And please notice that now msn-transport comes with a init.d script"
+	einfo "dont forget to add it to your runlevel."
+	einfo
+}