Upgrade to 2.10 release. Bugfixes and some minor wishlist items added,

documentation upgraded.

Fixed nit in configure.default file.

Requested by:	maintainer

9 files changed, 48 insertions, 45 deletions

diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index 6ed86d410098..817cd230ab10 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	exim
-# Version required:	2.054
+# Version required:	2.10
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.23 1998/11/29 12:21:58 asami Exp $
+# $Id: Makefile,v 1.24 1998/12/08 15:23:42 markm Exp $
 #
 
-DISTNAME=	exim-2.054
+DISTNAME=	exim-2.10
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.quite.net/pub/exim/Testing/ \
-		ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/Testing/ \
-		http://www.exim.org/ftp/Testing/ \
-		ftp://ftp.is.co.za/networking/mail/transport/exim/Testing/
-DISTFILES=	exim-testing-2.054.tar.gz exim-texinfo-2.00.tar.gz
+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
 
 MAINTAINER=	axl@iafrica.com
 
@@ -39,7 +39,7 @@ do-configure:
 	${SED} -e "s#XX_BINOWN_XX#${BINOWN}#" \
 	    < ${FILESDIR}/configure.default > ${WRKSRC}/src/configure.default
 	cd ${WRKSRC}/doc && \
-	for i in ../../exim-texinfo-2.00/doc/* ; do \
+	for i in ../../exim-texinfo-2.10/doc/* ; do \
 		ln -sf $$i ; \
 	done
 
diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo
index a9de942845e6..88e102b48609 100644
--- a/mail/exim-devel/distinfo
+++ b/mail/exim-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-testing-2.054.tar.gz) = 559653b34a40039ea5f03ace48dffcda
-MD5 (exim-texinfo-2.00.tar.gz) = 10a143d6abd3eab107434855e7d95dcd
+MD5 (exim-2.10.tar.gz) = 5b7e55314843e1df5b9a94726dd3045b
+MD5 (exim-texinfo-2.10.tar.gz) = ece154c4c8c95e3983d11c5de186005c
diff --git a/mail/exim-devel/files/configure.default b/mail/exim-devel/files/configure.default
index 6548c319e057..98de94e9f68b 100644
--- a/mail/exim-devel/files/configure.default
+++ b/mail/exim-devel/files/configure.default
@@ -69,7 +69,7 @@
 # normal user. This isn't usually a problem, as most sites have an alias for
 # root that redirects such mail to a human administrator.
 
-exim_user = bin
+exim_user = XX_BINOWN_XX
 exim_group = mail
 never_users = root
 
@@ -235,7 +235,7 @@ system_aliases:
   driver = aliasfile
   file = /etc/aliases
   search_type = lsearch
-# user = bin
+# user = XX_BINOWN_XX
 
 
 # This director handles forwarding using traditional .forward files.
@@ -250,6 +250,7 @@ userforward:
   driver = forwardfile
   file = .forward
   no_verify
+  no_expn
   check_ancestor
 # filter
 
@@ -306,14 +307,14 @@ end
 
 # This single retry rule applies to all domains and all errors. It specifies
 # retries every 15 minutes for 2 hours, then increasing retry intervals,
-# starting at 2 hours and increasing each time by a factor of 1.5, up to 16
+# starting at 1 hour and increasing each time by a factor of 1.5, up to 16
 # hours, then retries every 8 hours until 4 days have passed since the first
 # failed delivery.
 
 # Domain               Error       Retries
 # ------               -----       -------
 
-*                      *           F,2h,15m; G,16h,2h,1.5; F,4d,8h
+*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,8h
 
 end
 
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 6ed86d410098..817cd230ab10 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	exim
-# Version required:	2.054
+# Version required:	2.10
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.23 1998/11/29 12:21:58 asami Exp $
+# $Id: Makefile,v 1.24 1998/12/08 15:23:42 markm Exp $
 #
 
-DISTNAME=	exim-2.054
+DISTNAME=	exim-2.10
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.quite.net/pub/exim/Testing/ \
-		ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/Testing/ \
-		http://www.exim.org/ftp/Testing/ \
-		ftp://ftp.is.co.za/networking/mail/transport/exim/Testing/
-DISTFILES=	exim-testing-2.054.tar.gz exim-texinfo-2.00.tar.gz
+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
 
 MAINTAINER=	axl@iafrica.com
 
@@ -39,7 +39,7 @@ do-configure:
 	${SED} -e "s#XX_BINOWN_XX#${BINOWN}#" \
 	    < ${FILESDIR}/configure.default > ${WRKSRC}/src/configure.default
 	cd ${WRKSRC}/doc && \
-	for i in ../../exim-texinfo-2.00/doc/* ; do \
+	for i in ../../exim-texinfo-2.10/doc/* ; do \
 		ln -sf $$i ; \
 	done
 
diff --git a/mail/exim-old/distinfo b/mail/exim-old/distinfo
index a9de942845e6..88e102b48609 100644
--- a/mail/exim-old/distinfo
+++ b/mail/exim-old/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-testing-2.054.tar.gz) = 559653b34a40039ea5f03ace48dffcda
-MD5 (exim-texinfo-2.00.tar.gz) = 10a143d6abd3eab107434855e7d95dcd
+MD5 (exim-2.10.tar.gz) = 5b7e55314843e1df5b9a94726dd3045b
+MD5 (exim-texinfo-2.10.tar.gz) = ece154c4c8c95e3983d11c5de186005c
diff --git a/mail/exim-old/files/configure.default b/mail/exim-old/files/configure.default
index 6548c319e057..98de94e9f68b 100644
--- a/mail/exim-old/files/configure.default
+++ b/mail/exim-old/files/configure.default
@@ -69,7 +69,7 @@
 # normal user. This isn't usually a problem, as most sites have an alias for
 # root that redirects such mail to a human administrator.
 
-exim_user = bin
+exim_user = XX_BINOWN_XX
 exim_group = mail
 never_users = root
 
@@ -235,7 +235,7 @@ system_aliases:
   driver = aliasfile
   file = /etc/aliases
   search_type = lsearch
-# user = bin
+# user = XX_BINOWN_XX
 
 
 # This director handles forwarding using traditional .forward files.
@@ -250,6 +250,7 @@ userforward:
   driver = forwardfile
   file = .forward
   no_verify
+  no_expn
   check_ancestor
 # filter
 
@@ -306,14 +307,14 @@ end
 
 # This single retry rule applies to all domains and all errors. It specifies
 # retries every 15 minutes for 2 hours, then increasing retry intervals,
-# starting at 2 hours and increasing each time by a factor of 1.5, up to 16
+# starting at 1 hour and increasing each time by a factor of 1.5, up to 16
 # hours, then retries every 8 hours until 4 days have passed since the first
 # failed delivery.
 
 # Domain               Error       Retries
 # ------               -----       -------
 
-*                      *           F,2h,15m; G,16h,2h,1.5; F,4d,8h
+*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,8h
 
 end
 
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 6ed86d410098..817cd230ab10 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	exim
-# Version required:	2.054
+# Version required:	2.10
 # Date created:		23 June 1996
 # Whom:			markm@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.23 1998/11/29 12:21:58 asami Exp $
+# $Id: Makefile,v 1.24 1998/12/08 15:23:42 markm Exp $
 #
 
-DISTNAME=	exim-2.054
+DISTNAME=	exim-2.10
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.quite.net/pub/exim/Testing/ \
-		ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/Testing/ \
-		http://www.exim.org/ftp/Testing/ \
-		ftp://ftp.is.co.za/networking/mail/transport/exim/Testing/
-DISTFILES=	exim-testing-2.054.tar.gz exim-texinfo-2.00.tar.gz
+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
 
 MAINTAINER=	axl@iafrica.com
 
@@ -39,7 +39,7 @@ do-configure:
 	${SED} -e "s#XX_BINOWN_XX#${BINOWN}#" \
 	    < ${FILESDIR}/configure.default > ${WRKSRC}/src/configure.default
 	cd ${WRKSRC}/doc && \
-	for i in ../../exim-texinfo-2.00/doc/* ; do \
+	for i in ../../exim-texinfo-2.10/doc/* ; do \
 		ln -sf $$i ; \
 	done
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index a9de942845e6..88e102b48609 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-testing-2.054.tar.gz) = 559653b34a40039ea5f03ace48dffcda
-MD5 (exim-texinfo-2.00.tar.gz) = 10a143d6abd3eab107434855e7d95dcd
+MD5 (exim-2.10.tar.gz) = 5b7e55314843e1df5b9a94726dd3045b
+MD5 (exim-texinfo-2.10.tar.gz) = ece154c4c8c95e3983d11c5de186005c
diff --git a/mail/exim/files/configure.default b/mail/exim/files/configure.default
index 6548c319e057..98de94e9f68b 100644
--- a/mail/exim/files/configure.default
+++ b/mail/exim/files/configure.default
@@ -69,7 +69,7 @@
 # normal user. This isn't usually a problem, as most sites have an alias for
 # root that redirects such mail to a human administrator.
 
-exim_user = bin
+exim_user = XX_BINOWN_XX
 exim_group = mail
 never_users = root
 
@@ -235,7 +235,7 @@ system_aliases:
   driver = aliasfile
   file = /etc/aliases
   search_type = lsearch
-# user = bin
+# user = XX_BINOWN_XX
 
 
 # This director handles forwarding using traditional .forward files.
@@ -250,6 +250,7 @@ userforward:
   driver = forwardfile
   file = .forward
   no_verify
+  no_expn
   check_ancestor
 # filter
 
@@ -306,14 +307,14 @@ end
 
 # This single retry rule applies to all domains and all errors. It specifies
 # retries every 15 minutes for 2 hours, then increasing retry intervals,
-# starting at 2 hours and increasing each time by a factor of 1.5, up to 16
+# starting at 1 hour and increasing each time by a factor of 1.5, up to 16
 # hours, then retries every 8 hours until 4 days have passed since the first
 # failed delivery.
 
 # Domain               Error       Retries
 # ------               -----       -------
 
-*                      *           F,2h,15m; G,16h,2h,1.5; F,4d,8h
+*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,8h
 
 end