Update to 0.2.1, as requested in pkg/13772.

Changes since last version, from the NEWS file:
AMaViS 0.2.1 relesed. We improved qmail support and
added support for exim and postfix and a hack for sendmail
to scan outgoing/relayed mail, too. Added support for
several anti-virus programs. Lots of other improvements
and bug fixes. Read ChangeLog for full details.

4 files changed, 16 insertions, 34 deletions

diff --git a/security/amavis/Makefile b/security/amavis/Makefile
index d15c3bc3555..d41d1f02e96 100644
--- a/security/amavis/Makefile
+++ b/security/amavis/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:49:40 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/14 21:56:49 wiz Exp $
 #
 
-DISTNAME=	amavis-0.2.1-pre3
-PKGNAME=	amavis-0.2.1p3
+DISTNAME=	amavis-0.2.1
+PKGNAME=	amavis-0.2.1nb4
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.amavis.org/dist/ \
 		http://aachalon.de/AMaViS/
diff --git a/security/amavis/distinfo b/security/amavis/distinfo
index f270a9dc721..4efb6391064 100644
--- a/security/amavis/distinfo
+++ b/security/amavis/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:29 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/09/14 21:56:49 wiz Exp $
 
-SHA1 (amavis-0.2.1-pre3.tar.gz) = 0fcb39ab16cc4b768460ae7545d6c696eda12b67
-Size (amavis-0.2.1-pre3.tar.gz) = 232756 bytes
-SHA1 (patch-aa) = 5242df5c9aa09b862dfe2e025d6fd6c1c35a76d7
-SHA1 (patch-ab) = d67e751a555829673cc4a10e7657ec30511b900f
+SHA1 (amavis-0.2.1.tar.gz) = c47f60525a289274b88f7eaa47db1a9e888092ef
+Size (amavis-0.2.1.tar.gz) = 236011 bytes
+SHA1 (patch-ab) = dd2aa50136d3b89ce12c149c56b6f8c7e659d0d4
diff --git a/security/amavis/patches/patch-aa b/security/amavis/patches/patch-aa
deleted file mode 100644
index dbddc6dee95..00000000000
--- a/security/amavis/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/10/23 14:57:16 rh Exp $
-
---- configure.orig	Mon Oct 23 16:11:15 2000
-+++ configure
-@@ -2640,10 +2640,10 @@
-   then
-      tnef_arg="-x"
-   else
--   $tnef -h 2>&1 | grep "put unpacked files in DIR" >/dev/null 2>&1
-+   $tnef -h 2>&1 | grep "unpack files into DIR" >/dev/null 2>&1
-    if test $? -eq 0
-    then
--     tnef_arg="-d"
-+     tnef_arg="-C"
-    else
-     { echo "configure: error: Sorry, your tnef binary seems to be insecure. Please use the tnef file from http://world.std.com/~damned/software.html" 1>&2; exit 1; }
-    fi
diff --git a/security/amavis/patches/patch-ab b/security/amavis/patches/patch-ab
index c5d3374d2d1..68186a7a258 100644
--- a/security/amavis/patches/patch-ab
+++ b/security/amavis/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2000/10/23 14:57:16 rh Exp $
+$NetBSD: patch-ab,v 1.3 2001/09/14 21:56:50 wiz Exp $
 
---- src/scanmails/scanmails.in.orig	Sat Sep 16 17:40:38 2000
+--- src/scanmails/scanmails.in.orig	Tue Oct 31 17:47:28 2000
 +++ src/scanmails/scanmails.in
-@@ -352,7 +352,7 @@
+@@ -360,7 +360,7 @@
  	sendmail_flags="${sendmail_flags} -C${origconf}"
     else
  	SENDER="$2"
--	RECEIPIENT="$7"
-+	RECEIPIENT="$4"
+-	RECIPIENT="$7"
++	RECIPIENT="$4"
     fi
  fi
  
-@@ -447,6 +447,8 @@
+@@ -455,6 +455,8 @@
      cat | ${formail} -f -A "${X_Header_String}" >${tmpdir}/receivedmail
  else
      cat >${tmpdir}/receivedmail
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2000/10/23 14:57:16 rh Exp $
  fi
  
  mkdir ${tmpdir}/unpacked
-@@ -1210,7 +1212,7 @@
+@@ -1287,7 +1289,7 @@
  
                     V I R U S  A L E R T
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2000/10/23 14:57:16 rh Exp $
             We stopped delivery of this email!
  
      Now it is on you to check your system for viruses           
-@@ -1236,7 +1238,7 @@
+@@ -1313,7 +1315,7 @@
  
  ############### send a mail to the addressee ########################
  
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.2 2000/10/23 14:57:16 rh Exp $
  From: ${mailfrom}
  To: ${receiver}
  Subject: VIRUS IN A MAIL FOR YOU FROM ${sender}
-@@ -1250,6 +1252,8 @@
+@@ -1327,6 +1329,8 @@
    Delivery of the email was stopped!
    
    Please contact your system administrator for details