Sync-up with bsdinstall(8) FTP mirrorselect changes.

SVN r224656:
Add back ftp4, a new machine has taken its place. ftp2 and ftp8 are both
IPv6 capable mirrors.  cvsup4/ftp4 have already been added to the handbook.

NOTE: Except put IPv6 entries in IPv6 section at the top of the list

SVN r225467:
Add ftp4.se.freebsd.org to the IPv4 and IPv6 mirror lists.

SVN r235228:
Add the IPv6 tag to ftp4.fr.freebsd.org.

NOTE: Except dup entry into IPv6 section.

SVN r243832:
- Remove snapshots.se.freebsd.org [1]
- Add ftp6.se.freebsd.org

SVN r243854:
Remove snapshots.jp.freebsd.org. It stopped working years ago.

SVN r253543:
Update mirror list to more closely match
http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html

MFC after:	1 week

2 files changed, 18 insertions, 53 deletions

diff --git a/usr.sbin/bsdconfig/include/messages.subr b/usr.sbin/bsdconfig/include/messages.subr
index 1dc8f95..32e116f 100644
--- a/usr.sbin/bsdconfig/include/messages.subr
+++ b/usr.sbin/bsdconfig/include/messages.subr
@@ -42,7 +42,7 @@ msg_all_desc="All available packages in all categories."
 msg_always_try_sudo_when_run_as="Always try sudo(8) when run as %s"
 msg_arabic_desc="Ported software for Arab countries."
 msg_archivers_desc="Utilities for archiving and unarchiving data."
-msg_argentina="Argentina"
+msg_armenia="Armenia"
 msg_assume_network_is_already_configured="Running multi-user, assume that the network is already configured?"
 msg_assume_yes_to_all_non_critical_dialogs="Assume \"Yes\" answers to all non-critical dialogs"
 msg_astro_desc="Applications related to astronomy."
@@ -92,7 +92,6 @@ msg_couldnt_connect_to_proxy="Couldn't connect to proxy"
 msg_couldnt_connect_to_server="Couldn't connect to server"
 msg_couldnt_open_ftp_connection="Couldn't open FTP connection to %s:\n  %s."
 msg_created_path="Created %s"
-msg_croatia="Croatia"
 msg_czech_republic="Czech Republic"
 msg_databases_desc="Database software."
 msg_debugging="Debugging"
@@ -154,7 +153,6 @@ msg_hostname_variable_not_set="WARNING: hostname variable not set and is a non-o
 msg_http_direct="HTTP Direct"
 msg_http_proxy="HTTP Proxy"
 msg_hungarian_desc="Ported software for the Hungarian market."
-msg_hungary="Hungary"
 msg_iceland="Iceland"
 msg_install_from_a_dos_partition="Install from a DOS partition"
 msg_install_from_a_floppy_disk_set="Install from a floppy disk set"
@@ -195,6 +193,7 @@ msg_kld_desc="Kernel loadable modules."
 msg_korea="Korea"
 msg_korean_desc="Ported software for the Korean market."
 msg_lang_desc="Computer languages."
+msg_latvia="Latvia"
 msg_length_of_specified_url_is_too_long="Length of specified URL is %u characters. Allowable maximum is %u."
 msg_linux_desc="Linux programs that can run under binary compatibility."
 msg_lisp_desc="Software related to the Lisp language."
@@ -226,6 +225,7 @@ msg_netherlands="Netherlands"
 msg_netmask="Netmask"
 msg_network_configuration="Network Configuration"
 msg_network_interface_information_required="Network interface information required"
+msg_new_zealand="New Zealand"
 msg_news_desc="USENET News support software."
 msg_next_page="Next page"
 msg_nfailed_attempts="%u incorrect password attempts"
@@ -298,7 +298,6 @@ msg_please_specify_url_of_freebsd_http_distribution="Please specify the URL of a
 msg_poland="Poland"
 msg_polish_desc="Ported software for the Polish market."
 msg_ports_mgmt_desc="Utilities for managing ports and packages."
-msg_portugal="Portugal"
 msg_portuguese_desc="Ported software for the Portuguese market."
 msg_previous_page="Previous page"
 msg_previous_syntax_errors="%s: Not overwriting \`%s' due to previous syntax errors"
@@ -323,7 +322,6 @@ msg_review="Review"
 msg_review_desc="Review/perform pending actions"
 msg_review_help="Install, Re-Install, or Un-install selected packages and dependencies"
 msg_reviewing_selected_packages="Reviewing %u selected packages:"
-msg_romania="Romania"
 msg_ruby_desc="Software related to the Ruby language."
 msg_rubygems_desc="Ports of RubyGems packages."
 msg_russia="Russia"
@@ -340,11 +338,8 @@ msg_select_a_site_thats_close="Select a site that's close!"
 msg_selected="selected"
 msg_server_error_when_requesting_url="Server error when requesting %s, you could try an other server"
 msg_shells_desc="Various shells (tcsh, bash, etc)."
-msg_singapore="Singapore"
 msg_slovak_republic="Slovak Republic"
 msg_slovenia="Slovenia"
-msg_snapshots_server_japan="Snapshots Server Japan"
-msg_snapshots_server_sweden="Snapshots Server Sweden"
 msg_sorry_invalid_url="Sorry, %s is an invalid URL!"
 msg_sorry_package_was_not_found_in_the_index="Sorry, package %s was not found in the INDEX."
 msg_sorry_try_again="Sorry, try again."
diff --git a/usr.sbin/bsdconfig/share/media/ftp.subr b/usr.sbin/bsdconfig/share/media/ftp.subr
index 638584c..16a10cd 100644
--- a/usr.sbin/bsdconfig/share/media/ftp.subr
+++ b/usr.sbin/bsdconfig/share/media/ftp.subr
@@ -75,14 +75,12 @@ f_dialog_menu_media_ftp()
 	local menu_list="
 		'$msg_main_site'          'ftp.freebsd.org'
 		'URL'                     '$msg_specify_some_other_ftp_site'
-		'$msg_snapshots_server_japan'
-		                          'snapshots.jp.freebsd.org'
-		'$msg_snapshots_server_sweden'
-		                          'snapshots.se.freebsd.org'
 		'IPv6 $msg_main_site'     'ftp.freebsd.org'
+		' IPv6 $msg_france'       'ftp4.fr.freebsd.org'
+		' IPv6 $msg_france #8'    'ftp8.fr.freebsd.org'
 		' IPv6 $msg_ireland'      'ftp3.ie.freebsd.org'
-		' IPv6 $msg_israel'       'ftp.il.freebsd.org'
 		' IPv6 $msg_japan'        'ftp2.jp.freebsd.org'
+		' IPv6 $msg_sweden'       'ftp4.se.freebsd.org'
 		' IPv6 $msg_usa'          'ftp4.us.freebsd.org'
 		' IPv6 $msg_turkey'       'ftp2.tr.freebsd.org'
 		'$msg_primary'            'ftp1.freebsd.org'
@@ -92,44 +90,34 @@ f_dialog_menu_media_ftp()
 		' $msg_primary #5'        'ftp5.freebsd.org'
 		' $msg_primary #6'        'ftp6.freebsd.org'
 		' $msg_primary #7'        'ftp7.freebsd.org'
-		' $msg_primary #8'        'ftp8.freebsd.org'
-		' $msg_primary #9'        'ftp9.freebsd.org'
 		' $msg_primary #10'       'ftp10.freebsd.org'
 		' $msg_primary #11'       'ftp11.freebsd.org'
 		' $msg_primary #12'       'ftp12.freebsd.org'
 		' $msg_primary #13'       'ftp13.freebsd.org'
 		' $msg_primary #14'       'ftp14.freebsd.org'
-		'$msg_argentina'          'ftp.ar.freebsd.org'
+		'$msg_armenia'            'ftp1.am.freebsd.org'
 		'$msg_australia'          'ftp.au.freebsd.org'
 		' $msg_australia #2'      'ftp2.au.freebsd.org'
 		' $msg_australia #3'      'ftp3.au.freebsd.org'
 		'$msg_austria'            'ftp.at.freebsd.org'
-		' $msg_austria #2'        'ftp2.at.freebsd.org'
-		'$msg_brazil'             'ftp.br.freebsd.org'
-		' $msg_brazil #2'         'ftp2.br.freebsd.org'
+		'$msg_brazil'             'ftp2.br.freebsd.org'
 		' $msg_brazil #3'         'ftp3.br.freebsd.org'
 		' $msg_brazil #4'         'ftp4.br.freebsd.org'
-		' $msg_brazil #5'         'ftp5.br.freebsd.org'
-		' $msg_brazil #6'         'ftp6.br.freebsd.org'
-		' $msg_brazil #7'         'ftp7.br.freebsd.org'
 		'$msg_canada'             'ftp.ca.freebsd.org'
 		'$msg_china'              'ftp.cn.freebsd.org'
-		' $msg_china #2'          'ftp2.cn.freebsd.org'
-		'$msg_croatia'            'ftp.hr.freebsd.org'
 		'$msg_czech_republic'     'ftp.cz.freebsd.org'
 		'$msg_denmark'            'ftp.dk.freebsd.org'
-		' $msg_denmark #2'        'ftp2.dk.freebsd.org'
 		'$msg_estonia'            'ftp.ee.freebsd.org'
 		'$msg_finland'            'ftp.fi.freebsd.org'
 		'$msg_france'             'ftp.fr.freebsd.org'
-		' $msg_france #2'         'ftp2.fr.freebsd.org'
 		' $msg_france #3'         'ftp3.fr.freebsd.org'
+		' $msg_france #4'         'ftp4.fr.freebsd.org'
 		' $msg_france #5'         'ftp5.fr.freebsd.org'
 		' $msg_france #6'         'ftp6.fr.freebsd.org'
+		' $msg_france #7'         'ftp7.fr.freebsd.org'
 		' $msg_france #8'         'ftp8.fr.freebsd.org'
 		'$msg_germany'            'ftp.de.freebsd.org'
 		' $msg_germany #2'        'ftp2.de.freebsd.org'
-		' $msg_germany #3'        'ftp3.de.freebsd.org'
 		' $msg_germany #4'        'ftp4.de.freebsd.org'
 		' $msg_germany #5'        'ftp5.de.freebsd.org'
 		' $msg_germany #6'        'ftp6.de.freebsd.org'
@@ -137,11 +125,8 @@ f_dialog_menu_media_ftp()
 		' $msg_germany #8'        'ftp8.de.freebsd.org'
 		'$msg_greece'             'ftp.gr.freebsd.org'
 		' $msg_greece #2'         'ftp2.gr.freebsd.org'
-		'$msg_hungary'            'ftp.hu.freebsd.org'
 		'$msg_iceland'            'ftp.is.freebsd.org'
-		'$msg_ireland'            'ftp.ie.freebsd.org'
-		' $msg_ireland #2'        'ftp2.ie.freebsd.org'
-		' $msg_ireland #3'        'ftp3.ie.freebsd.org'
+		'$msg_ireland'            'ftp3.ie.freebsd.org'
 		'$msg_israel'             'ftp.il.freebsd.org'
 		'$msg_italy'              'ftp.it.freebsd.org'
 		'$msg_japan'              'ftp.jp.freebsd.org'
@@ -155,72 +140,57 @@ f_dialog_menu_media_ftp()
 		' $msg_japan #9'          'ftp9.jp.freebsd.org'
 		'$msg_korea'              'ftp.kr.freebsd.org'
 		' $msg_korea #2'          'ftp2.kr.freebsd.org'
+		'$msg_latvia'             'ftp.lv.freebsd.org'
 		'$msg_lithuania'          'ftp.lt.freebsd.org'
 		'$msg_netherlands'        'ftp.nl.freebsd.org'
 		' $msg_netherlands #2'    'ftp2.nl.freebsd.org'
+		'$msg_new_zealand'        'ftp.nz.freebsd.org'
 		'$msg_norway'             'ftp.no.freebsd.org'
-		' $msg_norway #3'         'ftp3.no.freebsd.org'
 		'$msg_poland'             'ftp.pl.freebsd.org'
 		' $msg_poland #2'         'ftp2.pl.freebsd.org'
-		' $msg_poland #5'         'ftp5.pl.freebsd.org'
-		'$msg_portugal'           'ftp.pt.freebsd.org'
-		' $msg_portugal #2'       'ftp2.pt.freebsd.org'
-		' $msg_portugal #4'       'ftp4.pt.freebsd.org'
-		'$msg_romania'            'ftp.ro.freebsd.org'
 		'$msg_russia'             'ftp.ru.freebsd.org'
 		' $msg_russia #2'         'ftp2.ru.freebsd.org'
-		' $msg_russia #3'         'ftp3.ru.freebsd.org'
 		' $msg_russia #4'         'ftp4.ru.freebsd.org'
-		'$msg_singapore'          'ftp.sg.freebsd.org'
+		' $msg_russia #5'         'ftp5.ru.freebsd.org'
+		' $msg_russia #6'         'ftp6.ru.freebsd.org'
 		'$msg_slovak_republic'    'ftp.sk.freebsd.org'
+		' $msg_slovak_republic #2' 'ftp2.sk.freebsd.org'
 		'$msg_slovenia'           'ftp.si.freebsd.org'
-		' $msg_slovenia #2'       'ftp2.si.freebsd.org'
 		'$msg_south_africa'       'ftp.za.freebsd.org'
 		' $msg_south_africa #2'   'ftp2.za.freebsd.org'
-		' $msg_south_africa #3'   'ftp3.za.freebsd.org'
 		' $msg_south_africa #4'   'ftp4.za.freebsd.org'
 		'$msg_spain'              'ftp.es.freebsd.org'
-		' $msg_spain #2'          'ftp2.es.freebsd.org'
 		' $msg_spain #3'          'ftp3.es.freebsd.org'
 		'$msg_sweden'             'ftp.se.freebsd.org'
 		' $msg_sweden #2'         'ftp2.se.freebsd.org'
 		' $msg_sweden #3'         'ftp3.se.freebsd.org'
 		' $msg_sweden #4'         'ftp4.se.freebsd.org'
 		' $msg_sweden #5'         'ftp5.se.freebsd.org'
+		' $msg_sweden #6'         'ftp6.se.freebsd.org'
 		'$msg_switzerland'        'ftp.ch.freebsd.org'
-		' $msg_switzerland #2'    'ftp2.ch.freebsd.org'
 		'$msg_taiwan'             'ftp.tw.freebsd.org'
 		' $msg_taiwan #2'         'ftp2.tw.freebsd.org'
 		' $msg_taiwan #3'         'ftp3.tw.freebsd.org'
 		' $msg_taiwan #4'         'ftp4.tw.freebsd.org'
 		' $msg_taiwan #6'         'ftp6.tw.freebsd.org'
 		' $msg_taiwan #11'        'ftp11.tw.freebsd.org'
-		'$msg_turkey'             'ftp.tr.freebsd.org'
-		' $msg_turkey #2'         'ftp2.tr.freebsd.org'
+		'$msg_turkey'             'ftp2.tr.freebsd.org'
 		'$msg_uk'                 'ftp.uk.freebsd.org'
 		' $msg_uk #2'             'ftp2.uk.freebsd.org'
 		' $msg_uk #3'             'ftp3.uk.freebsd.org'
 		' $msg_uk #4'             'ftp4.uk.freebsd.org'
 		' $msg_uk #5'             'ftp5.uk.freebsd.org'
-		' $msg_uk #6'             'ftp6.uk.freebsd.org'
 		'$msg_ukraine'            'ftp.ua.freebsd.org'
-		' $msg_ukraine #2'        'ftp2.ua.freebsd.org'
-		' $msg_ukraine #5'        'ftp5.ua.freebsd.org'
-		' $msg_ukraine #6'        'ftp6.ua.freebsd.org'
 		' $msg_ukraine #7'        'ftp7.ua.freebsd.org'
-		' $msg_ukraine #8'        'ftp8.ua.freebsd.org'
 		'$msg_usa #1'             'ftp1.us.freebsd.org'
 		' $msg_usa #2'            'ftp2.us.freebsd.org'
 		' $msg_usa #3'            'ftp3.us.freebsd.org'
 		' $msg_usa #4'            'ftp4.us.freebsd.org'
 		' $msg_usa #5'            'ftp5.us.freebsd.org'
 		' $msg_usa #6'            'ftp6.us.freebsd.org'
-		' $msg_usa #7'            'ftp7.us.freebsd.org'
 		' $msg_usa #8'            'ftp8.us.freebsd.org'
-		' $msg_usa #9'            'ftp9.us.freebsd.org'
 		' $msg_usa #10'           'ftp10.us.freebsd.org'
 		' $msg_usa #11'           'ftp11.us.freebsd.org'
-		' $msg_usa #12'           'ftp12.us.freebsd.org'
 		' $msg_usa #13'           'ftp13.us.freebsd.org'
 		' $msg_usa #14'           'ftp14.us.freebsd.org'
 		' $msg_usa #15'           'ftp15.us.freebsd.org'