Fix some init script problems and changed command line parameters for

starting vm-pop3d

4 files changed, 42 insertions, 26 deletions

diff --git a/net-mail/vm-pop3d/ChangeLog b/net-mail/vm-pop3d/ChangeLog
index 753c4a32e9a7..883239e9f840 100644
--- a/net-mail/vm-pop3d/ChangeLog
+++ b/net-mail/vm-pop3d/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for net-mail/vm-pop3d
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vm-pop3d/ChangeLog,v 1.1 2002/07/27 01:09:30 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vm-pop3d/ChangeLog,v 1.2 2002/09/25 17:00:56 raker Exp $
 
 *vm-pop3d-1.1.6 (26 Jul 2002)
 
+  25 Sep 2002; Nick Hadaway <raker@gentoo.org> vm-pop3d-1.1.6.ebuild,
+  files/vm-pop3d.rc3, files/vm-pop3d.confd :
+  Cleaned up init script of redhat cruft.  Updated command line
+  parameters.
+
   26 Jul 2002; Nick Hadaway <raker@gentoo.org>
   vm-pop3d-1.1.6.ebuild, files/digest-vm-pop3d-1.1.6, files/vm-pop3d.rc3,
   files/vm-pop3d.confd :
-
   Added initial ebuild.  Thanks to Cal Evans for the package suggestion.
diff --git a/net-mail/vm-pop3d/files/vm-pop3d.confd b/net-mail/vm-pop3d/files/vm-pop3d.confd
index 74eb1079e36f..55e60f2fb46d 100644
--- a/net-mail/vm-pop3d/files/vm-pop3d.confd
+++ b/net-mail/vm-pop3d/files/vm-pop3d.confd
@@ -1,2 +1,6 @@
-# Command-line options for running exim
-VM-POP3D_OPTS="-d5 -t 600"
+# Command-line options for running vm-pop3d
+# -d <number of daemons to start>
+# -t <timeout in seconds>
+# -p <port to run the pop server on>
+
+OPTS="-d 5 -t 600 -p 110"
diff --git a/net-mail/vm-pop3d/files/vm-pop3d.rc3 b/net-mail/vm-pop3d/files/vm-pop3d.rc3
index fd7dc6eaab9c..eb1e982bcc76 100644
--- a/net-mail/vm-pop3d/files/vm-pop3d.rc3
+++ b/net-mail/vm-pop3d/files/vm-pop3d.rc3
@@ -1,24 +1,21 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:75:This line is required for script management
-
-. /etc/rc.d/config/functions
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vm-pop3d/files/vm-pop3d.rc3,v 1.2 2002/09/25 17:00:56 raker Exp $
 
 SERVICE=vm-pop3d
+
 opts="start stop restart"
 
-PIDFILE=/var/run/exim.pid
-EXE=/usr/sbin/vm-pop3d
 
 start() {
 		ebegin "Starting $SERVICE..."
-     		start-stop-daemon --start --quiet --exec ${VM-POP3D_OPTS:-d5 -t 600}
-		eend $? "Started $SERVICE." "Error Starting $SERVICE."
+     		/usr/sbin/vm-pop3d $OPTS
 }
 
 stop() {
 		ebegin "Stopping $SERVICE..."
-		start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $EXE
-		eend $? "Stopped $SERVICE." "Error Stopping $SERVICE."
+		killall -15 /usr/sbin/vm-pop3d
 }
 
 restart() {
@@ -26,6 +23,3 @@ restart() {
 		start
 }
 
-doservice ${@}
-
-
diff --git a/net-mail/vm-pop3d/vm-pop3d-1.1.6.ebuild b/net-mail/vm-pop3d/vm-pop3d-1.1.6.ebuild
index a1a6c53d2b66..2738f52e3221 100644
--- a/net-mail/vm-pop3d/vm-pop3d-1.1.6.ebuild
+++ b/net-mail/vm-pop3d/vm-pop3d-1.1.6.ebuild
@@ -1,23 +1,40 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vm-pop3d/vm-pop3d-1.1.6.ebuild,v 1.2 2002/08/14 12:05:25 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vm-pop3d/vm-pop3d-1.1.6.ebuild,v 1.3 2002/09/25 17:00:56 raker Exp $
 
 S=${WORKDIR}/${P}
+
 DESCRIPTION="vm-pop3d - vm-pop3d is a POP3 server"
 SRC_URI="http://www.ibiblio.org/pub/Linux/system/mail/pop/${P}.tar.gz"
 HOMEPAGE="http://www.reedmedia.net/software/virtualmail-pop3d/"
 
-DEPEND="virtual/glibc"
-RDEPEND=""
-
-
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
 
+DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/makefile.in.diff || die "patch failed"
+
+}
+
 src_compile() {
 
-        use pam || myconf=" --disable-pam "
+	local myconf
+
+        use pam && myconf="${myconf} --enable-pam" \
+		|| myconf="${myconf} --disable-pam "
+
+	if [ -n "$DEBUG" ]; then
+		myconf="${myconf} --enable-debug"
+	else
+		myconf="${myconf} --disable-debug"
+	fi
 
 	econf ${myconf} || die "configure failed"
 
@@ -35,8 +52,5 @@ src_install () {
         newexe ${FILESDIR}/vm-pop3d.rc3 vm-pop3d
         insinto /etc/conf.d
         newins ${FILESDIR}/vm-pop3d.confd vm-pop3d
-}
 
-pkg_postinst() {
-	einfo "Done!"
 }