Sync the ftp site list with reality. Some day, this will be an algorithm

and not a menu.

2 files changed, 174 insertions, 110 deletions

diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 4cab22e..79c3ddb 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.44 1995/12/07 10:34:05 peter Exp $
+ * $Id: menus.c,v 1.45 1996/02/02 06:44:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -191,80 +191,112 @@ guaranteed to carry the full range of possible distributions.",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/", 0, 0		},
   { "Other",			"Specify some other ftp site by URL",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=other", 0, 0						},
-  { "Australia",		"ftp.physics.usyd.edu.au",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.physics.usyd.edu.au/FreeBSD/", 0, 0		},
-  { "Australia #2",		"minnie.cs.adfa.oz.au",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://minnie.cs.adfa.oz.au/FreeBSD/", 0, 0		},
-  { "Canada",			"ftp.synapse.net",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.synapse.net/contrib/FreeBSD/", 0, 0		},
+  { "Australia",		"ftp.au.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.au.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Australia #2",		"ftp2.au.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Australia #3",		"ftp3.au.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Australia #4",		"ftp4.au.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.au.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil",			"ftp.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil #2",		"ftp2.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil #3",		"ftp3.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil #4",		"ftp4.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil #5",		"ftp5.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp5.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Canada",			"ftp.ca.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Czech Republic",		"sunsite.mff.cuni.cz",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://sunsite.mff.cuni.cz/OS/FreeBSD/", 0, 0		},
   { "Finland",			"nic.funet.fi",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://nic.funet.fi/pub/unix/FreeBSD/", 0, 0		},
   { "France",			"ftp.ibp.fr",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ibp.fr/pub/FreeBSD/", 0, 0			},
-  { "Germany",			"ftp.fb9dv.uni-duisburg.de",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.fb9dv.uni-duisburg.de/pub/unix/FreeBSD/", 0, 0	},
-  { "Germany #2",		"gil.physik.rwth-aachen.de",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://gil.physik.rwth-aachen.de/pub/FreeBSD/", 0, 0	},
-  { "Germany #3",		"ftp.uni-paderborn.de",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.uni-paderborn.de/freebsd/", 0, 0		},
-  { "Germany #4",		"ftp.leo.org",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.leo.org/pub/comp/os/bsd/FreeBSD/", 0, 0	},
-  { "Germany #5",		"ftp.tu-dresden.de",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.tu-dresden.de/pub/soft/unix/bsd/FreeBSD/", 0, 0 },
+  { "Germany",			"ftp.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #2",		"ftp2.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #3",		"ftp3.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #4",		"ftp4.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #5",		"ftp5.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp5.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #6",		"ftp6.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #7",		"ftp7.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org/pub/FreeBSD/", 0, 0	},
   { "Hong Kong",		"ftp.hk.super.net",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.hk.super.net/pub/FreeBSD/", 0, 0		},
-  { "Ireland",			"ftp.internet-eireann.ie",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.internet-eireann.ie/pub/FreeBSD/", 0, 0	},
+  { "Ireland",			"ftp.ie.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org/pub/FreeBSD/", 0, 0	},
   { "Israel",			"orgchem.weizmann.ac.il",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://orgchem.weizmann.ac.il/pub/FreeBSD/", 0, 0		},
-  { "Japan",			"ftp.tokyonet.ad.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.tokyonet.ad.jp/pub/FreeBSD/", 0, 0		},
-  { "Japan #2",			"ftp.nisiq.net",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.nisiq.net/pub/os/FreeBSD/", 0, 0		},
-  { "Japan #3",			"ftp.iij.ad.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.iij.ad.jp/pub/FreeBSD/", 0, 0			},
-  { "Japan #4",			"ftp.kuis.kyoto-u.ac.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.kuis.kyoto-u.ac.jp/BSD/FreeBSD/", 0, 0		},
-  { "Japan #5",			"ftp.ee.uec.ac.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ee.uec.ac.jp/pub/os/mirror/ftp.freebsd.org/", 0, 0 },
-  { "Japan #6",			"ftp.u-aizu.ac.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.u-aizu.ac.jp/pub/os/FreeBSD/", 0, 0		},
-  { "Korea",			"ftp.cau.ac.kr",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.cau.ac.kr/pub/FreeBSD/", 0, 0			},
+  { "Israel #2",		"xray4.weizmann.ac.il",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://xray4.weizmann.ac.il/pub/FreeBSD/", 0, 0		},
+  { "Japan",			"ftp.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #2",			"ftp2.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #3",			"ftp3.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #4",			"ftp4.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #5",			"ftp5.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp5.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #6",			"ftp6.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp6.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Korea",			"ftp.kr.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.kr.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "Korea #2",			"ftp2.kr.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.kr.freebsd.org/pub/FreeBSD/", 0, 0			},
   { "Netherlands",		"ftp.nl.net",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.nl.net/pub/os/FreeBSD/", 0, 0			},
   { "Poland",			"SunSITE.icm.edu.pl",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://SunSITE.icm.edu.pl/pub/FreeBSD/", 0, 0		},
+  { "Portugal",			"ftp.ua.pt",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ua.pt/pub/misc/FreeBSD/", 0, 0			},
   { "Russia",			"ftp.kiae.su",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.kiae.su/FreeBSD/", 0, 0			},
+  { "South Africa",		"ftp.za.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.za.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "South Africa #2",		"ftp2.za.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/", 0, 0			},
   { "Sweden",			"ftp.luth.se",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.luth.se/pub/FreeBSD/", 0, 0			},
-  { "Taiwan",			"NCTUCCCA.edu.tw",
+  { "Taiwan",			"ftp.tw.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.tw.freebsd.org/pub/FreeBSD", 0, 0	},
+  { "Taiwan #2",		"NCTUCCCA.edu.tw",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://NCTUCCCA.edu.tw/Operating-Systems/FreeBSD", 0, 0	},
-  { "Taiwan #2",		"netbsd.csie.nctu.edu.tw",
+  { "Taiwan #3",		"netbsd.csie.nctu.edu.tw",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://netbsd.csie.nctu.edu.tw/pub/FreeBSD/", 0, 0	},
   { "Thailand",			"ftp.nectec.or.th",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/", 0, 0	},
-  { "UK",			"ftp.demon.co.uk",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.demon.co.uk/pub/BSD/FreeBSD/", 0, 0		},
-  { "UK #2",			"src.doc.ic.ac.uk",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://src.doc.ic.ac.uk/packages/unix/FreeBSD/", 0, 0	},
-  { "UK #3",			"unix.hensa.ac.uk",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://unix.hensa.ac.uk/mirrors/walnut.creek/FreeBSD/", 0, 0 },
-  { "USA",			"ref.tfs.com",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ref.tfs.com/pub/FreeBSD/", 0, 0			},
-  { "USA #2",			"ftp.dataplex.net",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.dataplex.net/pub/FreeBSD/", 0, 0		},
-  { "USA #3",			"kryten.atinc.com",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://kryten.atinc.com/pub/FreeBSD/", 0, 0		},
-  { "USA #4",			"ftp.neosoft.com",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.neosoft.com/systems/FreeBSD/", 0, 0		},
-  { "USA #5",			"ftp.cybernetics.net",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.cybernetics.net/pub/FreeBSD/", 0, 0		},
-  { "USA #6",			"ftp.cps.cmich.edu",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.cps.cmich.edu/pub/ftp.freebsd.org/", 0, 0	},
-  { "USA #7",			"ftp.cslab.vt.edu",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.cslab.vt.edu/pub/FreeBSD/", 0, 0		},
+  { "UK",			"ftp.uk.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/BSD/FreeBSD/", 0, 0		},
+  { "UK #2",			"ftp2.uk.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/BSD/FreeBSD/", 0, 0		},
+  { "UK #3",			"ftp3.uk.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/BSD/FreeBSD/", 0, 0		},
+  { "USA",			"ftp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #2",			"ftp2.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #3",			"ftp3.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #4",			"ftp4.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #5",			"ftp5.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp5.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #6",			"ftp6.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp6.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #7",			"ftp7.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp7.freebsd.org/pub/FreeBSD/", 0, 0			},
   { NULL } }
 };
 
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 4cab22e..79c3ddb 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.44 1995/12/07 10:34:05 peter Exp $
+ * $Id: menus.c,v 1.45 1996/02/02 06:44:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -191,80 +191,112 @@ guaranteed to carry the full range of possible distributions.",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/", 0, 0		},
   { "Other",			"Specify some other ftp site by URL",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=other", 0, 0						},
-  { "Australia",		"ftp.physics.usyd.edu.au",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.physics.usyd.edu.au/FreeBSD/", 0, 0		},
-  { "Australia #2",		"minnie.cs.adfa.oz.au",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://minnie.cs.adfa.oz.au/FreeBSD/", 0, 0		},
-  { "Canada",			"ftp.synapse.net",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.synapse.net/contrib/FreeBSD/", 0, 0		},
+  { "Australia",		"ftp.au.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.au.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Australia #2",		"ftp2.au.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Australia #3",		"ftp3.au.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Australia #4",		"ftp4.au.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.au.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil",			"ftp.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil #2",		"ftp2.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil #3",		"ftp3.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil #4",		"ftp4.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Brazil #5",		"ftp5.br.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp5.br.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Canada",			"ftp.ca.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Czech Republic",		"sunsite.mff.cuni.cz",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://sunsite.mff.cuni.cz/OS/FreeBSD/", 0, 0		},
   { "Finland",			"nic.funet.fi",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://nic.funet.fi/pub/unix/FreeBSD/", 0, 0		},
   { "France",			"ftp.ibp.fr",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ibp.fr/pub/FreeBSD/", 0, 0			},
-  { "Germany",			"ftp.fb9dv.uni-duisburg.de",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.fb9dv.uni-duisburg.de/pub/unix/FreeBSD/", 0, 0	},
-  { "Germany #2",		"gil.physik.rwth-aachen.de",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://gil.physik.rwth-aachen.de/pub/FreeBSD/", 0, 0	},
-  { "Germany #3",		"ftp.uni-paderborn.de",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.uni-paderborn.de/freebsd/", 0, 0		},
-  { "Germany #4",		"ftp.leo.org",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.leo.org/pub/comp/os/bsd/FreeBSD/", 0, 0	},
-  { "Germany #5",		"ftp.tu-dresden.de",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.tu-dresden.de/pub/soft/unix/bsd/FreeBSD/", 0, 0 },
+  { "Germany",			"ftp.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #2",		"ftp2.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #3",		"ftp3.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #4",		"ftp4.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #5",		"ftp5.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp5.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #6",		"ftp6.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org/pub/FreeBSD/", 0, 0	},
+  { "Germany #7",		"ftp7.de.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org/pub/FreeBSD/", 0, 0	},
   { "Hong Kong",		"ftp.hk.super.net",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.hk.super.net/pub/FreeBSD/", 0, 0		},
-  { "Ireland",			"ftp.internet-eireann.ie",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.internet-eireann.ie/pub/FreeBSD/", 0, 0	},
+  { "Ireland",			"ftp.ie.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org/pub/FreeBSD/", 0, 0	},
   { "Israel",			"orgchem.weizmann.ac.il",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://orgchem.weizmann.ac.il/pub/FreeBSD/", 0, 0		},
-  { "Japan",			"ftp.tokyonet.ad.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.tokyonet.ad.jp/pub/FreeBSD/", 0, 0		},
-  { "Japan #2",			"ftp.nisiq.net",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.nisiq.net/pub/os/FreeBSD/", 0, 0		},
-  { "Japan #3",			"ftp.iij.ad.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.iij.ad.jp/pub/FreeBSD/", 0, 0			},
-  { "Japan #4",			"ftp.kuis.kyoto-u.ac.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.kuis.kyoto-u.ac.jp/BSD/FreeBSD/", 0, 0		},
-  { "Japan #5",			"ftp.ee.uec.ac.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ee.uec.ac.jp/pub/os/mirror/ftp.freebsd.org/", 0, 0 },
-  { "Japan #6",			"ftp.u-aizu.ac.jp",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.u-aizu.ac.jp/pub/os/FreeBSD/", 0, 0		},
-  { "Korea",			"ftp.cau.ac.kr",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.cau.ac.kr/pub/FreeBSD/", 0, 0			},
+  { "Israel #2",		"xray4.weizmann.ac.il",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://xray4.weizmann.ac.il/pub/FreeBSD/", 0, 0		},
+  { "Japan",			"ftp.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #2",			"ftp2.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #3",			"ftp3.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #4",			"ftp4.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #5",			"ftp5.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp5.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Japan #6",			"ftp6.jp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp6.jp.freebsd.org/pub/FreeBSD/", 0, 0		},
+  { "Korea",			"ftp.kr.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.kr.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "Korea #2",			"ftp2.kr.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.kr.freebsd.org/pub/FreeBSD/", 0, 0			},
   { "Netherlands",		"ftp.nl.net",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.nl.net/pub/os/FreeBSD/", 0, 0			},
   { "Poland",			"SunSITE.icm.edu.pl",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://SunSITE.icm.edu.pl/pub/FreeBSD/", 0, 0		},
+  { "Portugal",			"ftp.ua.pt",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.ua.pt/pub/misc/FreeBSD/", 0, 0			},
   { "Russia",			"ftp.kiae.su",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.kiae.su/FreeBSD/", 0, 0			},
+  { "South Africa",		"ftp.za.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.za.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "South Africa #2",		"ftp2.za.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/", 0, 0			},
   { "Sweden",			"ftp.luth.se",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.luth.se/pub/FreeBSD/", 0, 0			},
-  { "Taiwan",			"NCTUCCCA.edu.tw",
+  { "Taiwan",			"ftp.tw.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.tw.freebsd.org/pub/FreeBSD", 0, 0	},
+  { "Taiwan #2",		"NCTUCCCA.edu.tw",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://NCTUCCCA.edu.tw/Operating-Systems/FreeBSD", 0, 0	},
-  { "Taiwan #2",		"netbsd.csie.nctu.edu.tw",
+  { "Taiwan #3",		"netbsd.csie.nctu.edu.tw",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://netbsd.csie.nctu.edu.tw/pub/FreeBSD/", 0, 0	},
   { "Thailand",			"ftp.nectec.or.th",
 	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/", 0, 0	},
-  { "UK",			"ftp.demon.co.uk",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.demon.co.uk/pub/BSD/FreeBSD/", 0, 0		},
-  { "UK #2",			"src.doc.ic.ac.uk",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://src.doc.ic.ac.uk/packages/unix/FreeBSD/", 0, 0	},
-  { "UK #3",			"unix.hensa.ac.uk",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://unix.hensa.ac.uk/mirrors/walnut.creek/FreeBSD/", 0, 0 },
-  { "USA",			"ref.tfs.com",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ref.tfs.com/pub/FreeBSD/", 0, 0			},
-  { "USA #2",			"ftp.dataplex.net",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.dataplex.net/pub/FreeBSD/", 0, 0		},
-  { "USA #3",			"kryten.atinc.com",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://kryten.atinc.com/pub/FreeBSD/", 0, 0		},
-  { "USA #4",			"ftp.neosoft.com",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.neosoft.com/systems/FreeBSD/", 0, 0		},
-  { "USA #5",			"ftp.cybernetics.net",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.cybernetics.net/pub/FreeBSD/", 0, 0		},
-  { "USA #6",			"ftp.cps.cmich.edu",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.cps.cmich.edu/pub/ftp.freebsd.org/", 0, 0	},
-  { "USA #7",			"ftp.cslab.vt.edu",
-	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.cslab.vt.edu/pub/FreeBSD/", 0, 0		},
+  { "UK",			"ftp.uk.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/BSD/FreeBSD/", 0, 0		},
+  { "UK #2",			"ftp2.uk.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/BSD/FreeBSD/", 0, 0		},
+  { "UK #3",			"ftp3.uk.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/BSD/FreeBSD/", 0, 0		},
+  { "USA",			"ftp.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #2",			"ftp2.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp2.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #3",			"ftp3.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp3.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #4",			"ftp4.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp4.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #5",			"ftp5.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp5.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #6",			"ftp6.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp6.freebsd.org/pub/FreeBSD/", 0, 0			},
+  { "USA #7",			"ftp7.freebsd.org",
+	DMENU_SET_VARIABLE,	VAR_FTP_PATH "=ftp://ftp7.freebsd.org/pub/FreeBSD/", 0, 0			},
   { NULL } }
 };