Provide 'real' rc.d script for exim, as submitted by Sergey Svishchev in

pkg/12997. Note how to use it in MESSAGE. Drop some unnecessary input
redirections in Makefile.

4 files changed, 25 insertions, 15 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 3ef47d40eac..670ed8e958a 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/02/25 04:17:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.22 2001/06/26 00:21:47 wiz Exp $
 
 DISTNAME=	exim-3.20
 CATEGORIES=	mail net
@@ -35,14 +35,14 @@ pre-install:
 
 post-install:
 	${SED} -e 's:@PREFIX@:${PREFIX}:' \
-	    < ${FILESDIR}/exim.sh \
+	    ${FILESDIR}/exim \
 	    > ${PREFIX}/etc/rc.d/exim
 	${SED} -e 's:@PREFIX@:${PREFIX}:' \
-	    < ${FILESDIR}/exim_newaliases \
+	    ${FILESDIR}/exim_newaliases \
 	    > ${PREFIX}/sbin/exim_newaliases
 	${CHMOD} ugo+x ${PREFIX}/sbin/exim_newaliases
 	${SED} -e 's:@PREFIX@:${PREFIX}:' \
-	    < ${FILESDIR}/mailer.conf.exim \
+	    ${FILESDIR}/mailer.conf.exim \
 	    > ${PREFIX}/etc/exim/mailer.conf.exim
 	${CP} ${FILESDIR}/exim.8 ${PREFIX}/man/man8/exim.8
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/exim
diff --git a/mail/exim/files/exim b/mail/exim/files/exim
new file mode 100644
index 00000000000..69237585343
--- /dev/null
+++ b/mail/exim/files/exim
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+#	$NetBSD: exim,v 1.1 2001/06/26 00:21:47 wiz Exp $
+#
+# PROVIDE: mail
+# REQUIRE: LOGIN
+
+. /etc/rc.subr
+
+name="exim"                      
+rcvar=$name         
+command="@PREFIX@/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="@PREFIX@/etc/exim/configure"
+              
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh
deleted file mode 100644
index c30a25474dd..00000000000
--- a/mail/exim/files/exim.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-#	$NetBSD: exim.sh,v 1.2 1999/09/18 20:28:26 ad Exp $
-#
-if [ -x @PREFIX@/sbin/exim ] ; then
-	echo -n ' exim'
-	@PREFIX@/sbin/exim -bd -q15m
-fi
diff --git a/mail/exim/pkg/MESSAGE b/mail/exim/pkg/MESSAGE
index 0400ae5c020..f1d06d8f99a 100644
--- a/mail/exim/pkg/MESSAGE
+++ b/mail/exim/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:30 wiz Exp $
+$NetBSD: MESSAGE,v 1.5 2001/06/26 00:21:48 wiz Exp $
 
 To use exim, you will need to perform the following steps manually; it is
 inappropriate for this package to make the changes for you.
@@ -12,8 +12,9 @@ inappropriate for this package to make the changes for you.
    /etc/mail and not /etc, as it was previously.
 4. Back-up /etc/mailer.conf to /etc/mailer.conf.sendmail.
    Copy ${PREFIX}/etc/exim/mailer.conf.exim to /etc/mailer.conf.
-5. Set sendmail=NO in /etc/rc.conf. Add the folllowing to /etc/rc.local:
-   echo -n ' exim'; ${PREFIX}/etc/rc.d/exim
+5. Set 'sendmail=NO', 'exim=YES' and exim_flags to some sane value in
+   /etc/rc.conf (previously it was "-bd -q15m"). Copy ${PREFIX}/etc/rc.d/exim
+   to /etc/rc.d.
 6. Configuring log rotation is dependant on personal taste and the version of
    NetBSD in use. See weekly.conf(5), newsyslog(8), exicyclog and eximstats.