Make life of maintainers of various XFree ports a bit easier by moving

MASTER_SITES into bsd.sites.mk (MASTER_SITE_XFREE). Also add officially
announced by xfree http mirror. Following is the announcement.

[20 September 2000]

   XFree86 nows offers http download access! This is a big story for those
   who cannot download via ftp access because of proxy/firewall concerns.
   This has been generously donated by the Computing Center of the University
   of Applied Sciences in Esslingen, Germany. This is a full ftp mirror
   repository which is updated hourly with a connection speed of 20 MegaBit.

8 files changed, 22 insertions, 34 deletions

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 763eacb05f67..b4d5637e979c 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -28,6 +28,14 @@ MASTER_SITE_XCONTRIB+=	\
 	ftp://ftp.sunet.se/pub/X11/contrib/%SUBDIR%/ \
 	ftp://ftp.huji.ac.il/mirror/X11/contrib/%SUBDIR%/
 
+MASTER_SITE_XFREE+= \
+	ftp://ftp.xfree86.org/pub/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.freesoftware.com/pub/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-%SUBDIR%/source/ \
+	ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/%SUBDIR%/source/ \
+	ftp://sunsite.doc.ic.ac.uk/packages/XFree86/%SUBDIR%/source/ \
+	http://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.xfree86.org/XFree86/%SUBDIR%/source/
+
 MASTER_SITE_GNU+=	\
 	ftp://ftp.gnu.org/gnu/%SUBDIR%/ \
 	ftp://ftp.freesoftware.com/pub/gnu/%SUBDIR%/ \
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index b65dd6338bb2..fe67f74562e4 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -8,11 +8,8 @@
 PORTNAME=	clients
 PORTVERSION=	4.0.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X401src-1.tgz
 
diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index 4b2aca1f0e3f..53ecec6ec896 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -8,11 +8,8 @@
 PORTNAME=	documents
 PORTVERSION=	4.0.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X401src-1.tgz X401src-2.tgz
 EXTRACT_ONLY=	X401src-2.tgz
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 89bf273a00f4..72327083fd8e 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -8,11 +8,8 @@
 PORTNAME=	libraries
 PORTVERSION=	4.0.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X401src-1.tgz
 
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index c8f441e2f438..4b55dcc4365d 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -8,11 +8,8 @@
 PORTNAME=	manuals
 PORTVERSION=	4.0.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X401src-1.tgz
 
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index c5e58421f233..b095473b8d26 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -8,11 +8,8 @@
 PORTNAME=	XFree86
 PORTVERSION= 	4.0.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0.1/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/4.0.1/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0.1/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0.1/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0.1/source/
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTFILES=	X401src-1.tgz X401src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/x11/XFree86-contrib/Makefile b/x11/XFree86-contrib/Makefile
index 6bf7f4ec0cd2..6428fb69d0aa 100644
--- a/x11/XFree86-contrib/Makefile
+++ b/x11/XFree86-contrib/Makefile
@@ -8,10 +8,8 @@
 PORTNAME=	XFree86-contrib
 PORTVERSION= 	3.3.6
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	X336contrib
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index f4b801df1362..9b15aa7ebc12 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -8,11 +8,8 @@
 PORTNAME=	XFree86
 PORTVERSION= 	3.3.6
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTFILES=	X336src-1.tgz X336src-2.tgz
 
 PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \