Update exim to 3.10.

6 files changed, 9 insertions, 60 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index bb4cab74d1a..0b3acc88afd 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,12 +1,13 @@
-# 	$NetBSD: Makefile,v 1.6 1999/10/06 23:02:35 ad Exp $
+# $NetBSD: Makefile,v 1.7 1999/11/25 18:05:02 ad Exp $
 
-DISTNAME=	exim-3.03
-DISTFILES=	exim-3.03.tar.gz exim-html-3.00.tar.gz
+DISTNAME=	exim-3.10
 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.10.tar.gz exim-html-3.10.tar.gz
 MAINTAINER=	ad@netbsd.org
 HOMEPAGE=	http://www.exim.org/
 
@@ -47,6 +48,6 @@ 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.00/doc/html/* ${PREFIX}/share/doc/exim
+	${CP} -R ${WRKDIR}/exim-html-3.10/doc/html/* ${PREFIX}/share/doc/exim
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/files/md5 b/mail/exim/files/md5
index 296d32fd147..39f597eaf1a 100644
--- a/mail/exim/files/md5
+++ b/mail/exim/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.2 1999/09/22 08:52:05 ad Exp $
+$NetBSD: md5,v 1.3 1999/11/25 18:05:02 ad Exp $
 
-MD5 (exim-3.03.tar.gz) = 71581c8e7bce2bf6bb859ad4ae21f15f
-MD5 (exim-html-3.00.tar.gz) = aea953ec22b41dc015a55f2f095c2fcd
+MD5 (exim-3.10.tar.gz) = 8fb872c6a2e92eceabdc3397e986e7d2
+MD5 (exim-html-3.10.tar.gz) = be4fbbc5623a2b5af892c90ecee7fbdb
diff --git a/mail/exim/files/patch-sum b/mail/exim/files/patch-sum
index bb795194150..aa0e7939798 100644
--- a/mail/exim/files/patch-sum
+++ b/mail/exim/files/patch-sum
@@ -1,7 +1,4 @@
-$NetBSD: patch-sum,v 1.3 1999/09/18 20:23:36 ad Exp $
+$NetBSD: patch-sum,v 1.4 1999/11/25 18:05:02 ad Exp $
 
-MD5 (patch-aa) = fa14804308a5ac2020be9684248eb6d5
 MD5 (patch-ab) = 35ca57154725fe373dea8500f9b39676
-MD5 (patch-ac) = 5a6c48cb8338c52e33c8bc76cfd4f4cb
-MD5 (patch-ad) = e4815e72b4c3ac1cfc6dcc9c1727ae94
 MD5 (patch-ae) = a2645ccf29d57aeabb5b4ddc647c3493
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
deleted file mode 100644
index 26fda30382b..00000000000
--- a/mail/exim/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1999/09/07 13:21:03 ad Exp $
-
---- OS/Makefile-NetBSD.orig	Tue Sep  7 14:25:22 1999
-+++ OS/Makefile-NetBSD	Tue Sep  7 13:20:08 1999
-@@ -1,7 +1,7 @@
- # Exim: OS-specific make file for NetBSD
- 
- CHOWN_COMMAND=/usr/sbin/chown
--CFLAGS=-O
-+CFLAGS=-O2
- 
- HAVE_SA_LEN=YES
- 
-@@ -13,5 +13,8 @@
- EXIWHAT_PS_ARG=-ax
- EXIWHAT_EGREP_ARG='/exim( |$$)'
- EXIWHAT_KILL_ARG=-USR1
-+
-+# NetBSD always ships with Berkeley DB
-+USE_DB=yes
- 
- # End
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
deleted file mode 100644
index 3927dc4cecf..00000000000
--- a/mail/exim/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/09/07 13:21:03 ad Exp $
-
---- scripts/os-type.orig	Tue Sep  7 13:36:03 1999
-+++ scripts/os-type	Tue Sep  7 13:36:13 1999
-@@ -54,6 +54,7 @@
- BSD_OS)     os=BSDI;;
- dgux)       os=DGUX;;
- freebsd*)   os=FreeBSD;;
-+netbsd*)    os=NetBSD;;
- gnu)        os=GNU;;
- Irix5)	    os=IRIX;;
- Irix6)	    os=IRIX6;;
diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad
deleted file mode 100644
index 8df1f9e91e5..00000000000
--- a/mail/exim/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/09/07 13:21:03 ad Exp $
-
---- scripts/exim_install.orig	Mon Aug  2 16:43:03 1999
-+++ scripts/exim_install	Tue Sep  7 14:36:04 1999
-@@ -96,6 +96,10 @@
- # of in /usr/bin, and therefore not likely to be on the path. This fudge
- # tries to cope with that.
- 
-+if [ "${CHOWN}" = "chown" -a -x /usr/sbin/chown ] ; then
-+  CHOWN=/usr/sbin/chown
-+fi
-+
- if [ "${CHOWN}" = "chown" -a ! -f /usr/bin/chown -a -f /usr/etc/chown ] ; then
-   CHOWN=/usr/etc/chown
- fi