Update to 0.63. From the changelog:

* Python version 2.1 or greater is now required.  Upgrade at
  <URL:http://www.python.org/download/>

* When sending an auto response, a new configuration variable
  (AUTORESPONSE_INCLUDE_SENDER_COPY) is used to control whether a copy
  of the sender's message is included or not.  For available options,
  <URL:http://tmda.net/config-vars.html#AUTORESPONSE_INCLUDE_SENDER_COPY>

  If you are using customized templates, you should remove the last
  few lines in each template which include the sender's copy.  For
  example, in confirm_request.txt:

  --- Enclosed is a copy of your message.

  %(original_message)s

  Otherwise, you'll include two copies of the sender's message.

* When sending confirmation requests, Reply-To is now set from the
  confirm_request.txt template.  This is to allow the option to not
  include the confirmation address in a Reply-To header.

  If you use a customized confirm_request.txt, you'll need to add the
  following line to the top (header section) of your template:

  Reply-To: %(confirm_accept_address)s

3 files changed, 71 insertions, 14 deletions

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 68251450266..663342ac579 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/09/21 23:46:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/11/11 05:28:07 schmonz Exp $
 #
 
-DISTNAME=	tmda-0.61
+DISTNAME=	tmda-0.63
 CATEGORIES=	mail python
 MASTER_SITES=	http://tmda.net/releases/ \
 		http://tmda.net/releases/old/
@@ -11,6 +11,8 @@ MAINTAINER=	schmonz@netbsd.org
 HOMEPAGE=	http://tmda.net/
 COMMENT=	Python-based SPAM reduction system
 
+PYTHON_VERSIONS_ACCEPTED=	22 21
+
 PY_PATCHPLIST=		# defined
 PYTHON_PATCH_SCRIPTS=	${TMDA_PROGRAMS}
 
@@ -52,6 +54,10 @@ do-install:
 	${INSTALL_SCRIPT_DIR} ${PREFIX}/${PYSITELIB}/TMDA
 	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PREFIX}/${PYSITELIB}/TMDA
 
+	${INSTALL_SCRIPT_DIR} ${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email
+	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/pythonlib/email/*.py* \
+		${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email
+
 	${INSTALL_DATA_DIR} ${PREFIX}/${SHAREDIR}
 	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${PREFIX}/${SHAREDIR}
 
diff --git a/mail/tmda/PLIST b/mail/tmda/PLIST
index 988556eb55e..83fcbf81ac4 100644
--- a/mail/tmda/PLIST
+++ b/mail/tmda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/31 23:08:41 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/11/11 05:28:07 schmonz Exp $
 bin/tmda-address
 bin/tmda-check-address
 bin/tmda-filter
@@ -8,6 +8,8 @@ bin/tmda-ofmipd
 bin/tmda-pending
 bin/tmda-rfilter
 bin/tmda-sendmail
+${PYSITELIB}/TMDA/AutoResponse.py
+${PYSITELIB}/TMDA/AutoResponse.pyc
 ${PYSITELIB}/TMDA/Cookie.py
 ${PYSITELIB}/TMDA/Cookie.pyc
 ${PYSITELIB}/TMDA/Defaults.py
@@ -32,16 +34,62 @@ ${PYSITELIB}/TMDA/Version.py
 ${PYSITELIB}/TMDA/Version.pyc
 ${PYSITELIB}/TMDA/__init__.py
 ${PYSITELIB}/TMDA/__init__.pyc
+${PYSITELIB}/TMDA/pythonlib/email/Charset.py
+${PYSITELIB}/TMDA/pythonlib/email/Charset.pyc
+${PYSITELIB}/TMDA/pythonlib/email/Encoders.py
+${PYSITELIB}/TMDA/pythonlib/email/Encoders.pyc
+${PYSITELIB}/TMDA/pythonlib/email/Errors.py
+${PYSITELIB}/TMDA/pythonlib/email/Errors.pyc
+${PYSITELIB}/TMDA/pythonlib/email/Generator.py
+${PYSITELIB}/TMDA/pythonlib/email/Generator.pyc
+${PYSITELIB}/TMDA/pythonlib/email/Header.py
+${PYSITELIB}/TMDA/pythonlib/email/Header.pyc
+${PYSITELIB}/TMDA/pythonlib/email/Iterators.py
+${PYSITELIB}/TMDA/pythonlib/email/Iterators.pyc
+${PYSITELIB}/TMDA/pythonlib/email/MIMEAudio.py
+${PYSITELIB}/TMDA/pythonlib/email/MIMEAudio.pyc
+${PYSITELIB}/TMDA/pythonlib/email/MIMEBase.py
+${PYSITELIB}/TMDA/pythonlib/email/MIMEBase.pyc
+${PYSITELIB}/TMDA/pythonlib/email/MIMEImage.py
+${PYSITELIB}/TMDA/pythonlib/email/MIMEImage.pyc
+${PYSITELIB}/TMDA/pythonlib/email/MIMEMessage.py
+${PYSITELIB}/TMDA/pythonlib/email/MIMEMessage.pyc
+${PYSITELIB}/TMDA/pythonlib/email/MIMEMultipart.py
+${PYSITELIB}/TMDA/pythonlib/email/MIMEMultipart.pyc
+${PYSITELIB}/TMDA/pythonlib/email/MIMENonMultipart.py
+${PYSITELIB}/TMDA/pythonlib/email/MIMENonMultipart.pyc
+${PYSITELIB}/TMDA/pythonlib/email/MIMEText.py
+${PYSITELIB}/TMDA/pythonlib/email/MIMEText.pyc
+${PYSITELIB}/TMDA/pythonlib/email/Message.py
+${PYSITELIB}/TMDA/pythonlib/email/Message.pyc
+${PYSITELIB}/TMDA/pythonlib/email/Parser.py
+${PYSITELIB}/TMDA/pythonlib/email/Parser.pyc
+${PYSITELIB}/TMDA/pythonlib/email/Utils.py
+${PYSITELIB}/TMDA/pythonlib/email/Utils.pyc
+${PYSITELIB}/TMDA/pythonlib/email/__init__.py
+${PYSITELIB}/TMDA/pythonlib/email/__init__.pyc
+${PYSITELIB}/TMDA/pythonlib/email/_compat21.py
+${PYSITELIB}/TMDA/pythonlib/email/_compat21.pyc
+${PYSITELIB}/TMDA/pythonlib/email/_compat22.py
+${PYSITELIB}/TMDA/pythonlib/email/_compat22.pyc
+${PYSITELIB}/TMDA/pythonlib/email/_parseaddr.py
+${PYSITELIB}/TMDA/pythonlib/email/_parseaddr.pyc
+${PYSITELIB}/TMDA/pythonlib/email/base64MIME.py
+${PYSITELIB}/TMDA/pythonlib/email/base64MIME.pyc
+${PYSITELIB}/TMDA/pythonlib/email/quopriMIME.py
+${PYSITELIB}/TMDA/pythonlib/email/quopriMIME.pyc
 ${HTMLDIR}/bugs.html
 ${HTMLDIR}/config-client.html
 ${HTMLDIR}/config-filter.html
 ${HTMLDIR}/config-pre.html
 ${HTMLDIR}/config-server.html
+${HTMLDIR}/config-vars.html
 ${HTMLDIR}/config.html
 ${HTMLDIR}/download.html
 ${HTMLDIR}/features.html
 ${HTMLDIR}/filter-sources.html
 ${HTMLDIR}/history.html
+${HTMLDIR}/howto-template.html
 ${HTMLDIR}/howtos.html
 ${HTMLDIR}/index.html
 ${HTMLDIR}/install.html
@@ -59,18 +107,21 @@ ${DOCDIR}/INSTALL
 ${DOCDIR}/README
 ${DOCDIR}/THANKS
 ${DOCDIR}/UPGRADE
-${CONTRIBDIR}/ChangeLog
-${CONTRIBDIR}/collectaddys
-${CONTRIBDIR}/printcdb
-${CONTRIBDIR}/printdbm
-${CONTRIBDIR}/sample.tmdarc
-${CONTRIBDIR}/tmda.el
-${CONTRIBDIR}/tmda.spec
+${DOCDIR}/contrib/ChangeLog
+${DOCDIR}/contrib/collectaddys
+${DOCDIR}/contrib/def2html
+${DOCDIR}/contrib/printcdb
+${DOCDIR}/contrib/printdbm
+${DOCDIR}/contrib/sample.tmdarc
+${DOCDIR}/contrib/tmda.el
+${DOCDIR}/contrib/tmda.spec
 ${SHAREDIR}/bounce.txt
 ${SHAREDIR}/confirm_accept.txt
 ${SHAREDIR}/confirm_request.txt
 @dirrm ${SHAREDIR}
-@dirrm ${CONTRIBDIR}
+@dirrm ${DOCDIR}/contrib
 @dirrm ${DOCDIR}
 @dirrm ${HTMLDIR}
+@dirrm ${PYSITELIB}/TMDA/pythonlib/email
+@dirrm ${PYSITELIB}/TMDA/pythonlib
 @dirrm ${PYSITELIB}/TMDA
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index 0ac0e023348..0f07d88b967 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/08/31 23:08:41 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2002/11/11 05:28:07 schmonz Exp $
 
-SHA1 (tmda-0.61.tgz) = ffc9428eebb092debf3578635e0b6ed5648fb9f2
-Size (tmda-0.61.tgz) = 153537 bytes
+SHA1 (tmda-0.63.tgz) = b8fe0357111d21a786148fada1a51e50dc7aa33d
+Size (tmda-0.63.tgz) = 230959 bytes