5 files changed, 33 insertions, 22 deletions

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 6747393fd9ec..e517e5bb17db 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tmda
-PORTVERSION=	0.37
+PORTVERSION=	0.40
 CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tmda
@@ -14,16 +14,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jason@mastaler.com
 
-RUN_DEPENDS=    ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
-
 USE_PYTHON=	yes
 
-.if exists(${PREFIX}/qmail/bin/qmail-send)
-QMAIL_DIR?=     ${PREFIX}/qmail
-.else
-QMAIL_DIR?=     /var/qmail
-.endif
-
 do-build:
 	(cd ${WRKSRC}; ${PYTHON_CMD} ./compileall)
 
@@ -37,9 +29,11 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/tmda
-.for f in ChangeLog COPYRIGHT CRYPTO FAQ INSTALL README THANKS TODO UPGRADE contrib/*.* doc/tmda*
+	${MKDIR} ${PREFIX}/share/doc/tmda/htdocs
+.for f in ChangeLog COPYRIGHT CRYPTO INSTALL README THANKS TODO UPGRADE contrib/*.*
 	@${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/tmda
 .endfor
+	@${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${PREFIX}/share/doc/tmda/htdocs
 	@${ECHO_MSG}
 	@${ECHO_MSG} See ${PREFIX}/share/doc/tmda/INSTALL for configuration instructions
 .endif
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index 8419e8d0c117..cb43a0fb2ca0 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1 +1 @@
-MD5 (tmda-0.37.tgz) = bc102d3e73f932d37d573134f0381201
+MD5 (tmda-0.40.tgz) = 37c1489ff1b5aedf6225d230b41e4c6f
diff --git a/mail/tmda/pkg-comment b/mail/tmda/pkg-comment
index 61db76484adc..c8bdb9fa78d3 100644
--- a/mail/tmda/pkg-comment
+++ b/mail/tmda/pkg-comment
@@ -1 +1 @@
-SPAM reduction system for qmail
+Python-based SPAM reduction system
diff --git a/mail/tmda/pkg-descr b/mail/tmda/pkg-descr
index 546df113b7d8..1b544757b4aa 100644
--- a/mail/tmda/pkg-descr
+++ b/mail/tmda/pkg-descr
@@ -1,10 +1,9 @@
 Tagged Message Delivery Agent (TMDA).
 
-TMDA is an OSI certified Python application for qmail systems
-designed to significantly reduce the amount of SPAM/UCE you receive.
-A "whitelist" filter allows known contacts immediately into your
-mailbox, and all others must reply to a simple confirmation to
-validate their message.  Once they respond to the confirmation,
-their original message is delivered to you.
+TMDA is an OSI certified software application designed to
+significantly reduce the amount of SPAM/UCE (junk-mail) you receive.
+TMDA combines a "whitelist" (for known/trusted senders), a "blacklist"
+(for undesired senders), and a cryptographically enhanced confirmation
+system (for unknown, but legitimate senders).
 
 WWW: http://tmda.sourceforge.net/
diff --git a/mail/tmda/pkg-plist b/mail/tmda/pkg-plist
index 98cbca85e129..bc3965352590 100644
--- a/mail/tmda/pkg-plist
+++ b/mail/tmda/pkg-plist
@@ -4,6 +4,7 @@ bin/tmda-dated-address
 bin/tmda-filter
 bin/tmda-inject
 bin/tmda-keygen
+bin/tmda-keyword-address
 bin/tmda-sender-address
 bin/tmda-sendmail
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/Cookie.py
@@ -12,16 +13,15 @@ lib/%%PYTHON_VERSION%%/site-packages/TMDA/Defaults.py
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/Defaults.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/Util.py
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/Util.pyc
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/TMDA/__init__.pyc
-share/tmda/confirm_accept.txt
-share/tmda/confirm_request.txt
 %%PORTDOCS%%share/doc/tmda/COPYRIGHT
 %%PORTDOCS%%share/doc/tmda/CRYPTO
 %%PORTDOCS%%share/doc/tmda/ChangeLog
-%%PORTDOCS%%share/doc/tmda/FAQ
 %%PORTDOCS%%share/doc/tmda/INSTALL
 %%PORTDOCS%%share/doc/tmda/README
 %%PORTDOCS%%share/doc/tmda/README.RELAY
@@ -31,7 +31,25 @@ share/tmda/confirm_request.txt
 %%PORTDOCS%%share/doc/tmda/qmail-smtpd_auth.patch
 %%PORTDOCS%%share/doc/tmda/sample.tmdarc
 %%PORTDOCS%%share/doc/tmda/tmda.spec
-%%PORTDOCS%%share/doc/tmda/tmda.html
+%%PORTDOCS%%share/doc/tmda/htdocs/bugs.html
+%%PORTDOCS%%share/doc/tmda/htdocs/config-client.html
+%%PORTDOCS%%share/doc/tmda/htdocs/config-pre.html
+%%PORTDOCS%%share/doc/tmda/htdocs/config-server.html
+%%PORTDOCS%%share/doc/tmda/htdocs/config.html
+%%PORTDOCS%%share/doc/tmda/htdocs/download.html
+%%PORTDOCS%%share/doc/tmda/htdocs/faq.html
+%%PORTDOCS%%share/doc/tmda/htdocs/features.html
+%%PORTDOCS%%share/doc/tmda/htdocs/history.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/lists.html
+%%PORTDOCS%%share/doc/tmda/htdocs/requirements.html
+%%PORTDOCS%%share/doc/tmda/htdocs/resources.html
+%%PORTDOCS%%share/doc/tmda/htdocs/results.html
+share/tmda/confirm_accept.txt
+share/tmda/confirm_request.txt
 @dirrm share/tmda
+%%PORTDOCS%%@dirrm share/doc/tmda/htdocs
 %%PORTDOCS%%@dirrm share/doc/tmda
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/TMDA