- update to 0.42

- have a seperate directory for contrib scripts/etc
- mention the UPGRADE file

PR:		32484
Submitted by:	maintainer

3 files changed, 19 insertions, 8 deletions

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index e517e5bb17db..6ff3e0339ab6 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tmda
-PORTVERSION=	0.40
+PORTVERSION=	0.42
 CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tmda
@@ -29,13 +29,16 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/tmda
+	${MKDIR} ${PREFIX}/share/doc/tmda/contrib
 	${MKDIR} ${PREFIX}/share/doc/tmda/htdocs
-.for f in ChangeLog COPYRIGHT CRYPTO INSTALL README THANKS TODO UPGRADE contrib/*.*
+.for f in ChangeLog COPYRIGHT CRYPTO INSTALL README THANKS UPGRADE
 	@${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/tmda
 .endfor
+	@${INSTALL_DATA} ${WRKSRC}/contrib/* ${PREFIX}/share/doc/tmda/contrib
 	@${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${PREFIX}/share/doc/tmda/htdocs
 	@${ECHO_MSG}
 	@${ECHO_MSG} See ${PREFIX}/share/doc/tmda/INSTALL for configuration instructions
+	@${ECHO_MSG} See ${PREFIX}/share/doc/tmda/UPGRADE if upgrading from a previous release
 .endif
 	@${ECHO_MSG} All related programs have been installed in ${PREFIX}/bin
 	@${ECHO_MSG}
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index cb43a0fb2ca0..ebcac0173a64 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1 +1 @@
-MD5 (tmda-0.40.tgz) = 37c1489ff1b5aedf6225d230b41e4c6f
+MD5 (tmda-0.42.tgz) = 9b79c4340774ad6c482417e25490593f
diff --git a/mail/tmda/pkg-plist b/mail/tmda/pkg-plist
index bc3965352590..be2e67db166f 100644
--- a/mail/tmda/pkg-plist
+++ b/mail/tmda/pkg-plist
@@ -11,6 +11,8 @@ lib/%%PYTHON_VERSION%%/site-packages/TMDA/Cookie.py
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/Cookie.pyc
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/Defaults.py
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/Defaults.pyc
+lib/%%PYTHON_VERSION%%/site-packages/TMDA/FilterParser.py
+lib/%%PYTHON_VERSION%%/site-packages/TMDA/FilterParser.pyc
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/HMAC.py
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/HMAC.pyc
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/MTA.py
@@ -24,15 +26,20 @@ lib/%%PYTHON_VERSION%%/site-packages/TMDA/__init__.pyc
 %%PORTDOCS%%share/doc/tmda/ChangeLog
 %%PORTDOCS%%share/doc/tmda/INSTALL
 %%PORTDOCS%%share/doc/tmda/README
-%%PORTDOCS%%share/doc/tmda/README.RELAY
 %%PORTDOCS%%share/doc/tmda/THANKS
-%%PORTDOCS%%share/doc/tmda/TODO
 %%PORTDOCS%%share/doc/tmda/UPGRADE
-%%PORTDOCS%%share/doc/tmda/qmail-smtpd_auth.patch
-%%PORTDOCS%%share/doc/tmda/sample.tmdarc
-%%PORTDOCS%%share/doc/tmda/tmda.spec
+%%PORTDOCS%%share/doc/tmda/contrib/ChangeLog
+%%PORTDOCS%%share/doc/tmda/contrib/README.RELAY
+%%PORTDOCS%%share/doc/tmda/contrib/list2cdb
+%%PORTDOCS%%share/doc/tmda/contrib/list2dbm
+%%PORTDOCS%%share/doc/tmda/contrib/printcdb
+%%PORTDOCS%%share/doc/tmda/contrib/printdbm
+%%PORTDOCS%%share/doc/tmda/contrib/qmail-smtpd_auth.patch
+%%PORTDOCS%%share/doc/tmda/contrib/sample.tmdarc
+%%PORTDOCS%%share/doc/tmda/contrib/tmda.spec
 %%PORTDOCS%%share/doc/tmda/htdocs/bugs.html
 %%PORTDOCS%%share/doc/tmda/htdocs/config-client.html
+%%PORTDOCS%%share/doc/tmda/htdocs/config-filter.html
 %%PORTDOCS%%share/doc/tmda/htdocs/config-pre.html
 %%PORTDOCS%%share/doc/tmda/htdocs/config-server.html
 %%PORTDOCS%%share/doc/tmda/htdocs/config.html
@@ -50,6 +57,7 @@ lib/%%PYTHON_VERSION%%/site-packages/TMDA/__init__.pyc
 share/tmda/confirm_accept.txt
 share/tmda/confirm_request.txt
 @dirrm share/tmda
+%%PORTDOCS%%@dirrm share/doc/tmda/contrib
 %%PORTDOCS%%@dirrm share/doc/tmda/htdocs
 %%PORTDOCS%%@dirrm share/doc/tmda
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/TMDA