Update to exim-3.31:

* Incorporates two patches previously supplied with the port.

* Fixes obscure bug affecting return_path transport option under certain
  conditions.

12 files changed, 9 insertions, 111 deletions

diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index c4be89ff4ab0..113f26fc1f78 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	exim
-PORTVERSION=	3.30
+PORTVERSION=	3.31
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
 		http://www.exim.org/ftp/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-3.30.tar.gz exim-texinfo-3.30.tar.gz
+DISTFILES=	exim-3.31.tar.gz exim-texinfo-3.30.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo
index 07c46d47b150..bc7b5cbc958a 100644
--- a/mail/exim-devel/distinfo
+++ b/mail/exim-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-3.30.tar.gz) = 401b2f6e75a55114a26f875c0ecb55b2
+MD5 (exim-3.31.tar.gz) = 32895393b49f5ac64fec7d3431b2b518
 MD5 (exim-texinfo-3.30.tar.gz) = 155ae0ece6c4b50f7c0a8f7d9e2d0944
diff --git a/mail/exim-devel/files/patch-src::configure.default b/mail/exim-devel/files/patch-src::configure.default
index 80d00f2e1d7d..9096beabbc5b 100644
--- a/mail/exim-devel/files/patch-src::configure.default
+++ b/mail/exim-devel/files/patch-src::configure.default
@@ -18,29 +18,6 @@
  
  # The setting below causes Exim to do a reverse DNS lookup on all incoming
  # IP calls, in order to get the true host name. If you feel this is too
-@@ -162,16 +166,16 @@
- # sender_verify
- 
- 
--# Exim contains support for the Realtime Blocking List (RBL) that is being
--# maintained as part of the DNS. See http://maps.vix.com/rbl/ for background.
-+# Exim contains support for the Realtime Blackhole List (RBL) that is being
-+# maintained as part of the DNS. See http://mail-abuse.org/rbl/ for background.
- # Uncommenting the first line below will make Exim reject mail from any
--# host whose IP address is blacklisted in the RBL at maps.vix.com. Some
--# others have followed the RBL lead and have produced other lists: DUL is
-+# host whose IP address is blacklisted in the RBL at blackholes.mail-abuse.org.
-+# Some others have followed the RBL lead and have produced other lists: DUL is
- # a list of dial-up addresses, and there are also a number of other lists
- # of various kinds at orbs.org.
- 
--# rbl_domains = rbl.maps.vix.com
--# rbl_domains = rbl.maps.vix.com:dul.maps.vix.com
-+# rbl_domains = blackholes.mail-abuse.org
-+# rbl_domains = blackholes.mail-abuse.org:dialups.mail-abuse.org
- 
- 
- # If you want Exim to support the "percent hack" for all your local domains,
 @@ -230,8 +234,8 @@
    delivery_date_add
    envelope_to_add
diff --git a/mail/exim-devel/files/patch-src::tree.c b/mail/exim-devel/files/patch-src::tree.c
deleted file mode 100644
index 5c92229fd0a4..000000000000
--- a/mail/exim-devel/files/patch-src::tree.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tree.c.orig	Mon Jun 18 18:10:01 2001
-+++ src/tree.c	Mon Jun 18 18:10:27 2001
-@@ -25,7 +25,7 @@
- Returns:  points to prepared address string, in a fixed bit of store
- */
- 
--static char prepared_address[256];
-+static char prepared_address[512];
- 
- static char *
- address_prepare(char *s)
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index c4be89ff4ab0..113f26fc1f78 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	exim
-PORTVERSION=	3.30
+PORTVERSION=	3.31
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
 		http://www.exim.org/ftp/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-3.30.tar.gz exim-texinfo-3.30.tar.gz
+DISTFILES=	exim-3.31.tar.gz exim-texinfo-3.30.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
diff --git a/mail/exim-old/distinfo b/mail/exim-old/distinfo
index 07c46d47b150..bc7b5cbc958a 100644
--- a/mail/exim-old/distinfo
+++ b/mail/exim-old/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-3.30.tar.gz) = 401b2f6e75a55114a26f875c0ecb55b2
+MD5 (exim-3.31.tar.gz) = 32895393b49f5ac64fec7d3431b2b518
 MD5 (exim-texinfo-3.30.tar.gz) = 155ae0ece6c4b50f7c0a8f7d9e2d0944
diff --git a/mail/exim-old/files/patch-src::configure.default b/mail/exim-old/files/patch-src::configure.default
index 80d00f2e1d7d..9096beabbc5b 100644
--- a/mail/exim-old/files/patch-src::configure.default
+++ b/mail/exim-old/files/patch-src::configure.default
@@ -18,29 +18,6 @@
  
  # The setting below causes Exim to do a reverse DNS lookup on all incoming
  # IP calls, in order to get the true host name. If you feel this is too
-@@ -162,16 +166,16 @@
- # sender_verify
- 
- 
--# Exim contains support for the Realtime Blocking List (RBL) that is being
--# maintained as part of the DNS. See http://maps.vix.com/rbl/ for background.
-+# Exim contains support for the Realtime Blackhole List (RBL) that is being
-+# maintained as part of the DNS. See http://mail-abuse.org/rbl/ for background.
- # Uncommenting the first line below will make Exim reject mail from any
--# host whose IP address is blacklisted in the RBL at maps.vix.com. Some
--# others have followed the RBL lead and have produced other lists: DUL is
-+# host whose IP address is blacklisted in the RBL at blackholes.mail-abuse.org.
-+# Some others have followed the RBL lead and have produced other lists: DUL is
- # a list of dial-up addresses, and there are also a number of other lists
- # of various kinds at orbs.org.
- 
--# rbl_domains = rbl.maps.vix.com
--# rbl_domains = rbl.maps.vix.com:dul.maps.vix.com
-+# rbl_domains = blackholes.mail-abuse.org
-+# rbl_domains = blackholes.mail-abuse.org:dialups.mail-abuse.org
- 
- 
- # If you want Exim to support the "percent hack" for all your local domains,
 @@ -230,8 +234,8 @@
    delivery_date_add
    envelope_to_add
diff --git a/mail/exim-old/files/patch-src::tree.c b/mail/exim-old/files/patch-src::tree.c
deleted file mode 100644
index 5c92229fd0a4..000000000000
--- a/mail/exim-old/files/patch-src::tree.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tree.c.orig	Mon Jun 18 18:10:01 2001
-+++ src/tree.c	Mon Jun 18 18:10:27 2001
-@@ -25,7 +25,7 @@
- Returns:  points to prepared address string, in a fixed bit of store
- */
- 
--static char prepared_address[256];
-+static char prepared_address[512];
- 
- static char *
- address_prepare(char *s)
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index c4be89ff4ab0..113f26fc1f78 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	exim
-PORTVERSION=	3.30
+PORTVERSION=	3.31
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
 		http://www.exim.org/ftp/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-3.30.tar.gz exim-texinfo-3.30.tar.gz
+DISTFILES=	exim-3.31.tar.gz exim-texinfo-3.30.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 07c46d47b150..bc7b5cbc958a 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,2 +1,2 @@
-MD5 (exim-3.30.tar.gz) = 401b2f6e75a55114a26f875c0ecb55b2
+MD5 (exim-3.31.tar.gz) = 32895393b49f5ac64fec7d3431b2b518
 MD5 (exim-texinfo-3.30.tar.gz) = 155ae0ece6c4b50f7c0a8f7d9e2d0944
diff --git a/mail/exim/files/patch-src::configure.default b/mail/exim/files/patch-src::configure.default
index 80d00f2e1d7d..9096beabbc5b 100644
--- a/mail/exim/files/patch-src::configure.default
+++ b/mail/exim/files/patch-src::configure.default
@@ -18,29 +18,6 @@
  
  # The setting below causes Exim to do a reverse DNS lookup on all incoming
  # IP calls, in order to get the true host name. If you feel this is too
-@@ -162,16 +166,16 @@
- # sender_verify
- 
- 
--# Exim contains support for the Realtime Blocking List (RBL) that is being
--# maintained as part of the DNS. See http://maps.vix.com/rbl/ for background.
-+# Exim contains support for the Realtime Blackhole List (RBL) that is being
-+# maintained as part of the DNS. See http://mail-abuse.org/rbl/ for background.
- # Uncommenting the first line below will make Exim reject mail from any
--# host whose IP address is blacklisted in the RBL at maps.vix.com. Some
--# others have followed the RBL lead and have produced other lists: DUL is
-+# host whose IP address is blacklisted in the RBL at blackholes.mail-abuse.org.
-+# Some others have followed the RBL lead and have produced other lists: DUL is
- # a list of dial-up addresses, and there are also a number of other lists
- # of various kinds at orbs.org.
- 
--# rbl_domains = rbl.maps.vix.com
--# rbl_domains = rbl.maps.vix.com:dul.maps.vix.com
-+# rbl_domains = blackholes.mail-abuse.org
-+# rbl_domains = blackholes.mail-abuse.org:dialups.mail-abuse.org
- 
- 
- # If you want Exim to support the "percent hack" for all your local domains,
 @@ -230,8 +234,8 @@
    delivery_date_add
    envelope_to_add
diff --git a/mail/exim/files/patch-src::tree.c b/mail/exim/files/patch-src::tree.c
deleted file mode 100644
index 5c92229fd0a4..000000000000
--- a/mail/exim/files/patch-src::tree.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tree.c.orig	Mon Jun 18 18:10:01 2001
-+++ src/tree.c	Mon Jun 18 18:10:27 2001
-@@ -25,7 +25,7 @@
- Returns:  points to prepared address string, in a fixed bit of store
- */
- 
--static char prepared_address[256];
-+static char prepared_address[512];
- 
- static char *
- address_prepare(char *s)