Update exim to 4.22. Too many changes to list since 4.10

Package changes include addition of Makefile.common (to be used by
Upcoming exim-exiscan-acl package), and exim.8

13 files changed, 310 insertions, 320 deletions

diff --git a/mail/exim/MESSAGE b/mail/exim/MESSAGE
index c755634bf82..a823576ced8 100644
--- a/mail/exim/MESSAGE
+++ b/mail/exim/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/08/02 17:00:08 jmmv Exp $
+$NetBSD: MESSAGE,v 1.4 2003/09/02 10:33:38 abs Exp $
 
 To use exim, you will need to perform the following steps manually; it is
 inappropriate for this package to make the changes for you.
@@ -8,7 +8,7 @@ inappropriate for this package to make the changes for you.
 2. Edit ${PKG_SYSCONFDIR}/aliases to taste (or override it with the default
    /etc/aliases system file).
 3. Back-up /etc/mailer.conf to /etc/mailer.conf.sendmail.
-   Copy ${EGDIR}/mailer.conf to /etc/mailer.conf.
+   Copy ${EXAMPLESDIR}/mailer.conf to /etc/mailer.conf.
 4. Set 'sendmail=NO', 'exim=YES' and exim_flags to some sane value in
    /etc/rc.conf (previously it was "-bd -q15m").
    Copy ${PREFIX}/etc/rc.d/exim to /etc/rc.d.
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 80ec5d76d10..e7550f81eb0 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,72 +1,16 @@
-# $NetBSD: Makefile,v 1.37 2003/08/02 17:00:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2003/09/02 10:33:38 abs Exp $
 
-DISTNAME=	exim-4.10
-PKGREVISION=	2
+DISTNAME=	exim-${EXIM_VERSION}
 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=	ad@NetBSD.org
 HOMEPAGE=	http://www.exim.org/
 COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 
-DEPENDS+=       exim-user>=4.10nb1:../../mail/exim-user
+DEPENDS+=	exim-user>=4.10nb1:../../mail/exim-user
+CONFLICTS+=	exim-exiscan-[0-9]* exim-exiscan-acl-[0-9]*
 
-USE_PERL5=	yes
-USE_BUILDLINK2=	yes
-USE_PKGINSTALL=	yes
+.include "Makefile.common"
 
-MAKE_ENV+=	SSLBASE=${SSLBASE:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=		EXIM_GROUP EXIM_USER
-
-PKG_SYSCONFSUBDIR=	exim
-EGDIR=			${PREFIX}/share/examples/exim
-CONF_FILES=		${EGDIR}/aliases ${PKG_SYSCONFDIR}/aliases
-CONF_FILES+=		${EGDIR}/configure ${PKG_SYSCONFDIR}/configure
-MESSAGE_SUBST+=		EGDIR="${EGDIR}"
-
-RCD_SCRIPTS=		exim
-
-OWN_DIRS_PERMS=		/var/log/exim ${EXIM_USER} ${EXIM_GROUP} 750
-
-# XXX: The following will be handled by buildlink2 at some point.
-CFLAGS+=		${_STRIPFLAG_CC}
-
-pre-patch:
-	${MKDIR} ${WRKSRC}/Local
-	${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.netbsd
-
-pre-configure:
-	${SED} -e 's:@PREFIX@:${PREFIX}:g' \
-	    -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:g' \
-	    -e 's:@EXIM_USER@:${EXIM_USER}:g' \
-	    -e 's:@EXIM_GROUP@:${EXIM_GROUP}:g' \
-	    < ${WRKSRC}/Local/Makefile.netbsd \
-	    > ${WRKSRC}/Local/Makefile
-	${SED} -e 's:@PREFIX@:${PREFIX}:g' \
-	    -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:g' \
-	    < ${WRKSRC}/src/configure.default \
-	    > ${WRKSRC}/src/configure.default.new
-	${MV} ${WRKSRC}/src/configure.default.new \
-	    ${WRKSRC}/src/configure.default
-
-post-build:
-	${SED} -e 's:@PREFIX@:${PREFIX}:' \
-	    ${FILESDIR}/exim_newaliases \
-	    > ${WRKDIR}/exim_newaliases
-	${SED} -e 's:@PREFIX@:${PREFIX}:' \
-	    ${FILESDIR}/mailer.conf.exim \
-	    > ${WRKDIR}/mailer.conf
-
-pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/exim_newaliases ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
-
-.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
+# 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
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
new file mode 100644
index 00000000000..d38b85f7958
--- /dev/null
+++ b/mail/exim/Makefile.common
@@ -0,0 +1,69 @@
+# $NetBSD: Makefile.common,v 1.1 2003/09/02 10:33:38 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_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+
+MAKE_ENV+=      SSLBASE=${SSLBASE:Q}
+
+EXIM_VERSION=	4.22
+
+WRKSRC=		${WRKDIR}/exim-${EXIM_VERSION}
+EXTRACT_SUFX=	.tar.bz2
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS=		EXIM_USER EXIM_GROUP
+
+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}"
+
+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 buildlink2 at some point.
+CFLAGS+=                ${_STRIPFLAG_CC}
+
+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:
+	${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:@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
+	${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
+
+.include "../../security/openssl/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/PLIST b/mail/exim/PLIST
index 293a81c42ad..6c844cd86fd 100644
--- a/mail/exim/PLIST
+++ b/mail/exim/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2003/08/02 17:00:08 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/09/02 10:33:38 abs Exp $
 etc/rc.d/exim
+man/man8/exim.8
 sbin/exicyclog
 sbin/exigrep
 sbin/exim
@@ -9,7 +10,6 @@ sbin/exim_dbmbuild
 sbin/exim_dumpdb
 sbin/exim_fixdb
 sbin/exim_lock
-sbin/exim_newaliases
 sbin/exim_tidydb
 sbin/eximstats
 sbin/exinext
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 69ee1cbe771..39184e3f50a 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.11 2003/08/02 17:00:08 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2003/09/02 10:33:39 abs Exp $
 
-SHA1 (exim-4.10.tar.bz2) = cd374dde11a24fd12aa1c0ff72270d876d9c180d
-Size (exim-4.10.tar.bz2) = 1037997 bytes
-SHA1 (patch-aa) = 9ef7ef419781ad7fceb55fa346b4d0abd2c37bc1
-SHA1 (patch-ab) = 6fcddd0d315dd19fa3a45cb30043a36bdb1ded84
-SHA1 (patch-ac) = 6f514aa7e52c3ccca6db8e95d521a1c43f8f515f
-SHA1 (patch-ad) = ec9f2404a0aa9bf0663e2146f203c08bcaf0295d
-SHA1 (patch-ae) = 5ca61d792b9426e0ae2da71643ea53c0ddf9cc2d
+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-ab) = afccbaec6ece925f87384535e70da8dd79d8e978
+SHA1 (patch-ac) = 8f3bd109cf961dc72fa11bd738aa69995bebc929
+SHA1 (patch-ad) = ad4cc6c2b2db445504613c04affcd5fc7b012d35
+SHA1 (patch-ae) = f5809185329771a691a75677c352fb54405e525d
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh
index 5d0db37d800..37688426630 100644
--- a/mail/exim/files/exim.sh
+++ b/mail/exim/files/exim.sh
@@ -1,18 +1,17 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-#	$NetBSD: exim.sh,v 1.4 2003/08/02 17:00:09 jmmv Exp $
+#	$NetBSD: exim.sh,v 1.5 2003/09/02 10:33:40 abs Exp $
 #
 # PROVIDE: mail
 # REQUIRE: LOGIN
-#
 
 . /etc/rc.subr
 
-name="exim"                      
-rcvar=$name         
+name="exim"
+rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="@PKG_SYSCONFDIR@/configure"
-              
+
 load_rc_config $name
 run_rc_command "$1"
diff --git a/mail/exim/files/exim_newaliases b/mail/exim/files/exim_newaliases
deleted file mode 100644
index 1855175cf67..00000000000
--- a/mail/exim/files/exim_newaliases
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-#	$NetBSD: exim_newaliases,v 1.4 2002/12/09 11:38:05 ad Exp $
-#
-if [ -f /etc/mail/aliases ]; then
-	ALIASDIR=/etc/mail
-else
-	ALIASDIR=/etc
-fi
-
-cd $ALIASDIR
-echo -n "$ALIASDIR/aliases: "
-@PREFIX@/sbin/exim_dbmbuild aliases aliases.db
-
diff --git a/mail/exim/files/mailer.conf.exim b/mail/exim/files/mailer.conf.exim
index edec8edb4c4..e689bf52484 100644
--- a/mail/exim/files/mailer.conf.exim
+++ b/mail/exim/files/mailer.conf.exim
@@ -1,8 +1,8 @@
-#	$NetBSD: mailer.conf.exim,v 1.1 1999/09/18 20:27:08 ad Exp $
+#	$NetBSD: mailer.conf.exim,v 1.2 2003/09/02 10:33:41 abs Exp $
 #
 # Use "exim" as replacement for "sendmail".
 #
 sendmail	@PREFIX@/sbin/exim
 send-mail	@PREFIX@/sbin/exim
 mailq		@PREFIX@/sbin/exim
-newaliases	@PREFIX@/sbin/exim_newaliases
+newaliases	@PREFIX@/sbin/exim
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index 89ee5e014fc..cb397861a65 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,31 +1,162 @@
-$NetBSD: patch-aa,v 1.4 2003/08/02 17:00:10 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2003/09/02 10:33:41 abs Exp $
 
---- scripts/exim_install.orig	2002-07-22 10:59:47.000000000 +0200
-+++ scripts/exim_install
-@@ -42,6 +42,8 @@ INFO_DIRECTORY=`sed -n -e '/^ *INFO_DIRE
- NO_SYMLINK=`sed -n         -e '/^ *NO_SYMLINK *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
- EXE=`sed -n                       -e '/^ *EXE *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
+--- Local/Makefile.pkgsrc.orig	2003-08-29 18:17:32.000000000 +0100
++++ Local/Makefile.pkgsrc
+@@ -98,7 +98,7 @@
+ # /usr/local/sbin. The installation script will try to create this directory,
+ # and any superior directories, if they do not exist.
  
-+INST_CONFIGURE_FILE=${PREFIX}/share/examples/exim/configure
+-BIN_DIRECTORY=/usr/exim/bin
++BIN_DIRECTORY=@PREFIX@/sbin
+ 
+ 
+ #------------------------------------------------------------------------------
+@@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin
+ # don't exist. It will also install a default runtime configuration if this
+ # file does not exist.
+ 
+-CONFIGURE_FILE=/usr/exim/configure
++CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure
+ 
+ # 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,8 @@ CONFIGURE_FILE=/usr/exim/configure
+ # owner of a local mailbox.) Specifying these values as root is very strongly
+ # discouraged. These values are compiled into the binary.
+ 
+-EXIM_USER=
++EXIM_USER=@EXIM_USER@
++EXIM_GROUP=@EXIM_GROUP@
+ 
+ # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
+ # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
+@@ -213,7 +214,7 @@ TRANSPORT_SMTP=yes
+ # This one is special-purpose, and commonly not required, so it is not
+ # included by default.
+ 
+-# TRANSPORT_LMTP=yes
++TRANSPORT_LMTP=yes
+ 
+ 
+ #------------------------------------------------------------------------------
+@@ -222,9 +223,9 @@ TRANSPORT_SMTP=yes
+ # MBX, is included only when requested. If you do not know what this is about,
+ # leave these settings commented out.
+ 
+-# SUPPORT_MAILDIR=yes
+-# SUPPORT_MAILSTORE=yes
+-# SUPPORT_MBX=yes
++SUPPORT_MAILDIR=yes
++SUPPORT_MAILSTORE=yes
++SUPPORT_MBX=yes
+ 
+ 
+ #------------------------------------------------------------------------------
+@@ -289,7 +290,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
+ 
+ 
+ 
+@@ -310,9 +311,9 @@ EXIM_MONITOR=eximon.bin
+ # included in the Exim binary. You will then need to set up the run time
+ # configuration to make use of the mechanism(s) selected.
+ 
+-# AUTH_CRAM_MD5=yes
+-# AUTH_PLAINTEXT=yes
+-# AUTH_SPA=yes
++AUTH_CRAM_MD5=yes
++AUTH_PLAINTEXT=yes
++AUTH_SPA=yes
+ 
+ 
+ #------------------------------------------------------------------------------
+@@ -365,10 +366,11 @@ HEADER_DECODE_TO="ISO-8859-1"
+ # leave these settings commented out.
+ 
+ # This setting is required for any TLS support (either OpenSSL or GnuTLS)
+-# SUPPORT_TLS=yes
++SUPPORT_TLS=yes
+ 
+ # Uncomment this setting if you are using OpenSSL
+-# TLS_LIBS=-lssl -lcrypto
++TLS_LIBS=-L${SSLBASE}/lib -Wl,-R${SSLBASE}/lib -lssl -lcrypto
++TLS_INCLUDE=-I${SSLBASE}/include
+ 
+ # Uncomment these settings if you are using GnuTLS
+ # USE_GNUTLS=yes
+@@ -402,6 +404,19 @@ HEADER_DECODE_TO="ISO-8859-1"
+ # You don't need to set TLS_INCLUDE if the relevant directories are already
+ # specified in INCLUDE.
+ 
++#------------------------------------------------------------------------------
++# On systems which support dynamic loading of shared libraries, Exim can
++# load a local_scan function specified in its config file instead of having
++# to be recompiled with the desired local_scan function. For a full
++# description of the API to this function, see the Exim specification.
++
++DLOPEN_LOCAL_SCAN=yes
 +
- # 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
-@@ -278,15 +280,8 @@ if [ ! -f ${CONFIGURE_FILE} ]; then
-     echo $com "*** Exim installation ${ver}failed ***"
-     exit 1
-   fi
--  if [ ! -f /etc/aliases ]; then
--    echo $com '****'
--    echo $com Installing a dummy /etc/aliases file because you do not have
--    echo $com one, and the default configuration requires it. You should
--    echo $com edit /etc/aliases and at least create an alias for postmaster.
--    echo $com '***'
--    echo ${CP} ../src/aliases.default /etc/aliases
--    ${real} ${CP} ../src/aliases.default /etc/aliases
--  fi
-+  echo ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
-+  ${real} ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
- else
-   echo $com Configuration file ${CONFIGURE_FILE} already exists
- fi
++# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
++# linker flags.  Without it, the loaded .so won't be able to access any
++# functions from exim.
++
++LFLAGS=-rdynamic
+ 
+ #------------------------------------------------------------------------------
+ # The default distribution of Exim contains only the plain text form of the
+@@ -432,7 +447,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:
+ 
+-# LOG_FILE_PATH=/var/log/exim_%slog
++LOG_FILE_PATH=/var/log/exim/%s
+ 
+ # 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
+ # 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
+ 
+ # 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
+ # haven't got Perl, Exim will still build and run; you just won't be able to
+ # use those utilities.
+ 
+-# CHOWN_COMMAND=/usr/bin/chown
+-# CHGRP_COMMAND=/usr/bin/chgrp
+-# MV_COMMAND=/bin/mv
+-# RM_COMMAND=/bin/rm
+-# PERL_COMMAND=/usr/bin/perl
++CHOWN_COMMAND=@CHOWN@
++CHGRP_COMMAND=@CHGRP@
++MV_COMMAND=@MV@
++RM_COMMAND=@RM@
++PERL_COMMAND=@PERL5@
+ 
+ 
+ #------------------------------------------------------------------------------
+@@ -816,7 +831,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:
+ 
+-# PID_FILE_PATH=/var/lock/exim.pid
++PID_FILE_PATH=/var/run/exim.pid
+ 
+ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
+ # using the name "exim-daemon.pid".
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab
index d3c0154979b..ad85bff7a56 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-ab
@@ -1,142 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2003/08/02 17:00:10 jmmv Exp $
+$NetBSD: patch-ab,v 1.9 2003/09/02 10:33:41 abs Exp $
 
---- Local/Makefile.netbsd.orig	2003-07-30 20:51:26.000000000 +0200
-+++ Local/Makefile.netbsd
-@@ -98,7 +98,9 @@
- # /usr/local/sbin. The installation script will try to create this directory,
- # and any superior directories, if they do not exist.
+--- OS/Makefile-Default.orig	2003-08-12 16:39:51.000000000 +0100
++++ OS/Makefile-Default
+@@ -69,7 +69,7 @@ PERL_COMMAND=/usr/bin/perl
  
--BIN_DIRECTORY=/usr/exim/bin
-+HAVE_IPV6=YES
-+
-+BIN_DIRECTORY=@PREFIX@/sbin
+ # CC contains the name of the C compiler to be used.
  
+-CC=gcc
++# CC=gcc
  
- #------------------------------------------------------------------------------
-@@ -113,7 +115,7 @@ BIN_DIRECTORY=/usr/exim/bin
- # directories if they don't exist. It will also install a default run time
- # configuration if this file does not exist.
  
--CONFIGURE_FILE=/usr/exim/configure
-+CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure
- 
- 
- #------------------------------------------------------------------------------
-@@ -126,7 +128,8 @@ CONFIGURE_FILE=/usr/exim/configure
- # owner of a local mailbox.) Specifying these values as root is very strongly
- # discouraged. These values are compiled into the binary.
- 
--EXIM_USER=
-+EXIM_USER=@EXIM_USER@
-+EXIM_GROUP=@EXIM_GROUP@
- 
- # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
- # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-@@ -207,7 +210,7 @@ TRANSPORT_SMTP=yes
- # This one is special-purpose, and commonly not required, so it is not
- # included by default.
- 
--# TRANSPORT_LMTP=yes
-+TRANSPORT_LMTP=yes
- 
- 
- #------------------------------------------------------------------------------
-@@ -216,9 +219,9 @@ TRANSPORT_SMTP=yes
- # MBX, is included only when requested. If you do not know what this is about,
- # leave these settings commented out.
- 
--# SUPPORT_MAILDIR=yes
--# SUPPORT_MAILSTORE=yes
--# SUPPORT_MBX=yes
-+SUPPORT_MAILDIR=yes
-+SUPPORT_MAILSTORE=yes
-+SUPPORT_MBX=yes
- 
- 
- #------------------------------------------------------------------------------
-@@ -281,7 +284,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
- 
- 
- 
-@@ -302,9 +305,9 @@ EXIM_MONITOR=eximon.bin
- # included in the Exim binary. You will then need to set up the run time
- # configuration to make use of the mechanism(s) selected.
- 
--# AUTH_CRAM_MD5=yes
--# AUTH_PLAINTEXT=yes
--# AUTH_SPA=yes
-+AUTH_CRAM_MD5=yes
-+AUTH_PLAINTEXT=yes
-+AUTH_SPA=yes
- 
- 
- #------------------------------------------------------------------------------
-@@ -315,8 +318,9 @@ EXIM_MONITOR=eximon.bin
- # with TLS support. If you don't know what this is all about, leave these
- # settings commented out.
- 
--# SUPPORT_TLS=yes
--# TLS_LIBS=-lssl -lcrypto
-+SUPPORT_TLS=yes
-+TLS_LIBS=-L${SSLBASE}/lib -Wl,-R${SSLBASE}/lib -lssl -lcrypto
-+TLS_INCLUDE=-I${SSLBASE}/include
- 
- # If you are running Exim as a server, note that just building it with TLS
- # support is not all you need to do. You also need to set up a suitable
-@@ -371,7 +375,7 @@ EXIM_MONITOR=eximon.bin
- # %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:
- 
--# LOG_FILE_PATH=/var/log/exim_%slog
-+LOG_FILE_PATH=/var/log/exim/%slog
- 
- # 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
-@@ -467,14 +471,14 @@ 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
- 
- # 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.
-@@ -511,11 +515,11 @@ ZCAT_COMMAND=/usr/bin/zcat
- # haven't got Perl, Exim will still build and run; you just won't be able to
- # use those utilities.
- 
--# CHOWN_COMMAND=/usr/bin/chown
--# CHGRP_COMMAND=/usr/bin/chgrp
--# MV_COMMAND=/bin/mv
--# RM_COMMAND=/bin/rm
--# PERL_COMMAND=/usr/bin/perl
-+CHOWN_COMMAND=/usr/sbin/chown
-+CHGRP_COMMAND=/usr/bin/chgrp
-+MV_COMMAND=/bin/mv
-+RM_COMMAND=/bin/rm
-+PERL_COMMAND=@PREFIX@/bin/perl
- 
- 
- #------------------------------------------------------------------------------
-@@ -695,7 +699,7 @@ ZCAT_COMMAND=/usr/bin/zcat
- # (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:
- 
--# PID_FILE_PATH=/var/lock/exim.pid
-+PID_FILE_PATH=/var/run/exim.pid
- 
- # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
- # using the name "exim-daemon.pid".
+ # CFLAGS contains flags to be passed to the compiler. Nothing is defaulted
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
index bb710d89f53..7f21c9770c3 100644
--- a/mail/exim/patches/patch-ac
+++ b/mail/exim/patches/patch-ac
@@ -1,16 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2003/08/02 17:00:10 jmmv Exp $
+$NetBSD: patch-ac,v 1.6 2003/09/02 10:33:42 abs Exp $
 
---- OS/Makefile-NetBSD-a.out.orig	Thu Apr 18 08:08:28 2002
-+++ OS/Makefile-NetBSD-a.out	Thu Jun 13 12:37:38 2002
-@@ -1,9 +1,10 @@
- # Exim: OS-specific make file for NetBSD (a.out binary format)
+--- OS/Makefile-NetBSD-a.out.orig	2003-08-12 16:39:51.000000000 +0100
++++ OS/Makefile-NetBSD-a.out
+@@ -1,7 +1,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 -pipe
  
  HAVE_SA_LEN=YES
-+HAVE_IPV6=YES
- LIBS=-lcrypt
- 
- X11=/usr/X11R6
+ HAVE_IPV6=YES
diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad
index 60200fb4fdc..8f55f66d052 100644
--- a/mail/exim/patches/patch-ad
+++ b/mail/exim/patches/patch-ad
@@ -1,40 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2003/08/02 17:00:10 jmmv Exp $
+$NetBSD: patch-ad,v 1.5 2003/09/02 10:33:42 abs Exp $
 
---- OS/Makefile-NetBSD~	Mon Jul 22 09:59:45 2002
-+++ OS/Makefile-NetBSD	Mon Dec  9 11:22:09 2002
-@@ -1,15 +1,26 @@
- # Exim: OS-specific make file for NetBSD (ELF binary format)
--# Submitted by: Vadim Vygonets <vadik@cs.huji.ac.il>
+--- OS/Makefile-NetBSD.orig	2003-08-12 16:39:51.000000000 +0100
++++ OS/Makefile-NetBSD
+@@ -1,7 +1,7 @@
+ # Exim: OS-specific make file for NetBSD (ELF object format)
  
--# Include Makfile.NetBSD-a.out
-+CHOWN_COMMAND=/usr/sbin/chown
-+CFLAGS+=-O2 -pipe
+ CHOWN_COMMAND=/usr/sbin/chown
+-CFLAGS=-O
++CFLAGS?=-O2 -pipe
  
--.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
-+HAVE_SA_LEN=YES
-+HAVE_IPV6=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_SIGNAL=-USR1
-+
-+# NetBSD always ships with Berkeley DB
-+
-+USE_DB=yes
-+
-+# End
- 
- # NetBSD ELF linker needs a -R flag.
- XLFLAGS+=-Wl,-R$(X11)/lib/
+ HAVE_SA_LEN=YES
+ HAVE_IPV6=YES
diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae
index c40e513d54f..e440e7c7d24 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-ae
@@ -1,13 +1,31 @@
-$NetBSD: patch-ae,v 1.4 2003/08/02 17:00:10 jmmv Exp $
+$NetBSD: patch-ae,v 1.5 2003/09/02 10:33:42 abs Exp $
 
---- src/configure.default.orig	Thu Jun 13 11:37:52 2002
-+++ src/configure.default	Thu Jun 13 11:38:06 2002
-@@ -367,7 +367,7 @@
-   driver = redirect
-   allow_fail
-   allow_defer
--  data = ${lookup{$local_part}lsearch{/etc/aliases}}
-+  data = ${lookup{$local_part}lsearch{@PKG_SYSCONFDIR@/aliases}}
- # user = exim
-   file_transport = address_file
-   pipe_transport = address_pipe
+--- scripts/exim_install.orig	2003-08-12 16:39:53.000000000 +0100
++++ scripts/exim_install
+@@ -79,6 +79,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
+   SYSTEM_ALIASES_FILE=/etc/aliases
+ fi
+ 
++INST_CONFIGURE_FILE=${PREFIX}/share/examples/exim/configure
++
+ # 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
+@@ -381,15 +383,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
+     echo $com "*** Exim installation ${ver}failed ***"
+     exit 1
+   fi
+-  if [ ! -f ${SYSTEM_ALIASES_FILE} ]; then
+-    echo $com '****'
+-    echo $com Installing a dummy ${SYSTEM_ALIASES_FILE} file because you do not have
+-    echo $com one, and the default configuration requires it. You should
+-    echo $com edit ${SYSTEM_ALIASES_FILE} and at least create an alias for postmaster.
+-    echo $com '***'
+-    echo ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
+-    ${real} ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
+-  fi
++  echo ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
++  ${real} ${CP} ../src/aliases.default ${PREFIX}/share/examples/exim/aliases
+ 
+ else
+   echo $com Configuration file ${CONFIGURE_FILE} already exists