Update courier-maildir to 0.53.1. Changes from version 0.52.2 include:

  + Install some of the HTML documentation in the locations expected by
    courier-mta.

  * fixes to the Maildir+ quota support.

3 files changed, 34 insertions, 74 deletions

diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index 56ca4a73702..6d56dcdd484 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/28 18:13:25 jlam Exp $
 
-DISTNAME=	courier-0.52.2
+DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,7 +15,7 @@ CONFLICTS=	courier-maildirmake-[0-9]*
 USE_TOOLS+=		gmake perl:run
 USE_LANGUAGES=		c c++
 
-.include "Makefile.common"
+.include "../../mail/courier-mta/Makefile.common"
 
 # This package doesn't need to depend on courier-authlib -- just fake
 # out the top-level configure script that thinks it needs
@@ -39,14 +38,23 @@ EXTRACT_ELEMENTS=	${WRKSRC_FILES:S/^/${DISTNAME}\//}
 EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
 
 BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
-INSTALLATION_DIRS=	bin man/man1 man/man5 man/man5 man/man7 man/man8 sbin
+INSTALLATION_DIRS=	bin			sbin			\
+			${PKGMANDIR}/man1	${PKGMANDIR}/man7	\
+			${PKGMANDIR}/man5	${PKGMANDIR}/man8	\
+			${DOCDIR}		${EGDIR}
 
-OWN_DIRS=		${PKG_SYSCONFDIR}/shared
-OWN_DIRS+=		${PKG_SYSCONFDIR}/shared.tmp
-CONF_FILES=		${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
-CONF_FILES_PERMS=	${EGDIR}/sharedindexupdate			\
+REQD_DIRS=		${PREFIX}/share/doc/courier
+REQD_DIRS+=		${PREFIX}/share/examples/courier
+OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/shared			\
+			${COURIER_DIR_PERMS}
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/shared.tmp			\
+			${COURIER_DIR_PERMS}
+CONF_FILES_PERMS+=	${EGDIR}/quotawarnmsg				\
+			${PKG_SYSCONFDIR}/quotawarnmsg			\
+			${COURIER_FILE_PERMS}
+CONF_FILES_PERMS+=	${EGDIR}/sharedindexupdate			\
 			${PKG_SYSCONFDIR}/sharedindexupdate		\
-			${ROOT_USER} ${ROOT_GROUP} 0755
+			${COURIER_SCRIPT_PERMS}
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/sharedindexupdate.sh
@@ -62,8 +70,6 @@ post-extract:
 	${CP} ${FILESDIR}/sharedindexupdate.sh ${WRKDIR}/sharedindexupdate.sh
 
 do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/maildir/deliverquota		\
 		${PREFIX}/bin/deliverquota
 	${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildiracl			\
@@ -73,17 +79,17 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirmake		\
 		${PREFIX}/bin/courier-maildirmake
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildiracl.1			\
-		${PREFIX}/man/man1/courier-maildiracl.1
+		${PREFIX}/${PKGMANDIR}/man1/courier-maildiracl.1
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildirkw.1			\
-		${PREFIX}/man/man1/courier-maildirkw.1
+		${PREFIX}/${PKGMANDIR}/man1/courier-maildirkw.1
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildirmake.1			\
-		${PREFIX}/man/man1/courier-maildirmake.1
+		${PREFIX}/${PKGMANDIR}/man1/courier-maildirmake.1
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildir.5			\
-		${PREFIX}/man/man5/courier-maildir.5
+		${PREFIX}/${PKGMANDIR}/man5/courier-maildir.5
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildirquota.7			\
-		${PREFIX}/man/man7/maildirquota.7
+		${PREFIX}/${PKGMANDIR}/man7/maildirquota.7
 	${INSTALL_MAN} ${WRKSRC}/maildir/deliverquota.8			\
-		${PREFIX}/man/man8/deliverquota.8
+		${PREFIX}/${PKGMANDIR}/man8/deliverquota.8
 	${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg			\
 		${EGDIR}/quotawarnmsg
 	${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexinstall		\
@@ -92,13 +98,11 @@ do-install:
 		${PREFIX}/sbin/sharedindexsplit
 	${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate.sh		\
 		${EGDIR}/sharedindexupdate
-	${INSTALL_DATA} ${WRKSRC}/maildir/README.imapkeywords.html	\
-		${DOCDIR}/README.imapkeywords.html
-	${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirfilter.html	\
-		${DOCDIR}/README.maildirfilter.html
-	${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirquota.html	\
-		${DOCDIR}/README.maildirquota.html
-	${INSTALL_DATA} ${WRKSRC}/maildir/README.sharedfolders.html	\
-		${DOCDIR}/README.sharedfolders.html
+	grep "^${DOCDIR:S/${PREFIX}\///}" ${PKGDIR}/PLIST |		\
+	while read file; do						\
+		src=${WRKSRC:Q}/maildir/`basename $$file`;		\
+		dst=${PREFIX:Q}"/$$file";				\
+		${INSTALL_DATA} "$$src" "$$dst";			\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildir/Makefile.common b/mail/courier-maildir/Makefile.common
deleted file mode 100644
index fc24d6dc67a..00000000000
--- a/mail/courier-maildir/Makefile.common
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile.common,v 1.9 2006/01/03 05:33:11 jlam Exp $
-#
-# Package Makefiles should include this file after setting PKGNAME and
-# PKG_SUPPORTED_OPTIONS.
-
-.if !defined(PKGNAME)
-PKG_FAIL_REASON+=	"[courier-mail/Makefile.common] PKGNAME must be set."
-.endif
-
-PKG_SYSCONFSUBDIR?=	courier
-DOCDIR=			${PREFIX}/share/doc/courier
-EGDIR=			${PREFIX}/share/examples/courier
-
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-
-CONFIGURE_ARGS+=	--disable-root-check
-CONFIGURE_ARGS+=	--enable-unicode
-CONFIGURE_ARGS+=	--with-trashquota
-
-USE_DB185=		yes
-CONFIGURE_ARGS+=	--with-db=db
-.include "../../mk/bdb.buildlink3.mk"
-
-CONFIGURE_ENV+=		SYSCONFTOOL_PERL=${PERL5:Q}
-
-# Note: This expression is the same as ${PKGBASE}, but the latter is
-# not defined yet, so we cannot use it here.
-PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
-.include "../../mk/bsd.options.mk"
-
-# The maildir subdirectory can be built with a "fam" option, but it's only
-# useful for the imap server and the webmail client.  Handle the option
-# here, but the corresponding package Makefiles should note that "fam" is
-# a supported option on their own.
-#
-.if !empty(PKG_OPTIONS:Mfam)
-.  include "../../mk/fam.buildlink3.mk"
-.endif
-
-.include "../../devel/pcre/buildlink3.mk"
diff --git a/mail/courier-maildir/distinfo b/mail/courier-maildir/distinfo
index ad4e5794195..08813683877 100644
--- a/mail/courier-maildir/distinfo
+++ b/mail/courier-maildir/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2006/01/03 05:33:11 jlam Exp $
+$NetBSD: distinfo,v 1.8 2006/04/28 18:13:25 jlam Exp $
 
-SHA1 (courier-0.52.2.tar.bz2) = 909b667a84498dbd79169fa4161b9fa3a4622608
-RMD160 (courier-0.52.2.tar.bz2) = 38e59a845ba30034d03a7472d04a1b62a0e9cf9b
-Size (courier-0.52.2.tar.bz2) = 6611624 bytes
+SHA1 (courier-0.53.1.tar.bz2) = 40c6a732efd9e74b524230ae08ce75166032a8d8
+RMD160 (courier-0.53.1.tar.bz2) = a2f016d67b2e360111d2ebc4811a35c2ed23fb01
+Size (courier-0.53.1.tar.bz2) = 6940783 bytes