Modify the Courier services rc.d scripts so that:

   (1) they are more likely to do the right thing if the user sets
       rc_fast_and_loose; and

   (2) they pre-create any necessary directories prior to start the
       respective services.

Also, fix the path to the courierwebadmin binary in SPECIAL_PERMS for the
courier-mta package.

Bump the PKGREVISION.

5 files changed, 18 insertions, 18 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 8e9187b8508..a1a7c43a70c 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2006/06/14 17:01:08 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2006/06/17 19:26:48 jlam Exp $
 
 DISTNAME=	courier-imap-4.1.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index a88958bdd8d..2c1403ac380 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.12 2006/04/28 18:15:20 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.13 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier IMAP services daemon
 #
@@ -17,10 +17,10 @@ ctl_command="@PREFIX@/sbin/imapd"
 pidfile="@VARBASE@/run/imapd.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courierimap_doit start"
+stop_cmd="courierimap_doit stop"
 
-courier_doit()
+courierimap_doit()
 {
 	action=$1
 	case $action in
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index df208941abf..96ac9141757 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimaps.sh,v 1.14 2006/06/09 16:35:04 reed Exp $
+# $NetBSD: courierimaps.sh,v 1.15 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
@@ -17,10 +17,10 @@ ctl_command="@PREFIX@/sbin/imapd-ssl"
 pidfile="@VARBASE@/run/imapd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courierimaps_doit start"
+stop_cmd="courierimaps_doit stop"
 
-courier_doit()
+courierimaps_doit()
 {
 	action=$1
 	case $action in
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index ec35f107012..500a2b09401 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpop.sh,v 1.12 2006/04/28 18:15:20 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.13 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier POP3 services daemon
 #
@@ -17,10 +17,10 @@ ctl_command="@PREFIX@/sbin/pop3d"
 pidfile="@VARBASE@/run/pop3d.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courierpop_doit start"
+stop_cmd="courierpop_doit stop"
 
-courier_doit()
+courierpop_doit()
 {
 	action=$1
 	case $action in
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index 2cf742d3748..28d8426e3fa 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpops.sh,v 1.14 2006/06/09 16:35:04 reed Exp $
+# $NetBSD: courierpops.sh,v 1.15 2006/06/17 19:26:48 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
@@ -17,10 +17,10 @@ ctl_command="@PREFIX@/sbin/pop3d-ssl"
 pidfile="@VARBASE@/run/pop3d-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 
-start_cmd="courier_doit start"
-stop_cmd="courier_doit stop"
+start_cmd="courierpops_doit start"
+stop_cmd="courierpops_doit stop"
 
-courier_doit()
+courierpops_doit()
 {
 	action=$1
 	case $action in