5 files changed, 55 insertions, 43 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 2556d147ddbf..3b631a978372 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	maildrop
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= courier
 
-MAINTAINER=	tom@FreeBSD.org
+MAINTAINER=	petef@databits.net
 
 # Maildrop is usually installed with gdbm extensions. If you do not
 # want these extensions installed, NO_GDBM must be defined.
 #
 .if !defined(NO_GDBM)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 .endif
 
-ALL_TARGET=	all
 INSTALL_TARGET=	install-strip
 
 # Maildrop will be installed with suid permissions for MAILDROP_SUID,
@@ -32,21 +31,23 @@ MAILDROP_SUID?=	root
 MAILDROP_SGID?=	mail
 
 CONFIGURE_ARGS=	--enable-syslog=1 \
-		--with-docdir="${PREFIX}/share/doc/maildrop" \
+		--enable-use-flock \
 		--with-etcdir="${PREFIX}/etc" \
 		--enable-maildrop-uid="${MAILDROP_SUID}" \
 		--enable-maildrop-gid="${MAILDROP_SGID}"
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" \
-		LIBS="-L${PREFIX}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib"
 GNU_CONFIGURE=	yes
 
 .if defined(NOPORTDOCS)
+# Just install the binary and man pages, no extra documentation
 INSTALL_TARGET=	install-maildrop install-man
-.else
-MAN1=		dotlock.1 maildirmake.1 maildrop.1 makemime.1 reformail.1 reformime.1
+.endif
+
+MAN1=		dotlock.1 maildirmake.1 maildrop.1 mailbot.1 makemime.1 \
+		reformail.1 reformime.1
 MAN5=		maildropex.5 maildropfilter.5 maildropgdbm.5
 MAN8=		maildirquota.8 deliverquota.8
-.endif
 
 .if defined(NO_GDBM)
 CONFIGURE_ARGS+=	--without-db
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 55da90592521..522e4c41cf5a 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1 +1 @@
-MD5 (maildrop-1.3.0.tar.gz) = ad2e4c92374083d4b82da58fc0987204
+MD5 (maildrop-1.3.2.tar.gz) = c2d194c41dc07330c9a89f0b8b933c6b
diff --git a/mail/maildrop/files/patch-Makefile.in b/mail/maildrop/files/patch-Makefile.in
new file mode 100644
index 000000000000..3f52104cc4ae
--- /dev/null
+++ b/mail/maildrop/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	Wed May 16 20:29:17 2001
++++ Makefile.in	Wed May 16 20:29:34 2001
+@@ -27,7 +27,7 @@
+ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+-datadir = @datadir@
++datadir = ${PREFIX}/share/doc
+ sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+@@ -88,7 +88,7 @@
+ EXTRA_DIST = UPGRADE.html UPGRADE.txt INSTALL.txt README README.postfix maildroptips.txt maildropldap.config
+ 
+ scriptdir = $(pkgdatadir)/scripts
+-htmldir = $(pkgdatadir)/html
++htmldir = $(pkgdatadir)
+ @INSTALL_USERDB_TRUE@USERDBHTML = userdb.html makeuserdb.html userdbpw.html
+ @INSTALL_USERDB_FALSE@USERDBHTML = 
+ @INSTALL_USERDB_TRUE@USERDBMAN = userdb.8 makeuserdb.8 userdbpw.8
diff --git a/mail/maildrop/pkg-descr b/mail/maildrop/pkg-descr
index ee099a7547b3..11560e4867b7 100644
--- a/mail/maildrop/pkg-descr
+++ b/mail/maildrop/pkg-descr
@@ -1,23 +1,13 @@
-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 can optionally read instructions from a file on how to filter
-incoming mail, and, based upon the instructions, deliver mail to
-alternate mailboxes, or forward it to somewhere else, like procmail.
-Unlike procmail, maildrop uses a structured filtering language that's a
-bit easier on the eyes.
-
-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 that file. Files are saved in the user's home directory. If the
-standard input to maildrop is a file, not a pipe, no temporary file will
-be necessary.
+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 the mailbox format
+used by the Qmail MTA.  maildrop is written in C++, and handles
+resources more efficiently.
 
 maildrop can be used with sendmail, Qmail, and other MTAs.
 
 WWW: http://www.flounder.net/~mrsam/maildrop/
+
+- Pete
+petef@databits.net
diff --git a/mail/maildrop/pkg-plist b/mail/maildrop/pkg-plist
index bf40f02db1da..700ac68e8b01 100644
--- a/mail/maildrop/pkg-plist
+++ b/mail/maildrop/pkg-plist
@@ -1,19 +1,20 @@
 bin/dotlock
+bin/mailbot
 bin/maildirmake
 bin/maildrop
 bin/makemime
 bin/reformail
 bin/reformime
-%%PORTDOCS%%share/maildrop/html/dotlock.html
-%%PORTDOCS%%share/maildrop/html/maildirmake.html
-%%PORTDOCS%%share/maildrop/html/maildrop.html
-%%PORTDOCS%%share/maildrop/html/maildropex.html
-%%PORTDOCS%%share/maildrop/html/maildropfilter.html
-%%PORTDOCS%%share/maildrop/html/maildropgdbm.html
-%%PORTDOCS%%share/maildrop/html/makemime.html
-%%PORTDOCS%%share/maildrop/html/reformail.html
-%%PORTDOCS%%share/maildrop/html/reformime.html
-%%PORTDOCS%%share/maildrop/html/rfc2045.html
-%%PORTDOCS%%share/maildrop/html/rfc822.html
-%%PORTDOCS%%@dirrm share/maildrop/html
-%%PORTDOCS%%@dirrm share/maildrop
+%%PORTDOCS%%share/doc/maildrop/dotlock.html
+%%PORTDOCS%%share/doc/maildrop/mailbot.html
+%%PORTDOCS%%share/doc/maildrop/maildirmake.html
+%%PORTDOCS%%share/doc/maildrop/maildrop.html
+%%PORTDOCS%%share/doc/maildrop/maildropex.html
+%%PORTDOCS%%share/doc/maildrop/maildropfilter.html
+%%PORTDOCS%%share/doc/maildrop/maildropgdbm.html
+%%PORTDOCS%%share/doc/maildrop/makemime.html
+%%PORTDOCS%%share/doc/maildrop/reformail.html
+%%PORTDOCS%%share/doc/maildrop/reformime.html
+%%PORTDOCS%%share/doc/maildrop/rfc2045.html
+%%PORTDOCS%%share/doc/maildrop/rfc822.html
+%%PORTDOCS%%@dirrm share/doc/maildrop