Catch up with exim-4.20.

5 files changed, 39 insertions, 10 deletions

diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index 28be7284396c..11a94d8c1405 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	exim-doc-${DOCFORMAT}
-PORTVERSION=	4.10
+PORTVERSION=	4.20
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
 		http://www.exim.org/ftp/exim4/ \
 		ftp://ftp.is.co.za/networking/mail/transport/exim/
 DISTNAME=	exim-${DOCFORMAT}-${PORTVERSION}
+DIST_SUBDIR=	exim
 
 MAINTAINER=	sheldonh@FreeBSD.org
 COMMENT=	Documentation for the Exim MTA in multiple formats
diff --git a/mail/exim-doc-html/distinfo b/mail/exim-doc-html/distinfo
index 7e36bd826cb5..4de852152ee3 100644
--- a/mail/exim-doc-html/distinfo
+++ b/mail/exim-doc-html/distinfo
@@ -1,3 +1,3 @@
-MD5 (exim-html-4.10.tar.bz2) = b8714b5870bf47fa7c45c84f2df2c4b4
-MD5 (exim-postscript-4.10.tar.bz2) = e0d9dbb5bca80efe5083723f6310bd4f
-MD5 (exim-pdf-4.10.tar.bz2) = 2cbb439952981bf61c51a3b99087ea15
+MD5 (exim/exim-html-4.20.tar.bz2) = 75541910675660bf3203bc16080f4365
+MD5 (exim/exim-pdf-4.20.tar.bz2) = f17a521b58372a016ada5745fa64cc8f
+MD5 (exim/exim-postscript-4.20.tar.bz2) = fb00d8ceae45779f4524f6f84f7f64ea
diff --git a/mail/exim-doc-html/pkg-plist_html b/mail/exim-doc-html/pkg-plist_html
index 933467e32b5e..b6cbfaed4229 100644
--- a/mail/exim-doc-html/pkg-plist_html
+++ b/mail/exim-doc-html/pkg-plist_html
@@ -45,6 +45,7 @@
 %%PORTDOCS%%share/doc/exim/html/FAQ_25.html
 %%PORTDOCS%%share/doc/exim/html/FAQ_26.html
 %%PORTDOCS%%share/doc/exim/html/FAQ_27.html
+%%PORTDOCS%%share/doc/exim/html/FAQ_28.html
 %%PORTDOCS%%share/doc/exim/html/FAQ_3.html
 %%PORTDOCS%%share/doc/exim/html/FAQ_4.html
 %%PORTDOCS%%share/doc/exim/html/FAQ_5.html
@@ -79,6 +80,7 @@
 %%PORTDOCS%%share/doc/exim/html/filter_30.html
 %%PORTDOCS%%share/doc/exim/html/filter_31.html
 %%PORTDOCS%%share/doc/exim/html/filter_32.html
+%%PORTDOCS%%share/doc/exim/html/filter_33.html
 %%PORTDOCS%%share/doc/exim/html/filter_4.html
 %%PORTDOCS%%share/doc/exim/html/filter_5.html
 %%PORTDOCS%%share/doc/exim/html/filter_6.html
@@ -87,7 +89,7 @@
 %%PORTDOCS%%share/doc/exim/html/filter_9.html
 %%PORTDOCS%%share/doc/exim/html/filter_toc.html
 %%PORTDOCS%%share/doc/exim/html/index.html
-%%PORTDOCS%%share/doc/exim/html/pcre.html
+%%PORTDOCS%%share/doc/exim/html/pcrepattern.html
 %%PORTDOCS%%share/doc/exim/html/pcretest.html
 %%PORTDOCS%%share/doc/exim/html/relaying.gif
 %%PORTDOCS%%share/doc/exim/html/routing.gif
diff --git a/mail/exim-monitor/Makefile b/mail/exim-monitor/Makefile
index 1b700626e610..584e10823c59 100644
--- a/mail/exim-monitor/Makefile
+++ b/mail/exim-monitor/Makefile
@@ -6,12 +6,36 @@
 #
 
 PORTNAME=	exim-monitor
-PORTVERSION=	4.12
+PORTVERSION=	${EXIM_VERSION}
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
-		http://www.exim.org/ftp/exim4/ \
-		ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/
+MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \
+		ftp://gd.tuwien.ac.at/infosys/mail/exim/%SUBDIR%/ \
+		ftp://ftp.easynet.be/exim/%SUBDIR%/ \
+		ftp://mirror.direct.ca/pub/exim/%SUBDIR%/ \
+		ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/%SUBDIR%/ \
+		ftp://sunsite.auc.dk/pub/mail/exim/%SUBDIR%/ \
+		ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.exim.org/%SUBDIR%/ \
+		ftp://ftp.fu-berlin.de/unix/mail/exim/%SUBDIR%/ \
+		ftp://ftp.tin.org/pub/mail/exim/%SUBDIR%/ \
+		ftp://ftp.freenet.de/pub/ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \
+		ftp://ftp.esat.net/pub/networking/mail/mta/exim/%SUBDIR%/ \
+		ftp://nagoya.linux.or.jp/mirror/exim/%SUBDIR%/ \
+		http://exim.psshee.com/ftp/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/mail/exim/%SUBDIR%/ \
+		ftp://ftp.demon.nl/pub/mirrors/exim/%SUBDIR%/ \
+		ftp://ftp.easynet.nl/mirror/exim/%SUBDIR%/ \
+		ftp://sunsite.uio.no/pub/mail/exim/%SUBDIR%/ \
+		http://sunsite.icm.edu.pl/pub/unix/mail/exim/%SUBDIR%/ \
+		ftp://ftp.smux.net/pub/exim/%SUBDIR%/ \
+		ftp://ftp.is.co.za/networking/mail/mta/exim/%SUBDIR%/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/exim/%SUBDIR%/ \
+		ftp://ftp.exim.org/pub/exim/%SUBDIR%/ \
+		http://www.us.exim.org/ftp/%SUBDIR%/ \
+		http://exim.stanford.edu/ftp/pub/exim/%SUBDIR%/ \
+		ftp://ftp.fsckit.net/pub/exim/%SUBDIR%/ \
+MASTER_SITE_SUBDIR=	exim4
 DISTNAME=	exim-${PORTVERSION}
+DIST_SUBDIR=	exim
 
 MAINTAINER=	sheldonh@FreeBSD.org
 COMMENT=	The Exim monitor for the Exim MTA
@@ -20,6 +44,8 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_XLIB=	yes
 
+EXIM_VERSION=	4.20
+
 # This dependency is disabled, because it prevents package users from
 # using the exim-monitor package with any of the exim slave packages.
 #
diff --git a/mail/exim-monitor/distinfo b/mail/exim-monitor/distinfo
index f1d331a7cf98..9946b322140a 100644
--- a/mail/exim-monitor/distinfo
+++ b/mail/exim-monitor/distinfo
@@ -1 +1 @@
-MD5 (exim-4.12.tar.bz2) = 7aed2a66295a7702b9a9394ec2bc5ffd
+MD5 (exim/exim-4.20.tar.bz2) = 90f9e876b60d00c0a5dd53ece7c85338