Update mail/maildrop to 2.0.4. Changes from version 2.0.2 include:

* New command-line option to require the use of a working courier-authlib
  installation.

* Install makedat along with related documentation.

8 files changed, 62 insertions, 62 deletions

diff --git a/mail/maildrop/DESCR b/mail/maildrop/DESCR
index 4adaab173cd..f0c6f381ab0 100644
--- a/mail/maildrop/DESCR
+++ b/mail/maildrop/DESCR
@@ -1,7 +1,7 @@
 Maildrop is a replacement for your local mail delivery agent.  maildrop
 reads a mail message from standard input, then delivers the message to your
-mailbox.  maildrop knows how to deliver mail to mbox-style mailboxes, and
-maildirs.  "maildir" is a mailbox format used by the Qmail MTA.
+mailbox.  Maildrop knows how to deliver mail to mbox-style mailboxes, and
+maildirs.  "Maildir" is a mailbox format used by the Qmail MTA.
 
 Maildrop will optionally read instructions from a file, which describes
 how to filter incoming mail.  Instructions can be provided having mail
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index f18855bc4d2..e12a1f13640 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2007/08/10 15:00:12 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2007/08/10 17:57:09 jlam Exp $
 
-DISTNAME=	maildrop-2.0.2
+DISTNAME=	maildrop-2.0.4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,6 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=	courier-maildir>=0.53.1:../../mail/courier-maildir
 
 USE_TOOLS+=		gmake perl
+USE_TOOLS+=		cat:run		# used by makedat(1)
 USE_LANGUAGES=		c c++
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.maildrop
@@ -26,8 +27,10 @@ PKG_SUGGESTED_OPTIONS=	authlib
 # These are the users that may invoke maildrop with the "-d user"
 # argument (mailbox delivery mode).
 #
-MAILDROP_TRUSTED_USERS?=	${ROOT_USER} ${COURIER_USER} qmaild
+MAILDROP_TRUSTED_USERS?=	${REAL_ROOT_USER} ${COURIER_USER} qmaild
 
+CONFIGURE_ARGS+=	--datadir=${DATADIR:Q}
+CONFIGURE_ARGS+=	--libexecdir=${LIBEXECDIR:Q}
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-maildirquota
 CONFIGURE_ARGS+=	--enable-maildrop-uid=${ROOT_USER:Q}
@@ -43,7 +46,10 @@ CONFIGURE_ARGS+=	--enable-authlib
 CONFIGURE_ARGS+=	--disable-authlib
 .endif
 
-REQD_DIRS=	${DOCDIR}
+INSTALL_AM_MAKEFLAGS+=	htmldir=${DOCDIR:Q}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
+
+REQD_DIRS=	${DATADIR} ${DOCDIR} ${LIBEXECDIR}
 
 # Note special permissions for some binaries.  These are set to match
 # the defaults from a courier-mta installation.
diff --git a/mail/maildrop/PLIST b/mail/maildrop/PLIST
index c87d20b0c2a..3a160fb92e1 100644
--- a/mail/maildrop/PLIST
+++ b/mail/maildrop/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/28 18:14:06 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/08/10 17:57:09 jlam Exp $
 bin/lockmail
 bin/mailbot
 bin/maildrop
+bin/makedat
 bin/makemime
 bin/reformail
 bin/reformime
+libexec/courier/makedatprog
 man/man1/lockmail.1
 man/man1/mailbot.1
 man/man1/maildrop.1
@@ -15,6 +17,7 @@ man/man1/reformime.1
 man/man7/maildropex.7
 man/man7/maildropfilter.7
 man/man7/maildropgdbm.7
+share/courier/makedat
 share/doc/courier/README.postfix
 share/doc/courier/lockmail.html
 share/doc/courier/mailbot.html
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 45bf681ef1b..1d996b0a58b 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2006/04/28 18:14:06 jlam Exp $
+$NetBSD: distinfo,v 1.12 2007/08/10 17:57:09 jlam Exp $
 
-SHA1 (maildrop-2.0.2.tar.bz2) = a7f3ac17cd1e14256b047e36810d3e8ec6cb872e
-RMD160 (maildrop-2.0.2.tar.bz2) = 7b2bd7fc0b3d9e7f8cefd9236e7e387d9d5ae1ce
-Size (maildrop-2.0.2.tar.bz2) = 2139549 bytes
-SHA1 (patch-aa) = f7e09cb85bfd831fdbc719ce88b7d19542ecdf8c
-SHA1 (patch-ab) = 7d8c9080bb413dd926eadd8ec2a8d93b19bb21b7
-SHA1 (patch-ac) = 752cddcc61226c9c8baefb5ec45f4787b6923a9f
+SHA1 (maildrop-2.0.4.tar.bz2) = df2755c1d0e00d19506b0659e59bf5d4756cce17
+RMD160 (maildrop-2.0.4.tar.bz2) = 9c0a349879cc0791ad01e5bae04b680de3a7a606
+Size (maildrop-2.0.4.tar.bz2) = 2286125 bytes
+SHA1 (patch-aa) = 294f05cf64f8ada8b18f6e555a93149850d93933
+SHA1 (patch-ab) = c863a21be30ee0808c6bc4cafd9a8775015a727e
+SHA1 (patch-ac) = c206b268d3cc1234f27c8ec133bd5251cc132930
+SHA1 (patch-ad) = e3ce0e564df467d7af0266df0467b382cbc8c831
diff --git a/mail/maildrop/patches/patch-aa b/mail/maildrop/patches/patch-aa
index 9a7b293cb6e..2fc9f4b7a06 100644
--- a/mail/maildrop/patches/patch-aa
+++ b/mail/maildrop/patches/patch-aa
@@ -1,24 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2006/04/28 18:14:06 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2007/08/10 17:57:09 jlam Exp $
 
---- Makefile.in.orig	2006-02-19 11:39:50.000000000 -0500
+--- Makefile.in.orig	2007-04-22 11:24:04.000000000 -0400
 +++ Makefile.in
-@@ -243,21 +243,18 @@ EXTRA_DIST = README.html INSTALL.html UP
- 	maildroptips.txt automake.fix COPYING.GPL manpage.css pgpkeys.txt
- 
- scriptdir = $(pkgdatadir)/scripts
--htmldir = $(pkgdatadir)/html
-+htmldir = $(prefix)/share/doc/courier
- DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
--@INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAHTML = 
--@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
--@INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAMAN = 
--@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
+@@ -249,15 +249,12 @@ DELIVERQUOTAHTMLSOURCE = maildirquota.ht
+ @INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
+ @INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAMAN = 
+ @INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
 -MAILDROPHTML = lockmail.html maildirmake.html maildropex.html \
 -	maildir.html \
-+DELIVERQUOTAHTML = 
-+#DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
-+DELIVERQUOTAMAN = 
-+#DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
 +MAILDROPHTML = lockmail.html maildropex.html \
  	maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
  	makemime.html reformail.html reformime.html
@@ -32,32 +21,19 @@ $NetBSD: patch-aa,v 1.6 2006/04/28 18:14:06 jlam Exp $
  
  EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
  @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3
-@@ -1046,15 +1043,15 @@ uninstall-man: uninstall-man1 uninstall-
- #  where deliverquota will be installed.
- #  Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
- 
--@INSTALL_DELIVERQUOTA_TRUE@install-deliverquota:
--@INSTALL_DELIVERQUOTA_TRUE@	$(mkinstalldirs) $(DESTDIR)$(bindir)
--@INSTALL_DELIVERQUOTA_TRUE@	$(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
--@INSTALL_DELIVERQUOTA_TRUE@	cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
-+#install-deliverquota:
-+#	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+#	$(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
-+#	cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
- 
- @INSTALL_DELIVERQUOTA_TRUE@uninstall-deliverquota:
- @INSTALL_DELIVERQUOTA_TRUE@	rm -f $(DESTDIR)$(bindir)/deliverquota
- 
--@INSTALL_DELIVERQUOTA_FALSE@install-deliverquota:
-+install-deliverquota:
- 
- @INSTALL_DELIVERQUOTA_FALSE@uninstall-deliverquota:
- 
-@@ -1084,7 +1081,6 @@ install-maildrop:
+@@ -1084,11 +1081,12 @@ install-maildrop:
  		$(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	$(INSTALL_PROGRAM) liblock/lockmail $(DESTDIR)$(bindir)/lockmail
 -	$(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
  	$(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime
  	$(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime
+-	$(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
+-	$(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(bindir)/makedat
++	$(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog
++	$(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(datadir)/makedat
++	rm -f $(DESTDIR)$(bindir)/makedat
++	$(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat
  	. maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
+ 	. maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
+ 
diff --git a/mail/maildrop/patches/patch-ab b/mail/maildrop/patches/patch-ab
index 96bddd17480..8ac611ca6af 100644
--- a/mail/maildrop/patches/patch-ab
+++ b/mail/maildrop/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/04/28 18:14:06 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2007/08/10 17:57:09 jlam Exp $
 
---- maildrop/configure.orig	2006-02-19 11:40:09.000000000 -0500
+--- maildrop/configure.orig	2007-04-22 11:24:25.000000000 -0400
 +++ maildrop/configure
-@@ -22605,7 +22605,7 @@ fi
+@@ -21562,7 +21562,7 @@ fi
  test "x$prefix" = xNONE && prefix=$ac_default_prefix
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2006/04/28 18:14:06 jlam Exp $
  then
  #
  # This version of maildrop is integrated into Courier mail server
-@@ -22742,7 +22742,7 @@ SPOOLDIR="$DIR"
+@@ -21699,7 +21699,7 @@ SPOOLDIR="$DIR"
  
  get_spooldir() {
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2006/04/28 18:14:06 jlam Exp $
  then
  	MBOX_RESET_GID=1
  	SPOOLDIR="./Maildir"
-@@ -22810,7 +22810,7 @@ if test "${with_default_maildrop+set}" =
+@@ -21767,7 +21767,7 @@ if test "${with_default_maildrop+set}" =
  else
    # Courier defaults to ./Maildir
  
diff --git a/mail/maildrop/patches/patch-ac b/mail/maildrop/patches/patch-ac
index c24ac876b40..a91056e7f8d 100644
--- a/mail/maildrop/patches/patch-ac
+++ b/mail/maildrop/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2006/03/21 19:50:51 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2007/08/10 17:57:09 jlam Exp $
 
---- maildrop/main.C.orig	2005-05-12 11:23:54.000000000 -0400
+--- maildrop/main.C.orig	2006-10-01 20:03:37.000000000 -0400
 +++ maildrop/main.C
-@@ -616,6 +616,14 @@ Buffer	value;
+@@ -628,6 +628,14 @@ Buffer	value;
  	{
  	const char *p;
  
@@ -17,7 +17,7 @@ $NetBSD: patch-ac,v 1.1 2006/03/21 19:50:51 jlam Exp $
  		if ((p=getenv("HOME")) && *p)
  			maildrop.init_home=p;
  
-@@ -640,6 +648,8 @@ Buffer	value;
+@@ -652,6 +660,8 @@ Buffer	value;
  
  		if ((p=getenv("MAILDIRQUOTA")) && *p)
  			maildrop.init_quota=p;
diff --git a/mail/maildrop/patches/patch-ad b/mail/maildrop/patches/patch-ad
new file mode 100644
index 00000000000..4684d6e41b8
--- /dev/null
+++ b/mail/maildrop/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2007/08/10 17:57:09 jlam Exp $
+
+--- configure.orig	2007-04-22 11:24:05.000000000 -0400
++++ configure
+@@ -20529,7 +20529,8 @@ esac
+ 
+ 
+ 
+-if test "$maildirquota" = "1"; then
++# deliverquota is installed by pkgsrc/mail/courier-maildir.
++if false && test "$maildirquota" = "1"; then
+   INSTALL_DELIVERQUOTA_TRUE=
+   INSTALL_DELIVERQUOTA_FALSE='#'
+ else