Re-add "courier-maildirmake" as "courier-maildir" and update to utilities

from courier-0.45.6.  Changes from version 0.44.2 include:

  * Renamed maildir* programs and manpages to be courier-maildir* to avoid
    conflicts with other maildir packages (notably, qmail).
  * New utilities to handle maildirs with ACLs to support ACL IMAP in
    courier-imap and sqwebmail.
  * Added scripts to build indices of shared maildirs on the system for
    courier-imap and sqwebmail.

8 files changed, 189 insertions, 0 deletions

diff --git a/mail/courier-maildir/DEINSTALL b/mail/courier-maildir/DEINSTALL
new file mode 100644
index 00000000000..156fb77ca27
--- /dev/null
+++ b/mail/courier-maildir/DEINSTALL
@@ -0,0 +1,6 @@
+# $NetBSD: DEINSTALL,v 1.1.1.1 2004/07/14 20:05: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"
diff --git a/mail/courier-maildir/DESCR b/mail/courier-maildir/DESCR
new file mode 100644
index 00000000000..62b953c4cdf
--- /dev/null
+++ b/mail/courier-maildir/DESCR
@@ -0,0 +1,2 @@
+This package contains the utilities used to manipulate the extended
+maildirs used by the Courier mail packages.
diff --git a/mail/courier-maildir/MESSAGE b/mail/courier-maildir/MESSAGE
new file mode 100644
index 00000000000..9433b4cf7cb
--- /dev/null
+++ b/mail/courier-maildir/MESSAGE
@@ -0,0 +1,11 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2004/07/14 20:05: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:
+
+    ${PREFIX}/share/courier/sharedindexupdate
+
+===========================================================================
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
new file mode 100644
index 00000000000..e691f138eb6
--- /dev/null
+++ b/mail/courier-maildir/Makefile
@@ -0,0 +1,59 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+
+PKGNAME=	courier-maildir-${BASE_VERS}
+COMMENT=	Courier maildir utilities
+
+CONFLICTS=	courier-maildirmake-[0-9]*
+
+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"
+
+# WRKSRC_FILES is copied from ../courier-auth/Makefile.authdaemond.
+WRKSRC_FILES=		config.guess config.sub configure		\
+			install-sh mkinstalldirs			\
+			depcomp 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.
+#
+WRKSRC_SUBDIRS=		bdbobj gdbmobj numlib liblock unicode rfc822
+
+# These are the parts of courier that we will be building and installing.
+WRKSRC_SUBDIRS+=	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
+
+.include "../../mk/bdb.buildlink3.mk"
+
+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
+	${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
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildir/PLIST b/mail/courier-maildir/PLIST
new file mode 100644
index 00000000000..a45fac24581
--- /dev/null
+++ b/mail/courier-maildir/PLIST
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+bin/deliverquota
+bin/courier-maildiracl
+bin/courier-maildirkw
+bin/courier-maildirmake
+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
+share/examples/courier/quotawarnmsg
+@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
new file mode 100644
index 00000000000..4e16476e7f7
--- /dev/null
+++ b/mail/courier-maildir/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/07/14 20:05:50 jlam Exp $
+
+SHA1 (courier-0.45.6.tar.bz2) = 0d8e36211af42e7b539cf53fe1f596e1ecb15117
+Size (courier-0.45.6.tar.bz2) = 4310616 bytes
+SHA1 (patch-aa) = 2c44b5cdff95ecff28f08469a11663957ce76cb5
diff --git a/mail/courier-maildir/files/sharedindexupdate.sh b/mail/courier-maildir/files/sharedindexupdate.sh
new file mode 100644
index 00000000000..ba0d87e6695
--- /dev/null
+++ b/mail/courier-maildir/files/sharedindexupdate.sh
@@ -0,0 +1,24 @@
+#!@SH@
+#
+# $NetBSD: sharedindexupdate.sh,v 1.1.1.1 2004/07/14 20:05: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
+# "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
+@RM@ -f $sysconfdir/shared.tmp/.tmplist
+$datadir/sharedindexinstall
diff --git a/mail/courier-maildir/patches/patch-aa b/mail/courier-maildir/patches/patch-aa
new file mode 100644
index 00000000000..b140b1c8033
--- /dev/null
+++ b/mail/courier-maildir/patches/patch-aa
@@ -0,0 +1,62 @@
+$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
+