Upgrade to version 2.11, featuring minor bug-fixes and some new features.

New features are backward compatible.

Submitted by:	maintainer

9 files changed, 96 insertions, 21 deletions

diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index 817cd230ab10..da0802aab7c8 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	exim
-# Version required:	2.10
+# Version required:	2.11
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.24 1998/12/08 15:23:42 markm Exp $
+# $Id: Makefile,v 1.25 1998/12/17 10:54:23 markm Exp $
 #
 
-DISTNAME=	exim-2.10
+DISTNAME=	exim-2.11
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
 		ftp://ftp.quite.net/pub/exim/ \
 		http://www.exim.org/ftp/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-2.10.tar.gz exim-texinfo-2.10.tar.gz
+DISTFILES=	exim-2.11.tar.gz exim-texinfo-2.10.tar.gz
 
 MAINTAINER=	axl@iafrica.com
 
diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo
index 88e102b48609..baa74a53f559 100644
--- a/mail/exim-devel/distinfo
+++ b/mail/exim-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-2.10.tar.gz) = 5b7e55314843e1df5b9a94726dd3045b
+MD5 (exim-2.11.tar.gz) = 8e4100415f98db74ff448cbff6c07183
 MD5 (exim-texinfo-2.10.tar.gz) = ece154c4c8c95e3983d11c5de186005c
diff --git a/mail/exim-devel/files/patch-aa b/mail/exim-devel/files/patch-aa
index 3dc16f46f560..7d19cace9958 100644
--- a/mail/exim-devel/files/patch-aa
+++ b/mail/exim-devel/files/patch-aa
@@ -7,9 +7,9 @@
 +# 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 ""
  
++echo $com ""
++
 +if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then
 +  echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten"
 +else
@@ -48,3 +48,28 @@
  
  # Install info files if the directory is defined and the Texinfo
  # source documentation is present.
+@@ -226,19 +240,21 @@
+   echo $com Info installation directory is ${INFO_DIRECTORY}
+   echo $com ""
+ 
+-  makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
++  makeinfo --no-validate --no-split --output exim_overview.info \
++      ../doc/oview.texinfo
+   echo ${CP} exim_overview.info ${INFO_DIRECTORY}
+   ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
+   install-info --section="Exim" \
+       --entry "* Overview: (exim_overview).    Overview of the Exim system" \
+       ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir
+-  makeinfo --no-split --output exim.info ../doc/spec.texinfo
++  makeinfo --no-validate --no-split --output exim.info ../doc/spec.texinfo
+   echo ${CP} exim.info ${INFO_DIRECTORY}
+   ${real} ${CP} exim.info ${INFO_DIRECTORY}
+   install-info --section="Exim" \
+       --entry "* User guide: (exim).           Exim manual" \
+       ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
+-  makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
++  makeinfo --no-validate --no-split --output exim_filter.info \
++      ../doc/filter.texinfo
+   echo ${CP} exim_filter.info ${INFO_DIRECTORY}
+   ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
+   install-info --section="Exim" \
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 817cd230ab10..da0802aab7c8 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	exim
-# Version required:	2.10
+# Version required:	2.11
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.24 1998/12/08 15:23:42 markm Exp $
+# $Id: Makefile,v 1.25 1998/12/17 10:54:23 markm Exp $
 #
 
-DISTNAME=	exim-2.10
+DISTNAME=	exim-2.11
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
 		ftp://ftp.quite.net/pub/exim/ \
 		http://www.exim.org/ftp/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-2.10.tar.gz exim-texinfo-2.10.tar.gz
+DISTFILES=	exim-2.11.tar.gz exim-texinfo-2.10.tar.gz
 
 MAINTAINER=	axl@iafrica.com
 
diff --git a/mail/exim-old/distinfo b/mail/exim-old/distinfo
index 88e102b48609..baa74a53f559 100644
--- a/mail/exim-old/distinfo
+++ b/mail/exim-old/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-2.10.tar.gz) = 5b7e55314843e1df5b9a94726dd3045b
+MD5 (exim-2.11.tar.gz) = 8e4100415f98db74ff448cbff6c07183
 MD5 (exim-texinfo-2.10.tar.gz) = ece154c4c8c95e3983d11c5de186005c
diff --git a/mail/exim-old/files/patch-aa b/mail/exim-old/files/patch-aa
index 3dc16f46f560..7d19cace9958 100644
--- a/mail/exim-old/files/patch-aa
+++ b/mail/exim-old/files/patch-aa
@@ -7,9 +7,9 @@
 +# 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 ""
  
++echo $com ""
++
 +if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then
 +  echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten"
 +else
@@ -48,3 +48,28 @@
  
  # Install info files if the directory is defined and the Texinfo
  # source documentation is present.
+@@ -226,19 +240,21 @@
+   echo $com Info installation directory is ${INFO_DIRECTORY}
+   echo $com ""
+ 
+-  makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
++  makeinfo --no-validate --no-split --output exim_overview.info \
++      ../doc/oview.texinfo
+   echo ${CP} exim_overview.info ${INFO_DIRECTORY}
+   ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
+   install-info --section="Exim" \
+       --entry "* Overview: (exim_overview).    Overview of the Exim system" \
+       ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir
+-  makeinfo --no-split --output exim.info ../doc/spec.texinfo
++  makeinfo --no-validate --no-split --output exim.info ../doc/spec.texinfo
+   echo ${CP} exim.info ${INFO_DIRECTORY}
+   ${real} ${CP} exim.info ${INFO_DIRECTORY}
+   install-info --section="Exim" \
+       --entry "* User guide: (exim).           Exim manual" \
+       ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
+-  makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
++  makeinfo --no-validate --no-split --output exim_filter.info \
++      ../doc/filter.texinfo
+   echo ${CP} exim_filter.info ${INFO_DIRECTORY}
+   ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
+   install-info --section="Exim" \
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 817cd230ab10..da0802aab7c8 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	exim
-# Version required:	2.10
+# Version required:	2.11
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.24 1998/12/08 15:23:42 markm Exp $
+# $Id: Makefile,v 1.25 1998/12/17 10:54:23 markm Exp $
 #
 
-DISTNAME=	exim-2.10
+DISTNAME=	exim-2.11
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
 		ftp://ftp.quite.net/pub/exim/ \
 		http://www.exim.org/ftp/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-2.10.tar.gz exim-texinfo-2.10.tar.gz
+DISTFILES=	exim-2.11.tar.gz exim-texinfo-2.10.tar.gz
 
 MAINTAINER=	axl@iafrica.com
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 88e102b48609..baa74a53f559 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-2.10.tar.gz) = 5b7e55314843e1df5b9a94726dd3045b
+MD5 (exim-2.11.tar.gz) = 8e4100415f98db74ff448cbff6c07183
 MD5 (exim-texinfo-2.10.tar.gz) = ece154c4c8c95e3983d11c5de186005c
diff --git a/mail/exim/files/patch-aa b/mail/exim/files/patch-aa
index 3dc16f46f560..7d19cace9958 100644
--- a/mail/exim/files/patch-aa
+++ b/mail/exim/files/patch-aa
@@ -7,9 +7,9 @@
 +# 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 ""
  
++echo $com ""
++
 +if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then
 +  echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten"
 +else
@@ -48,3 +48,28 @@
  
  # Install info files if the directory is defined and the Texinfo
  # source documentation is present.
+@@ -226,19 +240,21 @@
+   echo $com Info installation directory is ${INFO_DIRECTORY}
+   echo $com ""
+ 
+-  makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
++  makeinfo --no-validate --no-split --output exim_overview.info \
++      ../doc/oview.texinfo
+   echo ${CP} exim_overview.info ${INFO_DIRECTORY}
+   ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
+   install-info --section="Exim" \
+       --entry "* Overview: (exim_overview).    Overview of the Exim system" \
+       ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir
+-  makeinfo --no-split --output exim.info ../doc/spec.texinfo
++  makeinfo --no-validate --no-split --output exim.info ../doc/spec.texinfo
+   echo ${CP} exim.info ${INFO_DIRECTORY}
+   ${real} ${CP} exim.info ${INFO_DIRECTORY}
+   install-info --section="Exim" \
+       --entry "* User guide: (exim).           Exim manual" \
+       ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
+-  makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
++  makeinfo --no-validate --no-split --output exim_filter.info \
++      ../doc/filter.texinfo
+   echo ${CP} exim_filter.info ${INFO_DIRECTORY}
+   ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
+   install-info --section="Exim" \