Update to exim-4.22:

* IPv6 bug fix incorporated.
* Catch up with changes in makefiles.
* Make portlint happier with respect to DOCSDIR, INFO and spaces.
* Use the new INFO macro.
* Use PATCHFILES instead of patching by hand, now that we don't support
  the non-ACL exiscan patch.

This release fixes a few last minute release mistakes from 4.21.

PR:		ports/55701
Submitted by:	Oliver Eikemeier <eikemeier@fillmore-labs.com>

1 files changed, 20 insertions, 19 deletions

diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME
index dc7ff7373dbd..a6e48c5f2579 100644
--- a/mail/exim/files/patch-src::EDITME
+++ b/mail/exim/files/patch-src::EDITME
@@ -1,5 +1,5 @@
---- src/EDITME.orig	Mon Jul 22 10:59:47 2002
-+++ src/EDITME	Mon Sep 16 11:33:03 2002
+--- src/EDITME.orig	Mon Aug 18 14:52:52 2003
++++ src/EDITME	Mon Aug 18 17:34:17 2003
 @@ -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.
@@ -9,16 +9,16 @@
  
  
  #------------------------------------------------------------------------------
-@@ -113,7 +113,7 @@
- # directories if they don't exist. It will also install a default runtime
- # configuration if this file does not exist.
+@@ -114,7 +114,7 @@
+ # don't exist. It will also install a default runtime configuration if this
+ # file does not exist.
  
 -CONFIGURE_FILE=/usr/exim/configure
 +CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/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.
-@@ -131,14 +131,14 @@
+@@ -132,14 +132,14 @@
  # owner of a local mailbox.) Specifying these values as root is very strongly
  # discouraged. These values are compiled into the binary.
  
@@ -35,7 +35,7 @@
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
-@@ -264,6 +264,7 @@
+@@ -265,6 +265,7 @@
  # LDAP_LIB_TYPE=OPENLDAP2
  # LDAP_LIB_TYPE=NETSCAPE
  # LDAP_LIB_TYPE=SOLARIS
@@ -43,7 +43,7 @@
  
  # If you don't set any of these, Exim assumes the original University of
  # Michigan (OpenLDAP 1) library.
-@@ -276,8 +277,10 @@
+@@ -277,8 +278,10 @@
  # don't need to set LOOKUP_INCLUDE if the relevant directories are already
  # specified in INCLUDE.
  
@@ -56,7 +56,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -288,7 +290,7 @@
+@@ -289,7 +292,7 @@
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -65,7 +65,7 @@
  
  
  
-@@ -326,7 +328,7 @@
+@@ -393,7 +396,7 @@
  # SUPPORT_TLS=yes
  
  # Uncomment this setting if you are using OpenSSL
@@ -74,7 +74,7 @@
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -377,7 +379,7 @@
+@@ -444,7 +447,7 @@
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
  
@@ -83,7 +83,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -390,7 +392,7 @@
+@@ -457,7 +460,7 @@
  # %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:
  
@@ -92,13 +92,14 @@
  
  # 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
-@@ -493,12 +495,20 @@
- 
- #  USE_TCP_WRAPPERS=yes
- #  CFLAGS=-O -I/usr/local/include
--#  EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
+@@ -594,12 +597,20 @@
+ #
+ # USE_TCP_WRAPPERS=yes
+ # CFLAGS=-O -I/usr/local/include
+-# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
+-#
 +EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX
- 
++
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
  
@@ -114,7 +115,7 @@
  #------------------------------------------------------------------------------
  # The default action of the exim_install script (which is run by "make
  # install") is to install the Exim binary with a unique name such as
-@@ -726,7 +736,7 @@
+@@ -841,7 +852,7 @@
  # (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: