Update mail/maildrop to 1.3.4. Relevent changes from version 1.2.2 include:

+ Become maintainer for maildrop as I'm working on packaging the
  Courier-MTA software, of which maildrop is one piece.
+ Fix possible build problem on Solaris (untested).
+ Install maildirmake as maildrop.maildirmake to avoid conflicts
  with other packages that install maildirmake.
+ Add dependency on courier-maildirmake.
+ Move HTML documentation to ${PREFIX}/share/doc/html

* Bug fixes, of course.
* Disable MSIE smart tags in all html files.
* Added mailbot(1), a MIME-capable autoresponder utility.
* Reject ambigous nested MIME boundary delimiters.

5 files changed, 93 insertions, 55 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index f28fcdcfdc5..99573a89d96 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,17 +1,36 @@
-# $NetBSD: Makefile,v 1.4 2001/04/26 16:35:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/16 07:39:21 jlam Exp $
 #
 
-DISTNAME=	maildrop-1.2.2
+DISTNAME=	maildrop-1.3.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 
-MAINTAINER=	rh@netbsd.org
+MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.flounder.net/~mrsam/maildrop/
 COMMENT=	mail delivery agent with filtering abilities
 
-BUILD_DEPENDS+=	perl>=5.6.0:../../lang/perl5
+PERL5_REQD=	5.6.0
+BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
+DEPENDS+=	courier-maildirmake-[0-9]*:../../mail/courier-maildirmake
 
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--with-db=db
+USE_BUILDLINK_ONLY=	# defined
+USE_GMAKE=		# defined
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=	--with-etcdir=/etc
+
+INSTALL_TARGET=		install-strip
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+.include "../../databases/db/buildlink.mk"
+CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
+.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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 8b32aacd194..ab118b253bc 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:09:58 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/16 07:39:21 jlam Exp $
 
-SHA1 (maildrop-1.2.2.tar.gz) = 33c3ecd95fd5e61b1ec24e112c4012fcfe70661d
-Size (maildrop-1.2.2.tar.gz) = 538486 bytes
-SHA1 (patch-aa) = 44d6afa0775c315022a7d63897e67d3d12ab9363
+SHA1 (maildrop-1.3.4.tar.gz) = f15d2e8697a3c7bf6ff17d95cf99d0c176629efe
+Size (maildrop-1.3.4.tar.gz) = 584621 bytes
+SHA1 (patch-aa) = 19a8e82c98a395b9765e5009916a73094bbb0900
diff --git a/mail/maildrop/patches/patch-aa b/mail/maildrop/patches/patch-aa
index b385d077cab..023bee1f6ea 100644
--- a/mail/maildrop/patches/patch-aa
+++ b/mail/maildrop/patches/patch-aa
@@ -1,24 +1,51 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/10/23 13:34:58 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/16 07:39:21 jlam Exp $
 
---- Makefile.in.orig	Mon Oct 23 04:46:11 2000
+--- Makefile.in.orig	Mon Jul  9 22:06:48 2001
 +++ Makefile.in
-@@ -39,7 +39,7 @@
+@@ -87,7 +87,7 @@
+ EXTRA_DIST = UPGRADE.html UPGRADE.txt INSTALL.txt README README.postfix maildroptips.txt maildropldap.config maildropmysql.config
  
- DESTDIR =
+ scriptdir = $(pkgdatadir)/scripts
+-htmldir = $(pkgdatadir)/html
++htmldir = $(datadir)/doc/html/@PACKAGE@
+ @INSTALL_USERDB_TRUE@USERDBHTML = 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
  
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
  
-@@ -798,8 +798,8 @@
- 	$(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/$$f
+-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
+ 
+ 
+ EXTRA_LIBRARIES = librfc822.a librfc2045.a
+@@ -795,14 +795,14 @@
+ 	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 "$$gid" || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop dotlock
-+	. maildrop/uidgid ; test -z "$$uid" || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop dotlock && chmod 6755 maildrop dotlock
+ 	. 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
  
  uninstall-maildrop:
- 	for f in maildrop maildirmake reformail dotlock makemime reformime ; do \
+-	for f in maildrop mailbot maildirmake reformail dotlock makemime reformime ; do \
++	for f in maildrop mailbot maildrop.maildirmake 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
diff --git a/mail/maildrop/pkg/DESCR b/mail/maildrop/pkg/DESCR
index c2f4db0f6fc..dc3ddf7cd9b 100644
--- a/mail/maildrop/pkg/DESCR
+++ b/mail/maildrop/pkg/DESCR
@@ -1,22 +1,9 @@
-  maildrop is a replacement for your local mail delivery agent.  maildrop
+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.
 
-  maildrop will optionally read instructions from a file, which describes
+maildrop will optionally read instructions from a file, which describes
 how to filter incoming mail.  Instructions can be provided having mail
 delivered to alternate mailboxes, or forwarded somewhere else.  Unlike
 procmail, maildrop uses a structured filtering language.
-
-  maildrop is written in C++, and is significantly larger than procmail in
-compiled form.  However, it uses resources much more efficiently.  Unlike
-procmail, maildrop will not read a 10 megabyte mail message into memory.
-Large messages are saved in a temporary file, and are filtered from the
-temporary file.  Temporary files are saved in the user's home directory.
-If the standard input to maildrop is a file, and not a pipe, a temporary
-file will not be necessary.
-
-  maildrop checks the syntax of the mail delivery instructions the filter
-file, before attempting to deliver a message.  Unlike procmail, if the filter
-file contains syntax errors, maildrop terminates without delivering the
-message.  The user can fix the typo without causing any mail to be lost.
diff --git a/mail/maildrop/pkg/PLIST b/mail/maildrop/pkg/PLIST
index 13501a08b71..378b0789acd 100644
--- a/mail/maildrop/pkg/PLIST
+++ b/mail/maildrop/pkg/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/23 13:34:58 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/08/16 07:39:21 jlam Exp $
 bin/dotlock
-bin/maildirmake
+bin/mailbot
 bin/maildrop
+bin/maildrop.maildirmake
 bin/makemime
 bin/reformail
 bin/reformime
 man/man1/dotlock.1
-man/man1/maildirmake.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
@@ -16,16 +18,19 @@ man/man5/maildropfilter.5
 man/man5/maildropgdbm.5
 man/man8/deliverquota.8
 man/man8/maildirquota.8
-share/doc/maildrop/html/dotlock.html
-share/doc/maildrop/html/maildirmake.html
-share/doc/maildrop/html/maildrop.html
-share/doc/maildrop/html/maildropex.html
-share/doc/maildrop/html/maildropfilter.html
-share/doc/maildrop/html/maildropgdbm.html
-share/doc/maildrop/html/makemime.html
-share/doc/maildrop/html/reformail.html
-share/doc/maildrop/html/reformime.html
-share/doc/maildrop/html/rfc2045.html
-share/doc/maildrop/html/rfc822.html
-@dirrm share/doc/maildrop/html
+share/doc/html/maildrop/dotlock.html
+share/doc/html/maildrop/mailbot.html
+share/doc/html/maildrop/maildirmake.html
+share/doc/html/maildrop/maildrop.html
+share/doc/html/maildrop/maildropex.html
+share/doc/html/maildrop/maildropfilter.html
+share/doc/html/maildrop/maildropgdbm.html
+share/doc/html/maildrop/makemime.html
+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