4 files changed, 203 insertions, 10 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 3d071deb8e99..2ed7b5c0ae14 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mailman
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.list.org/ \
 		${MASTER_SITE_GNU} \
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 60f8124095ac..bb0833826b1d 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1 +1 @@
-MD5 (mailman-2.1.2.tgz) = 24d2917ba0229e7bcd6153661d749e60
+MD5 (mailman-2.1.3.tgz) = 1c9ec97b340ad1f802bce3f6b2dd9430
diff --git a/mail/mailman/files/FreeBSD-post-install-notes b/mail/mailman/files/FreeBSD-post-install-notes
index 29e85836d06e..3865212cda4c 100644
--- a/mail/mailman/files/FreeBSD-post-install-notes
+++ b/mail/mailman/files/FreeBSD-post-install-notes
@@ -154,17 +154,14 @@ popular MTAs.
 3.3) Postfix
 
      The value of MAIL_GID has to be set to 'nobody' (or 65534) when building
-     the Mailman port.  This has been confirmed by the maintainer of the
-     FreeBSD port of Postfix.
+     the Mailman port.
+
+     NOTE: the group needs to be 'mailman' if you are using the Mailman
+     integration for generating the postfix virtual and aliases files.
 
      Review the instructions found in README.POSTFIX in the same directory
      as this file.
 
-     No further instructions exist at this time on how to integrate the
-     Mailman port with Postfix.  Please submit any such information to the
-     maintainer of the Mailman port.
-
-
 3.4) Qmail
 
      The maintainer of the Mailman port has no information at this time as to
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index 05a9ee6dd855..4151cc2b64c1 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -266,6 +266,8 @@
 %%MMDIR%%/Mailman/Queue/NewsRunner.pyc
 %%MMDIR%%/Mailman/Queue/OutgoingRunner.py
 %%MMDIR%%/Mailman/Queue/OutgoingRunner.pyc
+%%MMDIR%%/Mailman/Queue/RetryRunner.py
+%%MMDIR%%/Mailman/Queue/RetryRunner.pyc
 %%MMDIR%%/Mailman/Queue/Runner.py
 %%MMDIR%%/Mailman/Queue/Runner.pyc
 %%MMDIR%%/Mailman/Queue/Switchboard.py
@@ -310,6 +312,7 @@
 %%MMDIR%%/bin/clone_member
 %%MMDIR%%/bin/config_list
 %%MMDIR%%/bin/convert.py
+%%MMDIR%%/bin/discard
 %%MMDIR%%/bin/dumpdb
 %%MMDIR%%/bin/find_member
 %%MMDIR%%/bin/fix_url.py
@@ -321,6 +324,7 @@
 %%MMDIR%%/bin/list_owners
 %%MMDIR%%/bin/mailmanctl
 %%MMDIR%%/bin/mmsitepass
+%%MMDIR%%/bin/msgfmt.py
 %%MMDIR%%/bin/newlist
 %%MMDIR%%/bin/paths.py
 %%MMDIR%%/bin/paths.pyc
@@ -328,6 +332,7 @@
 %%MMDIR%%/bin/remove_members
 %%MMDIR%%/bin/rmlist
 %%MMDIR%%/bin/sync_members
+%%MMDIR%%/bin/show_qfiles
 %%MMDIR%%/bin/transcheck
 %%MMDIR%%/bin/unshunt
 %%MMDIR%%/bin/update
@@ -364,9 +369,14 @@
 %%MMDIR%%/mail/mailman
 %%MMDIR%%/messages/cs/LC_MESSAGES/mailman.mo
 %%MMDIR%%/messages/cs/LC_MESSAGES/mailman.po
+%%MMDIR%%/messages/da/LC_MESSAGES/mailman.mo
+%%MMDIR%%/messages/da/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/de/LC_MESSAGES/mailman.mo
 %%MMDIR%%/messages/de/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/de/README.de
+%%MMDIR%%/messages/eu/LC_MESSAGES/mailman.mo
+%%MMDIR%%/messages/eu/LC_MESSAGES/mailman.po
+%%MMDIR%%/messages/eu/README.eu
 %%MMDIR%%/messages/es/LC_MESSAGES/mailman.mo
 %%MMDIR%%/messages/es/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/es/README.es
@@ -396,14 +406,23 @@
 %%MMDIR%%/messages/nl/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/no/LC_MESSAGES/mailman.mo
 %%MMDIR%%/messages/no/LC_MESSAGES/mailman.po
+%%MMDIR%%/messages/pl/LC_MESSAGES/mailman.mo
+%%MMDIR%%/messages/pl/LC_MESSAGES/mailman.po
+%%MMDIR%%/messages/pl/README.pl
+%%MMDIR%%/messages/pt/LC_MESSAGES/mailman.mo
+%%MMDIR%%/messages/pt/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/pt_BR/LC_MESSAGES/mailman.mo
 %%MMDIR%%/messages/pt_BR/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/ru/LC_MESSAGES/mailman.mo
 %%MMDIR%%/messages/ru/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/ru/README.ru
+%%MMDIR%%/messages/sr/LC_MESSAGES/mailman.mo
+%%MMDIR%%/messages/sr/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/sv/LC_MESSAGES/mailman.mo
 %%MMDIR%%/messages/sv/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/sv/README.sv
+%%MMDIR%%/messages/uk/LC_MESSAGES/mailman.mo
+%%MMDIR%%/messages/uk/LC_MESSAGES/mailman.po
 %%MMDIR%%/pythonlib/email/Charset.py
 %%MMDIR%%/pythonlib/email/Charset.pyc
 %%MMDIR%%/pythonlib/email/Encoders.py
@@ -609,6 +628,39 @@
 %%MMDIR%%/templates/big5/subscribeack.txt
 %%MMDIR%%/templates/big5/userpass.txt
 %%MMDIR%%/templates/big5/verify.txt
+%%MMDIR%%/templates/cs/admindbdetails.html
+%%MMDIR%%/templates/cs/admindbpreamble.html
+%%MMDIR%%/templates/cs/admindbsummary.html
+%%MMDIR%%/templates/cs/adminsubscribeack.txt
+%%MMDIR%%/templates/cs/adminunsubscribeack.txt
+%%MMDIR%%/templates/cs/admlogin.html
+%%MMDIR%%/templates/cs/approve.txt
+%%MMDIR%%/templates/cs/article.html
+%%MMDIR%%/templates/cs/bounce.txt
+%%MMDIR%%/templates/cs/checkdbs.txt
+%%MMDIR%%/templates/cs/convert.txt
+%%MMDIR%%/templates/cs/cronpass.txt
+%%MMDIR%%/templates/cs/disabled.txt
+%%MMDIR%%/templates/cs/emptyarchive.html
+%%MMDIR%%/templates/cs/headfoot.html
+%%MMDIR%%/templates/cs/help.txt
+%%MMDIR%%/templates/cs/listinfo.html
+%%MMDIR%%/templates/cs/masthead.txt
+%%MMDIR%%/templates/cs/newlist.txt
+%%MMDIR%%/templates/cs/options.html
+%%MMDIR%%/templates/cs/postack.txt
+%%MMDIR%%/templates/cs/postauth.txt
+%%MMDIR%%/templates/cs/postheld.txt
+%%MMDIR%%/templates/cs/private.html
+%%MMDIR%%/templates/cs/refuse.txt
+%%MMDIR%%/templates/cs/roster.html
+%%MMDIR%%/templates/cs/subauth.txt
+%%MMDIR%%/templates/cs/subscribe.html
+%%MMDIR%%/templates/cs/subscribeack.txt
+%%MMDIR%%/templates/cs/unsub.txt
+%%MMDIR%%/templates/cs/unsubauth.txt
+%%MMDIR%%/templates/cs/userpass.txt
+%%MMDIR%%/templates/cs/verify.txt
 %%MMDIR%%/templates/de/admindbdetails.html
 %%MMDIR%%/templates/de/admindbpreamble.html
 %%MMDIR%%/templates/de/admindbsummary.html
@@ -753,6 +805,48 @@
 %%MMDIR%%/templates/et/unsubauth.txt
 %%MMDIR%%/templates/et/userpass.txt
 %%MMDIR%%/templates/et/verify.txt
+%%MMDIR%%/templates/eu/admindbdetails.html
+%%MMDIR%%/templates/eu/admindbpreamble.html
+%%MMDIR%%/templates/eu/admindbsummary.html
+%%MMDIR%%/templates/eu/adminsubscribeack.txt
+%%MMDIR%%/templates/eu/adminunsubscribeack.txt
+%%MMDIR%%/templates/eu/admlogin.html
+%%MMDIR%%/templates/eu/approve.txt
+%%MMDIR%%/templates/eu/archidxentry.html
+%%MMDIR%%/templates/eu/archidxfoot.html
+%%MMDIR%%/templates/eu/archidxhead.html
+%%MMDIR%%/templates/eu/archlistend.html
+%%MMDIR%%/templates/eu/archliststart.html
+%%MMDIR%%/templates/eu/archtoc.html
+%%MMDIR%%/templates/eu/archtocentry.html
+%%MMDIR%%/templates/eu/article.html
+%%MMDIR%%/templates/eu/bounce.txt
+%%MMDIR%%/templates/eu/checkdbs.txt
+%%MMDIR%%/templates/eu/convert.txt
+%%MMDIR%%/templates/eu/cronpass.txt
+%%MMDIR%%/templates/eu/disabled.txt
+%%MMDIR%%/templates/eu/emptyarchive.html
+%%MMDIR%%/templates/eu/headfoot.html
+%%MMDIR%%/templates/eu/help.txt
+%%MMDIR%%/templates/eu/invite.txt
+%%MMDIR%%/templates/eu/listinfo.html
+%%MMDIR%%/templates/eu/masthead.txt
+%%MMDIR%%/templates/eu/newlist.txt
+%%MMDIR%%/templates/eu/nomoretoday.txt
+%%MMDIR%%/templates/eu/options.html
+%%MMDIR%%/templates/eu/postack.txt
+%%MMDIR%%/templates/eu/postauth.txt
+%%MMDIR%%/templates/eu/postheld.txt
+%%MMDIR%%/templates/eu/private.html
+%%MMDIR%%/templates/eu/refuse.txt
+%%MMDIR%%/templates/eu/roster.html
+%%MMDIR%%/templates/eu/subauth.txt
+%%MMDIR%%/templates/eu/subscribe.html
+%%MMDIR%%/templates/eu/subscribeack.txt
+%%MMDIR%%/templates/eu/unsub.txt
+%%MMDIR%%/templates/eu/unsubauth.txt
+%%MMDIR%%/templates/eu/userpass.txt
+%%MMDIR%%/templates/eu/verify.txt
 %%MMDIR%%/templates/fi/admindbdetails.html
 %%MMDIR%%/templates/fi/admindbpreamble.html
 %%MMDIR%%/templates/fi/admindbsummary.html
@@ -1222,7 +1316,6 @@
 %%MMDIR%%/templates/pt_BR/adminsubscribeack.txt
 %%MMDIR%%/templates/pt_BR/adminunsubscribeack.txt
 %%MMDIR%%/templates/pt_BR/admlogin.html
-%%MMDIR%%/templates/pt_BR/admlogin.txt
 %%MMDIR%%/templates/pt_BR/approve.txt
 %%MMDIR%%/templates/pt_BR/article.html
 %%MMDIR%%/templates/pt_BR/bounce.txt
@@ -1293,6 +1386,49 @@
 %%MMDIR%%/templates/ru/unsubauth.txt
 %%MMDIR%%/templates/ru/userpass.txt
 %%MMDIR%%/templates/ru/verify.txt
+%%MMDIR%%/templates/sr/admindbdetails.html
+%%MMDIR%%/templates/sr/admindbpreamble.html
+%%MMDIR%%/templates/sr/admindbsummary.html
+%%MMDIR%%/templates/sr/adminsubscribeack.txt
+%%MMDIR%%/templates/sr/adminunsubscribeack.txt
+%%MMDIR%%/templates/sr/admlogin.html
+%%MMDIR%%/templates/sr/approve.txt
+%%MMDIR%%/templates/sr/archidxentry.html
+%%MMDIR%%/templates/sr/archidxfoot.html
+%%MMDIR%%/templates/sr/archidxhead.html
+%%MMDIR%%/templates/sr/archlistend.html
+%%MMDIR%%/templates/sr/archliststart.html
+%%MMDIR%%/templates/sr/archtoc.html
+%%MMDIR%%/templates/sr/archtocentry.html
+%%MMDIR%%/templates/sr/article.html
+%%MMDIR%%/templates/sr/bounce.txt
+%%MMDIR%%/templates/sr/checkdbs.txt
+%%MMDIR%%/templates/sr/convert.txt
+%%MMDIR%%/templates/sr/cronpass.txt
+%%MMDIR%%/templates/sr/disabled.txt
+%%MMDIR%%/templates/sr/emptyarchive.html
+%%MMDIR%%/templates/sr/handle_opts.html
+%%MMDIR%%/templates/sr/headfoot.html
+%%MMDIR%%/templates/sr/help.txt
+%%MMDIR%%/templates/sr/invite.txt
+%%MMDIR%%/templates/sr/listinfo.html
+%%MMDIR%%/templates/sr/masthead.txt
+%%MMDIR%%/templates/sr/newlist.txt
+%%MMDIR%%/templates/sr/nomoretoday.txt
+%%MMDIR%%/templates/sr/options.html
+%%MMDIR%%/templates/sr/postack.txt
+%%MMDIR%%/templates/sr/postauth.txt
+%%MMDIR%%/templates/sr/postheld.txt
+%%MMDIR%%/templates/sr/private.html
+%%MMDIR%%/templates/sr/refuse.txt
+%%MMDIR%%/templates/sr/roster.html
+%%MMDIR%%/templates/sr/subauth.txt
+%%MMDIR%%/templates/sr/subscribe.html
+%%MMDIR%%/templates/sr/subscribeack.txt
+%%MMDIR%%/templates/sr/unsub.txt
+%%MMDIR%%/templates/sr/unsubauth.txt
+%%MMDIR%%/templates/sr/userpass.txt
+%%MMDIR%%/templates/sr/verify.txt
 %%MMDIR%%/templates/sv/admindbdetails.html
 %%MMDIR%%/templates/sv/admindbpreamble.html
 %%MMDIR%%/templates/sv/admindbsummary.html
@@ -1330,6 +1466,48 @@
 %%MMDIR%%/templates/sv/unsubauth.txt
 %%MMDIR%%/templates/sv/userpass.txt
 %%MMDIR%%/templates/sv/verify.txt
+%%MMDIR%%/templates/uk/admindbdetails.html
+%%MMDIR%%/templates/uk/admindbpreamble.html
+%%MMDIR%%/templates/uk/admindbsummary.html
+%%MMDIR%%/templates/uk/adminsubscribeack.txt
+%%MMDIR%%/templates/uk/adminunsubscribeack.txt
+%%MMDIR%%/templates/uk/admlogin.html
+%%MMDIR%%/templates/uk/approve.txt
+%%MMDIR%%/templates/uk/archidxentry.html
+%%MMDIR%%/templates/uk/archidxfoot.html
+%%MMDIR%%/templates/uk/archidxhead.html
+%%MMDIR%%/templates/uk/archlistend.html
+%%MMDIR%%/templates/uk/archliststart.html
+%%MMDIR%%/templates/uk/archtoc.html
+%%MMDIR%%/templates/uk/archtocentry.html
+%%MMDIR%%/templates/uk/article.html
+%%MMDIR%%/templates/uk/bounce.txt
+%%MMDIR%%/templates/uk/checkdbs.txt
+%%MMDIR%%/templates/uk/convert.txt
+%%MMDIR%%/templates/uk/cronpass.txt
+%%MMDIR%%/templates/uk/disabled.txt
+%%MMDIR%%/templates/uk/emptyarchive.html
+%%MMDIR%%/templates/uk/headfoot.html
+%%MMDIR%%/templates/uk/help.txt
+%%MMDIR%%/templates/uk/invite.txt
+%%MMDIR%%/templates/uk/listinfo.html
+%%MMDIR%%/templates/uk/masthead.txt
+%%MMDIR%%/templates/uk/newlist.txt
+%%MMDIR%%/templates/uk/nomoretoday.txt
+%%MMDIR%%/templates/uk/options.html
+%%MMDIR%%/templates/uk/postack.txt
+%%MMDIR%%/templates/uk/postauth.txt
+%%MMDIR%%/templates/uk/postheld.txt
+%%MMDIR%%/templates/uk/private.html
+%%MMDIR%%/templates/uk/refuse.txt
+%%MMDIR%%/templates/uk/roster.html
+%%MMDIR%%/templates/uk/subauth.txt
+%%MMDIR%%/templates/uk/subscribe.html
+%%MMDIR%%/templates/uk/subscribeack.txt
+%%MMDIR%%/templates/uk/unsub.txt
+%%MMDIR%%/templates/uk/unsubauth.txt
+%%MMDIR%%/templates/uk/userpass.txt
+%%MMDIR%%/templates/uk/verify.txt
 %%MMDIR%%/tests/EmailBase.py
 %%MMDIR%%/tests/TestBase.py
 %%MMDIR%%/tests/bounces/bounce_01.txt
@@ -1394,6 +1572,7 @@
 %%MMDIR%%/tests/test_runners.py
 %%MMDIR%%/tests/test_safedict.py
 %%MMDIR%%/tests/test_security_mgr.py
+%%MMDIR%%/tests/test_smtp.py
 %%MMDIR%%/tests/testall.py
 %%PORTDOCS%%share/doc/mailman/ACKNOWLEDGMENTS
 %%PORTDOCS%%share/doc/mailman/BUGS
@@ -1416,9 +1595,13 @@ etc/rc.d/mailman.sh
 @dirrm %%MMDIR%%/tests/msgs
 @dirrm %%MMDIR%%/tests/bounces
 @dirrm %%MMDIR%%/tests
+@dirrm %%MMDIR%%/templates/uk
 @dirrm %%MMDIR%%/templates/sv
+@dirrm %%MMDIR%%/templates/sr
 @dirrm %%MMDIR%%/templates/ru
 @dirrm %%MMDIR%%/templates/pt_BR
+@dirrm %%MMDIR%%/templates/pt
+@dirrm %%MMDIR%%/templates/pl
 @dirrm %%MMDIR%%/templates/no
 @dirrm %%MMDIR%%/templates/nl
 @dirrm %%MMDIR%%/templates/lt
@@ -1429,6 +1612,7 @@ etc/rc.d/mailman.sh
 @dirrm %%MMDIR%%/templates/gb
 @dirrm %%MMDIR%%/templates/fr
 @dirrm %%MMDIR%%/templates/fi
+@dirrm %%MMDIR%%/templates/eu
 @dirrm %%MMDIR%%/templates/et
 @dirrm %%MMDIR%%/templates/es
 @dirrm %%MMDIR%%/templates/en
@@ -1451,12 +1635,20 @@ etc/rc.d/mailman.sh
 @dirrm %%MMDIR%%/pythonlib/japanese
 @dirrm %%MMDIR%%/pythonlib/email
 @dirrm %%MMDIR%%/pythonlib
+@dirrm %%MMDIR%%/messages/uk/LC_MESSAGES
+@dirrm %%MMDIR%%/messages/uk
 @dirrm %%MMDIR%%/messages/sv/LC_MESSAGES
 @dirrm %%MMDIR%%/messages/sv
+@dirrm %%MMDIR%%/messages/sr/LC_MESSAGES
+@dirrm %%MMDIR%%/messages/sr
 @dirrm %%MMDIR%%/messages/ru/LC_MESSAGES
 @dirrm %%MMDIR%%/messages/ru
 @dirrm %%MMDIR%%/messages/pt_BR/LC_MESSAGES
 @dirrm %%MMDIR%%/messages/pt_BR
+@dirrm %%MMDIR%%/messages/pt/LC_MESSAGES
+@dirrm %%MMDIR%%/messages/pt
+@dirrm %%MMDIR%%/messages/pl/LC_MESSAGES
+@dirrm %%MMDIR%%/messages/pl
 @dirrm %%MMDIR%%/messages/no/LC_MESSAGES
 @dirrm %%MMDIR%%/messages/no
 @dirrm %%MMDIR%%/messages/nl/LC_MESSAGES
@@ -1477,10 +1669,14 @@ etc/rc.d/mailman.sh
 @dirrm %%MMDIR%%/messages/fi
 @dirrm %%MMDIR%%/messages/et/LC_MESSAGES
 @dirrm %%MMDIR%%/messages/et
+@dirrm %%MMDIR%%/messages/eu/LC_MESSAGES
+@dirrm %%MMDIR%%/messages/eu
 @dirrm %%MMDIR%%/messages/es/LC_MESSAGES
 @dirrm %%MMDIR%%/messages/es
 @dirrm %%MMDIR%%/messages/de/LC_MESSAGES
 @dirrm %%MMDIR%%/messages/de
+@dirrm %%MMDIR%%/messages/da/LC_MESSAGES
+@dirrm %%MMDIR%%/messages/da
 @dirrm %%MMDIR%%/messages/cs/LC_MESSAGES
 @dirrm %%MMDIR%%/messages/cs
 @dirrm %%MMDIR%%/messages