- Update to 1.6.3

- Remove patched we do not need anymore
- Disable database extensions by default;
  use WITH_GDBM knob to enable them [1]
- Add WITH_USERDB knob to enable userdb authentication [1]
- Add WITH_LDAP knob to enable virtual user LDAP support [2]
- Add WITH_MYSQL knob to enable virtual user MySQL support [3]
- Use DOCSDIR in pkg-plist
- Re-word/clarify pkg-descr

PR:		58968 [1], 56329 [2], 59807 [3]
Submitted by:	oleg dashevskii <be9-ml@be9.ru> [1],
		Paul Dlug <paul@aps.org> [2],
		Harold Paulson <haroldp@internal.org> [3]

8 files changed, 162 insertions, 107 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 692d5f970c65..8505c9f19299 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -6,77 +6,106 @@
 #
 
 # The following compile-time options are available:
-# WITHOUT_GDBM=yes	Disable building maildrop gdbm extensions.
-#			(default: enabled)
+# WITH_GDBM=yes		Enable database extensions using GDBM (default: off)
+# WITH_USERDB=yes	Enable optional userdb authentication
 # WITH_MAILDIRQUOTA=yes Enable optional support for maildir quotas
-#			(default: disabled)
 # MAILDROP_SUID=<uid>,
 # MAILDROP_SGID=<gid>	Maildrop will be installed with suid permissions for
 #			MAILDROP_SUID, and sgid permissions for MAILDROP_SGID.
 #			If undefined, these values default to "root" and "mail"
-#			respectively, which should be suitable for most
-#			systems.
-# NO_MAILWRAPPER	If defined, let configure guess which sendmail binary
+#			respectively, which should be suitable for most systems.
+# NO_MAILWRAPPER=yes	If defined, let configure guess which sendmail binary
 #			to use
+# WITH_LDAP=yes		Enable experimental virtual user LDAP support
+# WITH_MYSQL=yes	Enable experimental virtual user MySQL support
 
 PORTNAME=	maildrop
-PORTVERSION=	1.5.2
+PORTVERSION=	1.6.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
 
 MAINTAINER=	sergei@FreeBSD.org
-COMMENT=	Replacement local mail delivery agent, similar to procmail
+COMMENT=	Mail delivery agent (MDA) with filtering abilities
 
-.if !defined(WITHOUT_GDBM)
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
-.else
-CONFIGURE_ARGS+=	--without-db
-.endif
-
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
-USE_PERL5_RUN=	yes
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--enable-syslog=1 \
+USE_PERL5=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--enable-syslog=1 \
 		--enable-use-flock \
 		--with-etcdir="${PREFIX}/etc" \
 		--enable-maildrop-uid="${MAILDROP_SUID}" \
 		--enable-maildrop-gid="${MAILDROP_SGID}"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if !defined(NO_MAILWRAPPER)
-CONFIGURE_ARGS+=	--enable-sendmail=/usr/sbin/sendmail
+.if defined(WITH_GDBM)
+LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdb
+CONFIGURE_ARGS+=	--with-db=gdbm
+.else
+CONFIGURE_ARGS+=	--without-db
+.endif
+
+.if defined(WITH_USERDB)
+CONFIGURE_ARGS+=	--enable-userdb
+MAN1=		makedat.1
+MAN8=		makeuserdb.8 userdb.8 userdbpw.8
+MLINKS+=	makeuserdb.8 pw2userdb.8 \
+		makeuserdb.8 vchkpw2userdb.8
+EXTRA_TARGET+=	install-userdb install-makedat
+PLIST_SUB+=	USERDB=""
+.else
+PLIST_SUB+=	USERDB="@comment "
 .endif
 
 .if defined(WITH_MAILDIRQUOTA)
 CONFIGURE_ARGS+=	--enable-maildirquota
+EXTRA_TARGET+=	install-deliverquota
 PLIST_SUB+=	MAILDIRQUOTA=""
 .else
 PLIST_SUB+=	MAILDIRQUOTA="@comment "
 .endif
 
+.if !defined(NO_MAILWRAPPER)
+CONFIGURE_ARGS+=	--enable-sendmail=/usr/sbin/sendmail
+.endif
+
+.if exists(${LOCALBASE}/lib/libfam.so.0)
+LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
+.endif
+
+.if defined(WITH_LDAP)
+USE_OPENLDAP=	yes
+CONFIGURE_ARGS+=	--enable-maildropldap \
+			--with-ldapconfig=${PREFIX}/etc/maildropldap.config
+.endif
+
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=	--enable-maildropmysql \
+			--with-mysqlconfig=${PREFIX}/etc/maildropmysql.config
+LDFLAGS+=		-L${LOCALBASE}/lib/mysql
+.endif
+
 MAILDROP_SUID?=	root
 MAILDROP_SGID?=	mail
 
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET=	install-strip
-.else
+.if defined(NOPORTDOCS)
 # Just install the binary and man pages, no extra documentation
-INSTALL_TARGET=	install-maildrop install-man
+INSTALL_TARGET=	install-maildrop install-man ${EXTRA_TARGET}
+.else
+INSTALL_TARGET=	install-strip
 .endif
 
-MAN1=		lockmail.1 mailbot.1 maildirmake.1 maildrop.1 makemime.1 \
-		reformail.1 reformime.1
-MAN5=		maildir.5 maildropex.5 maildropfilter.5 maildropgdbm.5
-MAN7=		maildirquota.7
-MAN8=		deliverquota.8
-DOCS=		INSTALL INSTALL.html README README.html README.postfix \
-		UPGRADE UPGRADE.html maildroptips.txt \
-		maildir/README.*.html maildir/README.*.txt
+MAN1+=	lockmail.1 mailbot.1 maildirmake.1 maildrop.1 makemime.1 \
+	reformail.1 reformime.1
+MAN5=	maildir.5 maildropex.5 maildropfilter.5 maildropgdbm.5
+MAN7=	maildirquota.7
+MAN8+=	deliverquota.8
+DOCS=	AUTHORS INSTALL INSTALL.html README README.html README.postfix \
+	UPGRADE UPGRADE.html maildroptips.txt maildir/README.*
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 863f084a6054..76e30e5ada7e 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1 +1 @@
-MD5 (maildrop-1.5.2.tar.bz2) = 45ce438482780861ec43ce3af55b99cd
+MD5 (maildrop-1.6.3.tar.bz2) = bfb3ac8e182285fb683631ddfebd26fb
diff --git a/mail/maildrop/files/patch-Makefile.in b/mail/maildrop/files/patch-Makefile.in
index 075086d19a42..64f3c3f5a962 100644
--- a/mail/maildrop/files/patch-Makefile.in
+++ b/mail/maildrop/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Oct 29 15:42:15 2002
-+++ Makefile.in	Tue Oct 29 15:42:52 2002
+--- Makefile.in.orig	Thu Oct 30 03:24:52 2003
++++ Makefile.in	Tue Dec 23 17:45:42 2003
 @@ -29,7 +29,7 @@
  bindir = @bindir@
  sbindir = @sbindir@
@@ -9,12 +9,27 @@
  sysconfdir = @sysconfdir@
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
-@@ -105,7 +105,7 @@
- EXTRA_DIST = README.html INSTALL.html UPGRADE.html README.postfix maildroptips.txt maildropldap.config maildropmysql.config automake.fix COPYING.GPL
+@@ -104,8 +104,8 @@
  
- scriptdir = $(pkgdatadir)/scripts
+ EXTRA_DIST = README.html INSTALL.html UPGRADE.html README.postfix maildroptips.txt maildropldap.config maildropmysql.config automake.fix COPYING.GPL manpage.css
+ 
+-scriptdir = $(pkgdatadir)/scripts
 -htmldir = $(pkgdatadir)/html
++scriptdir = $(bindir)
 +htmldir = $(pkgdatadir)
  
  @INSTALL_USERDB_TRUE@USERDBHTML = userdb.html makeuserdb.html userdbpw.html
  @INSTALL_USERDB_FALSE@USERDBHTML = 
+@@ -854,12 +854,6 @@
+ @INSTALL_USERDB_TRUE@	$(INSTALL_SCRIPT) userdb/pw2userdb $(DESTDIR)$(scriptdir)/pw2userdb
+ @INSTALL_USERDB_TRUE@	$(INSTALL_SCRIPT) userdb/userdbpw $(DESTDIR)$(scriptdir)/userdbpw
+ @INSTALL_USERDB_TRUE@	$(INSTALL_SCRIPT) userdb/vchkpw2userdb $(DESTDIR)$(scriptdir)/vchkpw2userdb
+-@INSTALL_USERDB_TRUE@	rm -f $(DESTDIR)$(bindir)/userdb $(DESTDIR)$(bindir)/maildrop.userdb
+-@INSTALL_USERDB_TRUE@	rm -f $(DESTDIR)$(bindir)/makeuserdb $(DESTDIR)$(bindir)/maildrop.makeuserdb
+-@INSTALL_USERDB_TRUE@	rm -f $(DESTDIR)$(bindir)/pw2userdb $(DESTDIR)$(bindir)/maildrop.pw2userdb
+-@INSTALL_USERDB_TRUE@	for f in userdb userdbpw makeuserdb pw2userdb vchkpw2userdb ; do \
+-@INSTALL_USERDB_TRUE@		rm -f $(DESTDIR)$(bindir)/$$f ; \
+-@INSTALL_USERDB_TRUE@		$(LN_S) $(scriptdir)/$$f $(DESTDIR)$(bindir)/$$f ; done
+ @INSTALL_USERDB_TRUE@	cd $(DESTDIR)$(man8dir); rm -f pw2userdb.8 vchkpw2userdb.8 ; \
+ @INSTALL_USERDB_TRUE@		$(LN_S) makeuserdb.8 pw2userdb.8 ; \
+ @INSTALL_USERDB_TRUE@		$(LN_S) makeuserdb.8 vchkpw2userdb.8
diff --git a/mail/maildrop/files/patch-ad b/mail/maildrop/files/patch-ad
deleted file mode 100644
index 0822d77966be..000000000000
--- a/mail/maildrop/files/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
---- maildrop/funcs.C.orig	Tue Oct 29 15:43:32 2002
-+++ maildrop/funcs.C	Tue Oct 29 15:43:51 2002
-@@ -110,14 +110,7 @@
- static GETGROUPS_T getprocgroup()
- {
- #if	HAS_GETPGRP
--
--#ifdef	GETPGRP_VOID
--
- 	return ( getpgrp() );
--#else
--	return ( getpgrp( getpid()) );
--#endif
--#else
- #if	HAS_GETPGID
- 	return ( getpgid( 0 ) );
- #else
diff --git a/mail/maildrop/files/patch-ae b/mail/maildrop/files/patch-ae
deleted file mode 100644
index 2fcc49cae50b..000000000000
--- a/mail/maildrop/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- maildrop/main.C.orig	Wed Feb 21 16:58:09 2001
-+++ maildrop/main.C	Wed Feb 21 16:58:18 2001
-@@ -48,6 +48,7 @@
- 
- 
- extern void setprocgroup();
-+extern "C" int sprintf(char *str, const char *format, ...);
- 
- static Message m1, m2;
- extern char **environ;
diff --git a/mail/maildrop/files/patch-maildrop_configure b/mail/maildrop/files/patch-maildrop_configure
new file mode 100644
index 000000000000..5a72dfbca7b8
--- /dev/null
+++ b/mail/maildrop/files/patch-maildrop_configure
@@ -0,0 +1,20 @@
+--- maildrop/configure.orig	Thu Oct 30 03:25:02 2003
++++ maildrop/configure	Mon Dec 22 20:03:49 2003
+@@ -7409,15 +7409,8 @@
+ _ACEOF
+ 
+ 	use_mysql=1
+-	LIBMYSQL="`mysql_config --libs`"
+-
+-	if test "$?" != 0
+-	then
+-		{ { echo "$as_me:$LINENO: error: Unable to run mysql_config" >&5
+-echo "$as_me: error: Unable to run mysql_config" >&2;}
+-   { (exit 1); exit 1; }; }
+-	fi
+-	CPPFLAGS="`mysql_config --cflags` $CPPFLAGS"
++	LIBMYSQL="-lmysqlclient"
++	CPPFLAGS="$CPPFLAGS"
+         ;;
+ *)
+   	use_mysql=0
diff --git a/mail/maildrop/pkg-descr b/mail/maildrop/pkg-descr
index fb0ace6698cf..33893549b8c5 100644
--- a/mail/maildrop/pkg-descr
+++ b/mail/maildrop/pkg-descr
@@ -1,10 +1,15 @@
-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 is a replacement for your local mail delivery agent,
+similar to mail/procmail.
+- maildrop reads a mail message from standard input, 
+  then delivers the message to your mailbox. 
+- 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 knows how to deliver mail to mbox-style mailboxes and maildirs.
+- maildrop is written in C++, and handles resources more efficiently.
 
-maildrop can be used with sendmail, Qmail, and other MTAs.
+maildrop can be used with sendmail, qmail, and other MTAs.
 
-WWW: http://www.flounder.net/~mrsam/maildrop/
+WWW:	http://www.flounder.net/~mrsam/maildrop/
diff --git a/mail/maildrop/pkg-plist b/mail/maildrop/pkg-plist
index 82f434f0f5e9..237f221a0cd4 100644
--- a/mail/maildrop/pkg-plist
+++ b/mail/maildrop/pkg-plist
@@ -1,38 +1,51 @@
+@comment $FreeBSD$
 %%MAILDIRQUOTA%%bin/deliverquota
 bin/lockmail
 bin/mailbot
 bin/maildirmake
 bin/maildrop
+%%USERDB%%bin/makedat
+%%USERDB%%bin/makedatprog
 bin/makemime
+%%USERDB%%bin/makeuserdb
+%%USERDB%%bin/pw2userdb
 bin/reformail
 bin/reformime
-%%PORTDOCS%%share/doc/maildrop/INSTALL
-%%PORTDOCS%%share/doc/maildrop/INSTALL.html
-%%PORTDOCS%%share/doc/maildrop/README
-%%PORTDOCS%%share/doc/maildrop/README.html
-%%PORTDOCS%%share/doc/maildrop/README.maildirfilter.html
-%%PORTDOCS%%share/doc/maildrop/README.maildirquota.html
-%%PORTDOCS%%share/doc/maildrop/README.maildirquota.txt
-%%PORTDOCS%%share/doc/maildrop/README.postfix
-%%PORTDOCS%%share/doc/maildrop/README.sharedfolders.html
-%%PORTDOCS%%share/doc/maildrop/README.sharedfolders.txt
-%%PORTDOCS%%share/doc/maildrop/UPGRADE
-%%PORTDOCS%%share/doc/maildrop/UPGRADE.html
-%%MAILDIRQUOTA%%%%PORTDOCS%%share/doc/maildrop/deliverquota.html
-%%PORTDOCS%%share/doc/maildrop/lockmail.html
-%%PORTDOCS%%share/doc/maildrop/mailbot.html
-%%PORTDOCS%%share/doc/maildrop/maildir.html
-%%PORTDOCS%%share/doc/maildrop/maildirmake.html
-%%MAILDIRQUOTA%%%%PORTDOCS%%share/doc/maildrop/maildirquota.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/maildroptips.txt
-%%PORTDOCS%%share/doc/maildrop/makemime.html
-%%PORTDOCS%%share/doc/maildrop/manpage.css
-%%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
+%%USERDB%%bin/userdb
+%%USERDB%%bin/userdbpw
+%%USERDB%%bin/vchkpw2userdb
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.html
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.postfix
+%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.html
+%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE.html
+%%MAILDIRQUOTA%%%%PORTDOCS%%%%DOCSDIR%%/deliverquota.html
+%%PORTDOCS%%%%DOCSDIR%%/lockmail.html
+%%USERDB%%%%PORTDOCS%%%%DOCSDIR%%/makedat.html
+%%USERDB%%%%PORTDOCS%%%%DOCSDIR%%/makeuserdb.html
+%%PORTDOCS%%%%DOCSDIR%%/mailbot.html
+%%PORTDOCS%%%%DOCSDIR%%/maildir.html
+%%PORTDOCS%%%%DOCSDIR%%/maildirmake.html
+%%MAILDIRQUOTA%%%%PORTDOCS%%%%DOCSDIR%%/maildirquota.html
+%%PORTDOCS%%%%DOCSDIR%%/maildrop.html
+%%PORTDOCS%%%%DOCSDIR%%/maildropex.html
+%%PORTDOCS%%%%DOCSDIR%%/maildropfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/maildropgdbm.html
+%%PORTDOCS%%%%DOCSDIR%%/maildroptips.txt
+%%PORTDOCS%%%%DOCSDIR%%/makemime.html
+%%PORTDOCS%%%%DOCSDIR%%/manpage.css
+%%PORTDOCS%%%%DOCSDIR%%/reformail.html
+%%PORTDOCS%%%%DOCSDIR%%/reformime.html
+%%PORTDOCS%%%%DOCSDIR%%/rfc2045.html
+%%PORTDOCS%%%%DOCSDIR%%/rfc822.html
+%%USERDB%%%%PORTDOCS%%%%DOCSDIR%%/userdb.html
+%%USERDB%%%%PORTDOCS%%%%DOCSDIR%%/userdbpw.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%