From bb097776e06b0c45271e82e5d08616b3e50136d3 Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Tue, 21 Oct 2003 18:18:31 +0000
Subject: [PATCH] update to tmda 0.87

from new MAINTAINER Dave Steinberg <dave@redterror.net>
---
 mail/tmda/Makefile            | 17 ++++-------------
 mail/tmda/distinfo            |  6 +++---
 mail/tmda/pkg/DESCR           |  2 --
 mail/tmda/pkg/PFRAG.no-no_x11 |  2 --
 mail/tmda/pkg/PLIST           |  7 ++++---
 5 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 mail/tmda/pkg/PFRAG.no-no_x11

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 723689f7ab9..399688dd97e 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.22 2003/04/30 14:37:37 lebel Exp $
+# $OpenBSD: Makefile,v 1.23 2003/10/21 18:18:31 sturm Exp $
 
 COMMENT=		"reduce the amount of SPAM/UCE (junk-mail)"
 
-VERSION=		0.76
+VERSION=		0.87
 DISTNAME=		tmda-${VERSION}
 CATEGORIES=		mail
 
 HOMEPAGE=		http://tmda.net/
-MAINTAINER=		Jim Geovedi <jim@corebsd.or.id>
+MAINTAINER=		Dave Steinberg <dave@redterror.net>
 
 # BSD-style
 PERMIT_PACKAGE_CDROM=	Yes
@@ -19,15 +19,9 @@ MASTER_SITES=		http://tmda.net/releases/ \
 			http://tmda.net/releases/old/
 EXTRACT_SUFX=		.tgz
 
-FLAVORS=		no_x11
-FLAVOR?=
-
 PYTHON_VER=     	2.2
 
-.if ${FLAVOR} != "no_x11"
-RUN_DEPENDS=		:python-tkinter-${PYTHON_VER}*:lang/python/${PYTHON_VER},-tkinter
-.endif
-RUN_DEPENDS+=		:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
+RUN_DEPENDS=		:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
 BUILD_DEPENDS=		${RUN_DEPENDS}
 
 PYTHON_LIBDIR=		lib/python${PYTHON_VER}/site-packages
@@ -49,9 +43,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tmda
 	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${PREFIX}/share/tmda
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tmda-* ${PREFIX}/bin
-.if ${FLAVOR} == "no_x11"
-	@rm -f ${PREFIX}/bin/tmda-gui
-.endif
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tmda/contrib
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tmda
 	${INSTALL_DATA} ${WRKSRC}/contrib/sample.config \
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index 92a35233f75..7ea40dddb84 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1,3 +1,3 @@
-MD5 (tmda-0.76.tgz) = 71531e95ad56994e03072bc3a1ca91e9
-RMD160 (tmda-0.76.tgz) = a25013cf9e9f8f4242f45caad783fb887d2ff28d
-SHA1 (tmda-0.76.tgz) = 468d55a4e45d581779daae6cf32d4c724179a558
+MD5 (tmda-0.87.tgz) = d04c514ae9e3807197c0f97a5cc317fc
+RMD160 (tmda-0.87.tgz) = 865584aa6db5c462aee64dfa4b76c671153630ab
+SHA1 (tmda-0.87.tgz) = bfb21e2a62f6041cf17dba8d5427f4a054f0a420
diff --git a/mail/tmda/pkg/DESCR b/mail/tmda/pkg/DESCR
index a51cc95525e..953f4b495b4 100644
--- a/mail/tmda/pkg/DESCR
+++ b/mail/tmda/pkg/DESCR
@@ -4,5 +4,3 @@ reduce the amount of SPAM/UCE (junk-mail) you receive. TMDA combines a
 senders), and a cryptographically enhanced confirmation system (for
 unknown, but legitimate senders). TMDA strives to be more effectual, yet
 less time-consuming than traditional filters.
-
-WWW: ${HOMEPAGE}
diff --git a/mail/tmda/pkg/PFRAG.no-no_x11 b/mail/tmda/pkg/PFRAG.no-no_x11
deleted file mode 100644
index 7363fe53144..00000000000
--- a/mail/tmda/pkg/PFRAG.no-no_x11
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2003/04/30 14:37:37 lebel Exp $
-bin/tmda-gui
diff --git a/mail/tmda/pkg/PLIST b/mail/tmda/pkg/PLIST
index f936fce4616..2ba5950ad0d 100644
--- a/mail/tmda/pkg/PLIST
+++ b/mail/tmda/pkg/PLIST
@@ -1,11 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.12 2003/04/30 14:37:37 lebel Exp $
-!%%no_x11%%
+@comment $OpenBSD: PLIST,v 1.13 2003/10/21 18:18:32 sturm Exp $
 bin/tmda-address
 bin/tmda-check-address
 bin/tmda-filter
 bin/tmda-inject
 bin/tmda-keygen
-bin/tmda-manager
 bin/tmda-ofmipd
 bin/tmda-pending
 bin/tmda-rfilter
@@ -91,6 +89,7 @@ share/doc/tmda/INSTALL
 share/doc/tmda/README
 share/doc/tmda/UPGRADE
 share/doc/tmda/bugs.html
+share/doc/tmda/challengeresponse.html
 share/doc/tmda/config-client.html
 share/doc/tmda/config-filter.html
 share/doc/tmda/config-pre.html
@@ -105,6 +104,7 @@ share/doc/tmda/contrib/sample.config
 share/doc/tmda/contrib/sendit.sh
 share/doc/tmda/contrib/tmda.el
 share/doc/tmda/contrib/vadduser-tmda
+share/doc/tmda/donations.html
 share/doc/tmda/download.html
 share/doc/tmda/features.html
 share/doc/tmda/filter-sources.html
@@ -123,6 +123,7 @@ share/doc/tmda/support-commercial.html
 share/doc/tmda/tmda-ofmipd.html
 share/doc/tmda/tmda-vdomains.html
 share/doc/tmda/trouble.html
+share/doc/tmda/upgrade.html
 share/examples/tmda/sample.config
 share/tmda/bounce.txt
 share/tmda/confirm_accept.txt