Update exim from 4.44 to 4.51.

The main change is the incorporation of the content scanning from
the exiscan patch. (There are over 650 lines of Changes)
Retire exim-exiscan
Update exim-html from 4.40 to 4.50

10 files changed, 155 insertions, 200 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 29224653f69..bcce6a30713 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.56 2005/05/10 22:52:06 abs Exp $
+# $NetBSD: Makefile,v 1.57 2005/05/17 17:06:11 abs Exp $
 
-DISTNAME=	exim-${EXIM_VERSION}
-PKGREVISION=	3
+DISTNAME=	exim-4.51
 CATEGORIES=	mail net
+MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
+		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
+		ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.exim.org/
@@ -10,7 +13,107 @@ COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 
 CONFLICTS+=	exim-exiscan-[0-9]*
 
-.include "Makefile.common"
+USE_PERL5=	yes
+USE_PKGINSTALL=	yes
 
-# Note: The distinfo in this directory includes the exiscan-acl-4.22-10.patch
-# 'make mdi' or equivalent should be run from ../exim-exiscan-acl
+MAKE_ENV+=	SSLBASE=${SSLBASE:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS=	EXIM_USER EXIM_GROUP EXIM_DB EXIM_USE_LOOKUP_WHOSON
+
+PKG_GROUPS=	${EXIM_GROUP}
+PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}::Exim\\ mail\\ server\\ user:/var/mail:/sbin/nologin
+
+PKG_SYSCONFSUBDIR?=	exim
+EXAMPLESDIR=		${PREFIX}/share/examples/exim
+CONF_FILES=		${EXAMPLESDIR}/aliases ${PKG_SYSCONFDIR}/aliases
+CONF_FILES+=		${EXAMPLESDIR}/configure ${PKG_SYSCONFDIR}/configure
+MESSAGE_SUBST+=		EXAMPLESDIR="${EXAMPLESDIR}"
+PLIST_SUBST+=		DISTNAME="${DISTNAME}"
+
+RCD_SCRIPTS=		exim
+
+OWN_DIRS_PERMS=		/var/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
+OWN_DIRS_PERMS+=	/var/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
+
+# XXX: The following will be handled by buildlink3 at some point.
+CFLAGS+=		${_STRIPFLAG_CC}
+
+# BDB_TYPE gets set to "db1" if USE_DB185=="yes"
+USE_DB185?=		no
+BDB_ACCEPTED?=		db1 db2 db3 db4
+
+.if defined(EXIM_DB) && ${EXIM_DB} == "gdbm"
+.  include "../../databases/gdbm/buildlink3.mk"
+EXIM_USE_DB_CONFIG=	USE_GDBM=yes
+EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm
+EXIM_INCLUDE=		-I${PREFIX}/include
+.else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
+.  include "../../mk/bdb.buildlink3.mk"
+EXIM_USE_DB_CONFIG=	USE_DB=yes	# the default
+.  if ${BDB_TYPE} == "db4"
+EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} ${BDB_LIBS}
+EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db4}
+.  elif ${BDB_TYPE} == "db3"
+EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} ${BDB_LIBS}
+EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db3}
+.  elif ${BDB_TYPE} == "db2"
+EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} ${BDB_LIBS}
+EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db2}
+.  else # using native
+EXIM_DBMLIB=		# empty so use defaults
+EXIM_USE_DB_CONFIG=	# empty so use defaults
+EXIM_INCLUDE=		-I/usr/${BUILDLINK_INCDIRS.db-native}
+.  endif
+.endif
+
+post-extract:
+	${MKDIR} ${WRKSRC}/Local
+	${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
+	${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
+
+pre-configure:
+	@${ECHO} LOOKUP_DSEARCH=yes >> ${WRKSRC}/Local/Makefile.pkgsrc
+	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
+		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
+		-e 's:@EXIM_USER@:${EXIM_USER}:' \
+		-e 's:@EXIM_GROUP@:${EXIM_GROUP}:' \
+		-e 's:@EXIM_USE_DB_CONFIG@:${EXIM_USE_DB_CONFIG}:' \
+		-e 's:@EXIM_DBMLIB@:${EXIM_DBMLIB}:' \
+		-e 's:@EXIM_INCLUDE@:${EXIM_INCLUDE}:' \
+		-e 's:@CHOWN@:${CHOWN}:' \
+		-e 's:@CHGRP@:${CHGRP}:' \
+		-e 's:@MV@:${MV}:' \
+		-e 's:@RM@:${RM}:' \
+		-e 's:@PERL5@:${PERL5}:' \
+	    < ${WRKSRC}/Local/Makefile.pkgsrc \
+	    > ${WRKSRC}/Local/Makefile
+	@${ECHO} WITH_CONTENT_SCAN=yes >> ${WRKSRC}/Local/Makefile
+	@${ECHO} WITH_OLD_DEMIME=yes >> ${WRKSRC}/Local/Makefile
+.if defined(EXIM_USE_LOOKUP_WHOSON) && ${EXIM_USE_LOOKUP_WHOSON} == "YES"
+	@${ECHO} LOOKUP_WHOSON=yes >> ${WRKSRC}/Local/Makefile
+	@${ECHO} LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -lwhoson >> ${WRKSRC}/Local/Makefile
+.endif
+	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
+		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
+	    < ${WRKSRC}/Local/eximon.conf.pkgsrc \
+	    > ${WRKSRC}/Local/eximon.conf
+
+post-build:
+	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
+	    ${FILESDIR}/mailer.conf.exim \
+	    > ${WRKDIR}/mailer.conf
+
+post-install:
+	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/exim.8 ${PREFIX}/man/man8/exim.8
+
+.if defined(EXIM_USE_LOOKUP_WHOSON) && ${EXIM_USE_LOOKUP_WHOSON} == "YES"
+.  include "../../net/whoson/buildlink3.mk"
+.endif
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
deleted file mode 100644
index a1f6b542ac4..00000000000
--- a/mail/exim/Makefile.common
+++ /dev/null
@@ -1,113 +0,0 @@
-# $NetBSD: Makefile.common,v 1.28 2005/05/10 22:52:06 abs Exp $
-
-MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
-		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
-		ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
-
-USE_PERL5=	yes
-USE_PKGINSTALL=	yes
-
-MAKE_ENV+=	SSLBASE=${SSLBASE:Q}
-
-EXIM_VERSION=	4.44
-
-EXTRACT_SUFX=	.tar.bz2
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS=	EXIM_USER EXIM_GROUP EXIM_DB EXIM_USE_LOOKUP_WHOSON
-
-PKG_GROUPS=	${EXIM_GROUP}
-PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}::Exim\\ mail\\ server\\ user:/var/mail:/sbin/nologin
-
-WRKSRC=		${WRKDIR}/exim-${EXIM_VERSION}
-PKG_SYSCONFSUBDIR?=	exim
-EXAMPLESDIR=		${PREFIX}/share/examples/exim
-CONF_FILES=		${EXAMPLESDIR}/aliases ${PKG_SYSCONFDIR}/aliases
-CONF_FILES+=		${EXAMPLESDIR}/configure ${PKG_SYSCONFDIR}/configure
-MESSAGE_SUBST+=		EXAMPLESDIR="${EXAMPLESDIR}"
-PLIST_SUBST+=		DISTNAME="${DISTNAME}"
-
-RCD_SCRIPTS=		exim
-
-OWN_DIRS_PERMS=		/var/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
-OWN_DIRS_PERMS+=	/var/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
-
-# XXX: The following will be handled by buildlink3 at some point.
-CFLAGS+=		${_STRIPFLAG_CC}
-
-# BDB_TYPE gets set to "db1" if USE_DB185=="yes"
-USE_DB185?=		no
-BDB_ACCEPTED?=		db1 db2 db3 db4
-
-.if defined(EXIM_DB) && ${EXIM_DB} == "gdbm"
-.  include "../../databases/gdbm/buildlink3.mk"
-EXIM_USE_DB_CONFIG=	USE_GDBM=yes
-EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm
-EXIM_INCLUDE=		-I${PREFIX}/include
-.else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
-.  include "../../mk/bdb.buildlink3.mk"
-EXIM_USE_DB_CONFIG=	USE_DB=yes	# the default
-.  if ${BDB_TYPE} == "db4"
-EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} ${BDB_LIBS}
-EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db4}
-.  elif ${BDB_TYPE} == "db3"
-EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} ${BDB_LIBS}
-EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db3}
-.  elif ${BDB_TYPE} == "db2"
-EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} ${BDB_LIBS}
-EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db2}
-.  else # using native
-EXIM_DBMLIB=		# empty so use defaults
-EXIM_USE_DB_CONFIG=	# empty so use defaults
-EXIM_INCLUDE=		-I/usr/${BUILDLINK_INCDIRS.db-native}
-.  endif
-.endif
-
-pre-patch:
-	${MKDIR} ${WRKSRC}/Local
-	${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
-	${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
-
-pre-configure:
-	@${ECHO} LOOKUP_DSEARCH=yes >> ${WRKSRC}/Local/Makefile.pkgsrc
-	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
-		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
-		-e 's:@EXIM_USER@:${EXIM_USER}:' \
-		-e 's:@EXIM_GROUP@:${EXIM_GROUP}:' \
-		-e 's:@EXIM_USE_DB_CONFIG@:${EXIM_USE_DB_CONFIG}:' \
-		-e 's:@EXIM_DBMLIB@:${EXIM_DBMLIB}:' \
-		-e 's:@EXIM_INCLUDE@:${EXIM_INCLUDE}:' \
-		-e 's:@CHOWN@:${CHOWN}:' \
-		-e 's:@CHGRP@:${CHGRP}:' \
-		-e 's:@MV@:${MV}:' \
-		-e 's:@RM@:${RM}:' \
-		-e 's:@PERL5@:${PERL5}:' \
-	    < ${WRKSRC}/Local/Makefile.pkgsrc \
-	    > ${WRKSRC}/Local/Makefile
-.if defined(EXIM_USE_LOOKUP_WHOSON) && ${EXIM_USE_LOOKUP_WHOSON} == "YES"
-	@${ECHO} LOOKUP_WHOSON=yes >> ${WRKSRC}/Local/Makefile
-	@${ECHO} LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -lwhoson >> ${WRKSRC}/Local/Makefile
-.endif
-	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
-		-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
-	    < ${WRKSRC}/Local/eximon.conf.pkgsrc \
-	    > ${WRKSRC}/Local/eximon.conf
-
-post-build:
-	@${SED} -e 's:@PREFIX@:${PREFIX}:' \
-	    ${FILESDIR}/mailer.conf.exim \
-	    > ${WRKDIR}/mailer.conf
-
-post-install:
-	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/exim.8 ${PREFIX}/man/man8/exim.8
-
-.if defined(EXIM_USE_LOOKUP_WHOSON) && ${EXIM_USE_LOOKUP_WHOSON} == "YES"
-.  include "../../net/whoson/buildlink3.mk"
-.endif
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 7554990c63a..ab712d1e0d9 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.25 2005/02/24 09:59:22 agc Exp $
+$NetBSD: distinfo,v 1.26 2005/05/17 17:06:11 abs Exp $
 
-SHA1 (exim-4.44.tar.bz2) = c344674b85c734d399b7db4ce18cc49a90644654
-RMD160 (exim-4.44.tar.bz2) = b723fc51f959b36718acfb08f832c4220666eefb
-Size (exim-4.44.tar.bz2) = 1364290 bytes
-SHA1 (exiscan-acl-4.44-28.patch.bz2) = bafddb72e08f5988fe6d214e6878d7c54a3ae071
-RMD160 (exiscan-acl-4.44-28.patch.bz2) = 66f5ad353a1e6770e4353aad3c5a50fd9cd5ebd0
-Size (exiscan-acl-4.44-28.patch.bz2) = 83434 bytes
-SHA1 (patch-aa) = ab149803121eb1ce7dc6875d8626a44454c2ae0a
-SHA1 (patch-ab) = efdbfd11ade8b7b6ab6a5b0511a1322abbc4c3d7
-SHA1 (patch-ac) = e6bb70132b655862cf4af4e344dfe9509d7b8106
-SHA1 (patch-ad) = ab2df5e42b993937d124f50510f70d594bafff4a
-SHA1 (patch-ae) = d65205adf8c2ae8a874825e68c163014c13d1628
-SHA1 (patch-af) = 0f4fdaf82bcaa44620b8a235a86d4a638d6d8f66
-SHA1 (patch-ag) = 483fe63aa9c6b524ab61a53a20968e5a7fa3d095
+SHA1 (exim-4.51.tar.bz2) = 9b6633048ae79bb6bd6900f584fe5a650d7634b9
+RMD160 (exim-4.51.tar.bz2) = 9b4e511869935de840ac5690568ffc8443fcd835
+Size (exim-4.51.tar.bz2) = 1462114 bytes
+SHA1 (patch-aa) = a2b10bc2d8938c6973c353cb68394267c2e79ee5
+SHA1 (patch-ab) = 32452f2fed6f0300f460aa9de8528b5ab2fe15c1
+SHA1 (patch-ac) = ed2b1b02cfa8338e82cf6bb74e9f9e5959dd8775
+SHA1 (patch-ad) = 2f43716b398ce650a20750285ba19d7ba5c690bb
+SHA1 (patch-ae) = acc7897d417e137de73a2cac1dd46834f719e202
+SHA1 (patch-af) = 34c4ed129da092396f6f43ba17458c7b753343e4
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index 651a94ac599..bb34d609ac5 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
+$NetBSD: patch-aa,v 1.12 2005/05/17 17:06:12 abs Exp $
 
---- Local/Makefile.pkgsrc.orig	2004-10-07 11:09:11.000000000 +0100
+--- Local/Makefile.pkgsrc.orig	2005-05-17 17:34:46.000000000 +0100
 +++ Local/Makefile.pkgsrc
-@@ -98,7 +98,7 @@
+@@ -100,7 +100,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
  # and any superior directories, if they do not exist.
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin
+@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
  # don't exist. It will also install a default runtime configuration if this
  # file does not exist.
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
  # In this case, Exim will use the first of them that exists when it is run.
-@@ -132,7 +132,7 @@ CONFIGURE_FILE=/usr/exim/configure
+@@ -134,7 +134,7 @@ CONFIGURE_FILE=/usr/exim/configure
  # owner of a local mailbox.) Specifying these values as root is very strongly
  # discouraged.
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  # If you specify EXIM_USER as a name, this is looked up at build time, and the
  # uid number is built into the binary. However, you can specify that this
-@@ -153,7 +153,7 @@ EXIM_USER=
+@@ -155,7 +155,7 @@ EXIM_USER=
  # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
  # you want to use a group other than the default group for the given user.
  
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
-@@ -227,7 +227,7 @@ TRANSPORT_SMTP=yes
+@@ -229,7 +229,7 @@ TRANSPORT_SMTP=yes
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -236,9 +236,9 @@ TRANSPORT_SMTP=yes
+@@ -238,9 +238,9 @@ TRANSPORT_SMTP=yes
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -60,16 +60,16 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -310,7 +310,7 @@ LOOKUP_LSEARCH=yes
+@@ -312,7 +312,7 @@ LOOKUP_LSEARCH=yes
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
 -EXIM_MONITOR=eximon.bin
 +# EXIM_MONITOR=eximon.bin
  
- 
- 
-@@ -406,10 +406,10 @@ FIXED_NEVER_USERS=root
+ #------------------------------------------------------------------------------
+ # Compiling Exim with content scanning support: If you want to compile Exim
+@@ -464,10 +464,10 @@ FIXED_NEVER_USERS=root
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -83,7 +83,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -495,10 +495,11 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -553,10 +553,11 @@ HEADERS_CHARSET="ISO-8859-1"
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -97,7 +97,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -562,7 +563,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -620,7 +621,7 @@ HEADERS_CHARSET="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:
  
@@ -106,7 +106,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 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
-@@ -707,7 +708,8 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -781,7 +782,8 @@ ZCAT_COMMAND=/usr/bin/zcat
  # this setting. See the manual section entitled "Use of tcpwrappers" in the
  # chapter on building and installing Exim.
  #
@@ -116,7 +116,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  #
  # 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:
-@@ -782,11 +784,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -860,11 +862,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.
  
@@ -133,7 +133,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -980,7 +982,7 @@ TMPDIR="/tmp"
+@@ -1058,7 +1060,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:
  
@@ -142,7 +142,7 @@ $NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -1016,3 +1018,7 @@ TMPDIR="/tmp"
+@@ -1094,3 +1096,7 @@ TMPDIR="/tmp"
  # SUPPORT_MOVE_FROZEN_MESSAGES=yes
  
  # End of EDITME for Exim 4.
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab
index 61b816e426f..dfb78254bac 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2004/08/27 10:46:52 abs Exp $
+$NetBSD: patch-ab,v 1.12 2005/05/17 17:06:12 abs Exp $
 
---- OS/Makefile-Default.orig	2004-08-26 15:09:59.000000000 +0100
+--- OS/Makefile-Default.orig	2005-05-04 12:35:39.000000000 +0100
 +++ OS/Makefile-Default
-@@ -69,7 +69,7 @@ PERL_COMMAND=/usr/bin/perl
+@@ -71,7 +71,7 @@ PERL_COMMAND=/usr/bin/perl
  
  # CC contains the name of the C compiler to be used.
  
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
index 6761c969e3b..b08b729d475 100644
--- a/mail/exim/patches/patch-ac
+++ b/mail/exim/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.8 2004/08/27 10:46:52 abs Exp $
+$NetBSD: patch-ac,v 1.9 2005/05/17 17:06:12 abs Exp $
 
---- OS/Makefile-NetBSD-a.out.orig	2004-08-26 15:09:59.000000000 +0100
+--- OS/Makefile-NetBSD-a.out.orig	2005-05-04 12:35:39.000000000 +0100
 +++ OS/Makefile-NetBSD-a.out
-@@ -1,7 +1,7 @@
+@@ -3,7 +3,7 @@
  # Exim: OS-specific make file for NetBSD (a.out/COFF object format)
  
  CHOWN_COMMAND=/usr/sbin/chown
 -CFLAGS=-O
-+CFLAGS?=-O2 -pipe
++CFLAGS?=-O2
  
  HAVE_SA_LEN=YES
  HAVE_IPV6=YES
diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad
index dd260f6d30a..d1eb21c821e 100644
--- a/mail/exim/patches/patch-ad
+++ b/mail/exim/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.7 2004/08/27 10:46:52 abs Exp $
+$NetBSD: patch-ad,v 1.8 2005/05/17 17:06:12 abs Exp $
 
---- OS/Makefile-NetBSD.orig	2004-08-26 15:09:59.000000000 +0100
+--- OS/Makefile-NetBSD.orig	2005-05-04 12:35:39.000000000 +0100
 +++ OS/Makefile-NetBSD
-@@ -1,7 +1,7 @@
+@@ -3,7 +3,7 @@
  # Exim: OS-specific make file for NetBSD (ELF object format)
  
  CHOWN_COMMAND=/usr/sbin/chown
 -CFLAGS=-O
-+CFLAGS?=-O2 -pipe
++CFLAGS?=-O2
  
  HAVE_SA_LEN=YES
  HAVE_IPV6=YES
diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae
index 23b27ce66ad..154c520ce42 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2004/08/27 10:46:52 abs Exp $
+$NetBSD: patch-ae,v 1.8 2005/05/17 17:06:12 abs Exp $
 
---- scripts/exim_install.orig	2004-08-26 15:09:59.000000000 +0100
+--- scripts/exim_install.orig	2005-05-04 12:35:39.000000000 +0100
 +++ scripts/exim_install
-@@ -79,6 +79,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
+@@ -80,6 +80,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
    SYSTEM_ALIASES_FILE=/etc/aliases
  fi
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.7 2004/08/27 10:46:52 abs Exp $
  # Allow INST_xx to over-ride xx
  case "$INST_BIN_DIRECTORY"       in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
  case "$INST_CONFIGURE_FILE"      in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
-@@ -389,15 +391,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
+@@ -390,15 +392,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
      echo $com "*** Exim installation ${ver}failed ***"
      exit 1
    fi
diff --git a/mail/exim/patches/patch-af b/mail/exim/patches/patch-af
index 725964ca23e..3bce7dd94c1 100644
--- a/mail/exim/patches/patch-af
+++ b/mail/exim/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2004/09/25 07:45:51 grant Exp $
+$NetBSD: patch-af,v 1.5 2005/05/17 17:06:12 abs Exp $
 
---- OS/os.h-NetBSD.orig	2004-08-27 00:09:59.000000000 +1000
+--- OS/os.h-NetBSD.orig	2005-05-04 12:35:39.000000000 +0100
 +++ OS/os.h-NetBSD
-@@ -10,4 +10,10 @@ typedef struct flock flock_t;
+@@ -12,4 +12,10 @@ typedef struct flock flock_t;
  #define os_strsignal strsignal
  #define OS_STRSIGNAL
  
diff --git a/mail/exim/patches/patch-ag b/mail/exim/patches/patch-ag
deleted file mode 100644
index c561c6f8c97..00000000000
--- a/mail/exim/patches/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/11/01 17:25:25 abs Exp $
-
---- src/daemon.c.orig	Wed May  5 11:08:35 2004
-+++ src/daemon.c
-@@ -756,6 +756,7 @@ daemon_go(void)
- {
- int *listen_sockets = NULL;
- int listen_socket_count = 0;
-+int fd;
- ip_address_item *addresses = NULL;
- 
- /* If any debugging options are set, turn on the D_pid bit so that all
-@@ -1082,9 +1083,17 @@ if (background_daemon)
-   {
-   log_close_all();  /* Just in case anything was logged earlier */
-   search_tidyup();  /* Just in case any were used in reading the config. */
--  close(0);         /* Get rid of stdin/stdout/stderr */
-+  /* Get rid of stdin/stdout/stderr 
-+  close(0);
-   close(1);
-   close(2);
-+  */
-+  /* Instead of closing, dup them to /dev/null */
-+  fd= open( "/dev/null", O_RDWR );
-+  dup2( fd, 0 ); 
-+  dup2( fd, 1 ); 
-+  dup2( fd, 2 );
-+  if( fd > 2 ) close( fd );
-   log_stderr = NULL;  /* So no attempt to copy paniclog output */
- 
-   /* If the parent process of this one has pid == 1, we are re-initializing the