New version that hopefully won't break all running perl processes.

6 files changed, 40 insertions, 37 deletions

diff --git a/app-admin/wasabi/ChangeLog b/app-admin/wasabi/ChangeLog
index 01658250a3ab..ac0a4a0d4af8 100644
--- a/app-admin/wasabi/ChangeLog
+++ b/app-admin/wasabi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/wasabi
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/wasabi/ChangeLog,v 1.4 2004/06/16 14:26:41 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/wasabi/ChangeLog,v 1.5 2004/06/17 23:02:21 g2boojum Exp $
+
+*wasabi-0.1-r1 (17 Jun 2004)
+
+  17 Jun 2004; Grant Goodyear <g2boojum@gentoo.org> files/wasabi.init,
+  +wasabi-0.1-r1.ebuild, -wasabi-0.1.ebuild:
+  It seems that the init file kills all perl processes when shutdown.
+  Added new version from lcars.
 
   16 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> wasabi-0.1.ebuild:
   Added ~sparc
diff --git a/app-admin/wasabi/Manifest b/app-admin/wasabi/Manifest
index 6c3bf1736284..19e1ac1d161c 100644
--- a/app-admin/wasabi/Manifest
+++ b/app-admin/wasabi/Manifest
@@ -1,5 +1,5 @@
-MD5 6490fac30a61e5113b33911761560802 ChangeLog 668
+MD5 6abc60b497ad3556bd62f43fd8b62b75 wasabi-0.1-r1.ebuild 715
+MD5 161637777331137a25911c1e77558b0f ChangeLog 918
 MD5 129e36a48ebe6a3d2a7d7d126fd31d98 metadata.xml 254
-MD5 869350fc63278d95f8508243491d5d99 wasabi-0.1.ebuild 764
-MD5 d29af12f861a1fcd3bc9dcfc7bbbbb27 files/wasabi.init 286
-MD5 a88256033c1e5da06aef4cd9f559f4e4 files/digest-wasabi-0.1 61
+MD5 a88256033c1e5da06aef4cd9f559f4e4 files/digest-wasabi-0.1-r1 61
+MD5 67cedb0ce874775e0ee427bfd7792104 files/wasabi.init 292
diff --git a/app-admin/wasabi/files/digest-wasabi-0.1 b/app-admin/wasabi/files/digest-wasabi-0.1-r1
index 13533c314992..13533c314992 100644
--- a/app-admin/wasabi/files/digest-wasabi-0.1
+++ b/app-admin/wasabi/files/digest-wasabi-0.1-r1
diff --git a/app-admin/wasabi/files/wasabi.init b/app-admin/wasabi/files/wasabi.init
index 657ae2ca2cc3..ec998d753a42 100644
--- a/app-admin/wasabi/files/wasabi.init
+++ b/app-admin/wasabi/files/wasabi.init
@@ -6,12 +6,12 @@ depend() {
 
 start() {
 	ebegin "Starting wasabi"
-	start-stop-daemon --start --quiet --exec /usr/sbin/wasabi
+	start-stop-daemon --start --quiet --exec /usr/sbin/wasabi -- -c /etc/wasabi/wasabi.conf
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping wasabi"
-	start-stop-daemon --stop --quiet --exec /usr/bin/perl /usr/sbin/wasabi
+	start-stop-daemon --stop --quiet --name wasabi
 	eend $?
 }
diff --git a/app-admin/wasabi/wasabi-0.1-r1.ebuild b/app-admin/wasabi/wasabi-0.1-r1.ebuild
new file mode 100644
index 000000000000..49f1ab2984f6
--- /dev/null
+++ b/app-admin/wasabi/wasabi-0.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/wasabi/wasabi-0.1-r1.ebuild,v 1.1 2004/06/17 23:02:21 g2boojum Exp $
+
+DESCRIPTION="Log parsing and notification program"
+HOMEPAGE="http://www.gentoo.org/~lcars/wasabi"
+SRC_URI="http://www.gentoo.org/~lcars/wasabi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Storable
+	     dev-perl/BerkeleyDB
+		 dev-perl/File-Tail"
+
+src_install() {
+	doman wasabi.8
+	dodoc CREDITS Changelog README
+	dosbin wasabi
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/wasabi.init wasabi
+	dodir /etc/wasabi
+	insinto /etc/wasabi ; doins wasabi.conf
+}
diff --git a/app-admin/wasabi/wasabi-0.1.ebuild b/app-admin/wasabi/wasabi-0.1.ebuild
deleted file mode 100644
index 7b5dd789a275..000000000000
--- a/app-admin/wasabi/wasabi-0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/wasabi/wasabi-0.1.ebuild,v 1.4 2004/06/16 14:26:41 ciaranm Exp $
-
-DESCRIPTION="Log parsing and notification program"
-HOMEPAGE="http://www.gentoo.org/~lcars/wasabi"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE=""
-
-DEPEND="dev-perl/Storable
-	    dev-perl/BerkeleyDB"
-
-src_install() {
-	doman wasabi.8
-	dosbin wasabi
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/wasabi.init wasabi
-	insinto /etc ; doins wasabi.conf
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Remember that you have to emerge File-Tail when not using options"
-	einfo "'set fifo' or 'set tail'"
-	einfo
-}