- Update to 0.80 ("Determine"):

  * New feature from Cory Wright.  TEMPLATE_DIR_MATCH_RECIPIENT will
    search for a template directory based on the recipient address.
  * New feature.  The bounce,reject FILTER_INCOMING action now takes an
    optional 'template' argument to bounce using a specific template
    rather than the default template (bounce.txt).
- Install missing contributed scripts/configs

Noticed by:	Jason R. Mastaler <jason@mastaler.com>
PR:		53297
Submitted by:	Sergei Kolobov <sergei@kolobov.com>
Approved by:	Mike Meyer <mwm@mired.org> (MAINTAINER)

4 files changed, 27 insertions, 34 deletions

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 1b32c8fca2fb..797942828f09 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tmda
-PORTVERSION=	0.78
+PORTVERSION=	0.80
 CATEGORIES=	mail python
 MASTER_SITES=	http://www.tmda.net/releases/%SUBDIR%/ \
 		http://www.us.tmda.net/releases/%SUBDIR%/ \
@@ -23,9 +23,12 @@ USE_PYTHON=	yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-DOCS=		CODENAMES CRYPTO THANKS UPGRADE htdocs/*.html
-CONTRIB=	collectaddys def2html printcdb printdbm \
-		sendit.sh tmda.el vadduser-tmda
+DOCS=		CODENAMES CRYPTO README THANKS UPGRADE htdocs/*.html
+SAMPLES=	sample.config tmda.el tofmipd.sysconfig vtmdarc
+SCRIPTS=	collectaddys def2html printcdb printdbm sendit.sh \
+	 	smtp-check-sender tofmipd.init tofmipd.sysconfig \
+		update-internaldomains vadduser-tmda vmailmgr-vdir.sh \
+		vpopmail-vdir.sh wrapfd3.sh
 
 .include <bsd.port.pre.mk>
 
@@ -44,10 +47,9 @@ do-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tmda-* ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}/contrib
-	cd ${WRKSRC}/contrib && \
-		${INSTALL_DATA} sample.config ${EXAMPLESDIR} && \
-		${INSTALL_DATA} ${CONTRIB} ${EXAMPLESDIR}/contrib
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/contrib && ${INSTALL_DATA} ${SAMPLES} ${EXAMPLESDIR}
+	cd ${WRKSRC}/contrib && ${INSTALL_SCRIPT} ${SCRIPTS} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index c8dd66b7445e..5d1726cab031 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1 +1 @@
-MD5 (tmda-0.78.tgz) = a3abd8f0afd22d84940a1919c3ae59f8
+MD5 (tmda-0.80.tgz) = 2d724818d30799391eb8ab0901347dec
diff --git a/mail/tmda/pkg-plist b/mail/tmda/pkg-plist
index ff8a864a99d5..b98725247e39 100644
--- a/mail/tmda/pkg-plist
+++ b/mail/tmda/pkg-plist
@@ -91,6 +91,7 @@ bin/tmda-sendmail
 @dirrm %%PYTHON_SITELIBDIR%%/TMDA
 %%PORTDOCS%%%%DOCSDIR%%/CODENAMES
 %%PORTDOCS%%%%DOCSDIR%%/CRYPTO
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/bugs.html
@@ -119,15 +120,22 @@ bin/tmda-sendmail
 %%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%%/collectaddys
+%%EXAMPLESDIR%%/def2html
+%%EXAMPLESDIR%%/printcdb
+%%EXAMPLESDIR%%/printdbm
 %%EXAMPLESDIR%%/sample.config
+%%EXAMPLESDIR%%/sendit.sh
+%%EXAMPLESDIR%%/smtp-check-sender
+%%EXAMPLESDIR%%/tmda.el
+%%EXAMPLESDIR%%/tofmipd.init
+%%EXAMPLESDIR%%/tofmipd.sysconfig
+%%EXAMPLESDIR%%/update-internaldomains
+%%EXAMPLESDIR%%/vadduser-tmda
+%%EXAMPLESDIR%%/vmailmgr-vdir.sh
+%%EXAMPLESDIR%%/vpopmail-vdir.sh
+%%EXAMPLESDIR%%/vtmdarc
+%%EXAMPLESDIR%%/wrapfd3.sh
 @dirrm %%EXAMPLESDIR%%
 %%DATADIR%%/bounce.txt
 %%DATADIR%%/confirm_accept.txt
diff --git a/mail/tmda/pkg-req b/mail/tmda/pkg-req
deleted file mode 100644
index 2d7e408d9b3f..000000000000
--- a/mail/tmda/pkg-req
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PATH=$PATH:/usr/local/bin
-
-if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
-  PYTHON_GT=`python -c 'import string, sys; \
-                        print string.split(sys.version)[0] >= "2.1"'`
-  if [ "x${PYTHON_GT}" = "x1" ]; then
-    exit 0
-  else
-    echo "-----------------------------------------------------------"
-    echo "  TMDA requires Python version 2.1 or greater -"
-    echo "  please update your Python installation before proceeding."
-    echo "-----------------------------------------------------------"
-    exit 1
-  fi
-fi