3 files changed, 26 insertions, 5 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index f01cc6cdeeb6..01322e2dd594 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailman
 DISTVERSION=	2.1.18-1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -63,11 +63,12 @@ PORTDOCS=	ACKNOWLEDGMENTS BUGS FAQ INSTALL NEWS README README-I18N.en \
 		FreeBSD-post-install-notes
 
 OPTIONS_SINGLE=	MTA
-OPTIONS_SINGLE_MTA=	SENDMAIL EXIM4 POSTFIX COURIER
+OPTIONS_SINGLE_MTA=	COURIER EXIM4 OPENSMTPD POSTFIX SENDMAIL
 OPTIONS_DEFINE=	HTDIG NAMAZU2 NLS DOCS
 OPTIONS_DEFAULT=	SENDMAIL
 COURIER_DESC=	for use with courier
 EXIM4_DESC=	for use with exim4
+OPENSMTPD_DESC=	for use with opensmtpd - EXPERIMENTAL -
 POSTFIX_DESC=	for use with postfix
 SENDMAIL_DESC=	for use with sendmail
 HTDIG_DESC=	- EXPERIMENTAL - htdig integration patches
@@ -93,8 +94,8 @@ MAIL_GID?=	mail
 .endif
 
 .if ${PORT_OPTIONS:MPOSTFIX}
-RUN_DEPENDS+=	${LOCALBASE}/sbin/postconf:${PORTSDIR}/mail/postfix
 BUILD_DEPENDS+=	${LOCALBASE}/sbin/postconf:${PORTSDIR}/mail/postfix
+RUN_DEPENDS+=	${LOCALBASE}/sbin/postconf:${PORTSDIR}/mail/postfix
 MAIL_GID?=	mailman
 EXTRA_PATCHES+=	${FILESDIR}/postfix-verp.diff
 .endif
@@ -103,6 +104,10 @@ EXTRA_PATCHES+=	${FILESDIR}/postfix-verp.diff
 MAIL_GID?=	courier
 .endif
 
+.if ${PORT_OPTIONS:MOPENSMTPD}
+MAIL_GID?=	_smtpd
+.endif
+
 .if ${PORT_OPTIONS:MHTDIG}
 PATCH_SITES+=	http://www.openinfo.co.uk/mm/patches/444879/:patch1 \
 		http://www.openinfo.co.uk/mm/patches/444884/:patch2
diff --git a/mail/mailman/files/FreeBSD-post-install-notes b/mail/mailman/files/FreeBSD-post-install-notes
index c8f0ee7bfe34..0e8441a99e75 100644
--- a/mail/mailman/files/FreeBSD-post-install-notes
+++ b/mail/mailman/files/FreeBSD-post-install-notes
@@ -21,6 +21,12 @@ VERY IMPORTANT NOTE
 The Mailman port has a number of build time options.  Getting the values of
 some of these right is CRUCIAL if you want your Mailman installation to work!
 
+This is especially relevant to users of the binary package; the official
+package will build with default options, and will not support alternative
+mail server software (mail transfer agents, MTA) such as Exim, Postfix,
+or Qmail.  For that to happen, the package needs to be rebuilt with changed
+options.  The ports-mgmt/poudriere port (or package) can help with doing that.
+
 
 1) General post-installation instructions
 
diff --git a/mail/mailman/files/pkg-message.in b/mail/mailman/files/pkg-message.in
index 96ccb8d19042..13ae430bbcf5 100644
--- a/mail/mailman/files/pkg-message.in
+++ b/mail/mailman/files/pkg-message.in
@@ -7,10 +7,20 @@ extensive post-installation instructions may be found in:
 
   %%DOCSDIR%%/FreeBSD-post-install-notes
 
-Note (1):  If you use an alternate MTA (meaning "not Sendmail"), you MUST
+Note (1):  - ESPECIALLY RELEVANT FOR USERS OF THE BINARY PACKAGE -
+The FreeBSD binary package is built for use with Sendmail, and it will
+not work properly with alternative MTAs such as Exim or Postfix.
+  In order for Mailman to work with an alternative mailer,
+the port must be installed from source, with proper options configured.
+
+The separate poudriere port can be used to locally build a binary
+package of Mailman with non-default options.
+
+- FOR USERS OF A PORT BUILT FROM SOURCE -
+If you use an alternate MTA (meaning "not Sendmail"), you MUST
 be sure that the correct value of MAIL_GID was used when this port or
 package was built.  You can choose your MTA with the correct MAIL_GID by
-running "make config" in the Mailman port directory.
+running "make config" in the Mailman port's directory.
 
 Note (2):  The entire Mailman installation resides under %%MAILMANDIR%%.
 The command-line scripts necessary to administer Mailman have been