* Add a WITH_IPV6 knob. Exim breaks if compiled with IPv6 support and

  run with a kernel that has had IPv6 ommitted from its configuration,
  so I can't make this a default (yet).

* Remove crazy handling of exim.sh and replace it with something much
  simpler and more sane.  This allows non-root users to build, even if
  they can't install (properly).

2 files changed, 18 insertions, 31 deletions

diff --git a/mail/exim-old/files/patch-aa b/mail/exim-old/files/patch-aa
index 8d43ae9..9d71d81 100644
--- a/mail/exim-old/files/patch-aa
+++ b/mail/exim-old/files/patch-aa
@@ -1,22 +1,19 @@
-This patch makes four changes to the exim_install script:
+This patch makes three changes to the exim_install script:
 
-1) Changes the test used to determine whether a file should be installed
+*) Changes the test used to determine whether a file should be installed
    to cope with files which we "touch" to zero bytes for packaging
    purposes.
 
-2) Causes an exim.sh startup script to be installed in the BSD-style
-   ${PREFIX}/etc/rc.d
-
-3) Causes the configure file to be installed as a sample only.  The
+*) Causes the configure file to be installed as a sample only.  The
    administrator needs to rename this file to "activate" exim.
 
-4) Changes the invocation of make-info to be less prone to fail on
+*) Changes the invocation of make-info to be less prone to fail on
    silly errors.  XXX Check that this is still necessary from time
    to time.
 
 --- scripts/exim_install.orig	Mon Aug  2 17:43:03 1999
 +++ scripts/exim_install	Tue Aug  3 14:31:20 1999
-@@ -142,9 +142,9 @@
+@@ -146,9 +146,9 @@
      from=../util/
    fi
  
@@ -28,31 +25,13 @@ This patch makes four changes to the exim_install script:
      echo $com "*** Have you built Exim successfully?"
      echo $com "*** Exim installation ${ver}failed ***"
      exit 1
-@@ -195,25 +195,40 @@
+@@ -199,25 +199,20 @@
    fi
  done
  
-+# Install exim.sh startup script in FreeBSD's ${PREFIX}/etc/rc.d so that
-+# exim will start up on boot once sendmail is disabled and
-+# ${PREFIX}/etc/exim/configure is in place.
- 
-+echo $com ""
- 
+-
+-
 -# If there is no configuration file, install the default.
-+if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then
-+  echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten"
-+else
-+  echo $com "Installing exim.sh startup script in ${PREFIX}/etc/rc.d"
-+  ${real} mkdir -p ${PREFIX}/etc/rc.d
-+  echo ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
-+  ${real} ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
-+  if [ $? -ne 0 ]; then
-+    echo $com ""
-+    echo $com "**** Exim installation ${ver}failed ****"
-+    exit 1
-+  fi
-+fi
-+
 +# Install only a sample configuration, which encourages the admin to look
 +# at it, since Exim won't run without a configure file.
  
@@ -78,7 +57,7 @@ This patch makes four changes to the exim_install script:
  
  # Install info files if the directory is defined and the Texinfo
  # source documentation is present.
-@@ -235,19 +250,21 @@
+@@ -239,19 +234,21 @@
    echo $com Info installation directory is ${INFO_DIRECTORY}
    echo $com ""
  
diff --git a/mail/exim-old/files/patch-src::EDITME b/mail/exim-old/files/patch-src::EDITME
index 34dd374..e5f897f 100644
--- a/mail/exim-old/files/patch-src::EDITME
+++ b/mail/exim-old/files/patch-src::EDITME
@@ -96,10 +96,18 @@
  
  # If you are running Exim as a server, note that just building it with TLS
  # support is not usually all you need to do. You normally need to set up a
-@@ -573,5 +576,6 @@
+@@ -573,5 +576,14 @@
  # chapter on building and installing Exim.
  
  # USE_TCP_WRAPPERS=yes
 +EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX
++
++
++# IPv6 is coming. Exim has experimental support that has been tried out on
++# one or two OS. See the file README.IPV6 for the current status of this
++# support. Do not set this option unless you are working on IPv6 and know
++# what you are doing.
++
++# HAVE_IPV6=yes
  
  # End of EDITME