2 files changed, 30 insertions, 19 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index eb3b08d4c184..15db71ee678c 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailman
 DISTVERSION=	2.1.18-1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
diff --git a/mail/mailman/files/FreeBSD-post-install-notes b/mail/mailman/files/FreeBSD-post-install-notes
index 0e8441a99e75..d51ac553b1e6 100644
--- a/mail/mailman/files/FreeBSD-post-install-notes
+++ b/mail/mailman/files/FreeBSD-post-install-notes
@@ -12,7 +12,7 @@ CONTENTS:
    3.1) Sendmail
    3.2) Exim
    3.3) Postfix
-   3.4) Qmail
+   3.4) qmail
 4) Apache configuration
 
 
@@ -24,8 +24,9 @@ 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.
+or qmail.  For proper support of these alternatives, the package needs to be
+rebuilt with changed options.  The ports-mgmt/poudriere port (or
+package) can help with that.
 
 
 1) General post-installation instructions
@@ -41,8 +42,10 @@ options.  The ports-mgmt/poudriere port (or package) can help with doing that.
 2) Integrating Mailman with your web server
 
    You need to set up your webserver to find Mailman's CGI scripts.  The
-   Mailman port works well with either Apache 1.3.x or Apache 2.x as
-   installed from their respective ports (www/apache13 and www/apache2).
+   Mailman port works well with either Apache 2.2.x or Apache 2.4.x as
+   installed from their respective ports (www/apache22 and www/apache24).
+   Other options include lighttpd and nginx, also in the FreeBSD ports
+   collection, but not documented in this file.
 
    If you are using Apache, you need to add at least two lines to your
    httpd.conf.  Assuming that you installed the Mailman port in the default
@@ -70,12 +73,11 @@ options.  The ports-mgmt/poudriere port (or package) can help with doing that.
 
 3.1) Sendmail
 
-     You have to choose SENDMAIL option on config build and port will set 
-     MAIL_GID=mailnull to you. 
+     The default option is SENDMAIL when the port is built. It will set
+     MAIL_GID=mailnull for you.
 
-     When your build is finished, please review the instructions found in 
-     mailman-install.txt in the same directory port. The port is designed to 
-     work with Sendmail by default.
+     When your build is finished, please review the instructions found in
+     mailman-install.txt in the same directory port.
 
      No further instructions exist at this time on how to integrate the
      Mailman port with Sendmail.  Please submit any such information to the
@@ -94,8 +96,8 @@ options.  The ports-mgmt/poudriere port (or package) can help with doing that.
        exim_group = mail
 
      For Exim 4.x, the value of MAIL_GID has to be set to 'mail' (or 6) when
-     building the Mailman port, so you have to choose EXIM4 on build options to
-     set it to you.
+     building the Mailman port; you can choose EXIM4 as build option to
+     set it for you.
 
      Next, follow the instructions in mailman-install.txt found in the same
      directory as this file.  You can add the macros, transport and router
@@ -143,17 +145,16 @@ options.  The ports-mgmt/poudriere port (or package) can help with doing that.
      Review the instructions found in mailman-install.txt in the same
      directory as this file.
 
-3.4) Qmail
+3.4) qmail
 
      The maintainer of the Mailman port has no information at this time as to
-     the required value of MAIL_GID for Mailman to work with Qmail.  :-(
+     the required value of MAIL_GID for Mailman to work with qmail.
 
      Review the instructions found in mailman-install.txt in the same
      directory as this file.
 
      No further instructions exist at this time on how to integrate the
-     Mailman port with Qmail.  Please submit any such information to the
-     maintainer of the Mailman port.
+     Mailman port with qmail.
 
 
 4) Apache configuration
@@ -161,6 +162,16 @@ options.  The ports-mgmt/poudriere port (or package) can help with doing that.
     You should add the follow lines to your httpd.conf so
     that the mailman interface works correctly:
 
+    For Apache 2.4:
+
+      <Directory "/usr/local/mailman">
+        Options FollowSymLinks ExecCGI
+        AllowOverride None
+        Require all granted
+     </Directory>
+
+    For Apache 2.2:
+
       <Directory "/usr/local/mailman">
         Options FollowSymLinks ExecCGI
         AllowOverride None
@@ -172,5 +183,5 @@ options.  The ports-mgmt/poudriere port (or package) can help with doing that.
 
      # apachectl restart.
 
--- Jean Milanez Melo <jmelo@FreeBSD.org>
-   (former Mailman port maintainer)
+-- Matthias Andree <mandree@FreeBSD.org> (current Mailman port maintainer)
+-- Jean Milanez Melo <jmelo@FreeBSD.org> (former Mailman port maintainer)