Update mail/courier-imap to 2.2.1. Changes from version 1.4.2 include

addition of keywords on Maildir messages, use of FAM if it exists to
allow simultaneous access to the same Maildir from multiple clients,
and fixed handling of DELETEd messages and the Trash folder.

16 files changed, 165 insertions, 189 deletions

diff --git a/mail/courier-imap/DEINSTALL b/mail/courier-imap/DEINSTALL
index 06bbbd55323..8a45facdf35 100644
--- a/mail/courier-imap/DEINSTALL
+++ b/mail/courier-imap/DEINSTALL
@@ -1,7 +1,14 @@
-# $NetBSD: DEINSTALL,v 1.3 2002/01/22 22:08:48 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2004/02/22 03:13:07 jlam Exp $
 
 # Additional files that are may be created for courier-imap.
 ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/imapd.rand"
 ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/pop3d.rand"
 ALL_FILES="${ALL_FILES} /dev/null @SSLCERTS@/imapd.pem"
 ALL_FILES="${ALL_FILES} /dev/null @SSLCERTS@/pop3d.pem"
+
+case ${STAGE} in
+POST-DEINSTALL)
+	# Unconditionally remove the SSL cache file.
+	${RM} -f /var/couriersslcache
+	;;
+esac
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 95bd4510d23..b824ac6ac71 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,34 +1,36 @@
-# $NetBSD: Makefile,v 1.19 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/22 03:13:07 jlam Exp $
 
-DISTNAME=	courier-imap-1.4.2
-PKGREVISION=	2
+DISTNAME=	courier-imap-2.2.1
 COMMENT=	IMAP server for access to Maildir-style mailboxes
 HOMEPAGE=	http://www.inter7.com/courierimap/
 
-DEPENDS+=	courier-auth>=0.37.1:../../mail/courier-auth
-DEPENDS+=	courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
+DEPENDS+=	courier-auth>=${BASE_VERS}:../../mail/courier-auth
+DEPENDS+=	courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake
 
+USE_BUILDLINK3=		yes
+USE_LANGUAGES=		c c++
 USE_PERL5=		yes
 REPLACE_PERL=		sysconftool
+
 USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL=	${.CURDIR}/../courier-auth/INSTALL
 
 .include "../../mail/courier-auth/Makefile.common"
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--with-waitfunc=wait3
-.endif
-
-CONFIGURE_ENV+=		OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl
+CONFIGURE_ENV+=		OPENSSL=${SSLBASE}/bin/openssl
 
 .if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
 INSTALL_TARGET=         install-strip
 .endif
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
 SYSCONFTOOL=		${PREFIX}/sbin/imapd.sysconftool
 GEN_FILES=		imapd imapd-ssl pop3d pop3d-ssl
 SSLCNF_FILES=		imapd.cnf pop3d.cnf
-RCD_SCRIPTS=		courierimap courierimaps courierpop courierpops
+FILES_SUBST+=		SYSCONFTOOL=${SYSCONFTOOL:Q}
+FILES_SUBST+=		SSLCERTS=${SSLCERTS}
+FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
 
 CONF_FILES_PERMS=	# empty
 .for FILE in ${GEN_FILES}
@@ -39,11 +41,9 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
 CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
 			${ROOT_USER} ${ROOT_GROUP} 0600
 .endfor
+RCD_SCRIPTS=		courierimap courierimaps courierpop courierpops
 
-INSTALL_EXTRA_TMPL=	${.CURDIR}/../../mail/courier-auth/INSTALL
-FILES_SUBST+=		SYSCONFTOOL=${SYSCONFTOOL:Q}
-FILES_SUBST+=		SSLCERTS=${SSLCERTS}
-FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
+.include "../../security/openssl/buildlink3.mk"
 
 pre-configure:
 	cd ${WRKSRC}; for file in					\
@@ -68,11 +68,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
-	${INSTALL_DATA} ${WRKSRC}/imap/BUGS				\
-		${DOCDIR}/BUGS.imap
-	${INSTALL_DATA} ${WRKSRC}/imap/README				\
-		${DOCDIR}/README.imap
-	cd ${WRKSRC}; ${INSTALL_DATA} imap/imapd.pam imap/pop3d.pam ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/imap/BUGS ${DOCDIR}/BUGS.imap
+	${INSTALL_DATA} ${WRKSRC}/imap/README ${DOCDIR}/README.imap
+	cd ${WRKSRC}/imap; ${INSTALL_DATA} imapd.authpam pop3d.authpam ${EGDIR}
 
-.include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-imap/PLIST b/mail/courier-imap/PLIST
index 5e6b7b8cd93..a8bfd8d518c 100644
--- a/mail/courier-imap/PLIST
+++ b/mail/courier-imap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/01/23 02:22:20 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/02/22 03:13:07 jlam Exp $
 bin/couriertls
 bin/imapd
 bin/pop3d
@@ -6,10 +6,10 @@ etc/rc.d/courierimap
 etc/rc.d/courierimaps
 etc/rc.d/courierpop
 etc/rc.d/courierpops
+libexec/courier/courierlogger
 libexec/courier/couriertcpd
 libexec/courier/imapd-ssl.rc
 libexec/courier/imapd.rc
-libexec/courier/logger
 libexec/courier/pop3d-ssl.rc
 libexec/courier/pop3d.rc
 man/man1/couriertcpd.1
@@ -26,13 +26,13 @@ share/courier/mkpop3dcert
 share/doc/courier/BUGS.imap
 share/doc/courier/README.imap
 share/examples/courier/imapd-ssl.dist
+share/examples/courier/imapd.authpam
 share/examples/courier/imapd.cnf
 share/examples/courier/imapd.dist
-share/examples/courier/imapd.pam
 share/examples/courier/pop3d-ssl.dist
+share/examples/courier/pop3d.authpam
 share/examples/courier/pop3d.cnf
 share/examples/courier/pop3d.dist
-share/examples/courier/pop3d.pam
 @unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} -p %D/share/courier 2>/dev/null || ${TRUE}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 12d6fb5c0cc..6d7fa1d5065 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.9 2002/06/26 16:05:37 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2004/02/22 03:13:07 jlam Exp $
 
-SHA1 (courier-imap-1.4.2.tar.gz) = 7c869f6b7d9b43bbf3435cddfadcbae777acdccc
-Size (courier-imap-1.4.2.tar.gz) = 1189909 bytes
-SHA1 (patch-aa) = 55013db5260044ebeb5b7236ceb482535ca06487
-SHA1 (patch-ab) = 9f6afb8f2e046c5d7d5d94e659d8dc9b544816a3
-SHA1 (patch-ac) = f85ae9f2f56c1885180ae86b156ff508aa2491c4
-SHA1 (patch-ad) = d4c91ca56a85896f4f7fef72003f4f8c3be1b315
-SHA1 (patch-ae) = 842c76a8d6cd7820c337469966b3bb7e901e271f
-SHA1 (patch-af) = e2982c2120a582fe20763f85e00ca611b45ac98f
-SHA1 (patch-ag) = e29f5e481704285e366d31d0d3be211f6a91d79d
-SHA1 (patch-ah) = d0b7b7d11d016e632c49d21412cad76b3e5876de
+SHA1 (courier-imap-2.2.1.tar.bz2) = c5bf64c07509745730ec002468f5bba76d8a0b7d
+Size (courier-imap-2.2.1.tar.bz2) = 1342879 bytes
+SHA1 (patch-aa) = 811da9525943f64286c6f8f18670b35f7d2ea03f
+SHA1 (patch-ab) = d2aab90ab745e502e588474517d6233b2e94e1bb
+SHA1 (patch-ad) = 50fb9666cab86de650e1a09e6d4a8ba7062be017
+SHA1 (patch-ae) = 41f3b00426ea630d1bb6d243cacda842d14a3b3b
+SHA1 (patch-af) = f28470abe1a269e86eb21459b1d9a5de6989fe11
+SHA1 (patch-ag) = 9123600cd875b18523c78786fc62ac1c8dea910b
+SHA1 (patch-ah) = 6615aba99c62cc459fdbcadb230f70f916e7178d
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index c201d3c1e85..d5b60723f91 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,14 +1,13 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
+# $NetBSD: courierimap.sh,v 1.7 2004/02/22 03:13:07 jlam Exp $
 #
 # Courier IMAP services daemon
 #
 # PROVIDE: courierimap
 # REQUIRE: authdaemond
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
@@ -26,18 +25,17 @@ courier_doit()
 {
 	action=$1
 	case ${action} in
-	start)	echo "Starting ${name}." ;;
-	stop)	echo "Stopping ${name}." ;;
+	start)	@ECHO@ "Starting ${name}." ;;
+	stop)	@ECHO@ "Stopping ${name}." ;;
 	esac
 
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
-	echo -n " ${name}"
+	@ECHO@ -n " ${name}"
 	${start_cmd}
 fi
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index 9c1f698c3b8..ea710b2703f 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,14 +1,13 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimaps.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
+# $NetBSD: courierimaps.sh,v 1.7 2004/02/22 03:13:07 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
 # PROVIDE: courierimaps
 # REQUIRE: authdaemond
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
@@ -27,18 +26,17 @@ courier_doit()
 {
 	action=$1
 	case ${action} in
-	start)	echo "Starting ${name}." ;;
-	stop)	echo "Stopping ${name}." ;;
+	start)	@ECHO@ "Starting ${name}." ;;
+	stop)	@ECHO@ "Stopping ${name}." ;;
 	esac
 
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
-	echo -n " ${name}"
+	@ECHO@ -n " ${name}"
 	${start_cmd}
 fi
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index 38868508836..90ab3ac277b 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,14 +1,13 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpop.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
+# $NetBSD: courierpop.sh,v 1.7 2004/02/22 03:13:07 jlam Exp $
 #
 # Courier POP services daemon
 #
 # PROVIDE: courierpop
 # REQUIRE: authdaemond
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
@@ -26,18 +25,17 @@ courier_doit()
 {
 	action=$1
 	case ${action} in
-	start)	echo "Starting ${name}." ;;
-	stop)	echo "Stopping ${name}." ;;
+	start)	@ECHO@ "Starting ${name}." ;;
+	stop)	@ECHO@ "Stopping ${name}." ;;
 	esac
 
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
-	echo -n " ${name}"
+	@ECHO@ -n " ${name}"
 	${start_cmd}
 fi
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index 79e114865a7..3ff55a64273 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,14 +1,13 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpops.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
+# $NetBSD: courierpops.sh,v 1.7 2004/02/22 03:13:07 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
 # PROVIDE: courierpops
 # REQUIRE: authdaemond
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
@@ -27,18 +26,17 @@ courier_doit()
 {
 	action=$1
 	case ${action} in
-	start)	echo "Starting ${name}." ;;
-	stop)	echo "Stopping ${name}." ;;
+	start)	@ECHO@ "Starting ${name}." ;;
+	stop)	@ECHO@ "Stopping ${name}." ;;
 	esac
 
 	${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
-	echo -n " ${name}"
+	@ECHO@ -n " ${name}"
 	exec ${ctl_command} start
 fi
diff --git a/mail/courier-imap/patches/patch-aa b/mail/courier-imap/patches/patch-aa
index 4f199fb9981..2d0a9e45b8f 100644
--- a/mail/courier-imap/patches/patch-aa
+++ b/mail/courier-imap/patches/patch-aa
@@ -1,41 +1,46 @@
-$NetBSD: patch-aa,v 1.7 2002/01/23 02:22:21 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2004/02/22 03:13:07 jlam Exp $
 
---- Makefile.in.orig	Fri Jan 18 22:19:33 2002
+--- Makefile.in.orig	Thu Nov 27 15:51:57 2003
 +++ Makefile.in
-@@ -30,3 +30,3 @@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = ${prefix}/share/examples/courier
- sharedstatedir = @sharedstatedir@
-@@ -93,7 +93,7 @@
+@@ -137,9 +137,9 @@ SUBDIRS = numlib @DBSUBDIR@ soxwrap unic
+ CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA)
  databindir = $(datadir)
 -databin_SCRIPTS = mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb
 +databin_SCRIPTS = mkimapdcert mkpop3dcert
  
--bin_PROGRAMS = imapd pop3d maildirmake
--sbin_PROGRAMS = imaplogin pop3login userdbpw
--man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 deliverquota.8 maildirmake.1 imapd.8 mkimapdcert.8 mkpop3dcert.8
-+bin_PROGRAMS = imapd pop3d
-+sbin_PROGRAMS = imaplogin pop3login
+-binPROGRAMS = imapd pop3d maildirmake deliverquota maildirkw
+-sbinPROGRAMS = imaplogin pop3login userdbpw
+-libexecPROGRAMS = makedatprog couriertcpd courierlogger
++binPROGRAMS = imapd pop3d
++sbinPROGRAMS = imaplogin pop3login
++libexecPROGRAMS = couriertcpd courierlogger
+ 
+ bin_PROGRAMS = @binPROGRAMS_exec@
+@@ -149,5 +149,5 @@ libexec_PROGRAMS = @libexecPROGRAMS_exec
+ EXTRA_PROGRAMS = 
+ 
+-man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.1 deliverquota.8 maildirmake.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
 +man_MANS = couriertcpd.1 courier-imapd.8 mkimapdcert.8 mkpop3dcert.8
  
-@@ -109,6 +109,6 @@
+ 
+@@ -161,5 +161,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
+ 
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -	imapd.cnf pop3d.cnf quotawarnmsg.example
 +	imapd.cnf pop3d.cnf
  
  libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
--libexec_PROGRAMS = makedatprog couriertcpd deliverquota logger
-+libexec_PROGRAMS = couriertcpd logger
- 
-@@ -791,4 +791,4 @@
+@@ -927,6 +927,6 @@ maildirkw.1: maildir/maildirkw.1
+ 	cp $(srcdir)/maildir/maildirkw.1 .
  
 -imapd.8: imap/imapd.8
 -	cp imap/imapd.8 .
 +courier-imapd.8: imap/imapd.8
-+	cp imap/imapd.8 $@
++	cp imap/imapd.8 ./$@
+ 
+ mkimapdcert: imap/mkimapdcert
+@@ -954,20 +954,9 @@ quotawarnmsg.example: maildir/quotawarnm
  
-@@ -818,13 +818,2 @@
  install-exec-local:
 -	$(mkinstalldirs) $(DESTDIR)$(libexecdir)/authlib
 -	for f in `cat authlib/installlist` dummy ; do \
@@ -46,19 +51,23 @@ $NetBSD: patch-aa,v 1.7 2002/01/23 02:22:21 jlam Exp $
 -		test "$$f" = "dummy" && continue ; \
 -		$(INSTALL_SCRIPT) authlib/$$f \
 -			$(DESTDIR)$(libexecdir)/authlib/$$f ; done
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
--	$(INSTALL_SCRIPT) userdb/userdb.pl $(DESTDIR)$(datadir)/userdb
+-	$(mkinstalldirs) $(DESTDIR)$(databindir)
+-	$(INSTALL_SCRIPT) userdb/userdb.pl $(DESTDIR)$(databindir)/userdb
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
  	test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
-@@ -832,3 +821,3 @@
+ 		tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
  	$(mkinstalldirs) $(DESTDIR)$(sbindir)
 -	for f in mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb userdb ; \
 +	for f in mkimapdcert mkpop3dcert ; \
  		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
-@@ -837,3 +826,2 @@
+ 		$(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
+@@ -975,28 +964,8 @@ install-exec-local:
+ 
  install-exec-hook:
 -	chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
  
-@@ -842,30 +830,6 @@
+ # If authlib built authpam, install the PAM configuration file
+ 
  install-data-local: install-man
 -	for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
 -		test "$$f" = "authpam" || continue ; \
@@ -81,12 +90,3 @@ $NetBSD: patch-aa,v 1.7 2002/01/23 02:22:21 jlam Exp $
 -	@echo "Do not forget to run make install-configure"
  
  uninstall-local:
--	rm -f $(DESTDIR)$(man8dir)/pw2userdb.8
--	rm -f $(DESTDIR)$(man8dir)/vchkpw2userdb.8
--	rm -f $(DESTDIR)$(datadir)/userdb
--	for f in userdb mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb ; \
-+	for f in mkimapdcert mkpop3dcert ; \
- 		do rm -f $(DESTDIR)$(sbindir)/$$f ; done
--	for f in `cat authlib/installlist authlib/installlist.sh` ; do \
--			rm -f $(DESTDIR)$(libexecdir)/authlib/$$f ; done
- 	rm -f $(DESTDIR)$(bindir)/couriertls
diff --git a/mail/courier-imap/patches/patch-ab b/mail/courier-imap/patches/patch-ab
index 9a32829e6cc..49c66352be5 100644
--- a/mail/courier-imap/patches/patch-ab
+++ b/mail/courier-imap/patches/patch-ab
@@ -1,30 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2002/01/22 22:08:54 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2004/02/22 03:13:07 jlam Exp $
 
---- authlib/Makefile.in.orig	Fri Jan 18 22:19:41 2002
+--- authlib/Makefile.in.orig	Sat Nov 15 10:58:55 2003
 +++ authlib/Makefile.in
-@@ -2057,23 +2057,9 @@
+@@ -1279,7 +1279,7 @@ info: info-am
  
- # automake still a bit stupid...
+ info-am:
  
--install-data-local: install-authldaprc install-authdaemonrc install-authmysqlrc install-authpgsqlrc
--	test "$(man_LINKS)" = "" && exit 0; \
--	$(mkinstalldirs) $(DESTDIR)$(man7dir) ; \
--	for f in $(man_MANS) "" ; do \
--		test "$$f" = "" && continue ; \
--		$(INSTALL_DATA) $$f $(DESTDIR)$(man7dir) ; done ; \
--	cd $(DESTDIR)$(man7dir) || exit 1 ; \
--		for f in $(man_LINKS) "" ; do \
--			test "$$f" = "" && continue ; \
--			rm -f $$f; $(LN_S) authlib.7 $$f ; \
--			test -w /etc && chown bin $$f && chgrp bin $$f ; \
--			done ; exit 0
-+install-data-local:
+-install-data-am: install-data-local
++install-data-am:
  
--uninstall-local: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
--	cd $(DESTDIR)$(man7dir) 2>/dev/null || exit 0 ; \
--		test "$(man_LINKS)" = "" && exit 0; \
--		rm -f $(man_LINKS) $(man_MANS)
-+uninstall-local:
+ install-exec-am:
  
- authlib.html: authlib.html.in
- 	CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/mail/courier-imap/patches/patch-ac b/mail/courier-imap/patches/patch-ac
deleted file mode 100644
index 1132cb9fb7c..00000000000
--- a/mail/courier-imap/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/01/22 22:08:54 jlam Exp $
-
---- authlib/cryptpassword.c.orig	Wed Jun 20 21:44:04 2001
-+++ authlib/cryptpassword.c
-@@ -6,6 +6,7 @@
- #if	HAVE_CONFIG_H
- #include	"config.h"
- #endif
-+#include	<stdlib.h>
- #include	<string.h>
- #if	HAVE_UNISTD_H
- #include	<unistd.h>
diff --git a/mail/courier-imap/patches/patch-ad b/mail/courier-imap/patches/patch-ad
index 1bd6b85598d..53e480e6812 100644
--- a/mail/courier-imap/patches/patch-ad
+++ b/mail/courier-imap/patches/patch-ad
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.2 2002/01/22 22:08:54 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2004/02/22 03:13:07 jlam Exp $
 
---- configure.orig	Tue Jan 22 14:53:01 2002
+--- configure.orig	Thu Nov 27 15:51:08 2003
 +++ configure
-@@ -1719,9 +1719,6 @@
- fi
- 
+@@ -3607,9 +3607,6 @@ else
+   ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null"
+ fi;
  
 -INSTALL_DATA='${INSTALL} -m 0600'
 -INSTALL_SCRIPT='${INSTALL}'
 -
- #
- # autoconf bug
- #
+ if ulimit -v 2>/dev/null
+ then
+ 	ULIMIT='ulimit -v'
diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae
index 0cd7612881a..ff639dca9d4 100644
--- a/mail/courier-imap/patches/patch-ae
+++ b/mail/courier-imap/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2002/06/22 15:55:24 grant Exp $
+$NetBSD: patch-ae,v 1.4 2004/02/22 03:13:07 jlam Exp $
 
---- imapd-ssl.rc.in.orig	Fri Mar 16 04:36:47 2001
-+++ imapd-ssl.rc.in	Sat Jun 22 16:58:09 2002
-@@ -21,13 +21,8 @@
+--- imapd-ssl.rc.in.orig	Thu Nov 27 13:07:33 2003
++++ imapd-ssl.rc.in
+@@ -34,18 +34,13 @@ start)
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -11,13 +11,18 @@ $NetBSD: patch-ae,v 1.3 2002/06/22 15:55:24 grant Exp $
 -		@SETENV@ - ${libexecdir}/authlib/authdaemond start
 -	fi
 -
- 	ulimit -d $IMAP_ULIMITD
--	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
-+	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/imapd ; \
- 		. @sysconfdir@/imapd-ssl ; \
- 		IMAP_TLS=1; export IMAP_TLS; \
- 		`sed -n '/^#/d;/=/p' <@sysconfdir@/imapd | \
-@@ -45,10 +40,6 @@
+ 	if test "$TLS_CACHEFILE" != ""
+ 	then
+ 		rm -f $TLS_CACHEFILE
+ 	fi
+ 
+ 	@ULIMIT@ $IMAP_ULIMITD
+-	@SETENV@ - @SHELL@ -c " set -a ;
++	@SETENV@ -i @SHELL@ -c " set -a ;
+ 		prefix=@prefix@ ;
+ 		exec_prefix=@exec_prefix@ ;
+ 		bindir=@bindir@ ;
+@@ -64,10 +59,6 @@ start)
  	;;
  stop)
  	@libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
index 1330daffc4e..b4cab00767a 100644
--- a/mail/courier-imap/patches/patch-af
+++ b/mail/courier-imap/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2002/06/22 15:55:24 grant Exp $
+$NetBSD: patch-af,v 1.4 2004/02/22 03:13:07 jlam Exp $
 
---- imapd.rc.in.orig	Mon Jul 30 02:02:32 2001
-+++ imapd.rc.in	Sat Jun 22 16:58:20 2002
-@@ -21,13 +21,8 @@
+--- imapd.rc.in.orig	Thu Nov 27 13:07:34 2003
++++ imapd.rc.in
+@@ -34,18 +34,13 @@ start)
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -11,13 +11,18 @@ $NetBSD: patch-af,v 1.3 2002/06/22 15:55:24 grant Exp $
 -		@SETENV@ - ${libexecdir}/authlib/authdaemond start
 -	fi
 -
- 	ulimit -d $IMAP_ULIMITD
--	@SETENV@ - @SHELL@ -c " . @sysconfdir@/imapd ; \
-+	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/imapd ; \
- 				. @sysconfdir@/imapd-ssl ; \
- 		IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \
- 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
-@@ -45,10 +40,6 @@
+ 	if test "$TLS_CACHEFILE" != ""
+ 	then
+ 		rm -f $TLS_CACHEFILE
+ 	fi
+ 
+ 	@ULIMIT@ $IMAP_ULIMITD
+-	@SETENV@ - @SHELL@ -c " set -a ;
++	@SETENV@ -i @SHELL@ -c " set -a ;
+ 			prefix=@prefix@ ;
+ 			exec_prefix=@exec_prefix@ ;
+ 			bindir=@bindir@ ;
+@@ -64,10 +59,6 @@ start)
  	;;
  stop)
  	@libexecdir@/couriertcpd -pid=$PIDFILE -stop
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
index dae49a1fe2e..093495ddb46 100644
--- a/mail/courier-imap/patches/patch-ag
+++ b/mail/courier-imap/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2002/06/22 15:55:24 grant Exp $
+$NetBSD: patch-ag,v 1.4 2004/02/22 03:13:07 jlam Exp $
 
---- pop3d-ssl.rc.in.orig	Sun Jan 28 19:52:49 2001
-+++ pop3d-ssl.rc.in	Sat Jun 22 16:58:46 2002
-@@ -21,12 +21,7 @@
+--- pop3d-ssl.rc.in.orig	Thu Nov 27 13:07:35 2003
++++ pop3d-ssl.rc.in
+@@ -34,12 +34,7 @@ start)
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -11,12 +11,12 @@ $NetBSD: patch-ag,v 1.3 2002/06/22 15:55:24 grant Exp $
 -		@SETENV@ - ${libexecdir}/authlib/authdaemond start
 -	fi
 -
--	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
-+	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/pop3d ; \
- 		. @sysconfdir@/pop3d-ssl ; \
- 		POP3_TLS=1; export POP3_TLS; \
- 		`sed -n '/^#/d;/=/p' <@sysconfdir@/pop3d | \
-@@ -44,10 +39,6 @@
+-	@SETENV@ - @SHELL@ -c " set -a ;
++	@SETENV@ -i @SHELL@ -c " set -a ;
+ 		prefix=@prefix@ ;
+ 		exec_prefix=@exec_prefix@ ;
+ 		bindir=@bindir@ ;
+@@ -60,10 +55,6 @@ start)
  	;;
  stop)
  	@libexecdir@/couriertcpd -pid=$SSLPIDFILE -stop
diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah
index 822978e9e5f..728db9061f2 100644
--- a/mail/courier-imap/patches/patch-ah
+++ b/mail/courier-imap/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2002/06/22 15:55:25 grant Exp $
+$NetBSD: patch-ah,v 1.3 2004/02/22 03:13:07 jlam Exp $
 
---- pop3d.rc.in.orig	Mon Jul 30 02:02:32 2001
-+++ pop3d.rc.in	Sat Jun 22 16:58:36 2002
-@@ -21,12 +21,7 @@
+--- pop3d.rc.in.orig	Thu Nov 27 13:07:35 2003
++++ pop3d.rc.in
+@@ -33,12 +33,7 @@ start)
  		LIBAUTHMODULES="$LIBAUTHMODULES @libexecdir@/authlib/$f"
  	done
  
@@ -11,12 +11,12 @@ $NetBSD: patch-ah,v 1.2 2002/06/22 15:55:25 grant Exp $
 -		@SETENV@ - ${libexecdir}/authlib/authdaemond start
 -	fi
 -
--	@SETENV@ - @SHELL@ -c " . @sysconfdir@/pop3d ; \
-+	@SETENV@ -i @SHELL@ -c " . @sysconfdir@/pop3d ; \
- 				. @sysconfdir@/pop3d-ssl ; \
- 		POP3_STARTTLS=$POP3DSTARTTLS ; export POP3_STARTTLS ; \
- 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
-@@ -44,10 +39,6 @@
+-	@SETENV@ - @SHELL@ -c " set -a ;
++	@SETENV@ -i @SHELL@ -c " set -a ;
+ 		prefix=@prefix@ ;
+ 		exec_prefix=@exec_prefix@ ;
+ 		bindir=@bindir@ ;
+@@ -57,10 +52,6 @@ start)
  	;;
  stop)
  	@libexecdir@/couriertcpd -pid=$PIDFILE -stop