- Update to 2.1.12

Changelog:
	Mailman 2.1.12 is a minor bug fix and Python 2.6 compatibility release.

	The minimum Python for this release is Python 2.4 and it is compatible
	with Python through 2.6. The previous Mailman releases are not
	compatible with Python 2.6.

PR:		134442
Submitted by:	miwi
Approved by:	maintainer timeout

3 files changed, 32 insertions, 56 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 94d964c466c6..26d9310dec12 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	mailman
-DISTVERSION=	2.1.11
+DISTVERSION=	2.1.12
 CATEGORIES?=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		http://www.list.org/
-MASTER_SITE_SUBDIR=	mailman
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	mailman
 
@@ -27,6 +26,7 @@ OPTIONS=	SENDMAIL "for use with sendmail" off \
 
 HAS_CONFIGURE=	yes
 USE_PYTHON=	yes
+MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS+=	--prefix=${MAILMANDIR} --with-python=${PYTHON_CMD} \
 		--with-username=${MM_USERNAME} \
 		--with-groupname=${MM_GROUPNAME} \
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 06387f09b2ab..2e7d2321a931 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,9 +1,3 @@
-MD5 (mailman/mailman-2.1.11.tgz) = d9fd89f54c4743dbcb3b3eec8c6146d6
-SHA256 (mailman/mailman-2.1.11.tgz) = 66f2e1d27b6d1f253a8ebbe218cacaab947e6b421f7513fbaea2314b24f06bda
-SIZE (mailman/mailman-2.1.11.tgz) = 7992229
-MD5 (mailman/indexing-2.1.11-0.1.patch.gz) = 48803160278420a986e998671702e342
-SHA256 (mailman/indexing-2.1.11-0.1.patch.gz) = bb940388dfbc19a52bdd62569d6212d09b2a3ceb6cb5a1fe43b5f1551da10433
-SIZE (mailman/indexing-2.1.11-0.1.patch.gz) = 8203
-MD5 (mailman/htdig-2.1.11-0.1.patch.gz) = c36a1deaab0f9c3256b91b2131a8890d
-SHA256 (mailman/htdig-2.1.11-0.1.patch.gz) = e603257259a0e5255dbae82ac64c3ee2b0fe4d947b43c3b9e750571d8f829335
-SIZE (mailman/htdig-2.1.11-0.1.patch.gz) = 61311
+MD5 (mailman/mailman-2.1.12.tgz) = d565a6d2d0ec6d2dd6936a81e1c1ca86
+SHA256 (mailman/mailman-2.1.12.tgz) = 5e9313252cc2eea774c453131e7f3fe3a5873ebce26628c5504cdc318d563ddd
+SIZE (mailman/mailman-2.1.12.tgz) = 8010027
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index a76f7218f556..ddc4c4d16e30 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -469,50 +469,28 @@
 %%MMDIR%%/messages/zh_CN/LC_MESSAGES/mailman.po
 %%MMDIR%%/messages/zh_TW/LC_MESSAGES/mailman.mo
 %%MMDIR%%/messages/zh_TW/LC_MESSAGES/mailman.po
-%%MMDIR%%/pythonlib/email/Charset.py
-%%MMDIR%%/pythonlib/email/Charset.pyc
-%%MMDIR%%/pythonlib/email/Encoders.py
-%%MMDIR%%/pythonlib/email/Encoders.pyc
-%%MMDIR%%/pythonlib/email/Errors.py
-%%MMDIR%%/pythonlib/email/Errors.pyc
-%%MMDIR%%/pythonlib/email/Generator.py
-%%MMDIR%%/pythonlib/email/Generator.pyc
-%%MMDIR%%/pythonlib/email/Header.py
-%%MMDIR%%/pythonlib/email/Header.pyc
-%%MMDIR%%/pythonlib/email/Iterators.py
-%%MMDIR%%/pythonlib/email/Iterators.pyc
-%%MMDIR%%/pythonlib/email/MIMEAudio.py
-%%MMDIR%%/pythonlib/email/MIMEAudio.pyc
-%%MMDIR%%/pythonlib/email/MIMEBase.py
-%%MMDIR%%/pythonlib/email/MIMEBase.pyc
-%%MMDIR%%/pythonlib/email/MIMEImage.py
-%%MMDIR%%/pythonlib/email/MIMEImage.pyc
-%%MMDIR%%/pythonlib/email/MIMEMessage.py
-%%MMDIR%%/pythonlib/email/MIMEMessage.pyc
-%%MMDIR%%/pythonlib/email/MIMEMultipart.py
-%%MMDIR%%/pythonlib/email/MIMEMultipart.pyc
-%%MMDIR%%/pythonlib/email/MIMENonMultipart.py
-%%MMDIR%%/pythonlib/email/MIMENonMultipart.pyc
-%%MMDIR%%/pythonlib/email/MIMEText.py
-%%MMDIR%%/pythonlib/email/MIMEText.pyc
-%%MMDIR%%/pythonlib/email/Message.py
-%%MMDIR%%/pythonlib/email/Message.pyc
-%%MMDIR%%/pythonlib/email/Parser.py
-%%MMDIR%%/pythonlib/email/Parser.pyc
-%%MMDIR%%/pythonlib/email/Utils.py
-%%MMDIR%%/pythonlib/email/Utils.pyc
-%%MMDIR%%/pythonlib/email/__init__.py
-%%MMDIR%%/pythonlib/email/__init__.pyc
-%%MMDIR%%/pythonlib/email/_compat21.py
-%%MMDIR%%/pythonlib/email/_compat21.pyc
-%%MMDIR%%/pythonlib/email/_compat22.py
-%%MMDIR%%/pythonlib/email/_compat22.pyc
-%%MMDIR%%/pythonlib/email/_parseaddr.py
-%%MMDIR%%/pythonlib/email/_parseaddr.pyc
-%%MMDIR%%/pythonlib/email/base64MIME.py
-%%MMDIR%%/pythonlib/email/base64MIME.pyc
-%%MMDIR%%/pythonlib/email/quopriMIME.py
-%%MMDIR%%/pythonlib/email/quopriMIME.pyc
+%%MMDIR%%/pythonlib/japanese/__init__.py
+%%MMDIR%%/pythonlib/japanese/__init__.pyc
+%%MMDIR%%/pythonlib/japanese/aliases/__init__.py
+%%MMDIR%%/pythonlib/japanese/aliases/__init__.pyc
+%%MMDIR%%/pythonlib/japanese/c/__init__.py
+%%MMDIR%%/pythonlib/japanese/c/__init__.pyc
+%%MMDIR%%/pythonlib/japanese/c/_japanese_codecs.so
+%%MMDIR%%/pythonlib/japanese/c/euc_jp.py
+%%MMDIR%%/pythonlib/japanese/c/euc_jp.pyc
+%%MMDIR%%/pythonlib/japanese/c/iso_2022_jp.py
+%%MMDIR%%/pythonlib/japanese/c/iso_2022_jp.pyc
+%%MMDIR%%/pythonlib/japanese/c/iso_2022_jp_1.py
+%%MMDIR%%/pythonlib/japanese/c/iso_2022_jp_1.pyc
+%%MMDIR%%/pythonlib/japanese/c/iso_2022_jp_ext.py
+%%MMDIR%%/pythonlib/japanese/c/iso_2022_jp_ext.pyc
+%%MMDIR%%/pythonlib/japanese/c/ms932.py
+%%MMDIR%%/pythonlib/japanese/c/ms932.pyc
+%%MMDIR%%/pythonlib/japanese/c/shift_jis.py
+%%MMDIR%%/pythonlib/japanese/c/shift_jis.pyc
+%%MMDIR%%/pythonlib/japanese/euc_jp.py
+%%MMDIR%%/pythonlib/japanese/euc_jp.pyc
+%%MMDIR%%/pythonlib/japanese/iso_2022_jp.py
 %%MMDIR%%/pythonlib/japanese/__init__.py
 %%MMDIR%%/pythonlib/japanese/__init__.pyc
 %%MMDIR%%/pythonlib/japanese/aliases/__init__.py
@@ -2191,6 +2169,7 @@
 %%MMDIR%%/tests/bounces/qmail_03.txt
 %%MMDIR%%/tests/bounces/qmail_04.txt
 %%MMDIR%%/tests/bounces/qmail_05.txt
+%%MMDIR%%/tests/bounces/qmail_06.txt
 %%MMDIR%%/tests/bounces/sendmail_01.txt
 %%MMDIR%%/tests/bounces/simple_01.txt
 %%MMDIR%%/tests/bounces/simple_02.txt
@@ -2225,6 +2204,9 @@
 %%MMDIR%%/tests/bounces/simple_31.txt
 %%MMDIR%%/tests/bounces/simple_32.txt
 %%MMDIR%%/tests/bounces/simple_33.txt
+%%MMDIR%%/tests/bounces/simple_34.txt
+%%MMDIR%%/tests/bounces/simple_35.txt
+%%MMDIR%%/tests/bounces/simple_36.txt
 %%MMDIR%%/tests/bounces/sina_01.txt
 %%MMDIR%%/tests/bounces/smtp32_01.txt
 %%MMDIR%%/tests/bounces/smtp32_02.txt