4 files changed, 88 insertions, 80 deletions

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index ecbbd866ccd4..1b32c8fca2fb 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -6,9 +6,13 @@
 #
 
 PORTNAME=	tmda
-PORTVERSION=	0.76
+PORTVERSION=	0.78
 CATEGORIES=	mail python
-MASTER_SITES=	http://tmda.net/releases/%SUBDIR%/
+MASTER_SITES=	http://www.tmda.net/releases/%SUBDIR%/ \
+		http://www.us.tmda.net/releases/%SUBDIR%/ \
+		http://tmda.mirrors.summersault.com/releases/%SUBDIR%/ \
+		http://mirrors.standblue.net/tmda.net/releases/%SUBDIR%/ \
+		http://www.au.tmda.net/releases/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
 EXTRACT_SUFX=	.tgz
 
@@ -17,37 +21,40 @@ COMMENT=	Python-based SPAM reduction system
 
 USE_PYTHON=	yes
 
-do-build:
-	(cd ${WRKSRC}; ${PYTHON_CMD} ./compileall)
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+DOCS=		CODENAMES CRYPTO THANKS UPGRADE htdocs/*.html
+CONTRIB=	collectaddys def2html printcdb printdbm \
+		sendit.sh tmda.el vadduser-tmda
 
-pre-install:
-	@${SH} ${PKGREQ} INSTALL
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 210
+BROKEN=		"TMDA requries Python 2.1 or greater"
+.endif
+
+do-build:
+	cd ${WRKSRC} && ${PYTHON_CMD} ./compileall
 
 do-install:
-	${MKDIR} ${PYTHON_SITELIBDIR}/TMDA/pythonlib/email
-	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PYTHON_SITELIBDIR}/TMDA
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/TMDA/pythonlib/email
+	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PYTHONPREFIX_SITELIBDIR}/TMDA
 	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/pythonlib/email/*.py* \
-		${PYTHON_SITELIBDIR}/TMDA/pythonlib/email
-	${MKDIR} ${DATADIR}
+		${PYTHONPREFIX_SITELIBDIR}/TMDA/pythonlib/email
+	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tmda-* ${PREFIX}/bin
-
-post-install:
+	@${MKDIR} ${EXAMPLESDIR}/contrib
+	cd ${WRKSRC}/contrib && \
+		${INSTALL_DATA} sample.config ${EXAMPLESDIR} && \
+		${INSTALL_DATA} ${CONTRIB} ${EXAMPLESDIR}/contrib
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/contrib ${DOCSDIR}/htdocs
-.for f in CODENAMES COPYING CRYPTO ChangeLog INSTALL README THANKS UPGRADE
-	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
-.endfor
-.for f in ChangeLog collectaddys printcdb sample.config sendit.sh tmda.spec \
-		def2html printdbm tmda.el vadduser-tmda
-	@${INSTALL_DATA} ${WRKSRC}/contrib/$f ${DOCSDIR}/contrib
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${DOCSDIR}/htdocs
-	@${ECHO_MSG}
-	@${ECHO_MSG} See ${DOCSDIR}/INSTALL for configuration instructions
-	@${ECHO_MSG} See ${DOCSDIR}/UPGRADE if upgrading from a previous release
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	@${ECHO_MSG} All related programs have been installed in ${PREFIX}/bin
-	@${ECHO_MSG}
+	@${SED} -e 's!PREFIX!${PREFIX}!; s!DOCSDIR!${DOCSDIR}!;' \
+	       -e 's!EXAMPLESDIR!${EXAMPLESDIR}!' ${.CURDIR}/pkg-message \
+	       > ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index 588a43621bc6..c8dd66b7445e 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1 +1 @@
-MD5 (tmda-0.76.tgz) = 71531e95ad56994e03072bc3a1ca91e9
+MD5 (tmda-0.78.tgz) = a3abd8f0afd22d84940a1919c3ae59f8
diff --git a/mail/tmda/pkg-message b/mail/tmda/pkg-message
new file mode 100644
index 000000000000..51c5eda8c2f2
--- /dev/null
+++ b/mail/tmda/pkg-message
@@ -0,0 +1,6 @@
+
+	All TMDA programs have been installed in PREFIX/bin.
+	Documentation is located in DOCSDIR.
+	See DOCSDIR/UPGRADE if upgrading from a previous release.
+	Sample config file: EXAMPLESDIR/sample.config
+
diff --git a/mail/tmda/pkg-plist b/mail/tmda/pkg-plist
index 4e2d7261bf22..ff8a864a99d5 100644
--- a/mail/tmda/pkg-plist
+++ b/mail/tmda/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/tmda-gui
 bin/tmda-manager
 bin/tmda-address
@@ -53,6 +54,8 @@ bin/tmda-sendmail
 %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/base64MIME.pyc
 %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/quopriMIME.py
 %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/quopriMIME.pyc
+@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email
+@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib
 %%PYTHON_SITELIBDIR%%/TMDA/Address.py
 %%PYTHON_SITELIBDIR%%/TMDA/Address.pyc
 %%PYTHON_SITELIBDIR%%/TMDA/Auth.py
@@ -85,56 +88,48 @@ bin/tmda-sendmail
 %%PYTHON_SITELIBDIR%%/TMDA/Version.pyc
 %%PYTHON_SITELIBDIR%%/TMDA/__init__.py
 %%PYTHON_SITELIBDIR%%/TMDA/__init__.pyc
-%%PORTDOCS%%share/doc/tmda/CODENAMES
-%%PORTDOCS%%share/doc/tmda/COPYING
-%%PORTDOCS%%share/doc/tmda/CRYPTO
-%%PORTDOCS%%share/doc/tmda/ChangeLog
-%%PORTDOCS%%share/doc/tmda/INSTALL
-%%PORTDOCS%%share/doc/tmda/README
-%%PORTDOCS%%share/doc/tmda/THANKS
-%%PORTDOCS%%share/doc/tmda/UPGRADE
-%%PORTDOCS%%share/doc/tmda/contrib/ChangeLog
-%%PORTDOCS%%share/doc/tmda/contrib/collectaddys
-%%PORTDOCS%%share/doc/tmda/contrib/printcdb
-%%PORTDOCS%%share/doc/tmda/contrib/printdbm
-%%PORTDOCS%%share/doc/tmda/contrib/sample.config
-%%PORTDOCS%%share/doc/tmda/contrib/sendit.sh
-%%PORTDOCS%%share/doc/tmda/contrib/tmda.el
-%%PORTDOCS%%share/doc/tmda/contrib/tmda.spec
-%%PORTDOCS%%share/doc/tmda/contrib/def2html
-%%PORTDOCS%%share/doc/tmda/contrib/vadduser-tmda
-%%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-vars.html
-%%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/howto-template.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/mirrors.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
-%%PORTDOCS%%share/doc/tmda/htdocs/support-commercial.html
-%%PORTDOCS%%share/doc/tmda/htdocs/tmda-ofmipd.html
-%%PORTDOCS%%share/doc/tmda/htdocs/tmda-vdomains.html
-%%PORTDOCS%%share/doc/tmda/htdocs/trouble.html
-share/tmda/bounce.txt
-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 %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email
-@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib
 @dirrm %%PYTHON_SITELIBDIR%%/TMDA
+%%PORTDOCS%%%%DOCSDIR%%/CODENAMES
+%%PORTDOCS%%%%DOCSDIR%%/CRYPTO
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
+%%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/config-client.html
+%%PORTDOCS%%%%DOCSDIR%%/config-filter.html
+%%PORTDOCS%%%%DOCSDIR%%/config-pre.html
+%%PORTDOCS%%%%DOCSDIR%%/config-server.html
+%%PORTDOCS%%%%DOCSDIR%%/config-vars.html
+%%PORTDOCS%%%%DOCSDIR%%/config.html
+%%PORTDOCS%%%%DOCSDIR%%/download.html
+%%PORTDOCS%%%%DOCSDIR%%/features.html
+%%PORTDOCS%%%%DOCSDIR%%/filter-sources.html
+%%PORTDOCS%%%%DOCSDIR%%/history.html
+%%PORTDOCS%%%%DOCSDIR%%/howto-template.html
+%%PORTDOCS%%%%DOCSDIR%%/howtos.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/inuse.html
+%%PORTDOCS%%%%DOCSDIR%%/mirrors.html
+%%PORTDOCS%%%%DOCSDIR%%/press.html
+%%PORTDOCS%%%%DOCSDIR%%/requirements.html
+%%PORTDOCS%%%%DOCSDIR%%/resources.html
+%%PORTDOCS%%%%DOCSDIR%%/results.html
+%%PORTDOCS%%%%DOCSDIR%%/support-commercial.html
+%%PORTDOCS%%%%DOCSDIR%%/tmda-ofmipd.html
+%%PORTDOCS%%%%DOCSDIR%%/tmda-vdomains.html
+%%PORTDOCS%%%%DOCSDIR%%/trouble.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/contrib/collectaddys
+%%EXAMPLESDIR%%/contrib/def2html
+%%EXAMPLESDIR%%/contrib/printcdb
+%%EXAMPLESDIR%%/contrib/printdbm
+%%EXAMPLESDIR%%/contrib/sendit.sh
+%%EXAMPLESDIR%%/contrib/tmda.el
+%%EXAMPLESDIR%%/contrib/vadduser-tmda
+@dirrm %%EXAMPLESDIR%%/contrib
+%%EXAMPLESDIR%%/sample.config
+@dirrm %%EXAMPLESDIR%%
+%%DATADIR%%/bounce.txt
+%%DATADIR%%/confirm_accept.txt
+%%DATADIR%%/confirm_request.txt
+@dirrm %%DATADIR%%