Update mail/maildrop to 2.0.2. Changes from version 2.0.1 include

  + Install the makedat documentation; even though "makedat" is part
    of courier-authlib, that package installs no doucmentation for
    it, and "makedat" is used quite frequently in conjunction with
    maildrop.

  * fix for RFC822 compliance -- encode spaces that precede a newline.

5 files changed, 33 insertions, 29 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index f10c69d83f8..45aaf7ff995 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2006/03/21 19:50:51 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/28 18:14:06 jlam Exp $
 
-DISTNAME=	maildrop-2.0.1
-PKGREVISION=	3
+DISTNAME=	maildrop-2.0.2
 CATEGORIES=     security
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=   .tar.bz2
@@ -10,20 +9,17 @@ MAINTAINER=	jlam@pkgsrc.org
 COMMENT=	Courier mail delivery agent with filtering abilities
 HOMEPAGE=	http://www.courier-mta.org/maildrop/
 
-DEPENDS+=	courier-maildir>=0.52.1:../../mail/courier-maildir
+DEPENDS+=	courier-maildir>=0.53.1:../../mail/courier-maildir
 
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
 
 PKG_SUPPORTED_OPTIONS=	authlib
 PKG_SUGGESTED_OPTIONS=	authlib
 
 # PKGNAME is a parameter to the following file.
 PKGNAME=	${DISTNAME}
-.include "../../mail/courier-maildir/Makefile.common"
-
-.include "../../security/courier-authlib/Makefile.common"
+.include "../../mail/courier-mta/Makefile.common"
 
 # These are the users that may invoke maildrop with the "-d user"
 # argument (mailbox delivery mode).
@@ -45,12 +41,17 @@ CONFIGURE_ARGS+=	--enable-authlib
 CONFIGURE_ARGS+=	--disable-authlib
 .endif
 
+REQD_DIRS=	${DOCDIR}
 SPECIAL_PERMS=	bin/maildrop ${ROOT_USER} ${COURIER_GROUP} 4711
 
+.include "../../devel/sysexits/buildlink3.mk"
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.postfix ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/maildroptips.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/maildrop/maildroptips.html ${DOCDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}/maildrop
+	${INSTALL_DATA} ${WRKSRC}/maildrop/README.html ${DOCDIR}/maildrop
+	${INSTALL_DATA} ${WRKSRC}/maildrop/makedat.html ${DOCDIR}
+	${INSTALL_MAN} ${WRKSRC}/maildrop/makedat.1 ${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../devel/sysexits/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/maildrop/PLIST b/mail/maildrop/PLIST
index 318b13e6604..c87d20b0c2a 100644
--- a/mail/maildrop/PLIST
+++ b/mail/maildrop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/11/10 01:29:44 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/28 18:14:06 jlam Exp $
 bin/lockmail
 bin/mailbot
 bin/maildrop
@@ -8,6 +8,7 @@ bin/reformime
 man/man1/lockmail.1
 man/man1/mailbot.1
 man/man1/maildrop.1
+man/man1/makedat.1
 man/man1/makemime.1
 man/man1/reformail.1
 man/man1/reformime.1
@@ -18,14 +19,16 @@ share/doc/courier/README.postfix
 share/doc/courier/lockmail.html
 share/doc/courier/mailbot.html
 share/doc/courier/maildrop.html
+share/doc/courier/maildrop/README.html
 share/doc/courier/maildropex.html
 share/doc/courier/maildropfilter.html
 share/doc/courier/maildropgdbm.html
-share/doc/courier/maildroptips.txt
+share/doc/courier/maildroptips.html
+share/doc/courier/makedat.html
 share/doc/courier/makemime.html
 share/doc/courier/manpage.css
 share/doc/courier/reformail.html
 share/doc/courier/reformime.html
 share/doc/courier/rfc2045.html
 share/doc/courier/rfc822.html
-@unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
+@dirrm share/doc/courier/maildrop
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index d700b2e4ed5..45bf681ef1b 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2006/03/21 19:50:51 jlam Exp $
+$NetBSD: distinfo,v 1.11 2006/04/28 18:14:06 jlam Exp $
 
-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
+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
diff --git a/mail/maildrop/patches/patch-aa b/mail/maildrop/patches/patch-aa
index 141130f9b40..9a7b293cb6e 100644
--- a/mail/maildrop/patches/patch-aa
+++ b/mail/maildrop/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2005/10/20 20:26:37 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2006/04/28 18:14:06 jlam Exp $
 
---- Makefile.in.orig	2005-09-23 20:27:51.000000000 -0400
+--- Makefile.in.orig	2006-02-19 11:39:50.000000000 -0500
 +++ Makefile.in
 @@ -243,21 +243,18 @@ EXTRA_DIST = README.html INSTALL.html UP
  	maildroptips.txt automake.fix COPYING.GPL manpage.css pgpkeys.txt
@@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.5 2005/10/20 20:26:37 jlam Exp $
  
  EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
  @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3
-@@ -1034,15 +1031,15 @@ uninstall-man: uninstall-man1 uninstall-
+@@ -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
  
@@ -53,7 +53,7 @@ $NetBSD: patch-aa,v 1.5 2005/10/20 20:26:37 jlam Exp $
  
  @INSTALL_DELIVERQUOTA_FALSE@uninstall-deliverquota:
  
-@@ -1072,7 +1069,6 @@ install-maildrop:
+@@ -1084,7 +1081,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 ed75f0707e4..96bddd17480 100644
--- a/mail/maildrop/patches/patch-ab
+++ b/mail/maildrop/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/10/20 20:26:37 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2006/04/28 18:14:06 jlam Exp $
 
---- maildrop/configure.orig	2005-09-23 20:28:40.000000000 -0400
+--- maildrop/configure.orig	2006-02-19 11:40:09.000000000 -0500
 +++ maildrop/configure
-@@ -22118,7 +22118,7 @@ fi
+@@ -22605,7 +22605,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.2 2005/10/20 20:26:37 jlam Exp $
  then
  #
  # This version of maildrop is integrated into Courier mail server
-@@ -22255,7 +22255,7 @@ SPOOLDIR="$DIR"
+@@ -22742,7 +22742,7 @@ SPOOLDIR="$DIR"
  
  get_spooldir() {
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2005/10/20 20:26:37 jlam Exp $
  then
  	MBOX_RESET_GID=1
  	SPOOLDIR="./Maildir"
-@@ -22323,7 +22323,7 @@ if test "${with_default_maildrop+set}" =
+@@ -22810,7 +22810,7 @@ if test "${with_default_maildrop+set}" =
  else
    # Courier defaults to ./Maildir