Update mail/courier-maildir to 0.48.2. Changes from version 0.45.6

include minor bugfixes, and fixing a major typo where the maildiracl
and maildirkw utilities were actually just copies of the maildirmake
utility.

9 files changed, 157 insertions, 121 deletions

diff --git a/mail/courier-maildir/DEINSTALL b/mail/courier-maildir/DEINSTALL
index 156fb77ca27..b10782e3650 100644
--- a/mail/courier-maildir/DEINSTALL
+++ b/mail/courier-maildir/DEINSTALL
@@ -1,6 +1,19 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2005/02/18 22:12:50 jlam Exp $
 
-# Additional files that may be created for courier-maildir.
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/autoresponsesquota"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/maildirfilterconfig"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/maildirshared"
+case ${STAGE} in
+DEINSTALL)
+	#
+	# Note some additional files that may be created by the sysadmin
+	# that can probably be removed.
+	#
+	if ${TEST} -x ./+FILES; then
+		for file in						\
+			${PKG_SYSCONFDIR}/autoresponsesquota		\
+			${PKG_SYSCONFDIR}/maildirfilterconfig		\
+			${PKG_SYSCONFDIR}/maildirshared
+		do
+			${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
+		done
+	fi
+	;;
+esac
diff --git a/mail/courier-maildir/MESSAGE b/mail/courier-maildir/MESSAGE
index 9433b4cf7cb..c0d7043875e 100644
--- a/mail/courier-maildir/MESSAGE
+++ b/mail/courier-maildir/MESSAGE
@@ -1,11 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2005/02/18 22:12:50 jlam Exp $
 
-If you are planning on using Courier-IMAP or SqWebMail to serve mail on
-the system and you will be using shared maildirs, then you should create
-a cron job that runs at regular intervals (once ever few hours is fine)
-that executes the following script to update the shared folder index:
+If you are planning on using Courier-IMAP or SqWebMail to serve mail
+on the system and you will be using shared maildirs, then you should
+create a cron job that runs at regular intervals (once every few hours
+is fine) that executes the following script to update the shared folder
+index:
 
-    ${PREFIX}/share/courier/sharedindexupdate
+    ${PKG_SYSCONFDIR}/sharedindexupdate
 
 ===========================================================================
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index fe2476f6e84..27ee8b247d2 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,61 +1,99 @@
-# $NetBSD: Makefile,v 1.2 2004/07/15 06:49:33 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/02/18 22:12:50 jlam Exp $
 
-PKGNAME=	courier-maildir-${BASE_VERS}
+DISTNAME=	courier-0.48.2
+PKGNAME=	${DISTNAME:S/-/-maildir-/}
+PKGBASE=	${PKGNAME:C/-[^-]*$//}
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	jlam@NetBSD.org
 COMMENT=	Courier maildir utilities
+HOMEPAGE=	http://www.courier-mta.org/
 
 CONFLICTS=	courier-maildirmake-[0-9]*
 
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
-USE_PKGINSTALL=		yes
 USE_PERL5=		yes
 PERL5_REQD+=		5.8.0
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
-.include "../courier-auth/Makefile.common"
+.include "Makefile.common"
 
-FILES_SUBST+=		DATADIR=${DATADIR}
+# This package doesn't need to depend on courier-authlib -- just fake
+# out the top-level configure script that thinks it needs
+# courierauthconfig.
+#
+CONFIGURE_ENV+=		ac_cv_path_COURIERAUTHCONFIG=${TRUE:Q}
 
-# WRKSRC_FILES is copied from ../courier-auth/Makefile.authdaemond.
-WRKSRC_FILES=		config.guess config.sub configure		\
-			install-sh mkinstalldirs			\
-			depcomp missing sysconftool
+# 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
 
-# These are subdirectories of courier that build auxiliary libraries
-# used by courier-maildirmake.
+# These are subdirectories containing libraries used by courier-maildir.
 #
-WRKSRC_SUBDIRS=		bdbobj gdbmobj numlib liblock unicode rfc822
-
-# These are the parts of courier that we will be building and installing.
-WRKSRC_SUBDIRS+=	maildir
+WRKSRC_SUBDIRS=		bdbobj numlib liblock unicode rfc822 maildir
 
 EXTRACT_ELEMENTS=	${WRKSRC_FILES:S/^/${DISTNAME}\//}
 EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
 
 BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
-INSTALL_DIRS=		${WRKSRC}/maildir
-
-OWN_DIRS=	${PKG_SYSCONFDIR}/shared
-OWN_DIRS+=	${PKG_SYSCONFDIR}/shared.tmp
-CONF_FILES=	${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
+INSTALLATION_DIRS=	bin man/man1 man/man5 man/man5 man/man7 man/man8 sbin
 
-.include "../../mk/bdb.buildlink3.mk"
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+OWN_DIRS=		${PKG_SYSCONFDIR}/shared
+OWN_DIRS+=		${PKG_SYSCONFDIR}/shared.tmp
+CONF_FILES=		${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
+CONF_FILES_PERMS=	${EGDIR}/sharedindexupdate			\
+			${PKG_SYSCONFDIR}/sharedindexupdate		\
+			${ROOT_USER} ${ROOT_GROUP} 0755
 
 post-build:
 	${SED} ${FILES_SUBST_SED} ${FILESDIR}/sharedindexupdate.sh	\
 		> ${WRKDIR}/sharedindexupdate.sh
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate.sh		\
-		${DATADIR}/sharedindexupdate
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg ${EGDIR}/quotawarnmsg
+do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirquota.txt	\
-		${DOCDIR}/README.maildirquota.txt
-	${INSTALL_DATA} ${WRKSRC}/maildir/README.sharedfolders.txt	\
-		${DOCDIR}/README.sharedfolders.txt
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/maildir/deliverquota		\
+		${PREFIX}/bin/deliverquota
+	${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildiracl			\
+		${PREFIX}/bin/courier-maildiracl
+	${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirkw			\
+		${PREFIX}/bin/courier-maildirkw
+	${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirmake		\
+		${PREFIX}/bin/courier-maildirmake
+	${INSTALL_MAN} ${WRKSRC}/maildir/maildiracl.1			\
+		${PREFIX}/man/man1/courier-maildiracl.1
+	${INSTALL_MAN} ${WRKSRC}/maildir/maildirkw.1			\
+		${PREFIX}/man/man1/courier-maildirkw.1
+	${INSTALL_MAN} ${WRKSRC}/maildir/maildirmake.1			\
+		${PREFIX}/man/man1/courier-maildirmake.1
+	${INSTALL_MAN} ${WRKSRC}/maildir/maildir.5			\
+		${PREFIX}/man/man5/courier-maildir.5
+	${INSTALL_MAN} ${WRKSRC}/maildir/maildirquota.7			\
+		${PREFIX}/man/man7/maildirquota.7
+	${INSTALL_MAN} ${WRKSRC}/maildir/deliverquota.8			\
+		${PREFIX}/man/man8/deliverquota.8
+	${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg			\
+		${EGDIR}/quotawarnmsg
+	${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexinstall		\
+		${PREFIX}/sbin/sharedindexinstall
+	${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexsplit		\
+		${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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildir/Makefile.common b/mail/courier-maildir/Makefile.common
new file mode 100644
index 00000000000..2a17e3c98c5
--- /dev/null
+++ b/mail/courier-maildir/Makefile.common
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile.common,v 1.1 2005/02/18 22:12:50 jlam Exp $
+#
+# Package Makefiles should include this file after setting PKGBASE and
+# PKG_SUPPORTED_OPTIONS.
+
+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}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+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+=		PERL=${PERL5}
+CONFIGURE_ENV+=		SYSCONFTOOL_PERL=${PERL5}
+
+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"
+.endif
diff --git a/mail/courier-maildir/PLIST b/mail/courier-maildir/PLIST
index a45fac24581..ee4e524560d 100644
--- a/mail/courier-maildir/PLIST
+++ b/mail/courier-maildir/PLIST
@@ -1,20 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
-bin/deliverquota
+@comment $NetBSD: PLIST,v 1.2 2005/02/18 22:12:50 jlam Exp $
 bin/courier-maildiracl
 bin/courier-maildirkw
 bin/courier-maildirmake
+bin/deliverquota
 man/man1/courier-maildiracl.1
 man/man1/courier-maildirkw.1
 man/man1/courier-maildirmake.1
 man/man5/courier-maildir.5
 man/man7/maildirquota.7
 man/man8/deliverquota.8
-share/courier/sharedindexinstall
-share/courier/sharedindexsplit
-share/courier/sharedindexupdate
-share/doc/courier/README.maildirquota.txt
-share/doc/courier/README.sharedfolders.txt
+sbin/sharedindexinstall
+sbin/sharedindexsplit
+share/doc/courier/README.imapkeywords.html
+share/doc/courier/README.maildirfilter.html
+share/doc/courier/README.maildirquota.html
+share/doc/courier/README.sharedfolders.html
 share/examples/courier/quotawarnmsg
+share/examples/courier/sharedindexupdate
 @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-maildir/distinfo b/mail/courier-maildir/distinfo
index 4e16476e7f7..b2b8e74a584 100644
--- a/mail/courier-maildir/distinfo
+++ b/mail/courier-maildir/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+$NetBSD: distinfo,v 1.2 2005/02/18 22:12:50 jlam Exp $
 
-SHA1 (courier-0.45.6.tar.bz2) = 0d8e36211af42e7b539cf53fe1f596e1ecb15117
-Size (courier-0.45.6.tar.bz2) = 4310616 bytes
-SHA1 (patch-aa) = 2c44b5cdff95ecff28f08469a11663957ce76cb5
+SHA1 (courier-0.48.2.tar.bz2) = eaa5b4bd184b28ea676034a3df915d86ff82b0fd
+Size (courier-0.48.2.tar.bz2) = 5874592 bytes
+SHA1 (patch-ab) = 7308011a5e2753ec881aa76111f2473bf8830b90
diff --git a/mail/courier-maildir/files/sharedindexupdate.sh b/mail/courier-maildir/files/sharedindexupdate.sh
index ba0d87e6695..ce86cdb35fd 100644
--- a/mail/courier-maildir/files/sharedindexupdate.sh
+++ b/mail/courier-maildir/files/sharedindexupdate.sh
@@ -1,24 +1,23 @@
 #!@SH@
 #
-# $NetBSD: sharedindexupdate.sh,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+# $NetBSD: sharedindexupdate.sh,v 1.2 2005/02/18 22:12:50 jlam Exp $
 #
 # This script updates the index of shared folders on the system and is
 # only needed if Courier-IMAP or SqWebMail used to serve mail and shared
 # folders are used.  If so, then this script should be run regularly as a
 # system process to ensure the shared folder index is kept up-to-date.
 #
-# The courier-auth package must be separately installed to provide the
+# The courier-authlib package must be separately installed to provide the
 # "authenumerate" program used in this script.
 
 sysconfdir="@PKG_SYSCONFDIR@"
 sbindir="@PREFIX@/sbin"
-datadir="@DATADIR@"
 
 @RM@ -rf $sysconfdir/shared.tmp
 @MKDIR@ $sysconfdir/shared.tmp || exit 1
 
 @TEST@ -x $sbindir/authenumerate || exit 1
 $sbindir/authenumerate > $sysconfdir/shared.tmp/.tmplist || exit 1
-$datadir/sharedindexsplit $sysconfdir/shared.tmp 1 < $sysconfdir/shared.tmp/.tmplist || exit 1
+$sysconfdir/sharedindexsplit $sysconfdir/shared.tmp 1 < $sysconfdir/shared.tmp/.tmplist || exit 1
 @RM@ -f $sysconfdir/shared.tmp/.tmplist
-$datadir/sharedindexinstall
+$sysconfdir/sharedindexinstall
diff --git a/mail/courier-maildir/patches/patch-aa b/mail/courier-maildir/patches/patch-aa
deleted file mode 100644
index b140b1c8033..00000000000
--- a/mail/courier-maildir/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
-
---- maildir/Makefile.in.orig	Sun Apr 18 12:05:09 2004
-+++ maildir/Makefile.in	Tue Jul 13 12:18:51 2004
-@@ -719,6 +719,45 @@
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- 
-+install-exec-local:
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	rm -f $(DESTDIR)$(bindir)/deliverquota
-+	$(INSTALL_PROGRAM) deliverquota $(DESTDIR)$(bindir)/deliverquota
-+	rm -f $(DESTDIR)$(bindir)/courier-maildiracl
-+	$(INSTALL_PROGRAM) maildirmake $(DESTDIR)$(bindir)/courier-maildiracl
-+	rm -f $(DESTDIR)$(bindir)/courier-maildirkw
-+	$(INSTALL_PROGRAM) maildirmake $(DESTDIR)$(bindir)/courier-maildirkw
-+	rm -f $(DESTDIR)$(bindir)/courier-maildirmake
-+	$(INSTALL_PROGRAM) maildirmake $(DESTDIR)$(bindir)/courier-maildirmake
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	rm -f $(DESTDIR)$(datadir)/sharedindexinstall
-+	$(INSTALL_SCRIPT) sharedindexinstall $(DESTDIR)$(datadir)/sharedindexinstall
-+	rm -f $(DESTDIR)$(datadir)/sharedindexsplit
-+	$(INSTALL_SCRIPT) sharedindexsplit $(DESTDIR)$(datadir)/sharedindexsplit
-+
-+man1dir = @mandir@/man1
-+man5dir = @mandir@/man5
-+man7dir = @mandir@/man7
-+man8dir = @mandir@/man8
-+
-+install-data-local:
-+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-+	rm -f $(DESTDIR)$(man1dir)/courier-maildiracl.1
-+	$(INSTALL_DATA) maildiracl.1 $(DESTDIR)$(man1dir)/courier-maildiracl.1
-+	rm -f $(DESTDIR)$(man1dir)/courier-maildirkw.1
-+	$(INSTALL_DATA) maildirkw.1 $(DESTDIR)$(man1dir)/courier-maildirkw.1
-+	rm -f $(DESTDIR)$(man1dir)/courier-maildirmake.1
-+	$(INSTALL_DATA) maildirmake.1 $(DESTDIR)$(man1dir)/courier-maildirmake.1
-+	$(mkinstalldirs) $(DESTDIR)$(man5dir)
-+	rm -f $(DESTDIR)$(man5dir)/courier-maildir.5
-+	$(INSTALL_DATA) maildir.5 $(DESTDIR)$(man5dir)/courier-maildir.5
-+	$(mkinstalldirs) $(DESTDIR)$(man7dir)
-+	rm -f $(DESTDIR)$(man7dir)/maildirquota.7
-+	$(INSTALL_DATA) maildirquota.7 $(DESTDIR)$(man7dir)/maildirquota.7
-+	$(mkinstalldirs) $(DESTDIR)$(man8dir)
-+	rm -f $(DESTDIR)$(man8dir)/deliverquota.8
-+	$(INSTALL_DATA) deliverquota.8 $(DESTDIR)$(man8dir)/deliverquota.8
-+
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-@@ -757,9 +796,9 @@
- 
- info-am:
- 
--install-data-am:
-+install-data-am: install-data-local
- 
--install-exec-am:
-+install-exec-am: install-exec-local
- 
- install-info: install-info-am
- 
diff --git a/mail/courier-maildir/patches/patch-ab b/mail/courier-maildir/patches/patch-ab
new file mode 100644
index 00000000000..42eee51f80b
--- /dev/null
+++ b/mail/courier-maildir/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/02/18 22:12:50 jlam Exp $
+
+--- configure.orig	2005-01-11 21:12:03.000000000 -0500
++++ configure
+@@ -19891,7 +19891,7 @@ echo "$as_me: error: courierauthconfig n
+ fi
+ 
+ $COURIERAUTHCONFIG --configfiles | sed 's/^/auth/' >configtmp
+-. configtmp
++. ./configtmp
+ 
+ # Check whether --with-courierlogger or --without-courierlogger was given.
+ if test "${with_courierlogger+set}" = set; then