3 files changed, 39 insertions, 37 deletions

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 8f649df84c70..cc1d7ecbc9a7 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	tmda
-PORTVERSION=	0.59
+PORTVERSION=	0.61
 CATEGORIES=	mail python
-MASTER_SITES=	http://tmda.net/releases/ \
-		http://tmda.net/releases/old/
+MASTER_SITES=	http://tmda.net/releases/%SUBDIR%/
+MASTER_SITE_SUBDIR= . old
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mwm@mired.org
@@ -25,23 +25,21 @@ pre-install:
 do-install:
 	${MKDIR} ${PYTHON_SITELIBDIR}/TMDA
 	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PYTHON_SITELIBDIR}/TMDA
-	${MKDIR} ${PREFIX}/share/tmda
-	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${PREFIX}/share/tmda
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tmda-* ${PREFIX}/bin
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/tmda
-	${MKDIR} ${PREFIX}/share/doc/tmda/contrib
-	${MKDIR} ${PREFIX}/share/doc/tmda/htdocs
+	${MKDIR} ${DOCSDIR} ${DOCSDIR}/contrib ${DOCSDIR}/htdocs
 .for f in COPYING CRYPTO ChangeLog INSTALL README THANKS UPGRADE
-	@${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/tmda
+	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/contrib/* ${PREFIX}/share/doc/tmda/contrib
-	@${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${PREFIX}/share/doc/tmda/htdocs
+	@${INSTALL_DATA} ${WRKSRC}/contrib/* ${DOCSDIR}/contrib
+	@${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${DOCSDIR}/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
+	@${ECHO_MSG} See ${DOCSDIR}/INSTALL for configuration instructions
+	@${ECHO_MSG} See ${DOCSDIR}/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 f93ffb592131..5d99705787ae 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1 +1 @@
-MD5 (tmda-0.59.tgz) = 680da61ae93badaf60dde34f6ff095ee
+MD5 (tmda-0.61.tgz) = 37fc7f4f8fd9a70a0470704d874eaee9
diff --git a/mail/tmda/pkg-plist b/mail/tmda/pkg-plist
index 51024b12abcc..d89d8423ce33 100644
--- a/mail/tmda/pkg-plist
+++ b/mail/tmda/pkg-plist
@@ -7,28 +7,30 @@ bin/tmda-ofmipd
 bin/tmda-pending
 bin/tmda-rfilter
 bin/tmda-sendmail
-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/Deliver.py
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/Deliver.pyc
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/Errors.py
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/Errors.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
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/MTA.pyc
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/SMTP.py
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/SMTP.pyc
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/Util.py
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/Util.pyc
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/Version.py
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/Version.pyc
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/TMDA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/Cookie.py
+%%PYTHON_SITELIBDIR%%/TMDA/Cookie.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/Defaults.py
+%%PYTHON_SITELIBDIR%%/TMDA/Defaults.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/Deliver.py
+%%PYTHON_SITELIBDIR%%/TMDA/Deliver.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/Errors.py
+%%PYTHON_SITELIBDIR%%/TMDA/Errors.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/FilterParser.py
+%%PYTHON_SITELIBDIR%%/TMDA/FilterParser.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/HMAC.py
+%%PYTHON_SITELIBDIR%%/TMDA/HMAC.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/MTA.py
+%%PYTHON_SITELIBDIR%%/TMDA/MTA.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/MessageLogger.py
+%%PYTHON_SITELIBDIR%%/TMDA/MessageLogger.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/SMTP.py
+%%PYTHON_SITELIBDIR%%/TMDA/SMTP.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/Util.py
+%%PYTHON_SITELIBDIR%%/TMDA/Util.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/Version.py
+%%PYTHON_SITELIBDIR%%/TMDA/Version.pyc
+%%PYTHON_SITELIBDIR%%/TMDA/__init__.py
+%%PYTHON_SITELIBDIR%%/TMDA/__init__.pyc
 %%PORTDOCS%%share/doc/tmda/COPYING
 %%PORTDOCS%%share/doc/tmda/CRYPTO
 %%PORTDOCS%%share/doc/tmda/ChangeLog
@@ -51,11 +53,13 @@ lib/%%PYTHON_VERSION%%/site-packages/TMDA/__init__.pyc
 %%PORTDOCS%%share/doc/tmda/htdocs/config.html
 %%PORTDOCS%%share/doc/tmda/htdocs/download.html
 %%PORTDOCS%%share/doc/tmda/htdocs/features.html
+%%PORTDOCS%%share/doc/tmda/htdocs/filter-sources.html
 %%PORTDOCS%%share/doc/tmda/htdocs/history.html
 %%PORTDOCS%%share/doc/tmda/htdocs/howtos.html
 %%PORTDOCS%%share/doc/tmda/htdocs/index.html
 %%PORTDOCS%%share/doc/tmda/htdocs/install.html
 %%PORTDOCS%%share/doc/tmda/htdocs/inuse.html
+%%PORTDOCS%%share/doc/tmda/htdocs/press.html
 %%PORTDOCS%%share/doc/tmda/htdocs/requirements.html
 %%PORTDOCS%%share/doc/tmda/htdocs/resources.html
 %%PORTDOCS%%share/doc/tmda/htdocs/results.html
@@ -68,4 +72,4 @@ share/tmda/confirm_request.txt
 %%PORTDOCS%%@dirrm share/doc/tmda/contrib
 %%PORTDOCS%%@dirrm share/doc/tmda/htdocs
 %%PORTDOCS%%@dirrm share/doc/tmda
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/TMDA
+@dirrm %%PYTHON_SITELIBDIR%%/TMDA