Fix patch in last and remove reference to non-existant exim-exiscan-acl

3 files changed, 15 insertions, 22 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index e7550f81eb0..9a16e48719f 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/09/02 10:33:38 abs Exp $
+# $NetBSD: Makefile,v 1.39 2003/09/02 11:14:16 abs Exp $
 
 DISTNAME=	exim-${EXIM_VERSION}
 CATEGORIES=	mail net
@@ -8,7 +8,7 @@ HOMEPAGE=	http://www.exim.org/
 COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 
 DEPENDS+=	exim-user>=4.10nb1:../../mail/exim-user
-CONFLICTS+=	exim-exiscan-[0-9]* exim-exiscan-acl-[0-9]*
+CONFLICTS+=	exim-exiscan-[0-9]*
 
 .include "Makefile.common"
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 39184e3f50a..78b5850534f 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2003/09/02 10:33:39 abs Exp $
+$NetBSD: distinfo,v 1.13 2003/09/02 11:14:16 abs Exp $
 
 SHA1 (exim-4.22.tar.bz2) = aa4d67313cfa262135ec455134ecacab5449c937
 Size (exim-4.22.tar.bz2) = 1249633 bytes
 SHA1 (exiscan-acl-4.22-10.patch) = d61865278ade6af14dde2ac807d3b7b442a078fa
 Size (exiscan-acl-4.22-10.patch) = 286429 bytes
-SHA1 (patch-aa) = 48fbcd68cae6c5886d0b6aab7d9f058e9ff9258d
+SHA1 (patch-aa) = d9bad0d2f51058b4e96d81b05ed88a00040ea6c2
 SHA1 (patch-ab) = afccbaec6ece925f87384535e70da8dd79d8e978
 SHA1 (patch-ac) = 8f3bd109cf961dc72fa11bd738aa69995bebc929
 SHA1 (patch-ad) = ad4cc6c2b2db445504613c04affcd5fc7b012d35
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index cb397861a65..fe58cf327b6 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2003/09/02 10:33:41 abs Exp $
+$NetBSD: patch-aa,v 1.6 2003/09/02 11:14:17 abs Exp $
 
---- Local/Makefile.pkgsrc.orig	2003-08-29 18:17:32.000000000 +0100
+--- Local/Makefile.pkgsrc.orig	2003-09-02 12:12:04.000000000 +0100
 +++ Local/Makefile.pkgsrc
 @@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
@@ -74,7 +74,7 @@ $NetBSD: patch-aa,v 1.5 2003/09/02 10:33:41 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -365,10 +366,11 @@ HEADER_DECODE_TO="ISO-8859-1"
+@@ -390,10 +391,11 @@ HEADER_DECODE_TO="ISO-8859-1"
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -88,7 +88,7 @@ $NetBSD: patch-aa,v 1.5 2003/09/02 10:33:41 abs Exp $
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -402,6 +404,19 @@ HEADER_DECODE_TO="ISO-8859-1"
+@@ -427,6 +429,19 @@ HEADER_DECODE_TO="ISO-8859-1"
  # You don't need to set TLS_INCLUDE if the relevant directories are already
  # specified in INCLUDE.
  
@@ -108,7 +108,7 @@ $NetBSD: patch-aa,v 1.5 2003/09/02 10:33:41 abs Exp $
  
  #------------------------------------------------------------------------------
  # The default distribution of Exim contains only the plain text form of the
-@@ -432,7 +447,7 @@ HEADER_DECODE_TO="ISO-8859-1"
+@@ -457,7 +472,7 @@ HEADER_DECODE_TO="ISO-8859-1"
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -117,24 +117,17 @@ $NetBSD: patch-aa,v 1.5 2003/09/02 10:33:41 abs Exp $
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -562,14 +577,14 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -587,7 +602,8 @@ ZCAT_COMMAND=/usr/bin/zcat
  # this setting. See the manual section entitled "Use of tcpwrappers" in the
  # chapter on building and installing Exim.
- 
+ #
 -# USE_TCP_WRAPPERS=yes
 +USE_TCP_WRAPPERS=yes
- 
++EXTRALIBS_EXIM=-lwrap
+ #
  # You may well also have to specify a local "include" file and an additional
  # library for TCP wrappers, so you probably need something like this:
- 
- #  USE_TCP_WRAPPERS=yes
- #  CFLAGS=-O -I/usr/local/include
--#  EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
-+EXTRALIBS_EXIM=-lwrap
- 
- # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
- # as well.
-@@ -618,11 +633,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -643,11 +659,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -151,7 +144,7 @@ $NetBSD: patch-aa,v 1.5 2003/09/02 10:33:41 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -816,7 +831,7 @@ TMPDIR="/tmp"
+@@ -841,7 +857,7 @@ TMPDIR="/tmp"
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this: