From 4082b6054a98c29482004e1a690a02b7eaf408f5 Mon Sep 17 00:00:00 2001
From: ad <ad>
Date: Sat, 14 Jul 2001 18:17:21 +0000
Subject: Update to exim-3.30. This is mainly a bugfix release. Changelogs can
 be found at http://www.exim.org/.

---
 mail/exim/Makefile         |  4 ++--
 mail/exim/distinfo         |  9 ++++-----
 mail/exim/patches/patch-ac | 44 ++++++++++++++++++++++++++++++++++++++++++++
 mail/exim/pkg/PLIST        |  3 +--
 4 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 mail/exim/patches/patch-ac

(limited to 'mail/exim')

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 5bb28051884..3ba14cf2101 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2001/07/11 14:58:42 ad Exp $
+# $NetBSD: Makefile,v 1.25 2001/07/14 18:17:21 ad Exp $
 
-DISTNAME=	exim-3.20
+DISTNAME=	exim-3.30
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 243f74a8f0d..f87518392fa 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/06/11 12:15:45 ad Exp $
+$NetBSD: distinfo,v 1.4 2001/07/14 18:17:21 ad Exp $
 
-SHA1 (exim-3.20.tar.gz) = dfb7a7b360dec968b03967f42555df41f79c7bc8
-Size (exim-3.20.tar.gz) = 1257746 bytes
-SHA1 (exim-html-3.20.tar.gz) = f830eaa2b9bd8cc183b66fa1627ce14b15f51ccf
-Size (exim-html-3.20.tar.gz) = 699383 bytes
+SHA1 (exim-3.30.tar.gz) = feef0190cc5347adb34e0a54e2353f5e160c958f
+Size (exim-3.30.tar.gz) = 1266152 bytes
 SHA1 (patch-ab) = 963c500ad8078264d0d0daeb4edc75756225c9b8
+SHA1 (patch-ac) = 39122ca045ca7bb61500acae2abf5683c8ec4530
 SHA1 (patch-ae) = 24009dd4807f0215e79cc0a86582297bf310c913
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
new file mode 100644
index 00000000000..d889be4f94f
--- /dev/null
+++ b/mail/exim/patches/patch-ac
@@ -0,0 +1,44 @@
+$NetBSD: patch-ac,v 1.3 2001/07/14 18:17:23 ad Exp $
+
+--- OS/Makefile-NetBSD.orig	Sat Jul 14 19:09:00 2001
++++ OS/Makefile-NetBSD	Sat Jul 14 19:14:34 2001
+@@ -3,15 +3,31 @@
+ 
+ # Include Makfile.NetBSD-a.out
+ 
+-.if exists(OS/Makefile-NetBSD-a.out)
+-.include "OS/Makefile-NetBSD-a.out"
+-.elif exists(../OS/Makefile-NetBSD-a.out)
+-.include "../OS/Makefile-NetBSD-a.out"
+-.else
+-.include "Makefile.NetBSD-a.out, submit a bug report."
+-.endif
++# Exim: OS-specific make file for NetBSD (a.out binary format)
++
++CHOWN_COMMAND=/usr/sbin/chown
++CFLAGS=-O
++
++HAVE_SA_LEN=YES
++LIBS=-lcrypt
++
++X11=/usr/X11R6
++XINCLUDE=-I$(X11)/include
++XLFLAGS=-L$(X11)/lib
++X11_LD_LIB=$(X11)/lib
++
++EXIWHAT_PS_ARG=-ax
++EXIWHAT_EGREP_ARG='/exim( |$$)'
++EXIWHAT_KILL_ARG=-USR1
++
++# NetBSD always ships with Berkeley DB
++
++USE_DB=yes
++
++# End
++
+ 
+ # NetBSD ELF linker needs a -R flag.
+-XLFLAGS+=-Wl,-R$(X11)/lib/
++#XLFLAGS+=-Wl,-R$(X11)/lib/
+ 
+ # End
diff --git a/mail/exim/pkg/PLIST b/mail/exim/pkg/PLIST
index a4097f687d1..41737e3ce84 100644
--- a/mail/exim/pkg/PLIST
+++ b/mail/exim/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2001/07/11 13:18:28 ad Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/07/14 18:17:23 ad Exp $
 etc/exim/configure
 etc/exim/mailer.conf.exim
 etc/rc.d/exim
@@ -18,4 +18,3 @@ sbin/exiwhat
 man/man8/exim.8
 @unexec rmdir /var/log/exim 2>/dev/null || true
 @dirrm etc/exim
-@dirrm share/doc/exim
-- 
cgit v1.2.3