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.

4 files changed, 38 insertions, 48 deletions

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