Merge from head

5 files changed, 28 insertions, 41 deletions

diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
index 3ad1f98..a76e764 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -2,6 +2,7 @@
 
 BINDIR= /usr/libexec/bsdinstall
 PROG=	distextract
+DPADD=	${LIBARCHIVE} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM}
 LDADD=	-larchive -lncursesw -ldialog -lm
 
 WARNS?=	6
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 5a449ac1..bb82908 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -2,6 +2,7 @@
 
 BINDIR= /usr/libexec/bsdinstall
 PROG=	distfetch
+DPADD=	${LIBFETCH} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM}
 LDADD=	-lfetch -lncursesw -ldialog -lm
 
 WARNS?=	6
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index b7f5097..fb75888 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -5,6 +5,7 @@ PROG=	partedit
 LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
        ${BINDIR}/partedit ${BINDIR}/scriptedpart
 SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade
+DPADD=	${LIBGEOM} ${LIBNCURSESW} ${LIBUTIL} ${LIBDIALOG} ${LIBM}
 LDADD=	-lgeom -lncursesw -lutil -ldialog -lm
 
 PARTEDIT_ARCH= ${MACHINE}
diff --git a/usr.sbin/bsdinstall/partedit/diskeditor.c b/usr.sbin/bsdinstall/partedit/diskeditor.c
index 9149c2b..4840ae7 100644
--- a/usr.sbin/bsdinstall/partedit/diskeditor.c
+++ b/usr.sbin/bsdinstall/partedit/diskeditor.c
@@ -94,6 +94,22 @@ diskeditor_show(const char *title, const char *cprompt,
 		END_KEYS_BINDING
 	};
 
+	static DLG_KEYS_BINDING binding2[] = {
+		INPUTSTR_BINDINGS,
+		ENTERKEY_BINDINGS,
+		DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
+		DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
+		DLG_KEYS_DATA( DLGK_ITEM_NEXT,  CHR_NEXT ),
+		DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_DOWN ),
+		DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_NEXT ),
+		DLG_KEYS_DATA( DLGK_ITEM_PREV,  CHR_PREVIOUS ),
+		DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_PREVIOUS ),
+		DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_UP ),
+		DLG_KEYS_DATA( DLGK_PAGE_NEXT,  KEY_NPAGE ),
+		DLG_KEYS_DATA( DLGK_PAGE_PREV,  KEY_PPAGE ),
+		END_KEYS_BINDING
+	};
+
 	/*
 	 * Set up editor window.
 	 */
@@ -125,7 +141,7 @@ diskeditor_show(const char *title, const char *cprompt,
 	/* Partition list sub-window */
 	partitions = dlg_sub_window(dialog, partlist_height, partlist_width,
 	    y + 3, x + 1);
-	dlg_register_window(partitions, "partlist", binding);
+	dlg_register_window(partitions, "partlist", binding2);
 	dlg_register_buttons(partitions, "partlist", buttons);
 	wattrset(partitions, menubox_attr);
 
diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect
index 30df830..0776a4d 100755
--- a/usr.sbin/bsdinstall/scripts/mirrorselect
+++ b/usr.sbin/bsdinstall/scripts/mirrorselect
@@ -41,7 +41,6 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
 	ftp://ftp.freebsd.org	"Main Site"\
 	ftp://ftp.freebsd.org 	"IPv6 Main Site"\
 	ftp://ftp3.ie.freebsd.org 	"IPv6 Ireland"\
-	ftp://ftp.il.freebsd.org 	"IPv6 Israel"\
 	ftp://ftp2.jp.freebsd.org 	"IPv6 Japan"\
 	ftp://ftp4.se.freebsd.org	"IPv6 Sweden"\
 	ftp://ftp4.us.freebsd.org 	"IPv6 USA"\
@@ -53,45 +52,34 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
 	ftp://ftp5.freebsd.org 	"Primary #5"\
 	ftp://ftp6.freebsd.org 	"Primary #6"\
 	ftp://ftp7.freebsd.org 	"Primary #7"\
-	ftp://ftp8.freebsd.org 	"Primary #8"\
-	ftp://ftp9.freebsd.org 	"Primary #9"\
 	ftp://ftp10.freebsd.org 	"Primary #10"\
 	ftp://ftp11.freebsd.org 	"Primary #11"\
 	ftp://ftp12.freebsd.org 	"Primary #12"\
 	ftp://ftp13.freebsd.org 	"Primary #13"\
 	ftp://ftp14.freebsd.org 	"Primary #14"\
-	ftp://ftp.ar.freebsd.org 	"Argentina"\
+	ftp://ftp1.am.freebsd.org 	"Armenia"\
 	ftp://ftp.au.freebsd.org 	"Australia"\
 	ftp://ftp2.au.freebsd.org 	"Australia #2"\
 	ftp://ftp3.au.freebsd.org 	"Australia #3"\
 	ftp://ftp.at.freebsd.org 	"Austria"\
-	ftp://ftp2.at.freebsd.org 	"Austria #2"\
-	ftp://ftp.br.freebsd.org 	"Brazil"\
 	ftp://ftp2.br.freebsd.org 	"Brazil #2"\
 	ftp://ftp3.br.freebsd.org 	"Brazil #3"\
 	ftp://ftp4.br.freebsd.org 	"Brazil #4"\
-	ftp://ftp5.br.freebsd.org 	"Brazil #5"\
-	ftp://ftp6.br.freebsd.org 	"Brazil #6"\
-	ftp://ftp7.br.freebsd.org 	"Brazil #7"\
 	ftp://ftp.ca.freebsd.org 	"Canada"\
 	ftp://ftp.cn.freebsd.org 	"China"\
-	ftp://ftp2.cn.freebsd.org 	"China #2"\
-	ftp://ftp.hr.freebsd.org 	"Croatia"\
 	ftp://ftp.cz.freebsd.org 	"Czech Republic"\
 	ftp://ftp.dk.freebsd.org 	"Denmark"\
-	ftp://ftp2.dk.freebsd.org 	"Denmark #2"\
 	ftp://ftp.ee.freebsd.org 	"Estonia"\
 	ftp://ftp.fi.freebsd.org 	"Finland"\
 	ftp://ftp.fr.freebsd.org 	"France"\
-	ftp://ftp2.fr.freebsd.org 	"IPv6 France #2"\
 	ftp://ftp3.fr.freebsd.org 	"France #3"\
 	ftp://ftp4.fr.freebsd.org 	"IPv6 France #4"\
 	ftp://ftp5.fr.freebsd.org 	"France #5"\
 	ftp://ftp6.fr.freebsd.org 	"France #6"\
+	ftp://ftp7.fr.freebsd.org 	"France #7"\
 	ftp://ftp8.fr.freebsd.org 	"IPv6 France #8"\
 	ftp://ftp.de.freebsd.org 	"Germany"\
 	ftp://ftp2.de.freebsd.org 	"Germany #2"\
-	ftp://ftp3.de.freebsd.org 	"Germany #3"\
 	ftp://ftp4.de.freebsd.org 	"Germany #4"\
 	ftp://ftp5.de.freebsd.org 	"Germany #5"\
 	ftp://ftp6.de.freebsd.org 	"Germany #6"\
@@ -99,10 +87,7 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
 	ftp://ftp8.de.freebsd.org 	"Germany #8"\
 	ftp://ftp.gr.freebsd.org 	"Greece"\
 	ftp://ftp2.gr.freebsd.org 	"Greece #2"\
-	ftp://ftp.hu.freebsd.org 	"Hungary"\
 	ftp://ftp.is.freebsd.org 	"Iceland"\
-	ftp://ftp.ie.freebsd.org 	"Ireland"\
-	ftp://ftp2.ie.freebsd.org 	"Ireland #2"\
 	ftp://ftp3.ie.freebsd.org 	"Ireland #3"\
 	ftp://ftp.il.freebsd.org 	"Israel"\
 	ftp://ftp.it.freebsd.org 	"Italy"\
@@ -117,32 +102,26 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
 	ftp://ftp9.jp.freebsd.org 	"Japan #9"\
 	ftp://ftp.kr.freebsd.org 	"Korea"\
 	ftp://ftp2.kr.freebsd.org 	"Korea #2"\
+	ftp://ftp.lv.freebsd.org 	"Latvia"\
 	ftp://ftp.lt.freebsd.org 	"Lithuania"\
 	ftp://ftp.nl.freebsd.org 	"Netherlands"\
 	ftp://ftp2.nl.freebsd.org 	"Netherlands #2"\
+	ftp://ftp.nz.freebsd.org 	"New Zealand"\
 	ftp://ftp.no.freebsd.org 	"Norway"\
-	ftp://ftp3.no.freebsd.org 	"Norway #3"\
 	ftp://ftp.pl.freebsd.org 	"Poland"\
 	ftp://ftp2.pl.freebsd.org 	"Poland #2"\
-	ftp://ftp5.pl.freebsd.org 	"Poland #5"\
-	ftp://ftp.pt.freebsd.org 	"Portugal"\
-	ftp://ftp2.pt.freebsd.org 	"Portugal #2"\
-	ftp://ftp4.pt.freebsd.org 	"Portugal #4"\
-	ftp://ftp.ro.freebsd.org 	"Romania"\
 	ftp://ftp.ru.freebsd.org 	"Russia"\
 	ftp://ftp2.ru.freebsd.org 	"Russia #2"\
-	ftp://ftp3.ru.freebsd.org 	"Russia #3"\
 	ftp://ftp4.ru.freebsd.org 	"Russia #4"\
-	ftp://ftp.sg.freebsd.org 	"Singapore"\
+	ftp://ftp5.ru.freebsd.org 	"Russia #5"\
+	ftp://ftp6.ru.freebsd.org 	"Russia #6"\
 	ftp://ftp.sk.freebsd.org 	"Slovak Republic"\
+	ftp://ftp2.sk.freebsd.org 	"Slovak Republic #2"\
 	ftp://ftp.si.freebsd.org 	"Slovenia"\
-	ftp://ftp2.si.freebsd.org 	"Slovenia #2"\
 	ftp://ftp.za.freebsd.org 	"South Africa"\
 	ftp://ftp2.za.freebsd.org 	"South Africa #2"\
-	ftp://ftp3.za.freebsd.org 	"South Africa #3"\
 	ftp://ftp4.za.freebsd.org 	"South Africa #4"\
 	ftp://ftp.es.freebsd.org 	"Spain"\
-	ftp://ftp2.es.freebsd.org 	"Spain #2"\
 	ftp://ftp3.es.freebsd.org 	"Spain #3"\
 	ftp://ftp.se.freebsd.org 	"Sweden"\
 	ftp://ftp2.se.freebsd.org 	"Sweden #2"\
@@ -151,39 +130,28 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
 	ftp://ftp5.se.freebsd.org 	"Sweden #5"\
 	ftp://ftp6.se.freebsd.org 	"Sweden #6"\
 	ftp://ftp.ch.freebsd.org 	"Switzerland"\
-	ftp://ftp2.ch.freebsd.org 	"Switzerland #2"\
 	ftp://ftp.tw.freebsd.org 	"Taiwan"\
 	ftp://ftp2.tw.freebsd.org 	"Taiwan #2"\
 	ftp://ftp3.tw.freebsd.org 	"Taiwan #3"\
 	ftp://ftp4.tw.freebsd.org 	"Taiwan #4"\
 	ftp://ftp6.tw.freebsd.org 	"Taiwan #6"\
 	ftp://ftp11.tw.freebsd.org 	"Taiwan #11"\
-	ftp://ftp.tr.freebsd.org 	"Turkey"\
-	ftp://ftp2.tr.freebsd.org 	"Turkey #2"\
 	ftp://ftp.uk.freebsd.org 	"UK"\
 	ftp://ftp2.uk.freebsd.org 	"UK #2"\
 	ftp://ftp3.uk.freebsd.org 	"UK #3"\
 	ftp://ftp4.uk.freebsd.org 	"UK #4"\
 	ftp://ftp5.uk.freebsd.org 	"UK #5"\
-	ftp://ftp6.uk.freebsd.org 	"UK #6"\
 	ftp://ftp.ua.freebsd.org 	"Ukraine"\
-	ftp://ftp2.ua.freebsd.org 	"Ukraine #2"\
-	ftp://ftp5.ua.freebsd.org 	"Ukraine #5"\
-	ftp://ftp6.ua.freebsd.org 	"Ukraine #6"\
 	ftp://ftp7.ua.freebsd.org 	"Ukraine #7"\
-	ftp://ftp8.ua.freebsd.org 	"Ukraine #8"\
 	ftp://ftp1.us.freebsd.org 	"USA #1"\
 	ftp://ftp2.us.freebsd.org 	"USA #2"\
 	ftp://ftp3.us.freebsd.org 	"USA #3"\
 	ftp://ftp4.us.freebsd.org 	"USA #4"\
 	ftp://ftp5.us.freebsd.org 	"USA #5"\
 	ftp://ftp6.us.freebsd.org 	"USA #6"\
-	ftp://ftp7.us.freebsd.org 	"USA #7"\
 	ftp://ftp8.us.freebsd.org 	"USA #8"\
-	ftp://ftp9.us.freebsd.org 	"USA #9"\
 	ftp://ftp10.us.freebsd.org 	"USA #10"\
 	ftp://ftp11.us.freebsd.org 	"USA #11"\
-	ftp://ftp12.us.freebsd.org 	"USA #12"\
 	ftp://ftp13.us.freebsd.org 	"USA #13"\
 	ftp://ftp14.us.freebsd.org 	"USA #14"\
 	ftp://ftp15.us.freebsd.org 	"USA #15"\
@@ -194,7 +162,7 @@ exec 3>&-
 _UNAME_R=`uname -r`
 
 case ${_UNAME_R} in
-	*-CURRENT|*-STABLE|*-BETA*|*-PRERELEASE|*-RC*)
+	*-CURRENT|*-STABLE|*-PRERELEASE)
 		RELDIR="snapshots"
 		;;
 	*)