Updated mail/courier-maildir to the utilities from the courier-0.51.0

distribution.  Changes include teaching courier-maildiracl about
account groups and the administrator group for IMAP ACLs, which are
understood by courier-imap>=4.0.4 and sqwebmail>=5.0.4.

3 files changed, 16 insertions, 15 deletions

diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index 385062fb700..cc98d294317 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2005/08/06 06:19:21 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/11 00:03:32 jlam Exp $
 
-DISTNAME=	courier-0.49.0
+DISTNAME=	courier-0.51.0
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
 PKGBASE=	${PKGNAME:C/-[^-]*$//}
 CATEGORIES=	mail
@@ -25,10 +25,11 @@ USE_LANGUAGES=		c c++
 CONFIGURE_ENV+=		ac_cv_path_COURIERAUTHCONFIG=${TRUE:Q}
 
 # These are files required by the Courier configure scripts.
-WRKSRC_FILES=		config.guess config.sub configure depcomp	\
-			install-sh ltmain.sh missing sysconftool
-WRKSRC_FILES+=		Makefile.in courier.spec.in courier.sysvinit.in	\
-			dbobj.h.in dbobj.config.in courier/courier.c
+WRKSRC_FILES=		courier/courier.c config.guess config.sub	\
+			configure depcomp install-sh ltmain.sh missing	\
+			sysconftool
+WRKSRC_FILES+=		Makefile.in courier.spec.in courier.lpspec.in	\
+			dbobj.h.in dbobj.config.in courier.sysvinit.in
 
 # These are subdirectories containing libraries used by courier-maildir.
 #
@@ -41,7 +42,7 @@ BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
 INSTALLATION_DIRS=	bin man/man1 man/man5 man/man5 man/man7 man/man8 sbin
 
 USE_PKGINSTALL=		yes
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
 OWN_DIRS=		${PKG_SYSCONFDIR}/shared
 OWN_DIRS+=		${PKG_SYSCONFDIR}/shared.tmp
 CONF_FILES=		${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
@@ -50,7 +51,7 @@ CONF_FILES_PERMS=	${EGDIR}/sharedindexupdate			\
 			${ROOT_USER} ${ROOT_GROUP} 0755
 
 post-build:
-	${SED} ${FILES_SUBST_SED} ${FILESDIR}/sharedindexupdate.sh	\
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/sharedindexupdate.sh	\
 		> ${WRKDIR}/sharedindexupdate.sh
 
 do-install:
diff --git a/mail/courier-maildir/Makefile.common b/mail/courier-maildir/Makefile.common
index 1d6bb765c71..18c07b05064 100644
--- a/mail/courier-maildir/Makefile.common
+++ b/mail/courier-maildir/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/08/11 00:03:32 jlam Exp $
 #
 # Package Makefiles should include this file after setting PKGBASE and
 # PKG_SUPPORTED_OPTIONS.
@@ -21,12 +21,12 @@ USE_DB185=		yes
 CONFIGURE_ARGS+=	--with-db=db
 .include "../../mk/bdb.buildlink3.mk"
 
-CONFIGURE_ENV+=		SYSCONFTOOL_PERL=${PERL5}
+CONFIGURE_ENV+=		SYSCONFTOOL_PERL=${PERL5:Q}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGBASE}
 PKG_SUPPORTED_OPTIONS+=	fam
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mfam)
-.  include "../../sysutils/fam/buildlink3.mk"
+.  include "../../mk/fam.buildlink3.mk"
 .endif
diff --git a/mail/courier-maildir/distinfo b/mail/courier-maildir/distinfo
index e07d2031ed7..e7ac7611f87 100644
--- a/mail/courier-maildir/distinfo
+++ b/mail/courier-maildir/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/03/22 04:21:25 jlam Exp $
+$NetBSD: distinfo,v 1.5 2005/08/11 00:03:32 jlam Exp $
 
-SHA1 (courier-0.49.0.tar.bz2) = 838c00f5c3be9f15174ff8b872e553859a875d7f
-RMD160 (courier-0.49.0.tar.bz2) = 4842fc4f28843b374c5c70a736ab6757a391abc5
-Size (courier-0.49.0.tar.bz2) = 5884664 bytes
+SHA1 (courier-0.51.0.tar.bz2) = c0811f1c21d2de8c4d817238956229288f7f9449
+RMD160 (courier-0.51.0.tar.bz2) = e0bd74219a7fc12bd3a836f3340757aa00dac8f2
+Size (courier-0.51.0.tar.bz2) = 6575351 bytes