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

    * msgbodystructure.c (msgbodystructure): Fix MSGBODYSTRUCTURE response
      for a corrupted content-type of "text".

5 files changed, 15 insertions, 48 deletions

diff --git a/mail/courier-imap/patches/patch-ad b/mail/courier-imap/patches/patch-ad
index f3a8c2b30ab..666ffb39198 100644
--- a/mail/courier-imap/patches/patch-ad
+++ b/mail/courier-imap/patches/patch-ad
@@ -1,17 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2005/02/18 22:12:46 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2005/03/23 04:07:03 jlam Exp $
 
---- configure.orig	2005-01-04 19:57:18.000000000 -0500
+--- configure.orig	2005-02-28 21:32:52.000000000 -0500
 +++ configure
-@@ -19568,7 +19568,7 @@ echo "$as_me: error: courierauthconfig n
- fi
- $COURIERAUTHCONFIG --configfiles >conftest || exit 1
- sed 's/^/auth/' <conftest >conftest2
--. conftest2
-+. ./conftest2
- if test ! -x $authsbindir/courierlogger$EXEEXT
- then
- 	{ { echo "$as_me:$LINENO: error: authlib configuration error - $authsbindir/courierlogger$EXEEXT not found" >&5
-@@ -20376,9 +20376,6 @@ else
+@@ -20383,9 +20383,6 @@ else
    ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null"
  fi;
  
diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae
index 331740cda32..bd7fa520105 100644
--- a/mail/courier-imap/patches/patch-ae
+++ b/mail/courier-imap/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2005/02/18 22:12:46 jlam Exp $
+$NetBSD: patch-ae,v 1.7 2005/03/23 04:07:03 jlam Exp $
 
---- imapd-ssl.rc.in.orig	2004-11-24 23:57:04.000000000 -0500
+--- imapd-ssl.rc.in.orig	2005-02-16 18:46:48.000000000 -0500
 +++ imapd-ssl.rc.in
 @@ -9,6 +9,7 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -10,13 +10,7 @@ $NetBSD: patch-ae,v 1.6 2005/02/18 22:12:46 jlam Exp $
  
  if test ! -f @sysconfdir@/imapd
  then
-@@ -35,11 +36,12 @@ start)
- 
- 	umask $IMAP_UMASK
- 	@ULIMIT@ $IMAP_ULIMITD
--	@SETENV@ - @SHELL@ -c " set -a ;
-+	@SETENV@ -i @SHELL@ -c " set -a ;
- 		prefix=@prefix@ ;
+@@ -40,6 +41,7 @@ start)
  		exec_prefix=@exec_prefix@ ;
  		bindir=@bindir@ ;
  		libexecdir=@libexecdir@ ;
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
index f12a0e4a1fc..f8d0869a7e4 100644
--- a/mail/courier-imap/patches/patch-af
+++ b/mail/courier-imap/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.6 2005/02/18 22:12:46 jlam Exp $
+$NetBSD: patch-af,v 1.7 2005/03/23 04:07:03 jlam Exp $
 
---- imapd.rc.in.orig	2004-11-24 23:57:04.000000000 -0500
+--- imapd.rc.in.orig	2005-02-16 18:46:48.000000000 -0500
 +++ imapd.rc.in
 @@ -9,6 +9,7 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -10,13 +10,7 @@ $NetBSD: patch-af,v 1.6 2005/02/18 22:12:46 jlam Exp $
  
  if test ! -f @sysconfdir@/imapd
  then
-@@ -35,11 +36,12 @@ start)
- 
- 	umask $IMAP_UMASK
- 	@ULIMIT@ $IMAP_ULIMITD
--	@SETENV@ - @SHELL@ -c " set -a ;
-+	@SETENV@ -i @SHELL@ -c " set -a ;
- 			prefix=@prefix@ ;
+@@ -40,6 +41,7 @@ start)
  			exec_prefix=@exec_prefix@ ;
  			bindir=@bindir@ ;
  			libexecdir=@libexecdir@ ;
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
index cb9d7cbdef7..302e96d89e4 100644
--- a/mail/courier-imap/patches/patch-ag
+++ b/mail/courier-imap/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.6 2005/02/18 22:12:46 jlam Exp $
+$NetBSD: patch-ag,v 1.7 2005/03/23 04:07:03 jlam Exp $
 
---- pop3d-ssl.rc.in.orig	2004-10-20 20:45:45.000000000 -0400
+--- pop3d-ssl.rc.in.orig	2005-02-16 18:46:48.000000000 -0500
 +++ pop3d-ssl.rc.in
 @@ -9,6 +9,7 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -10,13 +10,7 @@ $NetBSD: patch-ag,v 1.6 2005/02/18 22:12:46 jlam Exp $
  
  if test ! -f @sysconfdir@/pop3d
  then
-@@ -28,11 +29,12 @@ fi
- 
- case $1 in
- start)
--	@SETENV@ - @SHELL@ -c " set -a ;
-+	@SETENV@ -i @SHELL@ -c " set -a ;
- 		prefix=@prefix@ ;
+@@ -33,6 +34,7 @@ start)
  		exec_prefix=@exec_prefix@ ;
  		bindir=@bindir@ ;
  		libexecdir=@libexecdir@ ;
diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah
index 2cf54bc3c1b..2a34019b62d 100644
--- a/mail/courier-imap/patches/patch-ah
+++ b/mail/courier-imap/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.5 2005/02/18 22:12:46 jlam Exp $
+$NetBSD: patch-ah,v 1.6 2005/03/23 04:07:03 jlam Exp $
 
---- pop3d.rc.in.orig	2004-10-20 20:45:46.000000000 -0400
+--- pop3d.rc.in.orig	2005-02-16 18:46:48.000000000 -0500
 +++ pop3d.rc.in
 @@ -9,6 +9,7 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -10,13 +10,7 @@ $NetBSD: patch-ah,v 1.5 2005/02/18 22:12:46 jlam Exp $
  
  if test ! -f @sysconfdir@/pop3d
  then
-@@ -27,11 +28,12 @@ fi
- 
- case $1 in
- start)
--	@SETENV@ - @SHELL@ -c " set -a ;
-+	@SETENV@ -i @SHELL@ -c " set -a ;
- 		prefix=@prefix@ ;
+@@ -32,6 +33,7 @@ start)
  		exec_prefix=@exec_prefix@ ;
  		bindir=@bindir@ ;
  		libexecdir=@libexecdir@ ;