Update mail/courier-imap to courier-imap-4.0.1. Changes from version

3.0.5 include:

    * Implemented IMAP and POP3 proxy aggregator.  With a proxy
      aggregator, the mail accounts are split between multiple,
      independent servers, with an IMAP/POP3 server running on each
      individual server.  A separate, proxy server sits in front and
      accepts ordinary IMAP and POP3 connections.  It reads the login
      ID, determines which server the account is located on, connects
      to the server, and logs in.  Then, for the lifetime on the login
      session the front-end server takes itself out of the loop, and
      forwards all session traffic between the IMAP/POP3 client, and
      the back-end server.

    * Use courier-authlib for user authentication.

    * IPv6 support.

    * Minor bug fixes.

Please note when updating that the locations of the userdb files has
changed to be within the courier-authlib config directory, e.g.
/usr/pkg/etc/authlib/userdb*.

4 files changed, 32 insertions, 56 deletions

diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index b947553e701..911fcb9c8d4 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,21 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.10 2004/07/15 08:29:05 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.11 2005/02/18 22:12:46 jlam Exp $
 #
 # Courier IMAP services daemon
 #
 # PROVIDE: courierimap
 # REQUIRE: authdaemond
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="courierimap"
 rcvar=${name}
-command="@PREFIX@/libexec/courier/couriertcpd"
-ctl_command="@PREFIX@/libexec/courier/imapd.rc"
-pidfile="/var/run/imapd.pid"
+command="@PREFIX@/sbin/couriertcpd"
+ctl_command="@PREFIX@/sbin/imapd"
+pidfile="@VARBASE@/run/imapd.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 required_vars="authdaemond"
 
@@ -58,10 +57,5 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	${start_cmd}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index 455901c6ca9..b235adc9317 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,21 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimaps.sh,v 1.10 2004/07/15 08:29:05 jlam Exp $
+# $NetBSD: courierimaps.sh,v 1.11 2005/02/18 22:12:46 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
 # PROVIDE: courierimaps
 # REQUIRE: authdaemond
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="courierimaps"
 rcvar=${name}
-command="@PREFIX@/libexec/courier/couriertcpd"
-ctl_command="@PREFIX@/libexec/courier/imapd-ssl.rc"
-pidfile="/var/run/imapd-ssl.pid"
+command="@PREFIX@/sbin/couriertcpd"
+ctl_command="@PREFIX@/sbin/imapd-ssl"
+pidfile="@VARBASE@/run/imapd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 required_files="${required_files} @SSLCERTS@/imapd.pem"
 required_vars="authdaemond"
@@ -59,10 +58,5 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	${start_cmd}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index e983fbce7a7..ecfde58c271 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,21 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpop.sh,v 1.10 2004/07/15 08:29:05 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.11 2005/02/18 22:12:46 jlam Exp $
 #
 # Courier POP3 services daemon
 #
 # PROVIDE: courierpop
 # REQUIRE: authdaemond
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="courierpop"
 rcvar=${name}
-command="@PREFIX@/libexec/courier/couriertcpd"
-ctl_command="@PREFIX@/libexec/courier/pop3d.rc"
-pidfile="/var/run/pop3d.pid"
+command="@PREFIX@/sbin/couriertcpd"
+ctl_command="@PREFIX@/sbin/pop3d"
+pidfile="@VARBASE@/run/pop3d.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 required_vars="authdaemond"
 
@@ -58,10 +57,5 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	${start_cmd}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index 237aecc0fc9..a2af59c18cb 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,21 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpops.sh,v 1.10 2004/07/15 08:29:05 jlam Exp $
+# $NetBSD: courierpops.sh,v 1.11 2005/02/18 22:12:46 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
 # PROVIDE: courierpops
 # REQUIRE: authdaemond
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="courierpops"
 rcvar=${name}
-command="@PREFIX@/libexec/courier/couriertcpd"
-ctl_command="@PREFIX@/libexec/courier/pop3d-ssl.rc"
-pidfile="/var/run/pop3d-ssl.pid"
+command="@PREFIX@/sbin/couriertcpd"
+ctl_command="@PREFIX@/sbin/pop3d-ssl"
+pidfile="@VARBASE@/run/pop3d-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 required_files="${required_files} @SSLCERTS@/pop3d.pem"
 required_vars="authdaemond"
@@ -59,10 +58,5 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	exec ${ctl_command} start
-fi
+load_rc_config $name
+run_rc_command "$1"