Update exim and corresponding docs to version 3.20. Too many changes to note

here; changelogs can be found at http://www.exim.org/.

3 files changed, 27 insertions, 21 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index ecb42ea296b..3fe5bf97a89 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2000/08/07 02:26:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2000/11/28 19:24:42 ad Exp $
 
-DISTNAME=	exim-3.16
+DISTNAME=	exim-3.20
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/ \
 		ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
 		ftp://ftp.esat.net/pub/networking/mail/mta/exim/
-DISTFILES=	exim-3.16.tar.gz exim-html-3.10.tar.gz
+DISTFILES=	exim-3.20.tar.gz exim-html-3.20.tar.gz
 
 MAINTAINER=	ad@netbsd.org
 HOMEPAGE=	http://www.exim.org/
@@ -49,6 +49,7 @@ post-install:
 	${MKDIR} ${PREFIX}/man/man8
 	${CP} ${FILESDIR}/exim.8 ${PREFIX}/man/man8/exim.8
 	${MKDIR} ${PREFIX}/share/doc/exim
-	${CP} -R ${WRKDIR}/exim-html-3.10/doc/html/* ${PREFIX}/share/doc/exim
+	${RM} ${WRKDIR}/exim-html-3.20/doc/html/spec
+	${CP} -R ${WRKDIR}/exim-html-3.20/doc/html/* ${PREFIX}/share/doc/exim
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/files/md5 b/mail/exim/files/md5
index 4ea8c4da957..4fb8765079a 100644
--- a/mail/exim/files/md5
+++ b/mail/exim/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.7 2000/07/26 12:30:07 ad Exp $
+$NetBSD: md5,v 1.8 2000/11/28 19:24:42 ad Exp $
 
-MD5 (exim-3.16.tar.gz) = 9d943d05c4cf22da32f3bddf97c7e8bf
-MD5 (exim-html-3.10.tar.gz) = be4fbbc5623a2b5af892c90ecee7fbdb
+MD5 (exim-3.20.tar.gz) = a004701a49ab3ec8abf8a293ae47afa0
+MD5 (exim-html-3.20.tar.gz) = 5aa1087b8b4249be338b922d2cd5ffdd
diff --git a/mail/exim/pkg/PLIST b/mail/exim/pkg/PLIST
index d44375b3c18..1f28e5a3ff2 100644
--- a/mail/exim/pkg/PLIST
+++ b/mail/exim/pkg/PLIST
@@ -1,7 +1,21 @@
-@comment $NetBSD: PLIST,v 1.8 2000/08/07 02:26:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/11/28 19:24:43 ad Exp $
 etc/exim/configure
 etc/exim/mailer.conf.exim
 etc/rc.d/exim.sh
+sbin/exicyclog
+sbin/exigrep
+sbin/exim
+sbin/exim_dbmbuild
+sbin/exim_dumpdb
+sbin/exim_fixdb
+sbin/exim_lock
+sbin/exim_newaliases
+sbin/exim_tidydb
+sbin/eximstats
+sbin/exinext
+sbin/exiqsumm
+sbin/exiwhat
+share/doc/exim/drivers.gif
 share/doc/exim/filter.html
 share/doc/exim/filter_1.html
 share/doc/exim/filter_10.html
@@ -39,6 +53,7 @@ share/doc/exim/filter_8.html
 share/doc/exim/filter_9.html
 share/doc/exim/filter_toc.html
 share/doc/exim/oview.html
+share/doc/exim/relaying.gif
 share/doc/exim/spec.html
 share/doc/exim/spec_1.html
 share/doc/exim/spec_10.html
@@ -92,6 +107,9 @@ share/doc/exim/spec_53.html
 share/doc/exim/spec_54.html
 share/doc/exim/spec_55.html
 share/doc/exim/spec_56.html
+share/doc/exim/spec_57.html
+share/doc/exim/spec_58.html
+share/doc/exim/spec_59.html
 share/doc/exim/spec_6.html
 share/doc/exim/spec_7.html
 share/doc/exim/spec_8.html
@@ -100,19 +118,6 @@ share/doc/exim/spec_cindex.html
 share/doc/exim/spec_findex.html
 share/doc/exim/spec_toc.html
 share/doc/exim/spectop.html
-sbin/exicyclog
-sbin/exigrep
-sbin/exim
-sbin/exim_dbmbuild
-sbin/exim_dumpdb
-sbin/exim_fixdb
-sbin/exim_lock
-sbin/exim_newaliases
-sbin/exim_tidydb
-sbin/eximstats
-sbin/exinext
-sbin/exiqsumm
-sbin/exiwhat
 man/man8/exim.8
 @unexec rmdir /var/log/exim 2>/dev/null || true
 @dirrm etc/exim