4 files changed, 88 insertions, 37 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 2f8f8342967a..edd22c09bf30 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mailman
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.list.org/ \
 		${MASTER_SITE_GNU} \
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.list.org/ \
 MASTER_SITE_SUBDIR=	mailman
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	wjv@FreeBSD.org
+MAINTAINER=	khera@kcilink.com
 COMMENT=	A mailing list manager (MLM) with a user-friendly web front-end
 
 RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index a0593ce2340d..60f8124095ac 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1 +1 @@
-MD5 (mailman-2.1.1.tgz) = 7f7cdc52a40a17a2c7ee91c5f4dd675d
+MD5 (mailman-2.1.2.tgz) = 24d2917ba0229e7bcd6153661d749e60
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index c4510eee7648..a2f443ddaed0 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -606,39 +606,6 @@
 %%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
@@ -1162,6 +1129,90 @@
 %%MMDIR%%/templates/no/unsubauth.txt
 %%MMDIR%%/templates/no/userpass.txt
 %%MMDIR%%/templates/no/verify.txt
+%%MMDIR%%/templates/pl/admindbdetails.html
+%%MMDIR%%/templates/pl/admindbpreamble.html
+%%MMDIR%%/templates/pl/admindbsummary.html
+%%MMDIR%%/templates/pl/adminsubscribeack.txt
+%%MMDIR%%/templates/pl/adminunsubscribeack.txt
+%%MMDIR%%/templates/pl/admlogin.html
+%%MMDIR%%/templates/pl/approve.txt
+%%MMDIR%%/templates/pl/archidxentry.html
+%%MMDIR%%/templates/pl/archidxfoot.html
+%%MMDIR%%/templates/pl/archidxhead.html
+%%MMDIR%%/templates/pl/archlistend.html
+%%MMDIR%%/templates/pl/archliststart.html
+%%MMDIR%%/templates/pl/archtoc.html
+%%MMDIR%%/templates/pl/archtocentry.html
+%%MMDIR%%/templates/pl/article.html
+%%MMDIR%%/templates/pl/bounce.txt
+%%MMDIR%%/templates/pl/checkdbs.txt
+%%MMDIR%%/templates/pl/convert.txt
+%%MMDIR%%/templates/pl/cronpass.txt
+%%MMDIR%%/templates/pl/disabled.txt
+%%MMDIR%%/templates/pl/emptyarchive.html
+%%MMDIR%%/templates/pl/headfoot.html
+%%MMDIR%%/templates/pl/help.txt
+%%MMDIR%%/templates/pl/invite.txt
+%%MMDIR%%/templates/pl/listinfo.html
+%%MMDIR%%/templates/pl/masthead.txt
+%%MMDIR%%/templates/pl/newlist.txt
+%%MMDIR%%/templates/pl/nomoretoday.txt
+%%MMDIR%%/templates/pl/options.html
+%%MMDIR%%/templates/pl/postack.txt
+%%MMDIR%%/templates/pl/postauth.txt
+%%MMDIR%%/templates/pl/postheld.txt
+%%MMDIR%%/templates/pl/private.html
+%%MMDIR%%/templates/pl/refuse.txt
+%%MMDIR%%/templates/pl/roster.html
+%%MMDIR%%/templates/pl/subauth.txt
+%%MMDIR%%/templates/pl/subscribe.html
+%%MMDIR%%/templates/pl/subscribeack.txt
+%%MMDIR%%/templates/pl/unsub.txt
+%%MMDIR%%/templates/pl/unsubauth.txt
+%%MMDIR%%/templates/pl/userpass.txt
+%%MMDIR%%/templates/pl/verify.txt
+%%MMDIR%%/templates/pt/admindbdetails.html
+%%MMDIR%%/templates/pt/admindbpreamble.html
+%%MMDIR%%/templates/pt/admindbsummary.html
+%%MMDIR%%/templates/pt/adminsubscribeack.txt
+%%MMDIR%%/templates/pt/adminunsubscribeack.txt
+%%MMDIR%%/templates/pt/admlogin.html
+%%MMDIR%%/templates/pt/approve.txt
+%%MMDIR%%/templates/pt/archidxentry.html
+%%MMDIR%%/templates/pt/archidxfoot.html
+%%MMDIR%%/templates/pt/archidxhead.html
+%%MMDIR%%/templates/pt/archlistend.html
+%%MMDIR%%/templates/pt/archliststart.html
+%%MMDIR%%/templates/pt/archtoc.html
+%%MMDIR%%/templates/pt/archtocentry.html
+%%MMDIR%%/templates/pt/article.html
+%%MMDIR%%/templates/pt/bounce.txt
+%%MMDIR%%/templates/pt/checkdbs.txt
+%%MMDIR%%/templates/pt/convert.txt
+%%MMDIR%%/templates/pt/cronpass.txt
+%%MMDIR%%/templates/pt/disabled.txt
+%%MMDIR%%/templates/pt/emptyarchive.html
+%%MMDIR%%/templates/pt/headfoot.html
+%%MMDIR%%/templates/pt/help.txt
+%%MMDIR%%/templates/pt/invite.txt
+%%MMDIR%%/templates/pt/listinfo.html
+%%MMDIR%%/templates/pt/masthead.txt
+%%MMDIR%%/templates/pt/newlist.txt
+%%MMDIR%%/templates/pt/nomoretoday.txt
+%%MMDIR%%/templates/pt/options.html
+%%MMDIR%%/templates/pt/postack.txt
+%%MMDIR%%/templates/pt/postauth.txt
+%%MMDIR%%/templates/pt/postheld.txt
+%%MMDIR%%/templates/pt/private.html
+%%MMDIR%%/templates/pt/refuse.txt
+%%MMDIR%%/templates/pt/roster.html
+%%MMDIR%%/templates/pt/subauth.txt
+%%MMDIR%%/templates/pt/subscribe.html
+%%MMDIR%%/templates/pt/subscribeack.txt
+%%MMDIR%%/templates/pt/unsub.txt
+%%MMDIR%%/templates/pt/unsubauth.txt
+%%MMDIR%%/templates/pt/userpass.txt
+%%MMDIR%%/templates/pt/verify.txt
 %%MMDIR%%/templates/pt_BR/admindbdetails.html
 %%MMDIR%%/templates/pt_BR/admindbpreamble.html
 %%MMDIR%%/templates/pt_BR/admindbsummary.html
diff --git a/mail/mailman/pkg-req b/mail/mailman/pkg-req
index 07db2eab1c24..cffca7cab3ff 100644
--- a/mail/mailman/pkg-req
+++ b/mail/mailman/pkg-req
@@ -5,7 +5,7 @@ PATH=$PATH:/usr/local/bin
 if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
   PYTHON_GT=`python -c 'import string, sys; \
                         print string.split(sys.version)[0] >= "2.1.3"'`
-  if [ "x${PYTHON_GT}" = "x1" ]; then
+  if [ "x${PYTHON_GT}" = "x1" -o "x${PYTHON_GT}" = "xTrue" ]; then
     exit 0
   else
     echo "-----------------------------------------------------------"