Changes to bsd.sites.mk

[Steve Wills]

Anyone have objections to this patch:

http://meatwad.mouf.net/~swills/sites.diff

(also attached).

In particular, the xorg list puts the xorg and freedesktop.org mirrors
first, since the page here:

http://www.x.org/wiki/Releases/Download

lists them as "Primary". Also, it strips out the ftp sites and sticks to
http only, since I've heard some who consider ftp itself less than ideal
and there are plenty of mirrors without it. Also, I looked at all the
sites by hand and I removed a few that didn't seem to work at all and
adjusted a few that needed "/pub/" added to the entry from the x.org
list above.

This list does make things a bit more US centric, but it really didn't
seem to make sense to have .hk and .br as the first two. But, making the
list too long only makes it take longer to fall back to the FreeBSD.org
mirror. This seemed like the best compromise to me, but I don't normally
touch this file so I thought I'd get some feedback before committing.
Comments and suggestions welcome!

Steve
-------------- next part --------------
Index: bsd.sites.mk
===================================================================
--- bsd.sites.mk	(revision 312317)
+++ bsd.sites.mk	(working copy)
@@ -1094,8 +1094,8 @@
 
 .if !defined(IGNORE_MASTER_SITE_RUBY)
 MASTER_SITE_RUBY+= \
+	ftp://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/ \
 	ftp://ftp.SpringDaemons.com/pub/ruby/ruby/%SUBDIR%/ \
-	ftp://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/ \
 	http://www.ibiblio.org/pub/languages/ruby/%SUBDIR%/ \
 	ftp://xyz.lcs.mit.edu/pub/ruby/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,lang/ruby/&,} \
@@ -1421,17 +1421,27 @@
 
 .if !defined(IGNORE_MASTER_SITE_XORG)
 MASTER_SITE_XORG+= \
-	ftp://ftp.cs.cuhk.edu.hk/pub/X11/%SUBDIR%/ \
-	ftp://ftp.unicamp.br/pub/X11/releases/%SUBDIR%/ \
-	ftp://ftp.ntua.gr/pub/X11/X.org/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/opengroup/&/,} \
-	ftp://ftp.task.gda.pl/mirror/ftp.x.org/pub/%SUBDIR%/ \
-	ftp://ftp.sunet.se/pub/X11/ftp.x.org/%SUBDIR%/ \
-	ftp://ftp.mirrorservice.org/sites/ftp.x.org/pub/%SUBDIR%/ \
-	ftp://sunsite.uio.no/pub/X11/%SUBDIR%/ \
-	http://xorg.freedesktop.org/%SUBDIR%/ \
 	http://xorg.freedesktop.org/releases/%SUBDIR%/ \
-	ftp://ftp.x.org/pub/%SUBDIR%/
+	http://xorg.mirrors.pair.com/%SUBDIR%/ \
+	http://mirror.us.leaseweb.net/xorg/%SUBDIR%/ \
+	http://mirror.csclub.uwaterloo.ca/x.org/%SUBDIR%/ \
+	http://artfiles.org/x.org/pub/%SUBDIR%/ \
+	http://ftp.gwdg.de/pub/x11/x.org/pub/%SUBDIR%/ \
+	http://gd.tuwien.ac.at/X11/%SUBDIR%/ \
+	http://mi.mirror.garr.it/mirrors/x.org/%SUBDIR%/ \
+	http://mirror.switch.ch/ftp/mirror/X11/pub/%SUBDIR%/ \
+	http://mirrors.ircam.fr/pub/x.org/%SUBDIR%/ \
+	http://www.mirrorservice.org/sites/ftp.x.org/pub/%SUBDIR%/ \
+	http://www.portal-to-web.de/pub/mirrors/x.org/%SUBDIR%/ \
+	http://x.cybermirror.org/%SUBDIR%/ \
+	http://x.europnews.de/pub/%SUBDIR%/ \
+	http://xorg.mirror.solnet.ch/pub/%SUBDIR%/ \
+	http://mirror.nl.leaseweb.net/xorg/%SUBDIR%/ \
+	http://mirror.de.leaseweb.net/xorg/%SUBDIR%/ \
+	http://mirrors.go-part.com/xorg/%SUBDIR%/ \
+	http://ftp.yz.yamagata-u.ac.jp/pub/X11/x.org/%SUBDIR%/ \
+	http://ftp.kaist.ac.kr/x.org/%SUBDIR%/ \
+	http://x.cs.pu.edu.tw/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_KERNEL_ORG)