Add support for Ukrainian console.

Submitted by:	Olexander Kunytsa <kunia@istc.kiev.ua>
MFC after:	2 weeks

4 files changed, 38 insertions, 12 deletions

diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 36ce977..bfaf602 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -78,8 +78,8 @@ rtermcap:	rtermcap.c
 KEYMAPS= be.iso br275.iso danish.iso finnish.iso fr.iso \
 	german.iso hr.iso hu.iso2.101keys it.iso icelandic.iso jp.106 \
 	norwegian.iso pl_PL.ISO_8859-2 pt.iso ru.koi8-r si.iso \
-	spanish.iso swedish.iso swissfrench.iso swissgerman.iso uk.iso \
-	us.dvorak us.iso us.pc-ctrl us.unix
+	spanish.iso swedish.iso swissfrench.iso swissgerman.iso ua.koi8-u \
+	ua.koi8-u.shift.alt uk.iso us.dvorak us.iso us.pc-ctrl us.unix
 
 keymap.h:
 	rm -f keymap.tmp
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 0c3a362..cd62ddb 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -633,6 +633,12 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp4.uk.freebsd.org" },
       { " UK #5",	"ftp5.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp5.uk.freebsd.org" },
+      { " Ukraine",	"ftp.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ua.freebsd.org" },
+      { " Ukraine #2",	"ftp2.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.ua.freebsd.org" },
+      { " Ukraine #3",	"ftp3.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.ua.freebsd.org" },
       { " USA",		"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.freebsd.org" },
       { " USA #2",	"ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -1478,6 +1484,8 @@ DMenu MenuSysconsKeymap = {
       { " Swiss German CP850", "Swiss German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.cp850" },
       { "UK CP850",	"UK Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" },
       { " UK ISO",	"UK ISO keymap", dmenuVarCheck,	dmenuSetKmapVariable, NULL, "keymap=uk.iso" },
+      { " Ukrainian KOI8-U",	"Ukrainian KOI8-U keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ua.koi8-u" },
+      { " Ukrainian KOI8-U+KOI8-R",	"Ukrainian KOI8-U+KOI8-R keymap (alter)",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ua.koi8-u.shift.alt" },
       { " USA CapsLock->Ctrl",	"US standard (Caps as L-Control)",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.pc-ctrl" },
       { " USA Dvorak",	"US Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" },
       { " USA Dvorak (left)",	"US left handed Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorakl" },
@@ -1554,6 +1562,7 @@ DMenu MenuSysconsScrnmap = {
     NULL,
     { { "None",			"No screenmap, use default font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
       { "KOI8-R to IBM866",	"Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
+      { "KOI8-U to IBM866u",	"Ukrainian KOI8-U to IBM 866u screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-u2cp866u" },
       { "ISO 8859-1 to IBM437",	"W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
       { NULL } },
 };
@@ -1582,13 +1591,17 @@ DMenu MenuSysconsFont = {
 	"font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" },
       { "5 IBM 866", "Russian, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" },
-      { "6 ISO 8859-1", "Western Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "6 IBM 866u", "Ukrainian, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16" },
+      { "7 ISO 8859-1", "Western Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
-      { "7 ISO 8859-2", "Eastern Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "8 ISO 8859-2", "Eastern Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=iso02-8x8,font8x14=iso02-8x14,font8x16=iso02-8x16" },
-      { "8 KOI8-R", "Russian, KOI8-R encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "9 KOI8-R", "Russian, KOI8-R encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" },
-      { "9 SWISS", "English, better resolution", dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "0 KOI8-U", "Ukrainian, KOI8-U encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=koi8-u-8x8,font8x14=koi8-u-8x14,font8x16=koi8-u-8x16" },
+      { "S SWISS", "English, better resolution", dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" },
       { NULL } },
 };
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 36ce977..bfaf602 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -78,8 +78,8 @@ rtermcap:	rtermcap.c
 KEYMAPS= be.iso br275.iso danish.iso finnish.iso fr.iso \
 	german.iso hr.iso hu.iso2.101keys it.iso icelandic.iso jp.106 \
 	norwegian.iso pl_PL.ISO_8859-2 pt.iso ru.koi8-r si.iso \
-	spanish.iso swedish.iso swissfrench.iso swissgerman.iso uk.iso \
-	us.dvorak us.iso us.pc-ctrl us.unix
+	spanish.iso swedish.iso swissfrench.iso swissgerman.iso ua.koi8-u \
+	ua.koi8-u.shift.alt uk.iso us.dvorak us.iso us.pc-ctrl us.unix
 
 keymap.h:
 	rm -f keymap.tmp
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 0c3a362..cd62ddb 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -633,6 +633,12 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp4.uk.freebsd.org" },
       { " UK #5",	"ftp5.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp5.uk.freebsd.org" },
+      { " Ukraine",	"ftp.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ua.freebsd.org" },
+      { " Ukraine #2",	"ftp2.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.ua.freebsd.org" },
+      { " Ukraine #3",	"ftp3.ua.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.ua.freebsd.org" },
       { " USA",		"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.freebsd.org" },
       { " USA #2",	"ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -1478,6 +1484,8 @@ DMenu MenuSysconsKeymap = {
       { " Swiss German CP850", "Swiss German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.cp850" },
       { "UK CP850",	"UK Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" },
       { " UK ISO",	"UK ISO keymap", dmenuVarCheck,	dmenuSetKmapVariable, NULL, "keymap=uk.iso" },
+      { " Ukrainian KOI8-U",	"Ukrainian KOI8-U keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ua.koi8-u" },
+      { " Ukrainian KOI8-U+KOI8-R",	"Ukrainian KOI8-U+KOI8-R keymap (alter)",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ua.koi8-u.shift.alt" },
       { " USA CapsLock->Ctrl",	"US standard (Caps as L-Control)",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.pc-ctrl" },
       { " USA Dvorak",	"US Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" },
       { " USA Dvorak (left)",	"US left handed Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorakl" },
@@ -1554,6 +1562,7 @@ DMenu MenuSysconsScrnmap = {
     NULL,
     { { "None",			"No screenmap, use default font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
       { "KOI8-R to IBM866",	"Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
+      { "KOI8-U to IBM866u",	"Ukrainian KOI8-U to IBM 866u screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-u2cp866u" },
       { "ISO 8859-1 to IBM437",	"W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
       { NULL } },
 };
@@ -1582,13 +1591,17 @@ DMenu MenuSysconsFont = {
 	"font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" },
       { "5 IBM 866", "Russian, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" },
-      { "6 ISO 8859-1", "Western Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "6 IBM 866u", "Ukrainian, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16" },
+      { "7 ISO 8859-1", "Western Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
-      { "7 ISO 8859-2", "Eastern Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "8 ISO 8859-2", "Eastern Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=iso02-8x8,font8x14=iso02-8x14,font8x16=iso02-8x16" },
-      { "8 KOI8-R", "Russian, KOI8-R encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "9 KOI8-R", "Russian, KOI8-R encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" },
-      { "9 SWISS", "English, better resolution", dmenuVarCheck,	dmenuSetVariables, NULL,
+      { "0 KOI8-U", "Ukrainian, KOI8-U encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=koi8-u-8x8,font8x14=koi8-u-8x14,font8x16=koi8-u-8x16" },
+      { "S SWISS", "English, better resolution", dmenuVarCheck,	dmenuSetVariables, NULL,
 	"font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" },
       { NULL } },
 };