3 files changed, 32 insertions, 10 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 7f6b34c7b849..2903b7e1fd99 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -6,25 +6,23 @@
 #
 
 PORTNAME=	mailman
-PORTVERSION=	2.1.7
+PORTVERSION=	2.1.8
 CATEGORIES?=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.list.org/
 MASTER_SITE_SUBDIR=	mailman
-.if defined(WITH_HTDIG)
-PKGNAMESUFFIX=	-with-htdig
-.endif
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	mailman
 
 .if defined(WITH_HTDIG)
 # see http://www.openinfo.co.uk/mailman/index.html
 # Order of application of these patches is critical.
+PATCH_SITES+=	http://www.openinfo.co.uk/mm/patches/444879/:patch1 \
+		http://www.openinfo.co.uk/mm/patches/444884/:patch2
 PATCHFILES+=	indexing-2.1.6-0.1.patch.gz:patch1 \
 		htdig-2.1.6-0.1.patch.gz:patch2
 PATCH_DIST_STRIP=	-p1
-PATCH_SITES+=	http://www.openinfo.co.uk/mm/patches/444879/:patch1 \
-		http://www.openinfo.co.uk/mm/patches/444884/:patch2
+PKGNAMESUFFIX+=	-with-htdig
 .endif
 
 MAINTAINER?=	ports@freebsd.org
@@ -40,7 +38,6 @@ RUN_DEPENDS+=	htdig:${PORTSDIR}/textproc/htdig
 
 HAS_CONFIGURE=	yes
 USE_PYTHON=	yes
-USE_REINPLACE=	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 c23ec0028a2f..711a25b21c33 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,6 +1,6 @@
-MD5 (mailman/mailman-2.1.7.tgz) = 81ea139ecd24fbd2a85a9185a37df402
-SHA256 (mailman/mailman-2.1.7.tgz) = 5a5d56e8aa49db5297e27ea4dffa566923a3712fff43ed2b845e1377d0275f6e
-SIZE (mailman/mailman-2.1.7.tgz) = 6736536
+MD5 (mailman/mailman-2.1.8.tgz) = b9308ea3ffe8dd447458338408d46bd6
+SHA256 (mailman/mailman-2.1.8.tgz) = 115a341878414806d5974435fc663b3c842f344d989cba3ac5e0b4ac4b9c2367
+SIZE (mailman/mailman-2.1.8.tgz) = 6856039
 MD5 (mailman/indexing-2.1.6-0.1.patch.gz) = e94f41782441afd5f025506dbaf70b33
 SHA256 (mailman/indexing-2.1.6-0.1.patch.gz) = 97045874a8c68bcae910a679cb81a91644019c7bceca7b59f4bfc37f0cfd587c
 SIZE (mailman/indexing-2.1.6-0.1.patch.gz) = 8881
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index 2d8619fc5978..ed233d9e106e 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -182,6 +182,8 @@
 %%MMDIR%%/Mailman/Handlers/CalcRecips.pyc
 %%MMDIR%%/Mailman/Handlers/Cleanse.py
 %%MMDIR%%/Mailman/Handlers/Cleanse.pyc
+%%MMDIR%%/Mailman/Handlers/CleanseDKIM.py
+%%MMDIR%%/Mailman/Handlers/CleanseDKIM.pyc
 %%MMDIR%%/Mailman/Handlers/CookHeaders.py
 %%MMDIR%%/Mailman/Handlers/CookHeaders.pyc
 %%MMDIR%%/Mailman/Handlers/Decorate.py
@@ -782,6 +784,7 @@
 %%MMDIR%%/templates/de/unsub.txt
 %%MMDIR%%/templates/de/userpass.txt
 %%MMDIR%%/templates/de/verify.txt
+%%SUB_HTDIG%%%%MMDIR%%/templates/en/htdig.html
 %%SUB_HTDIG%%%%MMDIR%%/templates/en/TOC_htsearch.html
 %%MMDIR%%/templates/en/admindbdetails.html
 %%MMDIR%%/templates/en/admindbpreamble.html
@@ -1903,6 +1906,9 @@
 %%MMDIR%%/tests/bounces/dsn_09.txt
 %%MMDIR%%/tests/bounces/dsn_10.txt
 %%MMDIR%%/tests/bounces/dsn_11.txt
+%%MMDIR%%/tests/bounces/dsn_12.txt
+%%MMDIR%%/tests/bounces/dsn_13.txt
+%%MMDIR%%/tests/bounces/dsn_14.txt
 %%MMDIR%%/tests/bounces/dumbass_01.txt
 %%MMDIR%%/tests/bounces/exim_01.txt
 %%MMDIR%%/tests/bounces/groupwise_01.txt
@@ -1911,6 +1917,7 @@
 %%MMDIR%%/tests/bounces/llnl_01.txt
 %%MMDIR%%/tests/bounces/microsoft_01.txt
 %%MMDIR%%/tests/bounces/microsoft_02.txt
+%%MMDIR%%/tests/bounces/microsoft_03.txt
 %%MMDIR%%/tests/bounces/netscape_01.txt
 %%MMDIR%%/tests/bounces/newmailru_01.txt
 %%MMDIR%%/tests/bounces/postfix_01.txt
@@ -1919,15 +1926,32 @@
 %%MMDIR%%/tests/bounces/postfix_04.txt
 %%MMDIR%%/tests/bounces/postfix_05.txt
 %%MMDIR%%/tests/bounces/qmail_01.txt
+%%MMDIR%%/tests/bounces/qmail_02.txt
+%%MMDIR%%/tests/bounces/qmail_03.txt
 %%MMDIR%%/tests/bounces/sendmail_01.txt
 %%MMDIR%%/tests/bounces/simple_01.txt
 %%MMDIR%%/tests/bounces/simple_02.txt
 %%MMDIR%%/tests/bounces/simple_03.txt
 %%MMDIR%%/tests/bounces/simple_04.txt
+%%MMDIR%%/tests/bounces/simple_05.txt
+%%MMDIR%%/tests/bounces/simple_06.txt
+%%MMDIR%%/tests/bounces/simple_07.txt
+%%MMDIR%%/tests/bounces/simple_08.txt
+%%MMDIR%%/tests/bounces/simple_09.txt
+%%MMDIR%%/tests/bounces/simple_10.txt
+%%MMDIR%%/tests/bounces/simple_11.txt
+%%MMDIR%%/tests/bounces/simple_12.txt
+%%MMDIR%%/tests/bounces/simple_13.txt
+%%MMDIR%%/tests/bounces/simple_14.txt
+%%MMDIR%%/tests/bounces/simple_15.txt
+%%MMDIR%%/tests/bounces/simple_16.txt
 %%MMDIR%%/tests/bounces/sina_01.txt
 %%MMDIR%%/tests/bounces/smtp32_01.txt
 %%MMDIR%%/tests/bounces/smtp32_02.txt
 %%MMDIR%%/tests/bounces/smtp32_03.txt
+%%MMDIR%%/tests/bounces/smtp32_04.txt
+%%MMDIR%%/tests/bounces/smtp32_05.txt
+%%MMDIR%%/tests/bounces/smtp32_06.txt
 %%MMDIR%%/tests/bounces/yahoo_01.txt
 %%MMDIR%%/tests/bounces/yahoo_02.txt
 %%MMDIR%%/tests/bounces/yahoo_03.txt
@@ -1937,6 +1961,7 @@
 %%MMDIR%%/tests/bounces/yahoo_07.txt
 %%MMDIR%%/tests/bounces/yahoo_08.txt
 %%MMDIR%%/tests/bounces/yahoo_09.txt
+%%MMDIR%%/tests/bounces/yahoo_10.txt
 %%MMDIR%%/tests/bounces/yale_01.txt
 %%MMDIR%%/tests/fblast.py
 %%MMDIR%%/tests/msgs/bad_01.txt