Move Exim mirror sites to MASTER_SITE_EXIM in Mk/bsd.sites.mk.

Add additional mirrors.

PR:		ports/53499
Submitted by:	Oliver Eikemeier <eikemeier@fillmore-labs.com>

5 files changed, 44 insertions, 79 deletions

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index e97f793d1a08..7e6b4c7ec4f9 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -166,6 +166,41 @@ MASTER_SITE_ECLIPSE+= \
 	http://www.binarycode.org/eclipse/%SUBDIR%/ \
 	http://eclipse.get-software.com/%SUBDIR%/
 
+MASTER_SITE_EXIM+=	\
+	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \
+	ftp://ftp.exim.org/pub/exim/%SUBDIR%/ \
+	http://public.planetmirror.com/pub/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%/ \
+	ftp://exim.stupendous.net/mirror/exim/%SUBDIR%/ \
+	http://washitake.com/mail/exim/mirror/%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://www.no.exim.org/ftp/%SUBDIR%/ \
+	http://sunsite.icm.edu.pl/pub/unix/mail/exim/%SUBDIR%/ \
+	ftp://exim.directnet.ru/pub/exim/%SUBDIR%/ \
+	ftp://ftp.smux.net/pub/exim/%SUBDIR%/ \
+	ftp://ftp.is.co.za/networking/mail/mta/exim/%SUBDIR%/ \
+	ftp://ftp.reaper.org/pub/exim/%SUBDIR%/ \
+	ftp://sunsite.cnlab-switch.ch/mirror/exim/%SUBDIR%/ \
+	http://www.mirror.ac.uk/sites/ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \
+	ftp://ftp.demon.co.uk/pub/mirrors/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_FESTIVAL+= \
 	http://www.festvox.org/packed/festival/%SUBDIR%/ \
 	http://www.speech.cs.cmu.edu/festival/cstr/festival/%SUBDIR%/ \
diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index b1ff09ff70f7..dee58a18f0e2 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -8,31 +8,7 @@
 PORTNAME=	exim-doc-${DOCFORMAT}
 PORTVERSION=	4.20
 CATEGORIES=	mail
-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_SITES=	${MASTER_SITE_EXIM}
 MASTER_SITE_SUBDIR=	exim4
 DISTNAME=	exim-${DOCFORMAT}-${PORTVERSION}
 DIST_SUBDIR=	exim
diff --git a/mail/exim-monitor/Makefile b/mail/exim-monitor/Makefile
index abeac6d54743..07c513e1afd1 100644
--- a/mail/exim-monitor/Makefile
+++ b/mail/exim-monitor/Makefile
@@ -8,31 +8,7 @@
 PORTNAME=	exim-monitor
 PORTVERSION=	${EXIM_VERSION}
 CATEGORIES=	mail
-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_SITES=	${MASTER_SITE_EXIM}
 MASTER_SITE_SUBDIR=	exim4
 DISTNAME=	exim-${PORTVERSION}
 DIST_SUBDIR=	exim
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 7cd3fd074e3e..aaebf4e7dcfa 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -9,10 +9,9 @@ PORTNAME=	exim
 PORTVERSION=	3.36
 PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
-		http://www.exim.org/ftp/exim3/ \
-		ftp://ftp.is.co.za/networking/mail/transport/exim/exim3/
-DISTFILES=	exim-3.36.tar.bz2 exim-texinfo-3.30.tar.bz2
+MASTER_SITES=	${MASTER_SITE_EXIM}
+MASTER_SITE_SUBDIR=	exim3
+DISTFILES=	exim-${EXIM_VERSION}${EXTRACT_SUFX} exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	sheldonh@FreeBSD.org
 COMMENT=	High performance MTA for Unix systems on the Internet
@@ -20,6 +19,9 @@ COMMENT=	High performance MTA for Unix systems on the Internet
 USE_BZIP2=	yes
 USE_PERL5=	yes
 
+EXIM_VERSION=		3.36
+EXIM_DOCVERSION=	3.30
+
 .if defined(NOPORTDOCS)
 PKGMESSAGE=	${FILESDIR}/POST-INSTALL-NOTES
 .endif
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 0c1dffc8e7cc..e715b3a980c6 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -9,31 +9,7 @@ PORTNAME=	exim
 PORTVERSION=	${EXIM_VERSION}
 PORTREVISION=	4
 CATEGORIES=	mail
-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_SITES=	${MASTER_SITE_EXIM} \
 		http://duncanthrax.net/%SUBDIR%/:exiscan,exiscan_acl
 MASTER_SITE_SUBDIR=	exim4 exiscan/:exiscan exiscan-acl/:exiscan_acl
 DISTFILES=	exim-${EXIM_VERSION}${EXTRACT_SUFX} \