Index: Mk/bsd.sites.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.sites.mk,v
retrieving revision 1.101
diff -u -r1.101 bsd.sites.mk
--- Mk/bsd.sites.mk	21 Sep 2002 03:06:37 -0000	1.101
+++ Mk/bsd.sites.mk	21 Sep 2002 18:23:12 -0000
@@ -17,9 +17,9 @@
 MASTER_SITE_LOCAL?= \
 	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \
 	ftp://ftp.se.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \
-	ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \
 	ftp://ftp.uk.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \
 	ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/
+#	ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/
 #	ftp://ftp.nectec.or.th/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/
 
 MASTER_SITE_PORTS_JP+=	\
@@ -403,9 +403,22 @@
 
 MASTER_SITE_XFREE+= \
 	ftp://ftp.xfree86.org/pub/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.rge.com/pub/X/XFree86/%SUBDIR%/source/ \
+	ftp://archive.progeny.com/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.mirrorcentral.com/pub/XFree86/%SUBDIR%/source/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,XFree86/&/source,} \
+	ftp://gd.tuwien.Ac.at/hci/X11/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.fit.vutbr.cz/pub/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.free.fr/pub/XFree86/%SUBDIR%/source/ \
+	ftp://mir1.ovh.net/ftp.xfree86.org/%SUBDIR%/source/ \
+	ftp://ftp.lami.univ-evry.fr/XFree86/%SUBDIR%/source/ \
 	ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/%SUBDIR%/source/ \
-	ftp://sunsite.doc.ic.ac.uk/packages/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.gwdg.de/pub/xfree86/XFree86/%SUBDIR%/source/ \
 	http://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.xfree86.org/XFree86/%SUBDIR%/source/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,XFree86/&/source,} \
 	ftp://ftp.rediris.es/mirror/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.esat.net/pub/X11/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.nl.uu.net/pub/XFree86/%SUBDIR%/source/ \
+	ftp://sunsite.uio.no/pub/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.task.gda.pl/pub/XFree86/%SUBDIR%/source/ \
+	ftp://ftp.physics.uvt.ro/pub/XFree86/%SUBDIR%/source/ \
 	ftp://ftp.chg.ru/pub/XFree86/%SUBDIR%/source/
Index: x11-fonts/XFree86-4-fontCyrillic/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/XFree86-4-fontCyrillic/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- x11-fonts/XFree86-4-fontCyrillic/Makefile	19 Sep 2002 03:57:54 -0000	1.12
+++ x11-fonts/XFree86-4-fontCyrillic/Makefile	21 Sep 2002 18:22:04 -0000
@@ -11,7 +11,7 @@
 CATEGORIES=	x11-fonts
 MASTER_SITES=   ${MASTER_SITE_XFREE:S/$/:x/} \
 		http://koi8.pp.ru/dist/:xrus
-MASTER_SITE_SUBDIR=	${PORTVERSION}:x
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x
 PKGNAMEPREFIX=	XFree86-
 DISTFILES=      X${PORTVERSION:S/.//g}src-2.tgz:x \
 		xrus-2.3.1-xf4-bdf.tgz:xrus
Index: x11-servers/XFree86-4-FontServer/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-FontServer/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- x11-servers/XFree86-4-FontServer/Makefile	18 Sep 2002 04:22:50 -0000	1.15
+++ x11-servers/XFree86-4-FontServer/Makefile	21 Sep 2002 18:25:36 -0000
@@ -9,7 +9,7 @@
 PORTVERSION=	4.2.0
 CATEGORIES=	x11-servers x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz