Update mail/maildrop to 1.3.7. Changes from 1.3.4 include:

	* Find config files in /etc/courier (or PKG_SYSCONFDIR equivalent).
	  We consolidate all Courier MTA software config files under a
	  common /etc/courier directory.

	* Loosen up the parsing of the content-type header.  Strict parsing
	  allowed viruses to slip through using malformed content-type
	  headers which still got picked up by Microsoft's crapware which
	  does not strictly parse the MIME headers.

        * Drop install setuid.

        * Add UMASK variable, that sets the permissions on new mailboxes
        or messages.  Hence, drop MAILBOX_MODE from configure script.

4 files changed, 40 insertions, 59 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 99573a89d96..a76e7c1a92a 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,36 +1,30 @@
-# $NetBSD: Makefile,v 1.5 2001/08/16 07:39:21 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.6 2002/01/22 22:09:41 jlam Exp $
 
-DISTNAME=	maildrop-1.3.4
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
-
-MAINTAINER=	jlam@netbsd.org
+DISTNAME=	maildrop-1.3.7
+COMMENT=	Courier mail delivery agent with filtering abilities
 HOMEPAGE=	http://www.flounder.net/~mrsam/maildrop/
-COMMENT=	mail delivery agent with filtering abilities
 
 PERL5_REQD=	5.6.0
 BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
-DEPENDS+=	courier-maildirmake-[0-9]*:../../mail/courier-maildirmake
+DEPENDS+=	courier-maildirmake>=0.37.1:../../mail/courier-maildirmake
 
-USE_BUILDLINK_ONLY=	# defined
-USE_GMAKE=		# defined
-GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-db=db
-CONFIGURE_ARGS+=	--with-etcdir=/etc
+USE_BUILDLINK_ONLY=	yes
 
-INSTALL_TARGET=		install-strip
+.include "../../scratch/courier-auth/Makefile.common"
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--disable-userdb
 
-.if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink.mk"
-CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
+.if !defined(STRIPFLAG) || empty(STRIPFLAG:M-s)
+INSTALL_TARGET=		install-strip
+.else
+INSTALL_TARGET=		install
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/maildrop
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/maildrop
-	${INSTALL_DATA} ${WRKSRC}/README.postfix ${PREFIX}/share/doc/maildrop
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}/README.maildrop
+	${INSTALL_DATA} ${WRKSRC}/README.postfix ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/maildroptips.txt ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/maildrop/PLIST b/mail/maildrop/PLIST
index 0c40f4a78aa..83de77f9305 100644
--- a/mail/maildrop/PLIST
+++ b/mail/maildrop/PLIST
@@ -1,23 +1,22 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:22 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/22 22:09:41 jlam Exp $
 bin/dotlock
 bin/mailbot
 bin/maildrop
-bin/maildrop.maildirmake
 bin/makemime
 bin/reformail
 bin/reformime
 man/man1/dotlock.1
 man/man1/mailbot.1
 man/man1/maildrop.1
-man/man1/maildrop.maildirmake.1
 man/man1/makemime.1
 man/man1/reformail.1
 man/man1/reformime.1
 man/man5/maildropex.5
 man/man5/maildropfilter.5
 man/man5/maildropgdbm.5
-man/man8/deliverquota.8
-man/man8/maildirquota.8
+share/doc/courier/README.maildrop
+share/doc/courier/README.postfix
+share/doc/courier/maildroptips.txt
 share/doc/html/maildrop/dotlock.html
 share/doc/html/maildrop/mailbot.html
 share/doc/html/maildrop/maildirmake.html
@@ -30,7 +29,5 @@ share/doc/html/maildrop/reformail.html
 share/doc/html/maildrop/reformime.html
 share/doc/html/maildrop/rfc2045.html
 share/doc/html/maildrop/rfc822.html
-share/doc/maildrop/README
-share/doc/maildrop/README.postfix
-@dirrm share/doc/maildrop
 @dirrm share/doc/html/maildrop
+@unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index ab118b253bc..8b39717ea00 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/08/16 07:39:21 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/01/22 22:09:41 jlam Exp $
 
-SHA1 (maildrop-1.3.4.tar.gz) = f15d2e8697a3c7bf6ff17d95cf99d0c176629efe
-Size (maildrop-1.3.4.tar.gz) = 584621 bytes
-SHA1 (patch-aa) = 19a8e82c98a395b9765e5009916a73094bbb0900
+SHA1 (maildrop-1.3.7.tar.gz) = d41280e4c0805e8d08a33e5a04de3cd19b2490ad
+Size (maildrop-1.3.7.tar.gz) = 632478 bytes
+SHA1 (patch-aa) = 1c5c62ccbd1b69a4aaf68d81f095171b2c369e7b
diff --git a/mail/maildrop/patches/patch-aa b/mail/maildrop/patches/patch-aa
index 023bee1f6ea..94ad67c49aa 100644
--- a/mail/maildrop/patches/patch-aa
+++ b/mail/maildrop/patches/patch-aa
@@ -1,51 +1,41 @@
-$NetBSD: patch-aa,v 1.2 2001/08/16 07:39:21 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/01/22 22:09:42 jlam Exp $
 
---- Makefile.in.orig	Mon Jul  9 22:06:48 2001
+--- Makefile.in.orig	Sat Jan  5 13:28:01 2002
 +++ Makefile.in
 @@ -87,7 +87,7 @@
  EXTRA_DIST = UPGRADE.html UPGRADE.txt INSTALL.txt README README.postfix maildroptips.txt maildropldap.config maildropmysql.config
  
  scriptdir = $(pkgdatadir)/scripts
 -htmldir = $(pkgdatadir)/html
-+htmldir = $(datadir)/doc/html/@PACKAGE@
- @INSTALL_USERDB_TRUE@USERDBHTML = userdb.html makeuserdb.html userdbpw.html
++htmldir = $(prefix)/share/doc/html/@PACKAGE@
+ @INSTALL_USERDB_TRUE@USERDBHTML = @INSTALL_USERDB_TRUE@userdb.html makeuserdb.html userdbpw.html
  @INSTALL_USERDB_FALSE@USERDBHTML = 
- @INSTALL_USERDB_TRUE@USERDBMAN = userdb.8 makeuserdb.8 userdbpw.8
-@@ -106,7 +106,7 @@
- MAILDROPHTML = dotlock.html maildirmake.html maildropex.html 	maildropfilter.html maildropgdbm.html maildrop.html mailbot.html 	makemime.html reformail.html reformime.html
+ @INSTALL_USERDB_TRUE@USERDBMAN = @INSTALL_USERDB_TRUE@userdb.8 makeuserdb.8 userdbpw.8
+@@ -108,9 +108,8 @@
+ 	makemime.html reformail.html reformime.html
  
  
--MAILDROPMAN = dotlock.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.5 	maildropfilter.5 maildropgdbm.5 makemime.1 reformail.1 reformime.1 	maildirquota.8 deliverquota.8
-+MAILDROPMAN = dotlock.1 maildrop.maildirmake.1 maildrop.1 mailbot.1 maildropex.5 	maildropfilter.5 maildropgdbm.5 makemime.1 reformail.1 reformime.1 	maildirquota.8 deliverquota.8
+-MAILDROPMAN = dotlock.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.5 \
+-	maildropfilter.5 maildropgdbm.5 makemime.1 reformail.1 reformime.1 \
+-	maildirquota.7 deliverquota.8
++MAILDROPMAN = dotlock.1 maildrop.1 mailbot.1 maildropex.5 \
++	maildropfilter.5 maildropgdbm.5 makemime.1 reformail.1 reformime.1
  
  
  EXTRA_LIBRARIES = librfc822.a librfc2045.a
-@@ -795,14 +795,14 @@
+@@ -836,14 +835,13 @@
  	for f in maildrop mailbot reformail dotlock ; do \
  		$(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
  	done
 -	$(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/$$f
-+	$(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildrop.maildirmake
  	$(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime
  	$(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime
  	. maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop dotlock
- 	. maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop dotlock && chmod 6755 maildrop dotlock
+ 	. maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop dotlock && chmod 755 maildrop dotlock
  
  uninstall-maildrop:
 -	for f in maildrop mailbot maildirmake reformail dotlock makemime reformime ; do \
-+	for f in maildrop mailbot maildrop.maildirmake reformail dotlock makemime reformime ; do \
++	for f in maildrop mailbot reformail dotlock makemime reformime ; do \
  		rm -f $(DESTDIR)$(bindir)/$$f ; \
  	done
  
-@@ -837,9 +837,9 @@
- maildirmake.html: maildir/maildirmake.html
- 	cp -f maildir/maildirmake.html maildirmake.html
- 
--maildirmake.1: maildirmake.html
-+maildrop.maildirmake.1: maildirmake.html
- 	chmod +x maildrop/html2man.pl
--	maildrop/html2man.pl <maildirmake.html >maildirmake.1
-+	maildrop/html2man.pl <maildirmake.html >maildrop.maildirmake.1
- 
- maildropex.html: maildrop/maildropex.html
- 	cp -f $(srcdir)/maildrop/maildropex.html maildropex.html