Switch to new locale names

42 files changed, 67 insertions, 1799 deletions

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 91d2a0f..2c496a4 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -3,37 +3,37 @@
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
 
-LOCALES=	cs_CZ.ISO_8859-2 \
-		de_DE.ISO_8859-15 \
-		de_DE.ISO_8859-1 \
-		el_GR.ISO_8859-7 \
-		es_ES.ISO_8859-15 \
-		es_ES.ISO_8859-1 \
-		et_EE.ISO_8859-15 \
-		is_IS.ISO_8859-15 \
-		is_IS.ISO_8859-1 \
-		la_LN.ASCII      \
-		la_LN.ISO_8859-15 \
-		la_LN.ISO_8859-1 \
-		la_LN.ISO_8859-2 \
-		la_LN.ISO_8859-4 \
-		lt_LT.ISO_8859-4 \
+LOCALES=        cs_CZ.ISO8859-2 \
+		de_DE.ISO8859-15 \
+		de_DE.ISO8859-1 \
+		el_GR.ISO8859-7 \
+		es_ES.ISO8859-15 \
+		es_ES.ISO8859-1 \
+		et_EE.ISO8859-15 \
+		is_IS.ISO8859-15 \
+		is_IS.ISO8859-1 \
+		la_LN.US-ASCII \
+		la_LN.ISO8859-15 \
+		la_LN.ISO8859-1 \
+		la_LN.ISO8859-2 \
+		la_LN.ISO8859-4 \
+		lt_LT.ISO8859-4 \
 		ru_RU.CP866 \
-		ru_RU.ISO_8859-5 \
+		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
-		sv_SE.ISO_8859-15 \
-		sv_SE.ISO_8859-1 \
+		sv_SE.ISO8859-15 \
+		sv_SE.ISO8859-1 \
 		uk_UA.KOI8-U
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
 
 ASCIILINKS = \
-	ko_KR.EUC ja_JP.EUC ja_JP.SJIS ja_JP.Shift_JIS zh_CN.EUC
+	en_US.US-ASCII ko_KR.eucKR ja_JP.eucJP ja_JP.SJIS zh_CN.eucCN
 
 ZHLINKS =    zh_TW.Big5
 
 LATIN1LINKS = \
-	da_DK en_AU en_CA en_GB en_US fi_FI \
+	af_ZA da_DK en_AU en_CA en_GB en_NZ en_US fi_FI \
 	fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL no_NO \
 	pt_PT
 
@@ -48,24 +48,24 @@ DELINKS = de_AT de_CH
 
 all: ${LOCALES:S/$/.out/g}
 
-cs_CZ.ISO_8859-2.out:	map.ISO_8859-2
-de_DE.ISO_8859-15.out:  map.ISO_8859-15
-de_DE.ISO_8859-1.out:   map.ISO_8859-1
-el_GR.ISO_8859-7.out:   map.ISO_8859-7
-es_ES.ISO_8859-15.out:  map.ISO_8859-15
-es_ES.ISO_8859-1.out:   map.ISO_8859-1
-et_EE.ISO_8859-15.out:	map.ISO_8859-15
-is_IS.ISO_8859-15.out:  map.ISO_8859-15
-is_IS.ISO_8859-1.out:   map.ISO_8859-1
-la_LN.ISO_8859-15.out:  map.ISO_8859-15
-la_LN.ISO_8859-1.out:   map.ISO_8859-1
-la_LN.ISO_8859-4.out:   map.ISO_8859-4
-lt_LT.ISO_8859-4.out:   map.ISO_8859-4
+cs_CZ.ISO8859-2.out:    map.ISO8859-2
+de_DE.ISO8859-15.out:   map.ISO8859-15
+de_DE.ISO8859-1.out:    map.ISO8859-1
+el_GR.ISO8859-7.out:    map.ISO8859-7
+es_ES.ISO8859-15.out:   map.ISO8859-15
+es_ES.ISO8859-1.out:    map.ISO8859-1
+et_EE.ISO8859-15.out:   map.ISO8859-15
+is_IS.ISO8859-15.out:   map.ISO8859-15
+is_IS.ISO8859-1.out:    map.ISO8859-1
+la_LN.ISO8859-15.out:   map.ISO8859-15
+la_LN.ISO8859-1.out:    map.ISO8859-1
+la_LN.ISO8859-4.out:    map.ISO8859-4
+lt_LT.ISO8859-4.out:    map.ISO8859-4
 ru_RU.CP866.out:        map.CP866
-ru_RU.ISO_8859-5.out:   map.ISO_8859-5
+ru_RU.ISO8859-5.out:    map.ISO8859-5
 ru_RU.KOI8-R.out:       map.KOI8-R
-sv_SE.ISO_8859-15.out:  map.ISO_8859-15
-sv_SE.ISO_8859-1.out:   map.ISO_8859-1
+sv_SE.ISO8859-15.out:   map.ISO8859-15
+sv_SE.ISO8859-1.out:    map.ISO8859-1
 uk_UA.KOI8-U.out:       map.KOI8-U
 
 afterinstall:
@@ -74,34 +74,34 @@ afterinstall:
 		${locale}.out ${LOCALEDIR}/${locale}/LC_COLLATE
 .endfor
 .for link in ${ASCIILINKS}
-	ln -fs ../la_LN.ASCII/LC_COLLATE \
+	ln -fs ../la_LN.US-ASCII/LC_COLLATE \
 	       ${LOCALEDIR}/${link}/LC_COLLATE
 .endfor
 .for link in ${ZHLINKS}
-	ln -fs ../is_IS.ISO_8859-1/LC_COLLATE \
+	ln -fs ../is_IS.ISO8859-1/LC_COLLATE \
 	       ${LOCALEDIR}/${link}/LC_COLLATE
 .endfor
 .for link in ${LATIN1LINKS}
-	ln -fs ../la_LN.ISO_8859-1/LC_COLLATE \
-	       ${LOCALEDIR}/${link}.ISO_8859-1/LC_COLLATE
+	ln -fs ../la_LN.ISO8859-1/LC_COLLATE \
+	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
 .endfor
 .for link in ${LATIN1LINKS}
-	ln -fs ../la_LN.ISO_8859-15/LC_COLLATE \
-	       ${LOCALEDIR}/${link}.ISO_8859-15/LC_COLLATE
+	ln -fs ../la_LN.ISO8859-15/LC_COLLATE \
+	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
 .endfor
 .for link in ${LATIN2LINKS}
-	ln -fs ../la_LN.ISO_8859-2/LC_COLLATE \
-	       ${LOCALEDIR}/${link}.ISO_8859-2/LC_COLLATE
+	ln -fs ../la_LN.ISO8859-2/LC_COLLATE \
+	       ${LOCALEDIR}/${link}.ISO8859-2/LC_COLLATE
 .endfor
 .for link in ${DELINKS}
-	ln -fs ../de_DE.ISO_8859-1/LC_COLLATE \
-	       ${LOCALEDIR}/${link}.ISO_8859-1/LC_COLLATE
+	ln -fs ../de_DE.ISO8859-1/LC_COLLATE \
+	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
 .endfor
 .for link in ${DELINKS}
-	ln -fs ../de_DE.ISO_8859-15/LC_COLLATE \
-	       ${LOCALEDIR}/${link}.ISO_8859-15/LC_COLLATE
+	ln -fs ../de_DE.ISO8859-15/LC_COLLATE \
+	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
 .endfor
-	ln -fs ../cs_CZ.ISO_8859-2/LC_COLLATE \
-	       ${LOCALEDIR}/sk_SK.ISO_8859-2/LC_COLLATE
+	ln -fs ../cs_CZ.ISO8859-2/LC_COLLATE \
+	       ${LOCALEDIR}/sk_SK.ISO8859-2/LC_COLLATE
 
 .include <bsd.prog.mk>
diff --git a/share/colldef/cs_CZ.ISO8859-2.src b/share/colldef/cs_CZ.ISO8859-2.src
index e8392c7..2a7c798 100644
--- a/share/colldef/cs_CZ.ISO8859-2.src
+++ b/share/colldef/cs_CZ.ISO8859-2.src
@@ -3,7 +3,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-2
+charmap map.ISO8859-2
 substitute <ss> with "ss"
 order \
 # spaces
diff --git a/share/colldef/cs_CZ.ISO_8859-2.src b/share/colldef/cs_CZ.ISO_8859-2.src
deleted file mode 100644
index e8392c7..0000000
--- a/share/colldef/cs_CZ.ISO_8859-2.src
+++ /dev/null
@@ -1,52 +0,0 @@
-# Latin2 (for Czech; partially according to CSN 97 6030)
-# by Rudolf Cejka <cejkar@dcse.fee.vutbr.cz>
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-2
-substitute <ss> with "ss"
-order \
-# spaces
-	<SP>;<NS>;\
-# capital and small
-	(A,a,<A'>,<a'>,<A/>>,<a/>>,<A(>,<a(>,<A:>,<a:>,<A;>,<a;>);\
-	(B,b);\
-	(C,c,<C'>,<c'>,<C,>,<c,>);\
-	(<C<>,<c<>);\
-	(D,d,<D<>,<d<>,<D//>,<d//>);\
-	(E,e,<E'>,<e'>,<E<>,<e<>,<E:>,<e:>,<E;>,<e;>);\
-	(F,f);\
-	(G,g);\
-	(H,h);\
-	(CH,Ch,ch);\
-	(I,i,<I'>,<i'>,<I/>>,<i/>>);\
-	(J,j);\
-	(K,k);\
-	(L,l,<L'>,<l'>,<L<>,<l<>,<L//>,<l//>);\
-	(M,m);\
-	(N,n,<N'>,<n'>,<N<>,<n<>);\
-	(O,o,<O'>,<o'>,<O/>>,<o/>>,<O:>,<o:>,<O">,<o">);\
-	(P,p);\
-	(Q,q);\
-	(R,r,<R'>,<r'>);\
-	(<R<>,<r<>);\
-	(S,s,<S'>,<s'>,<S,>,<s,>);\
-	(<S<>,<s<>);\
-	(T,t,<T<>,<t<>,<T,>,<t,>);\
-	(U,u,<U'>,<u'>,<U0>,<u0>,<U:>,<u:>,<U">,<u">);\
-	(V,v);\
-	(W,w);\
-	(X,x);\
-	(Y,y,<Y'>,<y'>);\
-	(Z,z,<Z.>,<z.>,<Z'>,<z'>);\
-	(<Z<>,<z<>);\
-# digits
-	0;...;9;\
-# symbols
-	.;\,;\;;?;!;:;';`;\";\
-	<-->;-;|;/;\\;\(;\);[;];\<;>;\{;\};\
-	&;<SE>;%;<DO>;<At>;\
-	_;=;^;<-:>;+;<*X>;*;<Nb>;~;<DG>;<Cu>;\
-	<'.>;<''>;<'<>;<'(>;<':>;<'">;<',>;<';>;\
-# controls
-	<NU>;...;<US>;<DT>;<PA>;...;<AC>
diff --git a/share/colldef/de_DE.ISO8859-1.src b/share/colldef/de_DE.ISO8859-1.src
index 52d155d..888623f 100644
--- a/share/colldef/de_DE.ISO8859-1.src
+++ b/share/colldef/de_DE.ISO8859-1.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-1
+charmap map.ISO8859-1
 substitute <ss> with "ss"
 order \
 # controls
diff --git a/share/colldef/de_DE.ISO8859-15.src b/share/colldef/de_DE.ISO8859-15.src
index 2c40b5f..4bb6bbc 100644
--- a/share/colldef/de_DE.ISO8859-15.src
+++ b/share/colldef/de_DE.ISO8859-15.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-15
+charmap map.ISO8859-15
 substitute <ss> with "ss"
 order \
 # controls
diff --git a/share/colldef/de_DE.ISO_8859-1.src b/share/colldef/de_DE.ISO_8859-1.src
deleted file mode 100644
index 52d155d..0000000
--- a/share/colldef/de_DE.ISO_8859-1.src
+++ /dev/null
@@ -1,39 +0,0 @@
-# German/ISO 8859-1 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-1
-substitute <ss> with "ss"
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Cu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;<',>;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	(0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<AA>,<A:>,<A?>,<AE>);\
-	B;(C,<C,>);D;(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O/>>,<O:>,<O?>,<O//>);\
-	P;...;T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	V;W;X;(Y,<Y'>);Z;\
-	<D->;<TH>;\
-#
-	[;\\;];^;<':>;_;<'m>;<''>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>,<ae>);\
-	b;(c,<c,>);d;(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o/>>,<o:>,<o?>,<o//>);\
-	p;...;t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	v;w;x;(y,<y'>,<y:>);z;\
-	<d->;<th>;\
-#
-	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<-o>
diff --git a/share/colldef/de_DE.ISO_8859-15.src b/share/colldef/de_DE.ISO_8859-15.src
deleted file mode 100644
index 2c40b5f..0000000
--- a/share/colldef/de_DE.ISO_8859-15.src
+++ /dev/null
@@ -1,39 +0,0 @@
-# German/ISO 8859-1 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-15
-substitute <ss> with "ss"
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Eu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	0;(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<AA>,<A:>,<A?>,<AE>);\
-	B;(C,<C,>);D;(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O/>>,<O:>,<O?>,<O//>,<OE>);\
-	P;...;R;(S,<S<>);T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	V;W;X;(Y,<Y'>,<Y:>);(Z,<Z<>);\
-	<D->;<TH>;\
-#
-	[;\\;];^;_;<'m>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>,<ae>);\
-	b;(c,<c,>);d;(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o/>>,<o:>,<o?>,<o//>,<oe>);\
-	p;...;r;(s,<s<>);t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	v;w;x;(y,<y'>,<y:>);(z,<z<>);\
-	<d->;<th>;\
-#
-	\{;<NO>;|;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<-o>
diff --git a/share/colldef/el_GR.ISO8859-7.src b/share/colldef/el_GR.ISO8859-7.src
index b548b36..c345b81 100644
--- a/share/colldef/el_GR.ISO8859-7.src
+++ b/share/colldef/el_GR.ISO8859-7.src
@@ -2,7 +2,7 @@
 #
 # Greek/ISO 8859-7 (backward compatible with ASCII)
 #
-charmap map.ISO_8859-7
+charmap map.ISO8859-7
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/el_GR.ISO_8859-7.src b/share/colldef/el_GR.ISO_8859-7.src
deleted file mode 100644
index b548b36..0000000
--- a/share/colldef/el_GR.ISO_8859-7.src
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD$
-#
-# Greek/ISO 8859-7 (backward compatible with ASCII)
-#
-charmap map.ISO_8859-7
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;\";<<<>;</>/>>;<Nb>;<DO>;<Pd>;%;&;\
-	';\(;\);*;+;<+->;\,;<-->;-;.;/;\
-# digits
-	(0,<12>);1;(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<SE>;<Co>;<At>;\
-# capital
-	A;...;Z;\
-	<A%>;<A*>;<B*>;<G*>;<D*>;<E%>;<E*>;<Z*>;<Y%>;\
-	<Y*>;<H*>;<J*>;<I%>;<I*>;<K*>;<L*>;<M*>;<N*>;\
-	<C*>;<O%>;<O*>;<P*>;<R*>;<S*>;<T*>;<V*>;<U%>;\
-	<U*>;<F*>;<X*>;<Q*>;<W%>;<W*>;\
-#
-	[;\\;];<':>;_;<''>;`;\
-# small
-	a;...;z;\
-	<a%>;<a*>;<b*>;<g*>;<d*>;<e%>;<e*>;<z*>;<y%>;\
-	<y*>;<h*>;<i3>;<j*>;<i%>;<i*>;<k*>;<l*>;<m*>;\
-	<n*>;<c*>;<o%>;<p*>;<o*>;<r*>;<s*>;<*s>;<t*>;\
-	<u3>;<v*>;<u%>;<u*>;<f*>;<x*>;<q*>;<w%>;<w*>;\
-#
-	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<DT>;\
-# remains
-	<'/>>;<9'>;<'9>;<IE>;<DS>;<NJ>;<V%>;<-M>;<'%>;\
-	<v=>;<dz>
diff --git a/share/colldef/es_ES.ISO8859-1.src b/share/colldef/es_ES.ISO8859-1.src
index 7c2b21f..138ff84 100644
--- a/share/colldef/es_ES.ISO8859-1.src
+++ b/share/colldef/es_ES.ISO8859-1.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-1
+charmap map.ISO8859-1
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/es_ES.ISO8859-15.src b/share/colldef/es_ES.ISO8859-15.src
index 0532c2c..7aa54f6 100644
--- a/share/colldef/es_ES.ISO8859-15.src
+++ b/share/colldef/es_ES.ISO8859-15.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-15
+charmap map.ISO8859-15
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/es_ES.ISO_8859-1.src b/share/colldef/es_ES.ISO_8859-1.src
deleted file mode 100644
index 7c2b21f..0000000
--- a/share/colldef/es_ES.ISO_8859-1.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# Espan~ol (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-1
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Cu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;<',>;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	(0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<AA>,<A:>,<A?>,<AE>);\
-	B;(C,<C,>);{CH,Ch};D;(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;K;L;{LL,Ll};M;(N,<N?>);(O,<O'>,<O!>,<O/>>,<O:>,<O?>,<O//>);\
-	P;Q;R;{RR,Rr};S;T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	V;W;X;(Y,<Y'>);Z;\
-	<D->;<TH>;\
-#
-	[;\\;];^;<':>;_;<'m>;<''>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>,<ae>);\
-	b;(c,<c,>);ch;d;(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;k;l;ll;m;(n,<n?>);(o,<o'>,<o!>,<o/>>,<o:>,<o?>,<o//>);\
-	p;q;r;rr;s;t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	v;w;x;(y,<y'>,<y:>);z;\
-	<d->;<th>;<ss>;\
-#
-	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<-o>
diff --git a/share/colldef/es_ES.ISO_8859-15.src b/share/colldef/es_ES.ISO_8859-15.src
deleted file mode 100644
index 0532c2c..0000000
--- a/share/colldef/es_ES.ISO_8859-15.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# Espan~ol (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-15
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Eu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	0;(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<AA>,<A:>,<A?>,<AE>);\
-	B;(C,<C,>);{CH,Ch};D;(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;K;L;{LL,Ll};M;(N,<N?>);(O,<O'>,<O!>,<O/>>,<O:>,<O?>,<O//>,<OE>);\
-	P;Q;R;{RR,Rr};(S,<S<>);T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	V;W;X;(Y,<Y'>,<Y:>);(Z,<Z<>);\
-	<D->;<TH>;\
-#
-	[;\\;];^;_;<'m>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>,<ae>);\
-	b;(c,<c,>);ch;d;(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;k;l;ll;m;(n,<n?>);(o,<o'>,<o!>,<o/>>,<o:>,<o?>,<o//>,<oe>);\
-	p;q;r;rr;(s,<s<>);t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	v;w;x;(y,<y'>,<y:>);(z,<z<>);\
-	<d->;<th>;<ss>;\
-#
-	\{;<NO>;|;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<-o>
diff --git a/share/colldef/et_EE.ISO8859-15.src b/share/colldef/et_EE.ISO8859-15.src
index 68909bb..e05a90a 100644
--- a/share/colldef/et_EE.ISO8859-15.src
+++ b/share/colldef/et_EE.ISO8859-15.src
@@ -2,7 +2,7 @@
 # latin1 (backward compatible with ASCII)
 #
 #
-charmap map.ISO_8859-15
+charmap map.ISO8859-15
 substitute <ss> with "ss"
 order \
 # controls
diff --git a/share/colldef/et_EE.ISO_8859-15.src b/share/colldef/et_EE.ISO_8859-15.src
deleted file mode 100644
index 68909bb..0000000
--- a/share/colldef/et_EE.ISO_8859-15.src
+++ /dev/null
@@ -1,62 +0,0 @@
-# $FreeBSD$
-# latin1 (backward compatible with ASCII)
-#
-#
-charmap map.ISO_8859-15
-substitute <ss> with "ss"
-order \
-# controls
-	<NU>;...;<US>;<DT>;<PA>;...;<AC>;\
-# spaces
-	<SP>;<NS>;\
-#
-	_;-;<-->;\,;\;;:;!;<!I>;?;<?I>;/;.;\
-# accents
-	`;^;~;<.M>;<'m>;\
-# paired brackets
-	';\";<<<>;</>/>>;\(;[;\{;\};];\);\
-# typography
-	<SE>;<PI>;<Co>;<Rg>;<At>;<Eu>;<Ct>;<DO>;<Pd>;<Ye>;\
-# math and logic
-	*;\\;&;<Nb>;%;+;<+->;<*X>;<-:>;\<;=;>;|;<NO>;\
-# measurement
-	<DG>;<My>;\
-# digits
-	0;(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-# small and capital
-	(a,A,<a'>,<A'>,<a!>,<A!>,<A/>>,<a/>>,<aa>,<AA>,<a?>,<A?>,<ae>,<AE>);\
-	<-a>;\
-	(b,B);\
-	(c,C,<c,>,<C,>);\
-	(d,D,<d->,<D->);\
-	(e,E,<e'>,<E'>,<e!>,<E!>,<e/>>,<E/>>,<E:>,<e:>);\
-	(f,F);\
-	(g,G);\
-	(h,H);\
-	(i,I,<i'>,<I'>,<i!>,<I!>,<i/>>,<I/>>,<i:>,<I:>);\
-	(j,J);\
-	(k,K);\
-	(l,L);\
-	(m,M);\
-	(n,N,<n?>,<N?>);\
-	(o,O,<o'>,<O'>,<o!>,<O!>,<o/>>,<O/>>,<o//>,<O//>);\
-	<-o>;\
-	(<oe>,<OE>);\
-	(p,P);\
-	(q,Q);\
-	(r,R);\
-	(s,S);\
-	(<s<>,<S<>);\
-	(z,Z);\
-	(<z<>,<Z<>);\
-	(t,T);\
-	(u,U,<u'>,<U'>,<u!>,<U!>,<u/>>,<U/>>);\
-	(v,V);\
-	(w,W);\
-	(<o?>,<O?>);\
-	(<a:>,<A:>);\
-	(<o:>,<O:>);\
-	(<u:>,<U:>);\
-	(x,X);\
-	(y,Y,<y'>,<Y'>,<y:>,<Y:>);\
-	(<th>,<TH>)
diff --git a/share/colldef/is_IS.ISO8859-1.src b/share/colldef/is_IS.ISO8859-1.src
index 50cd9a9..68a96c7 100644
--- a/share/colldef/is_IS.ISO8859-1.src
+++ b/share/colldef/is_IS.ISO8859-1.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-1
+charmap map.ISO8859-1
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/is_IS.ISO8859-15.src b/share/colldef/is_IS.ISO8859-15.src
index dd36cb1..0fcbe63 100644
--- a/share/colldef/is_IS.ISO8859-15.src
+++ b/share/colldef/is_IS.ISO8859-15.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-15
+charmap map.ISO8859-15
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/is_IS.ISO_8859-1.src b/share/colldef/is_IS.ISO_8859-1.src
deleted file mode 100644
index 50cd9a9..0000000
--- a/share/colldef/is_IS.ISO_8859-1.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# icelandic (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-1
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Cu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;<',>;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	(0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<AA>,<A:>,<A?>);\
-	B;(C,<C,>);(D,<D->);(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O/>>,<O?>,<O//>);\
-	P;...;T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	V;W;X;(Y,<Y'>);Z;\
-	<TH>;<AE>;<O:>;\
-#
-	[;\\;];^;<':>;_;<'m>;<''>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>);\
-	b;(c,<c,>);(d,<d->);(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o/>>,<o?>,<o//>);\
-	p;...;t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	v;w;x;(y,<y'>,<y:>);z;\
-	<th>;<ae>;<o:>;<ss>;\
-#
-	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<-o>
diff --git a/share/colldef/is_IS.ISO_8859-15.src b/share/colldef/is_IS.ISO_8859-15.src
deleted file mode 100644
index dd36cb1..0000000
--- a/share/colldef/is_IS.ISO_8859-15.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# icelandic (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-15
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Eu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	0;(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<AA>,<A:>,<A?>);\
-	B;(C,<C,>);(D,<D->);(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O/>>,<O?>,<O//>,<OE>);\
-	P;...;R;(S,<S<>);T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	V;W;X;(Y,<Y'>,<Y:>);(Z,<Z<>);\
-	<TH>;<AE>;<O:>;\
-#
-	[;\\;];^;_;<'m>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>);\
-	b;(c,<c,>);(d,<d->);(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o/>>,<o?>,<o//>,<oe>);\
-	p;...;r;(s,<s<>);t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	v;w;x;(y,<y'>,<y:>);(z,<z<>);\
-	<th>;<ae>;<o:>;<ss>;\
-#
-	\{;<NO>;|;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<-o>
diff --git a/share/colldef/la_LN.ASCII.src b/share/colldef/la_LN.ASCII.src
deleted file mode 100644
index df3c340..0000000
--- a/share/colldef/la_LN.ASCII.src
+++ /dev/null
@@ -1,6 +0,0 @@
-# ASCII
-#
-# $FreeBSD$
-#
-order \
-	\x00;...;\xff
diff --git a/share/colldef/la_LN.ISO8859-1.src b/share/colldef/la_LN.ISO8859-1.src
index 99b7d08..89e1abb 100644
--- a/share/colldef/la_LN.ISO8859-1.src
+++ b/share/colldef/la_LN.ISO8859-1.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-1
+charmap map.ISO8859-1
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/la_LN.ISO8859-15.src b/share/colldef/la_LN.ISO8859-15.src
index d600472..40d0bf4 100644
--- a/share/colldef/la_LN.ISO8859-15.src
+++ b/share/colldef/la_LN.ISO8859-15.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-15
+charmap map.ISO8859-15
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/la_LN.ISO8859-2.src b/share/colldef/la_LN.ISO8859-2.src
index aee3671..6672d87 100644
--- a/share/colldef/la_LN.ISO8859-2.src
+++ b/share/colldef/la_LN.ISO8859-2.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-2
+charmap map.ISO8859-2
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/la_LN.ISO8859-4.src b/share/colldef/la_LN.ISO8859-4.src
index 776d0e3..5b8417d 100644
--- a/share/colldef/la_LN.ISO8859-4.src
+++ b/share/colldef/la_LN.ISO8859-4.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-4
+charmap map.ISO8859-4
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/la_LN.ISO_8859-1.src b/share/colldef/la_LN.ISO_8859-1.src
deleted file mode 100644
index 99b7d08..0000000
--- a/share/colldef/la_LN.ISO_8859-1.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# latin1 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-1
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Cu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;<',>;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	(0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<AA>,<A:>,<A?>,<AE>);\
-	B;(C,<C,>);D;(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O/>>,<O:>,<O?>,<O//>);\
-	P;...;T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	V;W;X;(Y,<Y'>);Z;\
-	<D->;<TH>;\
-#
-	[;\\;];^;<':>;_;<'m>;<''>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>,<ae>);\
-	b;(c,<c,>);d;(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o/>>,<o:>,<o?>,<o//>);\
-	p;...;t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	v;w;x;(y,<y'>,<y:>);z;\
-	<d->;<th>;<ss>;\
-#
-	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<-o>
diff --git a/share/colldef/la_LN.ISO_8859-15.src b/share/colldef/la_LN.ISO_8859-15.src
deleted file mode 100644
index d600472..0000000
--- a/share/colldef/la_LN.ISO_8859-15.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# latin1 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-15
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Eu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	0;(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<AA>,<A:>,<A?>,<AE>);\
-	B;(C,<C,>);D;(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O/>>,<O:>,<O?>,<O//>,<OE>);\
-	P;...;R;(S,<S<>);T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	V;W;X;(Y,<Y'>,<Y:>);(Z,<Z<>);\
-	<D->;<TH>;\
-#
-	[;\\;];^;_;<'m>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<aa>,<a:>,<a?>,<ae>);\
-	b;(c,<c,>);d;(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o/>>,<o:>,<o?>,<o//>,<oe>);\
-	p;...;r;(s,<s<>);t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	v;w;x;(y,<y'>,<y:>);(z,<z<>);\
-	<d->;<th>;<ss>;\
-#
-	\{;<NO>;|;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<-o>
diff --git a/share/colldef/la_LN.ISO_8859-2.src b/share/colldef/la_LN.ISO_8859-2.src
deleted file mode 100644
index aee3671..0000000
--- a/share/colldef/la_LN.ISO_8859-2.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# latin2 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-2
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-# 
-	<NS>;<SP>;!;\";<Nb>;\
-	<Cu>;<DO>;\
-	%;&;<',>;<';>;';\(;\);*;+;<-:>;<*X>;\,;<-->;-;.;<'.>;/;\
-# digits
-	0;...;9;\
-# 
-	:;\;;\<;=;>;?;<SE>;<At>;\
-# capital
-	(A,<A'>,<A/>>,<A:>,<A;>,<A(>);\
-	B;(C,<C,>,<C'>,<C<>);(D,<D<>,<D//>);(E,<E'>,<E:>,<E;>,<E<>);\
-	F;G;H;(I,<I'>,<I/>>);\
-	J;K;(L,<L//>,<L<>,<L'>);M;(N,<N'>,<N<>);(O,<O'>,<O/>>,<O:>,<O">);\
-	P;Q;(R,<R'>,<R<>);(S,<S'>,<S<>,<S,>);(T,<T<>,<T,>);\
-	(U,<U'>,<U:>,<U0>,<U">);\
-	V;W;X;(Y,<Y'>);(Z,<Z'>,<Z<>,<Z.>);\
-#
-	[;\\;];^;<':>;<'">;<'<>;<'(>;_;<''>;`;\
-# small
-	(a,<a'>,<a/>>,<a:>,<a;>,<a(>);\
-	b;(c,<c,>,<c'>,<c<>);(d,<d<>,<d//>);(e,<e'>,<e:>,<e;>,<e<>);\
-	f;g;h;(i,<i'>,<i/>>);\
-	j;k;(l,<l//>,<l<>,<l'>);m;(n,<n'>,<n<>);(o,<o'>,<o/>>,<o:>,<o">);\
-	p;q;(r,<r'>,<r<>);(s,<s'>,<s<>,<s,>,<ss>);(t,<t<>,<t,>);\
-	(u,<u'>,<u:>,<u0>,<u">);\
-	v;w;x;(y,<y'>);(z,<z'>,<z<>,<z.>);\
-#
-	\{;|;\};~;<DG>;<DT>
diff --git a/share/colldef/la_LN.ISO_8859-4.src b/share/colldef/la_LN.ISO_8859-4.src
deleted file mode 100644
index 776d0e3..0000000
--- a/share/colldef/la_LN.ISO_8859-4.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# latin4 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-4
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-# 
-	<NS>;<SP>;!;\";<Nb>;\
-	<Cu>;<DO>;\
-	%;&;<',>;<';>;';\(;\);*;+;<-:>;<*X>;\,;<-->;-;.;<'.>;/;\
-# digits
-	0;...;9;\
-# 
-	:;\;;\<;=;>;?;<SE>;<At>;\
-# capital
-	(A,<A'>,<A/>>,<AA>,<A:>,<A;>,<A?>,<A->,<AE>);\
-	B;(C,<C<>);(D,<D//>);(E,<E'>,<E:>,<E.>,<E;>,<E->);\
-	F;(G,<G,>);H;(I,<I'>,<I/>>,<I?>,<I;>,<I->);\
-	J;(K,<K,>);(L,<L,>);M;(N,<N,>);<NG>;(O,<O/>>,<O:>,<O?>,<O//>,<O->);\
-	P;Q;(R,<R,>);(S,<S<>);(T,<T//>);\
-	(U,<U'>,<U/>>,<U:>,<U;>,<U?>,<U->);\
-	V;W;X;Y;(Z,<Z<>);\
-#
-	[;\\;];^;<':>;<'<>;_;<'m>;<''>;`;\
-# small
-	(a,<a'>,<a/>>,<aa>,<a:>,<a?>,<a;>,<a->,<ae>);\
-	b;(c,<c<>);(d,<d//>);(e,<e'>,<e:>,<e.>,<e;>,<e->);\
-	f;(g,<g,>);h;(i,<i'>,<i/>>,<i?>,<i;>,<i->);\
-	j;(k,<k,>);<kk>;(l,<l,>);m;(n,<n,>);<ng>;(o,<o/>>,<o:>,<o?>,<o//>,<o->);\
-	p;q;(r,<r,>);(s,<s<>,<ss>);(t,<t//>);\
-	(u,<u'>,<u/>>,<u:>,<u;>,<u?>,<u->);\
-	v;w;x;y;(z,<z<>);\
-#
-	\{;|;\};~;<DG>;<DT>
diff --git a/share/colldef/lt_LT.ISO8859-4.src b/share/colldef/lt_LT.ISO8859-4.src
index 712b5f0..961ce6e 100644
--- a/share/colldef/lt_LT.ISO8859-4.src
+++ b/share/colldef/lt_LT.ISO8859-4.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-4
+charmap map.ISO8859-4
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/lt_LT.ISO_8859-4.src b/share/colldef/lt_LT.ISO_8859-4.src
deleted file mode 100644
index 712b5f0..0000000
--- a/share/colldef/lt_LT.ISO_8859-4.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# Lithuanian (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-4
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-# 
-	<NS>;<SP>;!;\";<Nb>;\
-	<Cu>;<DO>;\
-	%;&;<',>;<';>;';\(;\);*;+;<-:>;<*X>;\,;<-->;-;.;<'.>;/;\
-# digits
-	0;...;9;\
-# 
-	:;\;;\<;=;>;?;<SE>;<At>;\
-# capital
-	(A,<A'>,<A/>>,<AA>,<A:>,<A;>,<A?>,<A->,<AE>);\
-	B;(C,<C<>);(D,<D//>);(E,<E'>,<E:>,<E;>,<E->,<E.>);\
-	F;(G,<G,>);H;(I,<I'>,<I/>>,<I?>,<I;>,<I->);Y;\
-	J;(K,<K,>);(L,<L,>);M;(N,<N,>);<NG>;(O,<O/>>,<O:>,<O?>,<O//>,<O->);\
-	P;Q;(R,<R,>);(S,<S<>);(T,<T//>);\
-	(U,<U'>,<U/>>,<U:>,<U;>,<U?>,<U->);\
-	V;W;X;(Z,<Z<>);\
-#
-	[;\\;];^;<':>;<'<>;_;<'m>;<''>;`;\
-# small
-	(a,<a'>,<a/>>,<aa>,<a:>,<a?>,<a;>,<a->,<ae>);\
-	b;(c,<c<>);(d,<d//>);(e,<e'>,<e:>,<e;>,<e->,<e.>);\
-	f;(g,<g,>);h;(i,<i'>,<i/>>,<i?>,<i;>,<i->);y;\
-	j;(k,<k,>);<kk>;(l,<l,>);m;(n,<n,>);<ng>;(o,<o/>>,<o:>,<o?>,<o//>,<o->);\
-	p;q;(r,<r,>);(s,<s<>,<ss>);(t,<t//>);\
-	(u,<u'>,<u/>>,<u:>,<u;>,<u?>,<u->);\
-	v;w;x;(z,<z<>);\
-#
-	\{;|;\};~;<DG>;<DT>
diff --git a/share/colldef/map.ISO_8859-1 b/share/colldef/map.ISO_8859-1
deleted file mode 100644
index ee5a557..0000000
--- a/share/colldef/map.ISO_8859-1
+++ /dev/null
@@ -1,174 +0,0 @@
-NU \x00
-SH \x01
-SX \x02
-EX \x03
-ET \x04
-EQ \x05
-AK \x06
-BL \x07
-BS \x08
-HT \x09
-LF \x0a
-VT \x0b
-FF \x0c
-CR \x0d
-SO \x0e
-SI \x0f
-DL \x10
-D1 \x11
-D2 \x12
-D3 \x13
-D4 \x14
-NK \x15
-SY \x16
-EB \x17
-CN \x18
-EM \x19
-SB \x1a
-EC \x1b
-FS \x1c
-GS \x1d
-RS \x1e
-US \x1f
-SP \x20
-Nb \x23
-DO \x24
-At \x40
-<( \x5b
-// \x5c
-)> \x5d
-'> \x5e
-'! \x60
-(! \x7b
-!! \x7c
-!) \x7d
-'? \x7e
-DT \x7f
-PA \x80
-HO \x81
-BH \x82
-NH \x83
-IN \x84
-NL \x85
-SA \x86
-ES \x87
-HS \x88
-HJ \x89
-VS \x8a
-PD \x8b
-PU \x8c
-RI \x8d
-S2 \x8e
-S3 \x8f
-DC \x90
-P1 \x91
-P2 \x92
-TS \x93
-CC \x94
-MW \x95
-SG \x96
-EG \x97
-SS \x98
-GC \x99
-SC \x9a
-CI \x9b
-ST \x9c
-OC \x9d
-PM \x9e
-AC \x9f
-NS \xa0
-!I \xa1
-Ct \xa2
-Pd \xa3
-Cu \xa4
-Ye \xa5
-BB \xa6
-SE \xa7
-': \xa8
-Co \xa9
--a \xaa
-<< \xab
-NO \xac
--- \xad
-Rg \xae
-'m \xaf
-DG \xb0
-+- \xb1
-2S \xb2
-3S \xb3
-'' \xb4
-My \xb5
-PI \xb6
-.M \xb7
-', \xb8
-1S \xb9
--o \xba
->> \xbb
-14 \xbc
-12 \xbd
-34 \xbe
-?I \xbf
-A! \xc0
-A' \xc1
-A> \xc2
-A? \xc3
-A: \xc4
-AA \xc5
-AE \xc6
-C, \xc7
-E! \xc8
-E' \xc9
-E> \xca
-E: \xcb
-I! \xcc
-I' \xcd
-I> \xce
-I: \xcf
-D- \xd0
-N? \xd1
-O! \xd2
-O' \xd3
-O> \xd4
-O? \xd5
-O: \xd6
-*X \xd7
-O/ \xd8
-U! \xd9
-U' \xda
-U> \xdb
-U: \xdc
-Y' \xdd
-TH \xde
-ss \xdf
-a! \xe0
-a' \xe1
-a> \xe2
-a? \xe3
-a: \xe4
-aa \xe5
-ae \xe6
-c, \xe7
-e! \xe8
-e' \xe9
-e> \xea
-e: \xeb
-i! \xec
-i' \xed
-i> \xee
-i: \xef
-d- \xf0
-n? \xf1
-o! \xf2
-o' \xf3
-o> \xf4
-o? \xf5
-o: \xf6
--: \xf7
-o/ \xf8
-u! \xf9
-u' \xfa
-u> \xfb
-u: \xfc
-y' \xfd
-th \xfe
-y: \xff
diff --git a/share/colldef/map.ISO_8859-15 b/share/colldef/map.ISO_8859-15
deleted file mode 100644
index 041dd5a..0000000
--- a/share/colldef/map.ISO_8859-15
+++ /dev/null
@@ -1,174 +0,0 @@
-NU \x00
-SH \x01
-SX \x02
-EX \x03
-ET \x04
-EQ \x05
-AK \x06
-BL \x07
-BS \x08
-HT \x09
-LF \x0a
-VT \x0b
-FF \x0c
-CR \x0d
-SO \x0e
-SI \x0f
-DL \x10
-D1 \x11
-D2 \x12
-D3 \x13
-D4 \x14
-NK \x15
-SY \x16
-EB \x17
-CN \x18
-EM \x19
-SB \x1a
-EC \x1b
-FS \x1c
-GS \x1d
-RS \x1e
-US \x1f
-SP \x20
-Nb \x23
-DO \x24
-At \x40
-<( \x5b
-// \x5c
-)> \x5d
-'> \x5e
-'! \x60
-(! \x7b
-!! \x7c
-!) \x7d
-'? \x7e
-DT \x7f
-PA \x80
-HO \x81
-BH \x82
-NH \x83
-IN \x84
-NL \x85
-SA \x86
-ES \x87
-HS \x88
-HJ \x89
-VS \x8a
-PD \x8b
-PU \x8c
-RI \x8d
-S2 \x8e
-S3 \x8f
-DC \x90
-P1 \x91
-P2 \x92
-TS \x93
-CC \x94
-MW \x95
-SG \x96
-EG \x97
-SS \x98
-GC \x99
-SC \x9a
-CI \x9b
-ST \x9c
-OC \x9d
-PM \x9e
-AC \x9f
-NS \xa0
-!I \xa1
-Ct \xa2
-Pd \xa3
-Eu \xa4
-Ye \xa5
-S< \xa6
-SE \xa7
-s< \xa8
-Co \xa9
--a \xaa
-<< \xab
-NO \xac
--- \xad
-Rg \xae
-'m \xaf
-DG \xb0
-+- \xb1
-2S \xb2
-3S \xb3
-Z< \xb4
-My \xb5
-PI \xb6
-.M \xb7
-z< \xb8
-1S \xb9
--o \xba
->> \xbb
-OE \xbc
-oe \xbd
-Y: \xbe
-?I \xbf
-A! \xc0
-A' \xc1
-A> \xc2
-A? \xc3
-A: \xc4
-AA \xc5
-AE \xc6
-C, \xc7
-E! \xc8
-E' \xc9
-E> \xca
-E: \xcb
-I! \xcc
-I' \xcd
-I> \xce
-I: \xcf
-D- \xd0
-N? \xd1
-O! \xd2
-O' \xd3
-O> \xd4
-O? \xd5
-O: \xd6
-*X \xd7
-O/ \xd8
-U! \xd9
-U' \xda
-U> \xdb
-U: \xdc
-Y' \xdd
-TH \xde
-ss \xdf
-a! \xe0
-a' \xe1
-a> \xe2
-a? \xe3
-a: \xe4
-aa \xe5
-ae \xe6
-c, \xe7
-e! \xe8
-e' \xe9
-e> \xea
-e: \xeb
-i! \xec
-i' \xed
-i> \xee
-i: \xef
-d- \xf0
-n? \xf1
-o! \xf2
-o' \xf3
-o> \xf4
-o? \xf5
-o: \xf6
--: \xf7
-o/ \xf8
-u! \xf9
-u' \xfa
-u> \xfb
-u: \xfc
-y' \xfd
-th \xfe
-y: \xff
diff --git a/share/colldef/map.ISO_8859-2 b/share/colldef/map.ISO_8859-2
deleted file mode 100644
index 75f2013..0000000
--- a/share/colldef/map.ISO_8859-2
+++ /dev/null
@@ -1,174 +0,0 @@
-NU \x00
-SH \x01
-SX \x02
-EX \x03
-ET \x04
-EQ \x05
-AK \x06
-BL \x07
-BS \x08
-HT \x09
-LF \x0a
-VT \x0b
-FF \x0c
-CR \x0d
-SO \x0e
-SI \x0f
-DL \x10
-D1 \x11
-D2 \x12
-D3 \x13
-D4 \x14
-NK \x15
-SY \x16
-EB \x17
-CN \x18
-EM \x19
-SB \x1a
-EC \x1b
-FS \x1c
-GS \x1d
-RS \x1e
-US \x1f
-SP \x20
-Nb \x23
-DO \x24
-At \x40
-<( \x5b
-// \x5c
-)> \x5d
-'> \x5e
-'! \x60
-(! \x7b
-!! \x7c
-!) \x7d
-'? \x7e
-DT \x7f
-PA \x80
-HO \x81
-BH \x82
-NH \x83
-IN \x84
-NL \x85
-SA \x86
-ES \x87
-HS \x88
-HJ \x89
-VS \x8a
-PD \x8b
-PU \x8c
-RI \x8d
-S2 \x8e
-S3 \x8f
-DC \x90
-P1 \x91
-P2 \x92
-TS \x93
-CC \x94
-MW \x95
-SG \x96
-EG \x97
-SS \x98
-GC \x99
-SC \x9a
-CI \x9b
-ST \x9c
-OC \x9d
-PM \x9e
-AC \x9f
-NS \xa0
-A; \xa1
-'( \xa2
-L/ \xa3
-Cu \xa4
-L< \xa5
-S' \xa6
-SE \xa7
-': \xa8
-S< \xa9
-S, \xaa
-T< \xab
-Z' \xac
--- \xad
-Z< \xae
-Z. \xaf
-DG \xb0
-a; \xb1
-'; \xb2
-l/ \xb3
-'' \xb4
-l< \xb5
-s' \xb6
-'< \xb7
-', \xb8
-s< \xb9
-s, \xba
-t< \xbb
-z' \xbc
-'" \xbd
-z< \xbe
-z. \xbf
-R' \xc0
-A' \xc1
-A> \xc2
-A( \xc3
-A: \xc4
-L' \xc5
-C' \xc6
-C, \xc7
-C< \xc8
-E' \xc9
-E; \xca
-E: \xcb
-E< \xcc
-I' \xcd
-I> \xce
-D< \xcf
-D/ \xd0
-N' \xd1
-N< \xd2
-O' \xd3
-O> \xd4
-O" \xd5
-O: \xd6
-*X \xd7
-R< \xd8
-U0 \xd9
-U' \xda
-U" \xdb
-U: \xdc
-Y' \xdd
-T, \xde
-ss \xdf
-r' \xe0
-a' \xe1
-a> \xe2
-a( \xe3
-a: \xe4
-l' \xe5
-c' \xe6
-c, \xe7
-c< \xe8
-e' \xe9
-e; \xea
-e: \xeb
-e< \xec
-i' \xed
-i> \xee
-d< \xef
-d/ \xf0
-n' \xf1
-n< \xf2
-o' \xf3
-o> \xf4
-o" \xf5
-o: \xf6
--: \xf7
-r< \xf8
-u0 \xf9
-u' \xfa
-u" \xfb
-u: \xfc
-y' \xfd
-t, \xfe
-'. \xff
diff --git a/share/colldef/map.ISO_8859-4 b/share/colldef/map.ISO_8859-4
deleted file mode 100644
index 8bbeb57..0000000
--- a/share/colldef/map.ISO_8859-4
+++ /dev/null
@@ -1,175 +0,0 @@
-# $FreeBSD$
-NU \x00
-SH \x01
-SX \x02
-EX \x03
-ET \x04
-EQ \x05
-AK \x06
-BL \x07
-BS \x08
-HT \x09
-LF \x0a
-VT \x0b
-FF \x0c
-CR \x0d
-SO \x0e
-SI \x0f
-DL \x10
-D1 \x11
-D2 \x12
-D3 \x13
-D4 \x14
-NK \x15
-SY \x16
-EB \x17
-CN \x18
-EM \x19
-SB \x1a
-EC \x1b
-FS \x1c
-GS \x1d
-RS \x1e
-US \x1f
-SP \x20
-Nb \x23
-DO \x24
-At \x40
-<( \x5b
-// \x5c
-)> \x5d
-'> \x5e
-'! \x60
-(! \x7b
-!! \x7c
-!) \x7d
-'? \x7e
-DT \x7f
-PA \x80
-HO \x81
-BH \x82
-NH \x83
-IN \x84
-NL \x85
-SA \x86
-ES \x87
-HS \x88
-HJ \x89
-VS \x8a
-PD \x8b
-PU \x8c
-RI \x8d
-S2 \x8e
-S3 \x8f
-DC \x90
-P1 \x91
-P2 \x92
-TS \x93
-CC \x94
-MW \x95
-SG \x96
-EG \x97
-SS \x98
-GC \x99
-SC \x9a
-CI \x9b
-ST \x9c
-OC \x9d
-PM \x9e
-AC \x9f
-NS \xa0
-A; \xa1
-kk \xa2
-R, \xa3
-Cu \xa4
-I? \xa5
-L, \xa6
-SE \xa7
-': \xa8
-S< \xa9
-E- \xaa
-G, \xab
-T/ \xac
--- \xad
-Z< \xae
-'m \xaf
-DG \xb0
-a; \xb1
-'; \xb2
-r, \xb3
-'' \xb4
-i? \xb5
-l, \xb6
-'< \xb7
-', \xb8
-s< \xb9
-e- \xba
-g, \xbb
-t/ \xbc
-NG \xbd
-z< \xbe
-ng \xbf
-A- \xc0
-A' \xc1
-A> \xc2
-A? \xc3
-A: \xc4
-AA \xc5
-AE \xc6
-I; \xc7
-C< \xc8
-E' \xc9
-E; \xca
-E: \xcb
-E. \xcc
-I' \xcd
-I> \xce
-I- \xcf
-D/ \xd0
-N, \xd1
-O- \xd2
-K, \xd3
-O> \xd4
-O? \xd5
-O: \xd6
-*X \xd7
-O/ \xd8
-U; \xd9
-U' \xda
-U> \xdb
-U: \xdc
-U? \xdd
-U- \xde
-ss \xdf
-a- \xe0
-a' \xe1
-a> \xe2
-a? \xe3
-a: \xe4
-aa \xe5
-ae \xe6
-i; \xe7
-c< \xe8
-e' \xe9
-e; \xea
-e: \xeb
-e. \xec
-i' \xed
-i> \xee
-i- \xef
-d/ \xf0
-n, \xf1
-o- \xf2
-k, \xf3
-o> \xf4
-o? \xf5
-o: \xf6
--: \xf7
-o/ \xf8
-u; \xf9
-u' \xfa
-u> \xfb
-u: \xfc
-u? \xfd
-u- \xfe
-'. \xff
diff --git a/share/colldef/map.ISO_8859-5 b/share/colldef/map.ISO_8859-5
deleted file mode 100644
index 230b559..0000000
--- a/share/colldef/map.ISO_8859-5
+++ /dev/null
@@ -1,175 +0,0 @@
-# $FreeBSD$
-NU \x00
-SH \x01
-SX \x02
-EX \x03
-ET \x04
-EQ \x05
-AK \x06
-BL \x07
-BS \x08
-HT \x09
-LF \x0a
-VT \x0b
-FF \x0c
-CR \x0d
-SO \x0e
-SI \x0f
-DL \x10
-D1 \x11
-D2 \x12
-D3 \x13
-D4 \x14
-NK \x15
-SY \x16
-EB \x17
-CN \x18
-EM \x19
-SB \x1a
-EC \x1b
-FS \x1c
-GS \x1d
-RS \x1e
-US \x1f
-SP \x20
-Nb \x23
-DO \x24
-At \x40
-<( \x5b
-// \x5c
-)> \x5d
-'> \x5e
-'! \x60
-(! \x7b
-!! \x7c
-!) \x7d
-'? \x7e
-DT \x7f
-PA \x80
-HO \x81
-BH \x82
-NH \x83
-IN \x84
-NL \x85
-SA \x86
-ES \x87
-HS \x88
-HJ \x89
-VS \x8a
-PD \x8b
-PU \x8c
-RI \x8d
-S2 \x8e
-S3 \x8f
-DC \x90
-P1 \x91
-P2 \x92
-TS \x93
-CC \x94
-MW \x95
-SG \x96
-EG \x97
-SS \x98
-GC \x99
-SC \x9a
-CI \x9b
-ST \x9c
-OC \x9d
-PM \x9e
-AC \x9f
-NS \xa0
-IO \xa1
-D% \xa2
-G% \xa3
-IE \xa4
-DS \xa5
-II \xa6
-YI \xa7
-J% \xa8
-LJ \xa9
-NJ \xaa
-Ts \xab
-KJ \xac
--- \xad
-V% \xae
-DZ \xaf
-A= \xb0
-B= \xb1
-V= \xb2
-G= \xb3
-D= \xb4
-E= \xb5
-Z% \xb6
-Z= \xb7
-I= \xb8
-J= \xb9
-K= \xba
-L= \xbb
-M= \xbc
-N= \xbd
-O= \xbe
-P= \xbf
-R= \xc0
-S= \xc1
-T= \xc2
-U= \xc3
-F= \xc4
-H= \xc5
-C= \xc6
-C% \xc7
-S% \xc8
-Sc \xc9
-=" \xca
-Y= \xcb
-%" \xcc
-JE \xcd
-JU \xce
-JA \xcf
-a= \xd0
-b= \xd1
-v= \xd2
-g= \xd3
-d= \xd4
-e= \xd5
-z% \xd6
-z= \xd7
-i= \xd8
-j= \xd9
-k= \xda
-l= \xdb
-m= \xdc
-n= \xdd
-o= \xde
-p= \xdf
-r= \xe0
-s= \xe1
-t= \xe2
-u= \xe3
-f= \xe4
-h= \xe5
-c= \xe6
-c% \xe7
-s% \xe8
-sc \xe9
-=' \xea
-y= \xeb
-%' \xec
-je \xed
-ju \xee
-ja \xef
-N0 \xf0
-io \xf1
-d% \xf2
-g% \xf3
-ie \xf4
-ds \xf5
-ii \xf6
-yi \xf7
-j% \xf8
-lj \xf9
-nj \xfa
-ts \xfb
-kj \xfc
-SE \xfd
-v% \xfe
-dz \xff
diff --git a/share/colldef/map.ISO_8859-7 b/share/colldef/map.ISO_8859-7
deleted file mode 100644
index b45066a..0000000
--- a/share/colldef/map.ISO_8859-7
+++ /dev/null
@@ -1,175 +0,0 @@
-# $FreeBSD$
-NU \x00
-SH \x01
-SX \x02
-EX \x03
-ET \x04
-EQ \x05
-AK \x06
-BL \x07
-BS \x08
-HT \x09
-LF \x0a
-VT \x0b
-FF \x0c
-CR \x0d
-SO \x0e
-SI \x0f
-DL \x10
-D1 \x11
-D2 \x12
-D3 \x13
-D4 \x14
-NK \x15
-SY \x16
-EB \x17
-CN \x18
-EM \x19
-SB \x1a
-EC \x1b
-FS \x1c
-GS \x1d
-RS \x1e
-US \x1f
-SP \x20
-Nb \x23
-DO \x24
-At \x40
-<( \x5b
-// \x5c
-)> \x5d
-'> \x5e
-'! \x60
-(! \x7b
-!! \x7c
-!) \x7d
-'? \x7e
-DT \x7f
-PA \x80
-HO \x81
-BH \x82
-NH \x83
-IN \x84
-NL \x85
-SA \x86
-ES \x87
-HS \x88
-HJ \x89
-VS \x8a
-PD \x8b
-PU \x8c
-RI \x8d
-S2 \x8e
-S3 \x8f
-DC \x90
-P1 \x91
-P2 \x92
-TS \x93
-CC \x94
-MW \x95
-SG \x96
-EG \x97
-SS \x98
-GC \x99
-SC \x9a
-CI \x9b
-ST \x9c
-OC \x9d
-PM \x9e
-AC \x9f
-NS \xa0
-9' \xa1
-'9 \xa2
-Pd \xa3
-IE \xa4
-DS \xa5
-BB \xa6
-SE \xa7
-': \xa8
-Co \xa9
-NJ \xaa
-<< \xab
-NO \xac
--- \xad
-V% \xae
--M \xaf
-DG \xb0
-+- \xb1
-2S \xb2
-3S \xb3
-'' \xb4
-'% \xb5
-A% \xb6
-.M \xb7
-E% \xb8
-Y% \xb9
-I% \xba
->> \xbb
-O% \xbc
-12 \xbd
-U% \xbe
-W% \xbf
-i3 \xc0
-A* \xc1
-B* \xc2
-G* \xc3
-D* \xc4
-E* \xc5
-Z* \xc6
-Y* \xc7
-H* \xc8
-I* \xc9
-K* \xca
-L* \xcb
-M* \xcc
-N* \xcd
-C* \xce
-O* \xcf
-P* \xd0
-R* \xd1
-v= \xd2
-S* \xd3
-T* \xd4
-U* \xd5
-F* \xd6
-X* \xd7
-Q* \xd8
-W* \xd9
-J* \xda
-V* \xdb
-a% \xdc
-e% \xdd
-y% \xde
-i% \xdf
-u3 \xe0
-a* \xe1
-b* \xe2
-g* \xe3
-d* \xe4
-e* \xe5
-z* \xe6
-y* \xe7
-h* \xe8
-i* \xe9
-k* \xea
-l* \xeb
-m* \xec
-n* \xed
-c* \xee
-o* \xef
-p* \xf0
-r* \xf1
-*s \xf2
-s* \xf3
-t* \xf4
-u* \xf5
-f* \xf6
-x* \xf7
-q* \xf8
-w* \xf9
-j* \xfa
-v* \xfb
-o% \xfc
-u% \xfd
-w% \xfe
-dz \xff
diff --git a/share/colldef/ru_RU.ISO8859-5.src b/share/colldef/ru_RU.ISO8859-5.src
index 459851d..5bfad77 100644
--- a/share/colldef/ru_RU.ISO8859-5.src
+++ b/share/colldef/ru_RU.ISO8859-5.src
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-5
+charmap map.ISO8859-5
 order \
 # controls
 	<NU>;...;<US>;\
diff --git a/share/colldef/ru_RU.ISO_8859-5.src b/share/colldef/ru_RU.ISO_8859-5.src
deleted file mode 100644
index 459851d..0000000
--- a/share/colldef/ru_RU.ISO_8859-5.src
+++ /dev/null
@@ -1,37 +0,0 @@
-# Russian part of ISO8859-5 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-5
-order \
-# controls
-	<NU>;...;<US>;\
-#
-	<NS>;<SP>;!;\";<Nb>;<DO>;\
-	%;&;';\(;\);*;+;\,;-;.;/;\
-# digits
-	0;...;9;\
-#
-	:;\;;\<;=;>;?;<At>;\
-# capital
-	A;...;Z;\
-	<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
-	<I=>;<J=>;<K=>;<L=>;<M=>;<N=>;<O=>;<P=>;<R=>;\
-	<S=>;<T=>;<U=>;<F=>;<H=>;<C=>;<C%>;<S%>;<Sc>;\
-	<=">;<Y=>;<%">;<JE>;<JU>;<JA>;\
-#
-	[;\\;];^;_;`;\
-# small
-	a;...;z;\
-	<a=>;<b=>;<v=>;<g=>;<d=>;<e=>;<io>;<z%>;<z=>;\
-	<i=>;<j=>;<k=>;<l=>;<m=>;<n=>;<o=>;<p=>;<r=>;\
-	<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
-	<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
-#
-	\{;|;\};~;<DT>;<PA>;<HO>;<BH>;<NH>;<IN>;<NL>;\
-	<SA>;<ES>;<HS>;<HJ>;<VS>;<PD>;<PU>;<RI>;<S2>;\
-	<S3>;<DC>;<P1>;<P2>;<TS>;<CC>;<MW>;<SG>;<EG>;\
-	<SS>;<GC>;<SC>;<CI>;<ST>;<OC>;<PM>;<AC>;<D%>;\
-	<G%>;<IE>;<DS>;<II>;<YI>;<J%>;<LJ>;<NJ>;<Ts>;\
-	<KJ>;<-->;<V%>;<DZ>;<N0>;<d%>;<g%>;<ie>;<ds>;\
-	<ii>;<yi>;<j%>;<lj>;<nj>;<ts>;<kj>;<SE>;<v%>;<dz>
diff --git a/share/colldef/sv_SE.ISO8859-1.src b/share/colldef/sv_SE.ISO8859-1.src
index de5fa34..567d7a0 100644
--- a/share/colldef/sv_SE.ISO8859-1.src
+++ b/share/colldef/sv_SE.ISO8859-1.src
@@ -4,7 +4,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-1
+charmap map.ISO8859-1
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/sv_SE.ISO8859-15.src b/share/colldef/sv_SE.ISO8859-15.src
index 8271163..e5946b3 100644
--- a/share/colldef/sv_SE.ISO8859-15.src
+++ b/share/colldef/sv_SE.ISO8859-15.src
@@ -4,7 +4,7 @@
 #
 # $FreeBSD$
 #
-charmap map.ISO_8859-15
+charmap map.ISO8859-15
 order \
 # controls
 	<NU>;...;<US>;<PA>;...;<AC>;\
diff --git a/share/colldef/sv_SE.ISO_8859-1.src b/share/colldef/sv_SE.ISO_8859-1.src
deleted file mode 100644
index de5fa34..0000000
--- a/share/colldef/sv_SE.ISO_8859-1.src
+++ /dev/null
@@ -1,40 +0,0 @@
-# Swedish/ISO 8859-1 (backward compatible with ASCII)
-#
-# (Based on the German de_DE.ISO_8859-1)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-1
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Cu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;<',>;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	(0,<14>,<12>,<34>);(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<A?>);\
-	B;(C,<C,>);(D,<D->);(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O?>,<O/>>);\
-	P;...;T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	(V,W);X;(Y,<Y'>);Z;<AA>;(<A:>,<AE>);(<O:>,<O//>);\
-	<TH>;\
-#
-	[;\\;];^;<':>;_;<'m>;<''>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<a?>);\
-	b;(c,<c,>);(d,<d->);(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o?>,<o/>>);\
-	p;...;t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	(v,w);x;(y,<y'>,<y:>);z;<aa>;(<a:>,<ae>);(<o:>,<o//>);\
-	<th>;\
-#
-	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<ss>;<-o>
diff --git a/share/colldef/sv_SE.ISO_8859-15.src b/share/colldef/sv_SE.ISO_8859-15.src
deleted file mode 100644
index 8271163..0000000
--- a/share/colldef/sv_SE.ISO_8859-15.src
+++ /dev/null
@@ -1,40 +0,0 @@
-# Swedish/DIS 8859-15 (backward compatible with ASCII)
-#
-# (Based on the German de_DE.ISO_8859-15)
-#
-# $FreeBSD$
-#
-charmap map.ISO_8859-15
-order \
-# controls
-	<NU>;...;<US>;<PA>;...;<AC>;\
-#
-	<NS>;<SP>;!;<!I>;\";<<<>;</>/>>;<Nb>;\
-	<Eu>;<Ct>;<DO>;<Pd>;<Ye>;\
-	%;&;';\(;\);*;+;<+->;<-:>;<*X>;\,;<-->;-;.;/;\
-# digits
-	0;(1,<1S>);(2,<2S>);(3,<3S>);4;...;9;\
-#
-	:;\;;\<;=;>;?;<?I>;<SE>;<PI>;<Co>;<Rg>;<At>;\
-# capital
-	(A,<A'>,<A!>,<A/>>,<A?>);\
-	B;(C,<C,>);(D,<D->);(E,<E'>,<E!>,<E/>>,<E:>);\
-	F;G;H;(I,<I'>,<I!>,<I/>>,<I:>);\
-	J;...;M;(N,<N?>);(O,<O'>,<O!>,<O?>,<O/>>,<OE>);\
-	P;Q;R;(S,<S<>);T;(U,<U'>,<U!>,<U/>>,<U:>);\
-	(V,W);X;(Y,<Y'>,<Y:>);(Z,<Z<>);<AA>;(<A:>,<AE>);(<O:>,<O//>);\
-	<TH>;\
-#
-	[;\\;];^;_;<'m>;`;\
-# small
-	(a,<a'>,<a!>,<a/>>,<a?>);\
-	b;(c,<c,>);(d,<d->);(e,<e'>,<e!>,<e/>>,<e:>);\
-	f;g;h;(i,<i'>,<i!>,<i/>>,<i:>);\
-	j;...;m;(n,<n?>);(o,<o'>,<o!>,<o?>,<o/>>,<oe>);\
-	p;q;r;(s,<s<>,<ss>);t;(u,<u'>,<u!>,<u/>>,<u:>);\
-	(v,w);x;(y,<y'>,<y:>);(z,<z<>);<aa>;(<a:>,<ae>);(<o:>,<o//>);\
-	<th>;\
-#
-	\{;<NO>;|;\};~;<.M>;<DG>;<My>;<DT>;\
-# remains
-	<-a>;<-o>