Update mail/courier-imap to 4.1.3. Changes from version 4.1.1 include:

+ Remove BDB_LIB workaround which should already be handled by the wrapper
  scripts and db1.builtin.mk.

* Plug some resource leaks in the maildir library code.

6 files changed, 18 insertions, 25 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 0d4c1304981..ad03a439add 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2007/08/02 22:07:32 jlam Exp $
+# $NetBSD: Makefile,v 1.62 2007/08/10 17:56:57 jlam Exp $
 
-DISTNAME=	courier-imap-4.1.1
-PKGREVISION=	3
+DISTNAME=	courier-imap-4.1.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -52,12 +51,6 @@ CONF_FILES_PERMS+=	${EGDIR}/${_file_}				\
 .endfor
 RCD_SCRIPTS=		courierimap courierimaps courierpop courierpops
 
-SUBST_CLASSES+=		bdb
-SUBST_MESSAGE.bdb=	Configuring to use $(BDB_LIBS)
-SUBST_STAGE.bdb=	post-patch
-SUBST_FILES.bdb=	configure bdbobj/configure.in bdbobj/configure
-SUBST_SED.bdb=		-e "s,-ldb,${BDB_LIBS},g"
-
 SUBST_CLASSES+=		courier
 SUBST_FILES.courier=	imap/imapd-ssl.dist.in imap/imapd.8.in		\
 			imap/imapd.cnf.in imap/imapd.dist.in		\
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index ccf0d24a924..ac876183101 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2006/10/10 12:55:39 ben Exp $
+$NetBSD: distinfo,v 1.20 2007/08/10 17:56:57 jlam Exp $
 
-SHA1 (courier-imap-4.1.1.tar.bz2) = 505f35a8a7d6f55b9d624e544785bc758700135c
-RMD160 (courier-imap-4.1.1.tar.bz2) = e7f4c0d7cbb0ccf061c31de1b0b2387ec9d87084
-Size (courier-imap-4.1.1.tar.bz2) = 3211569 bytes
+SHA1 (courier-imap-4.1.3.tar.bz2) = d0042e585d6df658a41a1768887d135c89e51ac0
+RMD160 (courier-imap-4.1.3.tar.bz2) = b1422973a7c3b13cf35e895a8494761aa4b80834
+Size (courier-imap-4.1.3.tar.bz2) = 3262429 bytes
 SHA1 (patch-aa) = 81b1f736141da4a38226be12b342c8e69f1ee55c
 SHA1 (patch-ad) = c23fdfcf1a37fb828850c9fbf3b9d0c8a9eb6f9e
 SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index 2c1403ac380..f0004430cd8 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.13 2006/06/17 19:26:48 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.14 2007/08/10 17:56:57 jlam Exp $
 #
 # Courier IMAP services daemon
 #
@@ -17,8 +17,8 @@ ctl_command="@PREFIX@/sbin/imapd"
 pidfile="@VARBASE@/run/imapd.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 
-start_cmd="courierimap_doit start"
-stop_cmd="courierimap_doit stop"
+start_cmd="${name}_doit start"
+stop_cmd="${name}_doit stop"
 
 courierimap_doit()
 {
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index 96ac9141757..ea3dab13382 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.15 2006/06/17 19:26:48 jlam Exp $
+# $NetBSD: courierimaps.sh,v 1.16 2007/08/10 17:56:57 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
@@ -17,8 +17,8 @@ ctl_command="@PREFIX@/sbin/imapd-ssl"
 pidfile="@VARBASE@/run/imapd-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 
-start_cmd="courierimaps_doit start"
-stop_cmd="courierimaps_doit stop"
+start_cmd="${name}_doit start"
+stop_cmd="${name}_doit stop"
 
 courierimaps_doit()
 {
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index 500a2b09401..1f5df7abcd0 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.13 2006/06/17 19:26:48 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.14 2007/08/10 17:56:57 jlam Exp $
 #
 # Courier POP3 services daemon
 #
@@ -17,8 +17,8 @@ ctl_command="@PREFIX@/sbin/pop3d"
 pidfile="@VARBASE@/run/pop3d.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 
-start_cmd="courierpop_doit start"
-stop_cmd="courierpop_doit stop"
+start_cmd="${name}_doit start"
+stop_cmd="${name}_doit stop"
 
 courierpop_doit()
 {
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index 28d8426e3fa..a9db789dc3d 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.15 2006/06/17 19:26:48 jlam Exp $
+# $NetBSD: courierpops.sh,v 1.16 2007/08/10 17:56:57 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
@@ -17,8 +17,8 @@ ctl_command="@PREFIX@/sbin/pop3d-ssl"
 pidfile="@VARBASE@/run/pop3d-ssl.pid"
 required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 
-start_cmd="courierpops_doit start"
-stop_cmd="courierpops_doit stop"
+start_cmd="${name}_doit start"
+stop_cmd="${name}_doit stop"
 
 courierpops_doit()
 {