Update mail/maildrop to 2.0.1. Changes from version 1.8.1 include:

* Use PCRE (http://www.pcre.org) for mattern matching.
+ Most visible change is a different syntax for subexpression matching,
  using (...).  MATCH2 becomes MATCH1, MATCH3 becomes MATCH2, etc...
+ "w" account option dropped.
+ During a transitional period, setting MAILDROP_OLD_REGEXP
  reverts to the old pattern matching engine.

* Do not autoreply to messages with an Auto-Submitted: header, unless
  it's contents are "no".  Add Auto-Submitted: auto-replied.

4 files changed, 22 insertions, 22 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 32dcf1c34fd..f80e8828ac8 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2005/08/11 00:03:42 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/10/20 20:26:37 jlam Exp $
 
-DISTNAME=	maildrop-1.8.1
+DISTNAME=	maildrop-2.0.1
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
 CATEGORIES=     security
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=courier/}
@@ -10,7 +10,7 @@ MAINTAINER=	jlam@NetBSD.org
 COMMENT=	Courier mail delivery agent with filtering abilities
 HOMEPAGE=	http://www.courier-mta.org/maildrop/
 
-DEPENDS+=	courier-maildir>=0.51.0:../../mail/courier-maildir
+DEPENDS+=	courier-maildir>=0.52.1:../../mail/courier-maildir
 
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 6347d442882..430dc77f611 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/08/11 00:03:42 jlam Exp $
+$NetBSD: distinfo,v 1.9 2005/10/20 20:26:37 jlam Exp $
 
-SHA1 (maildrop-1.8.1.tar.bz2) = 431754227d64006f1952b7c2fe9a57e60129ebf2
-RMD160 (maildrop-1.8.1.tar.bz2) = 3cbcbe2ebaa3f42894ac79d7445d3b369a4eb83a
-Size (maildrop-1.8.1.tar.bz2) = 2014670 bytes
-SHA1 (patch-aa) = f7522d9b0443e9a2f4c1a8bc844cfd78ea38c1fe
-SHA1 (patch-ab) = 37d36dfd32cc12f9431a11efe7ad747975215a34
+SHA1 (maildrop-2.0.1.tar.bz2) = f9b69d7071c25def5af60893687c00ddb252d75e
+RMD160 (maildrop-2.0.1.tar.bz2) = c8f5e3b450bdf1d458a81dd54a9c9486d361ebd8
+Size (maildrop-2.0.1.tar.bz2) = 2105424 bytes
+SHA1 (patch-aa) = dc260a68f503af729981691010c6e699a8e398b2
+SHA1 (patch-ab) = c7d45179d712afd9e52dc1ef755f440ff11bb82b
diff --git a/mail/maildrop/patches/patch-aa b/mail/maildrop/patches/patch-aa
index 20cb00b7df3..141130f9b40 100644
--- a/mail/maildrop/patches/patch-aa
+++ b/mail/maildrop/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2005/02/18 22:12:53 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2005/10/20 20:26:37 jlam Exp $
 
---- Makefile.in.orig	2004-12-08 21:36:41.000000000 -0500
+--- Makefile.in.orig	2005-09-23 20:27:51.000000000 -0400
 +++ Makefile.in
-@@ -230,21 +230,18 @@ HTML2TXT = `which lynx 2>/dev/null && ec
- SUBDIRS = numlib liblock unicode rfc822 rfc2045 gdbmobj bdbobj maildir maildrop
- EXTRA_DIST = README.html INSTALL.html UPGRADE.html README.postfix maildroptips.txt automake.fix COPYING.GPL manpage.css
+@@ -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
@@ -30,9 +30,9 @@ $NetBSD: patch-aa,v 1.4 2005/02/18 22:12:53 jlam Exp $
 +MAILDROPMAN = lockmail.1 maildrop.1 mailbot.1 maildropex.7 \
 +	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
  
- EXTRA_LIBRARIES = librfc822.a librfc2045.a
+ EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
  @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3
-@@ -1007,15 +1004,15 @@ uninstall-man: uninstall-man1 uninstall-
+@@ -1034,15 +1031,15 @@ uninstall-man: uninstall-man1 uninstall-
  #  where deliverquota will be installed.
  #  Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
  
@@ -53,7 +53,7 @@ $NetBSD: patch-aa,v 1.4 2005/02/18 22:12:53 jlam Exp $
  
  @INSTALL_DELIVERQUOTA_FALSE@uninstall-deliverquota:
  
-@@ -1051,7 +1048,6 @@ install-maildrop:
+@@ -1072,7 +1069,6 @@ install-maildrop:
  		$(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	$(INSTALL_PROGRAM) liblock/lockmail $(DESTDIR)$(bindir)/lockmail
diff --git a/mail/maildrop/patches/patch-ab b/mail/maildrop/patches/patch-ab
index fb5332ab018..ed75f0707e4 100644
--- a/mail/maildrop/patches/patch-ab
+++ b/mail/maildrop/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/02/18 22:12:53 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2005/10/20 20:26:37 jlam Exp $
 
---- maildrop/configure.orig	2004-10-30 23:15:52.000000000 -0400
+--- maildrop/configure.orig	2005-09-23 20:28:40.000000000 -0400
 +++ maildrop/configure
-@@ -22094,7 +22094,7 @@ fi
+@@ -22118,7 +22118,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.1 2005/02/18 22:12:53 jlam Exp $
  then
  #
  # This version of maildrop is integrated into Courier mail server
-@@ -22231,7 +22231,7 @@ SPOOLDIR="$DIR"
+@@ -22255,7 +22255,7 @@ SPOOLDIR="$DIR"
  
  get_spooldir() {
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1 2005/02/18 22:12:53 jlam Exp $
  then
  	MBOX_RESET_GID=1
  	SPOOLDIR="./Maildir"
-@@ -22299,7 +22299,7 @@ if test "${with_default_maildrop+set}" =
+@@ -22323,7 +22323,7 @@ if test "${with_default_maildrop+set}" =
  else
    # Courier defaults to ./Maildir