1 files changed, 189 insertions, 183 deletions

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 24a1566eea92..0e999b11f2fc 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -13,49 +13,52 @@
 # $FreeBSD$
 #
 
-MASTER_SITE_XCONTRIB+=	\
-	ftp://crl.dec.com/pub/X11/contrib/%SUBDIR%/ \
-	ftp://ftp.net.ohio-state.edu/disk/d/X11/contrib/%SUBDIR%/ \
-	ftp://uiarchive.uiuc.edu/pub/X11/contrib/%SUBDIR%/ \
-	ftp://ftp.gwdg.de/pub/x11/x.org/contrib/%SUBDIR%/ \
-	ftp://ftp.duke.edu/pub/X11/contrib/%SUBDIR%/ \
-	ftp://ftp.x.org/contrib/%SUBDIR%/ \
-	ftp://ftp.sunet.se/pub/X11/contrib/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/X11/contrib/%SUBDIR%/ \
-	ftp://mirror.xmission.com/X/contrib/%SUBDIR%/ \
-	ftp://ftp2.x.org/contrib/%SUBDIR%/ \
-	ftp://sunsite.sut.ac.jp/pub/archives/X11/contrib/%SUBDIR%/ \
-	ftp://ftp.is.co.za/x/contrib/%SUBDIR%/ \
-	ftp://ftp.sunet.se/pub/X11/contrib/%SUBDIR%/ \
-	ftp://ftp.huji.ac.il/mirror/X11/contrib/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/X11/contrib/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/opengroup/contrib/&,} \
-	ftp://ftp.mirror.ac.uk/sites/ftp.x.org/contrib/%SUBDIR%/ \
-	ftp://sunsite.org.uk/Mirrors/ftp.x.org/contrib/%SUBDIR%/
+# Where to put distfiles that don't have any other master site
+MASTER_SITE_LOCAL?= \
+	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \
+	ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%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_RINGSERVER:S,%SUBDIR%,XFree86/&/source,} \
-	ftp://ftp.chg.ru/pub/XFree86/%SUBDIR%/source/
+MASTER_SITE_PORTS_JP+=	\
+	ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/ \
+	ftp://ftp4.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/ \
+	ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/
 
-MASTER_SITE_NETBSD+=	\
-	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.planix.com/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.plig.net/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.iastate.edu/pub/netbsd/packages/distfiles/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.unina.it/pub/Unix/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.sunsite.org.uk/Mirrors/ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.jaist.ac.jp/.arc07/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.tokyonet.ad.jp/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.sra.co.jp/pub/os/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.nectec.or.th/pub/bsd-distributions/NetBSD/packages/distfiles/%SUBDIR%/
+
+
+##
+##	KEEP THIS LIST SORTED
+##
+
+MASTER_SITE_AFTERSTEP+=	\
+	ftp://ftp.afterstep.org/%SUBDIR%/ \
+	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/%SUBDIR%/ \
+	ftp://ftp.kddlabs.co.jp/X11/AfterStep/%SUBDIR%/ \
+	ftp://ftp.math.uni-bonn.de/pub/mirror/ftp.afterstep.org/pub/%SUBDIR%/ \
+	ftp://ftp.dti.ad.jp/pub/X/AfterStep/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/X11/windowmanagers/afterstep/%SUBDIR%/
+
+MASTER_SITE_COMP_SOURCES+=	\
+	ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/ \
+	ftp://ftp.kddlabs.co.jp/Unix/com.sources.%SUBDIR%/ \
+	ftp://ftp.uu.net/usenet/comp.sources.%SUBDIR%/ \
+	ftp://ftp.funet.fi/pub/archive/comp.sources.%SUBDIR%/ \
+	ftp://rtfm.mit.edu/pub/usenet/comp.sources.%SUBDIR%/
+
+MASTER_SITE_GNOME+=	\
+	ftp://ftp.gnome.org/pub/GNOME/%SUBDIR%/ \
+	ftp://rpmfind.net/linux/gnome.org/%SUBDIR%/ \
+	ftp://ftp.mirror.ac.uk/sites/ftp.gnome.org/pub/GNOME/%SUBDIR%/ \
+	ftp://slave.opensource.captech.com/gnome/%SUBDIR%/ \
+	ftp://ftp.snoopy.net/pub/mirrors/GNOME/%SUBDIR%/ \
+	ftp://ftp.kddlabs.co.jp/X11/GNOME/%SUBDIR%/ \
+	ftp://ftp.sunet.se/pub/X11/GNOME/%SUBDIR%/ \
+	ftp://ftp.cybertrails.com/pub/gnome/%SUBDIR%/ \
+	ftp://ftp2.sinica.edu.tw/pub5/gnome/%SUBDIR%/ \
+	ftp://gnomeftp.blue-labs.org/pub/gnome/%SUBDIR%/ \
+	ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/%SUBDIR%/ \
+	ftp://ftp.tas.gov.au/gnome/%SUBDIR%/ \
+	ftp://download.sourceforge.net/pub/mirrors/gnome/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/X11/GNOME/%SUBDIR%/
 
 MASTER_SITE_GNU+=	\
 	ftp://ftp.gnu.org/gnu/%SUBDIR%/ \
@@ -74,6 +77,45 @@ MASTER_SITE_GNU+=	\
 	ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/pub/gnu/%SUBDIR%/ \
 	ftp://sunsite.org.uk/Mirrors/ftp.gnu.org/pub/gnu/%SUBDIR%/
 
+MASTER_SITE_KDE+=	\
+	ftp://ftp.us.kde.org/pub/kde/%SUBDIR%/ \
+	ftp://ftp.sourceforge.net/pub/mirrors/kde/%SUBDIR%/ \
+	ftp://ftp.kde.org/pub/kde/%SUBDIR%/ \
+	ftp://ftp.tuniv.szczecin.pl/pub/kde/%SUBDIR%/ \
+	ftp://ftp.kddlabs.co.jp/X11/kde/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/X11/kde/%SUBDIR%/ \
+	ftp://ftp.synesis.net/pub/mirrors/kde/%SUBDIR%/ \
+	ftp://ftp.twoguys.org/pub/kde/%SUBDIR%/ \
+	ftp://ftp.dataplus.se/pub/linux/kde/%SUBDIR%/
+
+MASTER_SITE_MOZILLA+= \
+	ftp://ftp.mozilla.org/pub/%SUBDIR%/ \
+	ftp://download.sourceforge.net/pub/mirrors/mozilla/%SUBDIR%/ \
+	ftp://sunsite.utk.edu/pub/netscape-source/%SUBDIR%/ \
+	ftp://ftp.informatik.uni-bonn.de/pub/www/mozilla/%SUBDIR%/ \
+	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.mozilla.org/pub/%SUBDIR%/ \
+	ftp://sunsite.auc.dk/pub/mozilla/%SUBDIR%/ \
+	ftp://ftp.funet.fi/pub/mirrors/ftp.mozilla.org/pub/%SUBDIR%/ \
+	ftp://ftp.sunsite.kth.se/archive/www/ftp.mozilla.org/%SUBDIR%/ \
+	ftp://ftp2.sinica.edu.tw/pub3/www/mozilla/%SUBDIR%/ \
+	ftp://ftp.is.co.za/networking/info-service/www/clients/netscape/mozilla/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/WWW/mozilla/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/mozilla/&,}
+
+MASTER_SITE_NETBSD+=	\
+	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.planix.com/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.plig.net/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.iastate.edu/pub/netbsd/packages/distfiles/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://sunsite.cnlab-switch.ch/mirror/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.unina.it/pub/Unix/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.sunsite.org.uk/Mirrors/ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.dti.ad.jp/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.jaist.ac.jp/.arc07/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.tokyonet.ad.jp/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.sra.co.jp/pub/os/NetBSD/packages/distfiles/%SUBDIR%/ \
+	ftp://ftp.nectec.or.th/pub/bsd-distributions/NetBSD/packages/distfiles/%SUBDIR%/
+
 MASTER_SITE_PERL_CPAN+=	\
 	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/%SUBDIR%/ \
 	ftp://ftp.cpan.org/CPAN/modules/by-module/%SUBDIR%/ \
@@ -99,42 +141,6 @@ MASTER_SITE_PERL_CPAN+=	\
 	ftp://ftp.mirror.ac.uk/sites/ftp.cpan.org/CPAN/modules/by-module/%SUBDIR%/ \
 	ftp://sunsite.org.uk/packages/perl/CPAN/modules/by-module/%SUBDIR%/ \
 
-MASTER_SITE_TEX_CTAN+=  \
-	ftp://ftp.freesoftware.com/pub/tex/ctan/%SUBDIR%/  \
-	ftp://wuarchive.wustl.edu/packages/TeX/%SUBDIR%/  \
-	ftp://ftp.funet.fi/pub/TeX/CTAN/%SUBDIR%/  \
-	ftp://ctan.unsw.edu.au/tex-archive/%SUBDIR%/ \
-	ftp://ftp.cise.ufl.edu/tex-archive/%SUBDIR%/ \
-	ftp://ftp.tex.ac.uk/tex-archive/%SUBDIR%/  \
-	ftp://shadowmere.student.utwente.nl/pub/CTAN/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/CTAN/%SUBDIR%/ \
-	ftp://sunsite.auc.dk/pub/tex/ctan/%SUBDIR%/ \
-	ftp://ctan.tug.org/tex-archive/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/TeX/CTAN/%SUBDIR%/ \
-	ftp://ftp.dante.de/tex-archive/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/CTAN/&,}
-
-MASTER_SITE_SUNSITE+=	\
-	ftp://metalab.unc.edu/pub/Linux/%SUBDIR%/ \
-	ftp://ftp.freesoftware.com/pub/linux/sunsite/%SUBDIR%/ \
-	ftp://ftp.sourceforge.net/pub/mirrors/metalab/Linux/%SUBDIR%/ \
-	ftp://ftp.rz.uni-wuerzburg.de/pub/linux/MIRROR.sunsite/%SUBDIR%/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/linux/sunsite/%SUBDIR%/ \
-	ftp://ftp.is.co.za/linux/sunsite/%SUBDIR%/ \
-	ftp://ftp.sun.ac.za/pub/linux/sunsite/%SUBDIR%/ \
-	ftp://ftp.nuri.net/pub/Linux/%SUBDIR%/ \
-	ftp://ftp.cse.cuhk.edu.hk/pub4/Linux/%SUBDIR%/ \
-	ftp://ftp.u-aizu.ac.jp/pub/os/Linux/sunsite.unc.edu/%SUBDIR%/ \
-	ftp://ftp.kobe-u.ac.jp/pub/Linux/metalab.unc.edu/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/Linux/metalab.unc.edu/%SUBDIR%/ \
-	ftp://ftp.funet.fi/pub/Linux/mirrors/metalab/%SUBDIR%/ \
-	ftp://sunsite.doc.ic.ac.uk/packages/linux/sunsite.unc-mirror/%SUBDIR%/ \
-	ftp://ftp.nluug.nl/vol/2/metalab/%SUBDIR%/ \
-	ftp://sunsite.anu.edu.au/mnt/disk1/linux/metalab/%SUBDIR%/ \
-	ftp://ftp.cs.umn.edu/pub/Linux/sunsite/%SUBDIR%/ \
-	http://metalab.unc.edu/pub/Linux/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/Linux/sunsite/%SUBDIR%/
-
 MASTER_SITE_RINGSERVER+=	\
 	ftp://core.ring.gr.jp/pub/%SUBDIR%/ \
 	ftp://ring.etl.go.jp/pub/%SUBDIR%/ \
@@ -159,83 +165,56 @@ MASTER_SITE_RINGSERVER+=	\
 	ftp://ring.yamanashi.ac.jp/pub/%SUBDIR%/ \
 	ftp://ring.nihon-u.ac.jp/pub/%SUBDIR%/
 
-MASTER_SITE_KDE+=	\
-	ftp://ftp.us.kde.org/pub/kde/%SUBDIR%/ \
-	ftp://ftp.sourceforge.net/pub/mirrors/kde/%SUBDIR%/ \
-	ftp://ftp.kde.org/pub/kde/%SUBDIR%/ \
-	ftp://ftp.tuniv.szczecin.pl/pub/kde/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/X11/kde/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/X11/kde/%SUBDIR%/ \
-	ftp://ftp.synesis.net/pub/mirrors/kde/%SUBDIR%/ \
-	ftp://ftp.twoguys.org/pub/kde/%SUBDIR%/ \
-	ftp://ftp.dataplus.se/pub/linux/kde/%SUBDIR%/
-
-MASTER_SITE_COMP_SOURCES+=	\
-	ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/Unix/com.sources.%SUBDIR%/ \
-	ftp://ftp.uu.net/usenet/comp.sources.%SUBDIR%/ \
-	ftp://ftp.funet.fi/pub/archive/comp.sources.%SUBDIR%/ \
-	ftp://rtfm.mit.edu/pub/usenet/comp.sources.%SUBDIR%/
-
-MASTER_SITE_GNOME+=	\
-	ftp://ftp.gnome.org/pub/GNOME/%SUBDIR%/ \
-	ftp://rpmfind.net/linux/gnome.org/%SUBDIR%/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.gnome.org/pub/GNOME/%SUBDIR%/ \
-	ftp://slave.opensource.captech.com/gnome/%SUBDIR%/ \
-	ftp://ftp.snoopy.net/pub/mirrors/GNOME/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/X11/GNOME/%SUBDIR%/ \
-	ftp://ftp.sunet.se/pub/X11/GNOME/%SUBDIR%/ \
-	ftp://ftp.cybertrails.com/pub/gnome/%SUBDIR%/ \
-	ftp://ftp2.sinica.edu.tw/pub5/gnome/%SUBDIR%/ \
-	ftp://gnomeftp.blue-labs.org/pub/gnome/%SUBDIR%/ \
-	ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/%SUBDIR%/ \
-	ftp://ftp.tas.gov.au/gnome/%SUBDIR%/ \
-	ftp://download.sourceforge.net/pub/mirrors/gnome/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/X11/GNOME/%SUBDIR%/
-
-MASTER_SITE_AFTERSTEP+=	\
-	ftp://ftp.afterstep.org/%SUBDIR%/ \
-	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/X11/AfterStep/%SUBDIR%/ \
-	ftp://ftp.math.uni-bonn.de/pub/mirror/ftp.afterstep.org/pub/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/X/AfterStep/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/X11/windowmanagers/afterstep/%SUBDIR%/
-
-MASTER_SITE_WINDOWMAKER+= \
-	ftp://ftp.windowmaker.org/pub/%SUBDIR%/ \
-	ftp://ftp.goldweb.com.au/pub/WindowMaker/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/X11/window_managers/windowmaker/%SUBDIR%/ \
-	ftp://ftp.ameth.org/pub/mirrors/ftp.windowmaker.org/%SUBDIR%/ \
-	ftp://ftp.minet.net/pub/windowmaker/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/X11/windowmanagers/windowmaker/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/X/WindowMaker/%SUBDIR%/
+MASTER_SITE_RUBY+= \
+	ftp://ftp.netlab.co.jp/pub/lang/ruby/%SUBDIR%/ \
+	ftp://ftp.fu-berlin.de/unix/languages/ruby/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/lang/ruby/%SUBDIR%/ \
+	ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/%SUBDIR%/ \
+	ftp://ftp.iij.ad.jp/pub/lang/ruby/%SUBDIR%/ \
+	ftp://ftp.krnet.ne.jp/pub/ruby/%SUBDIR%/ \
+	ftp://ftp.nctu.edu.tw/computer-languages/ruby/%SUBDIR%/ \
+	ftp://mirror.nucba.ac.jp/mirror/ruby/%SUBDIR%/
 
-MASTER_SITE_MOZILLA+= \
-	ftp://ftp.mozilla.org/pub/%SUBDIR%/ \
-	ftp://download.sourceforge.net/pub/mirrors/mozilla/%SUBDIR%/ \
-	ftp://sunsite.utk.edu/pub/netscape-source/%SUBDIR%/ \
-	ftp://ftp.informatik.uni-bonn.de/pub/www/mozilla/%SUBDIR%/ \
-	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.mozilla.org/pub/%SUBDIR%/ \
-	ftp://sunsite.auc.dk/pub/mozilla/%SUBDIR%/ \
-	ftp://ftp.funet.fi/pub/mirrors/ftp.mozilla.org/pub/%SUBDIR%/ \
-	ftp://ftp.sunsite.kth.se/archive/www/ftp.mozilla.org/%SUBDIR%/ \
-	ftp://ftp2.sinica.edu.tw/pub3/www/mozilla/%SUBDIR%/ \
-	ftp://ftp.is.co.za/networking/info-service/www/clients/netscape/mozilla/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/WWW/mozilla/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/mozilla/&,}
+MASTER_SITE_SOURCEWARE+= \
+	ftp://ftp.freesoftware.com/pub/sourceware/%SUBDIR%/ \
+	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/%SUBDIR%/ \
+	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/sources.redhat.com/%SUBDIR%/ \
+	ftp://ftp.pvv.ntnu.no/pub/cygnus/sourceware.cygnus.com/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/sourceware/%SUBDIR%/ \
+	ftp://gd.tuwien.ac.at/gnu/sourceware/%SUBDIR%/ \
+	ftp://ftp.unina.it/pub/Unix/cygnus/%SUBDIR%/ \
+	ftp://ftp1.sinica.edu.tw/pub3/CYGNUS/%SUBDIR%/ \
+	ftp://ftp.sdn.co.za/mirrors/sourceware.cygnus.com/pub/%SUBDIR%/ \
+	ftp://sunsite.org.uk/Mirrors/sourceware.cygnus.com/pub/%SUBDIR%/ \
+	ftp://unix.hensa.ac.uk/mirrors/sourceware.cygnus.com/pub/%SUBDIR%/
 
-MASTER_SITE_XEMACS+= \
-	ftp://ftp.xemacs.org/pub/xemacs/%SUBDIR%/ \
-	ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/%SUBDIR%/ \
-	ftp://ftp.usyd.edu.au/pub/xemacs/%SUBDIR%/ \
-	ftp://ftp.lab.kdd.co.jp/xemacs/%SUBDIR%/ \
-	ftp://ftp.th-darmstadt.de/pub/editors/xemacs/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/xemacs/&,}
+MASTER_SITE_SOURCEFORGE+= \
+	ftp://download.sourceforge.net/pub/sourceforge/%SUBDIR%/ \
+	http://download.sourceforge.net/%SUBDIR%/ \
+	ftp://projects.sourceforge.net/pub/%SUBDIR%/ \
+	ftp://ftp.kddlabs.co.jp/sourceforge/%SUBDIR%/ \
+	ftp://ftp.mirror.ac.uk/sites/download.sourceforge.net/pub/sourceforge/%SUBDIR%/
 
-MASTER_SITE_PORTS_JP+=	\
-	ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/ \
-	ftp://ftp4.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/ \
-	ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/
+MASTER_SITE_SUNSITE+=	\
+	ftp://metalab.unc.edu/pub/Linux/%SUBDIR%/ \
+	ftp://ftp.freesoftware.com/pub/linux/sunsite/%SUBDIR%/ \
+	ftp://ftp.sourceforge.net/pub/mirrors/metalab/Linux/%SUBDIR%/ \
+	ftp://ftp.rz.uni-wuerzburg.de/pub/linux/MIRROR.sunsite/%SUBDIR%/ \
+	ftp://sunsite.cnlab-switch.ch/mirror/linux/sunsite/%SUBDIR%/ \
+	ftp://ftp.is.co.za/linux/sunsite/%SUBDIR%/ \
+	ftp://ftp.sun.ac.za/pub/linux/sunsite/%SUBDIR%/ \
+	ftp://ftp.nuri.net/pub/Linux/%SUBDIR%/ \
+	ftp://ftp.cse.cuhk.edu.hk/pub4/Linux/%SUBDIR%/ \
+	ftp://ftp.u-aizu.ac.jp/pub/os/Linux/sunsite.unc.edu/%SUBDIR%/ \
+	ftp://ftp.kobe-u.ac.jp/pub/Linux/metalab.unc.edu/%SUBDIR%/ \
+	ftp://ftp.kddlabs.co.jp/Linux/metalab.unc.edu/%SUBDIR%/ \
+	ftp://ftp.funet.fi/pub/Linux/mirrors/metalab/%SUBDIR%/ \
+	ftp://sunsite.doc.ic.ac.uk/packages/linux/sunsite.unc-mirror/%SUBDIR%/ \
+	ftp://ftp.nluug.nl/vol/2/metalab/%SUBDIR%/ \
+	ftp://sunsite.anu.edu.au/mnt/disk1/linux/metalab/%SUBDIR%/ \
+	ftp://ftp.cs.umn.edu/pub/Linux/sunsite/%SUBDIR%/ \
+	http://metalab.unc.edu/pub/Linux/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/Linux/sunsite/%SUBDIR%/
 
 MASTER_SITE_TCLTK+= \
 	ftp://ftp.scriptics.com/pub/tcl/%SUBDIR%/ \
@@ -250,42 +229,69 @@ MASTER_SITE_TCLTK+= \
 	ftp://ftp.mirror.ac.uk/sites/ftp.scriptics.com/pub/tcl/%SUBDIR%/ \
 	ftp://sunsite.org.uk/Mirrors/ftp.scriptics.com/pub/tcl/%SUBDIR%/
 
-MASTER_SITE_SOURCEFORGE+= \
-	ftp://download.sourceforge.net/pub/sourceforge/%SUBDIR%/ \
-	http://download.sourceforge.net/%SUBDIR%/ \
-	ftp://projects.sourceforge.net/pub/%SUBDIR%/ \
-	ftp://ftp.kddlabs.co.jp/sourceforge/%SUBDIR%/ \
-	ftp://ftp.mirror.ac.uk/sites/download.sourceforge.net/pub/sourceforge/%SUBDIR%/
-
-MASTER_SITE_RUBY+= \
-	ftp://ftp.netlab.co.jp/pub/lang/ruby/%SUBDIR%/ \
-	ftp://ftp.fu-berlin.de/unix/languages/ruby/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/lang/ruby/%SUBDIR%/ \
-	ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/%SUBDIR%/ \
-	ftp://ftp.iij.ad.jp/pub/lang/ruby/%SUBDIR%/ \
-	ftp://ftp.krnet.ne.jp/pub/ruby/%SUBDIR%/ \
-	ftp://ftp.nctu.edu.tw/computer-languages/ruby/%SUBDIR%/ \
-	ftp://mirror.nucba.ac.jp/mirror/ruby/%SUBDIR%/
+MASTER_SITE_TEX_CTAN+=  \
+	ftp://ftp.freesoftware.com/pub/tex/ctan/%SUBDIR%/  \
+	ftp://wuarchive.wustl.edu/packages/TeX/%SUBDIR%/  \
+	ftp://ftp.funet.fi/pub/TeX/CTAN/%SUBDIR%/  \
+	ftp://ctan.unsw.edu.au/tex-archive/%SUBDIR%/ \
+	ftp://ftp.cise.ufl.edu/tex-archive/%SUBDIR%/ \
+	ftp://ftp.tex.ac.uk/tex-archive/%SUBDIR%/  \
+	ftp://shadowmere.student.utwente.nl/pub/CTAN/%SUBDIR%/ \
+	ftp://ftp.kddlabs.co.jp/CTAN/%SUBDIR%/ \
+	ftp://sunsite.auc.dk/pub/tex/ctan/%SUBDIR%/ \
+	ftp://ctan.tug.org/tex-archive/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/TeX/CTAN/%SUBDIR%/ \
+	ftp://ftp.dante.de/tex-archive/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/CTAN/&,}
 
 MASTER_SITE_THEMES+= \
 	ftp://ftp.themes.org/pub/themes/%SUBDIR%/ \
 	ftp://ftp.tuwien.ac.at/opsys/linux/themes.org/%SUBDIR%/ \
 	ftp://ftp.chg.ru/pub/X11/themes/%SUBDIR%/
 
-MASTER_SITE_SOURCEWARE+= \
-	ftp://ftp.freesoftware.com/pub/sourceware/%SUBDIR%/ \
-	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/%SUBDIR%/ \
-	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/sources.redhat.com/%SUBDIR%/ \
-	ftp://ftp.pvv.ntnu.no/pub/cygnus/sourceware.cygnus.com/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/sourceware/%SUBDIR%/ \
-	ftp://gd.tuwien.ac.at/gnu/sourceware/%SUBDIR%/ \
-	ftp://ftp.unina.it/pub/Unix/cygnus/%SUBDIR%/ \
-	ftp://ftp1.sinica.edu.tw/pub3/CYGNUS/%SUBDIR%/ \
-	ftp://ftp.sdn.co.za/mirrors/sourceware.cygnus.com/pub/%SUBDIR%/ \
-	ftp://sunsite.org.uk/Mirrors/sourceware.cygnus.com/pub/%SUBDIR%/ \
-	ftp://unix.hensa.ac.uk/mirrors/sourceware.cygnus.com/pub/%SUBDIR%/
+MASTER_SITE_WINDOWMAKER+= \
+	ftp://ftp.windowmaker.org/pub/%SUBDIR%/ \
+	ftp://ftp.goldweb.com.au/pub/WindowMaker/%SUBDIR%/ \
+	ftp://ftp.kddlabs.co.jp/X11/window_managers/windowmaker/%SUBDIR%/ \
+	ftp://ftp.ameth.org/pub/mirrors/ftp.windowmaker.org/%SUBDIR%/ \
+	ftp://ftp.minet.net/pub/windowmaker/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/X11/windowmanagers/windowmaker/%SUBDIR%/ \
+	ftp://ftp.dti.ad.jp/pub/X/WindowMaker/%SUBDIR%/
 
-# Where to put distfiles that don't have any other master site
-MASTER_SITE_LOCAL?= \
-	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \
-	ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/
+MASTER_SITE_XCONTRIB+=	\
+	ftp://crl.dec.com/pub/X11/contrib/%SUBDIR%/ \
+	ftp://ftp.net.ohio-state.edu/disk/d/X11/contrib/%SUBDIR%/ \
+	ftp://uiarchive.uiuc.edu/pub/X11/contrib/%SUBDIR%/ \
+	ftp://ftp.gwdg.de/pub/x11/x.org/contrib/%SUBDIR%/ \
+	ftp://ftp.duke.edu/pub/X11/contrib/%SUBDIR%/ \
+	ftp://ftp.x.org/contrib/%SUBDIR%/ \
+	ftp://ftp.sunet.se/pub/X11/contrib/%SUBDIR%/ \
+	ftp://ftp.kddlabs.co.jp/X11/contrib/%SUBDIR%/ \
+	ftp://mirror.xmission.com/X/contrib/%SUBDIR%/ \
+	ftp://ftp2.x.org/contrib/%SUBDIR%/ \
+	ftp://sunsite.sut.ac.jp/pub/archives/X11/contrib/%SUBDIR%/ \
+	ftp://ftp.is.co.za/x/contrib/%SUBDIR%/ \
+	ftp://ftp.sunet.se/pub/X11/contrib/%SUBDIR%/ \
+	ftp://ftp.huji.ac.il/mirror/X11/contrib/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/X11/contrib/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/opengroup/contrib/&,} \
+	ftp://ftp.mirror.ac.uk/sites/ftp.x.org/contrib/%SUBDIR%/ \
+	ftp://sunsite.org.uk/Mirrors/ftp.x.org/contrib/%SUBDIR%/
+
+MASTER_SITE_XEMACS+= \
+	ftp://ftp.xemacs.org/pub/xemacs/%SUBDIR%/ \
+	ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/%SUBDIR%/ \
+	ftp://ftp.usyd.edu.au/pub/xemacs/%SUBDIR%/ \
+	ftp://ftp.lab.kdd.co.jp/xemacs/%SUBDIR%/ \
+	ftp://ftp.th-darmstadt.de/pub/editors/xemacs/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/xemacs/&,}
+
+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_RINGSERVER:S,%SUBDIR%,XFree86/&/source,} \
+	ftp://ftp.chg.ru/pub/XFree86/%SUBDIR%/source/