- Update to 1.1.5

  This is the latest stable release of TMDA
  1.1 is now the stable branch, 1.0 branch has been obsoleted
  Changes include:
  - ~/.tmdarc configuration file has been obsoleted by
    ~/.tmda/ configuration directory - see EXAMPLESDIR/dot-tmda
  - only minimal set of HTML documentation is installed;
    please see http://wiki.tmda.net/ for full documentation
  - templates has changed: single bounce.txt has been replaced
    with various bounce_*.txt templates; see DATADIR
- Sync MASTER_SITES to the official mirror list
- Use SUB_FILES mechanism for pkg-message customization

5 files changed, 57 insertions, 53 deletions

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index ca3f5d156882..f2c09522ea2c 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	tmda
-PORTVERSION=	1.0.3
+PORTVERSION=	1.1.5
 CATEGORIES=	mail python
-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.de.tmda.net/releases/%SUBDIR%/ \
-		http://www.pl.tmda.net/releases/%SUBDIR%/ \
-		http://www.au.tmda.net/releases/%SUBDIR%/
-MASTER_SITE_SUBDIR=	stable
+MASTER_SITES=	http://tmda.sourceforge.net/releases/ \
+		http://tmda.mirrors.summersault.com/releases/ \
+		http://mirrors.standblue.net/tmda.net/releases/ \
+		http://tmda.paracode.com/releases/ \
+		http://tmda.rtin.bz/releases/ \
+		http://ftp.heanet.ie/mirrors/tmda.net/releases/ \
+		http://tmda.moscuito.net/releases/ \
+		http://dl.ambiweb.de/mirrors/www.tmda.net/releases/ \
+		http://tmda.pradnik.net/releases/ \
+		http://tmda.planetmirror.com/releases/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sergei@FreeBSD.org
@@ -27,11 +29,11 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
 
 USE_PYTHON=	2.1+
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 
-DOCS=		CODENAMES CRYPTO README THANKS UPGRADE htdocs/*.html
-DOCS2=		htdocs/img/*.png
-SAMPLES=	sample.config tmda.el tofmipd.sysconfig vtmdarc
+DOCS=		CODENAMES CRYPTO README THANKS UPGRADE \
+		htdocs/README htdocs/*.html htdocs/*.css
+SAMPLES=	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 \
@@ -48,18 +50,19 @@ do-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tmda-* ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/contrib && ${INSTALL_DATA} ${SAMPLES} ${EXAMPLESDIR}
-	cd ${WRKSRC}/contrib && ${INSTALL_SCRIPT} ${SCRIPTS} ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}/dot-tmda/filters ${EXAMPLESDIR}/dot-tmda/lists
+	cd ${WRKSRC}/contrib && \
+		${INSTALL_SCRIPT} ${SCRIPTS} ${EXAMPLESDIR} && \
+		${INSTALL_DATA} ${SAMPLES} ${EXAMPLESDIR}
+	cd ${WRKSRC}/contrib/dot-tmda && \
+		${INSTALL_DATA} [Rc]* ${EXAMPLESDIR}/dot-tmda && \
+		${INSTALL_DATA} filters/* ${EXAMPLESDIR}/dot-tmda/filters && \
+		${INSTALL_DATA} lists/* ${EXAMPLESDIR}/dot-tmda/lists
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/img
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${DOCS} ${DOCSDIR} && \
-		${INSTALL_DATA} ${DOCS2} ${DOCSDIR}/img
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} && \
+		${INSTALL_DATA} htdocs/img/* ${DOCSDIR}/img
 .endif
-	@${SED} -e 's!PREFIX!${PREFIX}!; s!DOCSDIR!${DOCSDIR}!;' \
-	       -e 's!EXAMPLESDIR!${EXAMPLESDIR}!' ${.CURDIR}/pkg-message \
-	       > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index 83486033d6c7..77deb1e4d01d 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1,3 +1,3 @@
-MD5 (tmda-1.0.3.tgz) = e5710270586d52444f5d94ecbb0f318f
-SHA256 (tmda-1.0.3.tgz) = abda8c0761d58e954992b1e6ec052b1de29b83b119b08235e4dc0d694b4f8ab5
-SIZE (tmda-1.0.3.tgz) = 392608
+MD5 (tmda-1.1.5.tgz) = 6634c950753e109eb77b4531127d6347
+SHA256 (tmda-1.1.5.tgz) = fc132fdd22f5c112a21e4d009d7ca4753a5baebd0fab646ad4d902e257b1ce55
+SIZE (tmda-1.1.5.tgz) = 320499
diff --git a/mail/tmda/files/pkg-message.in b/mail/tmda/files/pkg-message.in
new file mode 100644
index 000000000000..b3b4af949473
--- /dev/null
+++ b/mail/tmda/files/pkg-message.in
@@ -0,0 +1,7 @@
+
+	All TMDA programs have been installed in %%PREFIX%%/bin.
+	Documentation is located in %%DOCSDIR%%.
+	See %%DOCSDIR%%/UPGRADE if upgrading from a previous release.
+	Sample configuration files are in  %%EXAMPLESDIR%%/dot-tmda.
+        You can copy it to ~/.tmda and customize to your needs.
+
diff --git a/mail/tmda/pkg-message b/mail/tmda/pkg-message
deleted file mode 100644
index 51c5eda8c2f2..000000000000
--- a/mail/tmda/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	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 cda99f2a0214..73dc4457dc40 100644
--- a/mail/tmda/pkg-plist
+++ b/mail/tmda/pkg-plist
@@ -92,40 +92,31 @@ bin/tmda-sendmail
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/challengeresponse.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%%/donations.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%%/img/blocksmall.png
+%%PORTDOCS%%%%DOCSDIR%%/img/stripes.gif
 %%PORTDOCS%%%%DOCSDIR%%/img/tmda-186x253.png
 %%PORTDOCS%%%%DOCSDIR%%/img/tmda-47x64.png
 %%PORTDOCS%%%%DOCSDIR%%/img/tmda-562x765.png
 %%PORTDOCS%%%%DOCSDIR%%/img/tmda-70x95.png
 %%PORTDOCS%%%%DOCSDIR%%/img/tmda-93x127.png
 %%PORTDOCS%%%%DOCSDIR%%/img/tmda-nt-616x616.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/img
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/logos.html
-%%PORTDOCS%%%%DOCSDIR%%/requirements.html
-%%PORTDOCS%%%%DOCSDIR%%/tmda-ofmipd.html
-%%PORTDOCS%%%%DOCSDIR%%/tmda-vdomains.html
-%%PORTDOCS%%%%DOCSDIR%%/trouble.html
-%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/tmda.css
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/collectaddys
 %%EXAMPLESDIR%%/def2html
+%%EXAMPLESDIR%%/dot-tmda/README
+%%EXAMPLESDIR%%/dot-tmda/config
+%%EXAMPLESDIR%%/dot-tmda/crypt_key
+%%EXAMPLESDIR%%/dot-tmda/filters/incoming
+%%EXAMPLESDIR%%/dot-tmda/filters/outgoing
+%%EXAMPLESDIR%%/dot-tmda/lists/blacklist
+%%EXAMPLESDIR%%/dot-tmda/lists/confirmed
+%%EXAMPLESDIR%%/dot-tmda/lists/whitelist
 %%EXAMPLESDIR%%/printcdb
 %%EXAMPLESDIR%%/printdbm
-%%EXAMPLESDIR%%/sample.config
 %%EXAMPLESDIR%%/sendit.sh
 %%EXAMPLESDIR%%/smtp-check-sender
 %%EXAMPLESDIR%%/tmda.el
@@ -137,8 +128,17 @@ bin/tmda-sendmail
 %%EXAMPLESDIR%%/vpopmail-vdir.sh
 %%EXAMPLESDIR%%/vtmdarc
 %%EXAMPLESDIR%%/wrapfd3.sh
+@dirrm %%EXAMPLESDIR%%/dot-tmda/lists
+@dirrm %%EXAMPLESDIR%%/dot-tmda/filters
+@dirrm %%EXAMPLESDIR%%/dot-tmda
 @dirrm %%EXAMPLESDIR%%
-%%DATADIR%%/bounce.txt
+%%DATADIR%%/bounce_expired_dated.txt
+%%DATADIR%%/bounce_fail_dated.txt
+%%DATADIR%%/bounce_fail_keyword.txt
+%%DATADIR%%/bounce_fail_sender.txt
+%%DATADIR%%/bounce_incoming.txt
+%%DATADIR%%/bounce_invalid_confirmation.txt
+%%DATADIR%%/bounce_missing_pending.txt
 %%DATADIR%%/confirm_accept.txt
 %%DATADIR%%/confirm_request.txt
 @dirrm %%DATADIR%%