Upgrade to new release 2.1.21. Disable HTDIG option.

Disable experimental HTDIG integration option,
the relevant ht://Dig patch no longer fits.

Changelog: https://launchpad.net/mailman/2.1/2.1.21

3 files changed, 10 insertions, 14 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index d23ee3c9e802..a5d2751cc0f8 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mailman
-DISTVERSION=	2.1.20
-PORTREVISION=	2
+DISTVERSION=	2.1.21
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -64,7 +63,7 @@ PORTDOCS=	ACKNOWLEDGMENTS BUGS FAQ INSTALL NEWS README README-I18N.en \
 
 OPTIONS_SINGLE=	MTA
 OPTIONS_SINGLE_MTA=	COURIER EXIM4 OPENSMTPD POSTFIX SENDMAIL
-OPTIONS_DEFINE=	HTDIG NAMAZU2 NLS DOCS
+OPTIONS_DEFINE=	NAMAZU2 NLS DOCS	# HTDIG defunct in 2.1.21
 OPTIONS_DEFAULT=	SENDMAIL
 COURIER_DESC=	for use with courier
 EXIM4_DESC=	for use with exim4
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 61044ae161c6..eac15ed06211 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,4 +1,4 @@
-SHA256 (mailman/mailman-2.1.20.tgz) = 522c2b5c5ab91398fdf949a8961162c314f6323cd1bfeb907e0fb2d88277711f
-SIZE (mailman/mailman-2.1.20.tgz) = 9204867
+SHA256 (mailman/mailman-2.1.21.tgz) = fed33a18154deaa4e81a20798c814485ed4b2e5d8b42cf6d3d55867ff4f70843
+SIZE (mailman/mailman-2.1.21.tgz) = 9266286
 SHA256 (mailman/index_htdig.patch.2.1.20) = 6b47c01b3d65b280829adc8d937e0e8b42d175cceb2a5bc7518e46819f960ac2
 SIZE (mailman/index_htdig.patch.2.1.20) = 324328
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index d7a6def0b6ef..5fb410574561 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -1,5 +1,5 @@
-@unexec if cmp -s %D/%%MMDIR%%/Mailman/mm_cfg.py %D/%%MMDIR%%/Mailman/mm_cfg.py.dist; then rm -f %D/%%MMDIR%%/Mailman/mm_cfg.py; fi
-@unexec rm -f %D/%%MMDIR%%/Mailman/mm_cfg.pyc
+@postunexec if cmp -s %D/%%MMDIR%%/Mailman/mm_cfg.py %D/%%MMDIR%%/Mailman/mm_cfg.py.dist; then rm -f %D/%%MMDIR%%/Mailman/mm_cfg.py; fi
+@postunexec rm -f %D/%%MMDIR%%/Mailman/mm_cfg.pyc
 %%IMGDIR%%/mailman-large.jpg
 %%IMGDIR%%/gnu-head-tiny.jpg
 %%IMGDIR%%/mailman.jpg
@@ -308,7 +308,7 @@
 %%MMDIR%%/Mailman/i18n.py
 %%MMDIR%%/Mailman/i18n.pyc
 %%MMDIR%%/Mailman/mm_cfg.py.dist
-@exec [ -f %B/mm_cfg.py ] || cp %B/%f %B/mm_cfg.py
+@postexec [ -f %B/mm_cfg.py ] || cp %B/%f %B/mm_cfg.py
 %%MMDIR%%/Mailman/versions.py
 %%MMDIR%%/Mailman/versions.pyc
 %%MMDIR%%/bin/FreeBSD-post-install
@@ -379,7 +379,7 @@
 %%MMDIR%%/cron/mailpasswds
 %%MMDIR%%/cron/nightly_gzip
 %%SUB_HTDIG%%%%MMDIR%%/cron/nightly_htdig
-@unexec rm -f %%MMDIR%%/cron/paths.pyc
+@postunexec rm -f %%MMDIR%%/cron/paths.pyc
 %%MMDIR%%/cron/paths.py
 %%SUB_HTDIG%%%%MMDIR%%/cron/remote_nightly_htdig
 %%SUB_HTDIG%%%%MMDIR%%/cron/remote_nightly_htdig.pl
@@ -716,6 +716,7 @@
 %%NLS%%%%MMDIR%%/templates/da/unsubauth.txt
 %%NLS%%%%MMDIR%%/templates/da/userpass.txt
 %%NLS%%%%MMDIR%%/templates/da/verify.txt
+%%NLS%%%%MMDIR%%/templates/de/adminaddrchgack.txt
 %%NLS%%%%MMDIR%%/templates/de/admindbdetails.html
 %%NLS%%%%MMDIR%%/templates/de/admindbpreamble.html
 %%NLS%%%%MMDIR%%/templates/de/admindbsummary.html
@@ -1351,6 +1352,7 @@
 %%NLS%%%%MMDIR%%/templates/it/verify.txt
 %%NLS%%%%MMDIR%%/templates/it/probe.txt
 %%NLS%%%%MMDIR%%/templates/ja/probe.txt
+%%NLS%%%%MMDIR%%/templates/ja/adminaddrchgack.txt
 %%NLS%%%%MMDIR%%/templates/ja/admindbdetails.html
 %%NLS%%%%MMDIR%%/templates/ja/admindbpreamble.html
 %%NLS%%%%MMDIR%%/templates/ja/admindbsummary.html
@@ -1555,9 +1557,6 @@
 %%NLS%%%%MMDIR%%/templates/no/unsubauth.txt
 %%NLS%%%%MMDIR%%/templates/no/userpass.txt
 %%NLS%%%%MMDIR%%/templates/no/verify.txt
-%%NLS%%%%MMDIR%%/templates/pl/admindbdetails.html
-%%NLS%%%%MMDIR%%/templates/pl/admindbpreamble.html
-%%NLS%%%%MMDIR%%/templates/pl/admindbsummary.html
 %%NLS%%%%MMDIR%%/templates/pl/adminsubscribeack.txt
 %%NLS%%%%MMDIR%%/templates/pl/adminunsubscribeack.txt
 %%NLS%%%%MMDIR%%/templates/pl/admlogin.html
@@ -1573,11 +1572,9 @@
 %%NLS%%%%MMDIR%%/templates/pl/article.html
 %%NLS%%%%MMDIR%%/templates/pl/bounce.txt
 %%NLS%%%%MMDIR%%/templates/pl/checkdbs.txt
-%%NLS%%%%MMDIR%%/templates/pl/convert.txt
 %%NLS%%%%MMDIR%%/templates/pl/cronpass.txt
 %%NLS%%%%MMDIR%%/templates/pl/disabled.txt
 %%NLS%%%%MMDIR%%/templates/pl/emptyarchive.html
-%%NLS%%%%MMDIR%%/templates/pl/headfoot.html
 %%NLS%%%%MMDIR%%/templates/pl/help.txt
 %%NLS%%%%MMDIR%%/templates/pl/invite.txt
 %%NLS%%%%MMDIR%%/templates/pl/listinfo.html