DIS_8859-15 -> ISO_8859-15 rename

10 files changed, 24 insertions, 438 deletions

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 997c998..0c1918e 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -4,15 +4,15 @@ NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
 
 LOCALES=	cs_CZ.ISO_8859-2 \
-		de_DE.DIS_8859-15 \
+		de_DE.ISO_8859-15 \
 		de_DE.ISO_8859-1 \
 		el_GR.ISO_8859-7 \
-		es_ES.DIS_8859-15 \
+		es_ES.ISO_8859-15 \
 		es_ES.ISO_8859-1 \
-		is_IS.DIS_8859-15 \
+		is_IS.ISO_8859-15 \
 		is_IS.ISO_8859-1 \
 		la_LN.ASCII      \
-		la_LN.DIS_8859-15 \
+		la_LN.ISO_8859-15 \
 		la_LN.ISO_8859-1 \
 		la_LN.ISO_8859-2 \
 		la_LN.ISO_8859-4 \
@@ -20,7 +20,7 @@ LOCALES=	cs_CZ.ISO_8859-2 \
 		ru_RU.CP866 \
 		ru_RU.ISO_8859-5 \
 		ru_RU.KOI8-R \
-		sv_SE.DIS_8859-15 \
+		sv_SE.ISO_8859-15 \
 		sv_SE.ISO_8859-1 \
 		uk_UA.KOI8-U
 
@@ -48,21 +48,21 @@ DELINKS = de_AT de_CH
 all: ${LOCALES:S/$/.out/g}
 
 cs_CZ.ISO_8859-2.out:	map.ISO_8859-2
-de_DE.DIS_8859-15.out:  map.DIS_8859-15
+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.DIS_8859-15.out:  map.DIS_8859-15
+es_ES.ISO_8859-15.out:  map.ISO_8859-15
 es_ES.ISO_8859-1.out:   map.ISO_8859-1
-is_IS.DIS_8859-15.out:  map.DIS_8859-15
+is_IS.ISO_8859-15.out:  map.ISO_8859-15
 is_IS.ISO_8859-1.out:   map.ISO_8859-1
-la_LN.DIS_8859-15.out:  map.DIS_8859-15
+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
 ru_RU.CP866.out:        map.CP866
 ru_RU.ISO_8859-5.out:   map.ISO_8859-5
 ru_RU.KOI8-R.out:       map.KOI8-R
-sv_SE.DIS_8859-15.out:  map.DIS_8859-15
+sv_SE.ISO_8859-15.out:  map.ISO_8859-15
 sv_SE.ISO_8859-1.out:   map.ISO_8859-1
 uk_UA.KOI8-U.out:       map.KOI8-U
 
@@ -84,8 +84,8 @@ afterinstall:
 	       ${LOCALEDIR}/${link}.ISO_8859-1/LC_COLLATE
 .endfor
 .for link in ${LATIN1LINKS}
-	ln -fs ../la_LN.DIS_8859-15/LC_COLLATE \
-	       ${LOCALEDIR}/${link}.DIS_8859-15/LC_COLLATE
+	ln -fs ../la_LN.ISO_8859-15/LC_COLLATE \
+	       ${LOCALEDIR}/${link}.ISO_8859-15/LC_COLLATE
 .endfor
 .for link in ${LATIN2LINKS}
 	ln -fs ../la_LN.ISO_8859-2/LC_COLLATE \
@@ -96,8 +96,8 @@ afterinstall:
 	       ${LOCALEDIR}/${link}.ISO_8859-1/LC_COLLATE
 .endfor
 .for link in ${DELINKS}
-	ln -fs ../de_DE.DIS_8859-15/LC_COLLATE \
-	       ${LOCALEDIR}/${link}.DIS_8859-15/LC_COLLATE
+	ln -fs ../de_DE.ISO_8859-15/LC_COLLATE \
+	       ${LOCALEDIR}/${link}.ISO_8859-15/LC_COLLATE
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/share/colldef/de_DE.DIS_8859-15.src b/share/colldef/de_DE.DIS_8859-15.src
deleted file mode 100644
index f5d6093..0000000
--- a/share/colldef/de_DE.DIS_8859-15.src
+++ /dev/null
@@ -1,39 +0,0 @@
-# German/ISO 8859-1 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.DIS_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/es_ES.DIS_8859-15.src b/share/colldef/es_ES.DIS_8859-15.src
deleted file mode 100644
index 002b635..0000000
--- a/share/colldef/es_ES.DIS_8859-15.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# Espan~ol (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.DIS_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/is_IS.DIS_8859-15.src b/share/colldef/is_IS.DIS_8859-15.src
deleted file mode 100644
index fe4dd9b..0000000
--- a/share/colldef/is_IS.DIS_8859-15.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# icelandic (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.DIS_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.DIS_8859-15.src b/share/colldef/la_LN.DIS_8859-15.src
deleted file mode 100644
index 449ce85..0000000
--- a/share/colldef/la_LN.DIS_8859-15.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# latin1 (backward compatible with ASCII)
-#
-# $FreeBSD$
-#
-charmap map.DIS_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/map.DIS_8859-15 b/share/colldef/map.DIS_8859-15
deleted file mode 100644
index 041dd5a..0000000
--- a/share/colldef/map.DIS_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/sv_SE.DIS_8859-15.src b/share/colldef/sv_SE.DIS_8859-15.src
deleted file mode 100644
index d8ebb75..0000000
--- a/share/colldef/sv_SE.DIS_8859-15.src
+++ /dev/null
@@ -1,40 +0,0 @@
-# Swedish/DIS 8859-15 (backward compatible with ASCII)
-#
-# (Based on the German de_DE.DIS_8859-15)
-#
-# $FreeBSD$
-#
-charmap map.DIS_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>
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index fa8cf01..cf3c933 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -11,7 +11,7 @@ LOCALES=        el_GR.ISO_8859-7 \
 		la_LN.ISO_8859-1 \
 		la_LN.ISO_8859-2 \
 		la_LN.ISO_8859-4 \
-		la_LN.DIS_8859-15 \
+		la_LN.ISO_8859-15 \
 		ru_RU.CP866 \
 		ru_RU.ISO_8859-5 \
 		ru_RU.KOI8-R \
@@ -47,8 +47,8 @@ afterinstall:
 		       ${LOCALEDIR}/${link}.ISO_8859-1/LC_CTYPE
 .endfor
 .for link in ${LATIN1LINKS}
-	ln -fs ../la_LN.DIS_8859-15/LC_CTYPE \
-		       ${LOCALEDIR}/${link}.DIS_8859-15/LC_CTYPE
+	ln -fs ../la_LN.ISO_8859-15/LC_CTYPE \
+		       ${LOCALEDIR}/${link}.ISO_8859-15/LC_CTYPE
 .endfor
 .for link in ${LATIN2LINKS}
 	ln -fs ../la_LN.ISO_8859-2/LC_CTYPE \
diff --git a/share/mklocale/la_LN.DIS_8859-15.src b/share/mklocale/la_LN.DIS_8859-15.src
deleted file mode 100644
index 7d89e03..0000000
--- a/share/mklocale/la_LN.DIS_8859-15.src
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Standard LOCALE_CTYPE for the dis_8859_15 Locale
- */
-ENCODING	"NONE"
-VARIABLE        DIS 8859-15 Latin-9 character set
-
-#
-# This is a comment
-#
-ALPHA		'A' - 'Z' 'a' - 'z' 0xa6 0xa8 0xb4 0xb8 0xbc - 0xbe 0xc0 - 0xd6 0xd8 - 0xf6 0xf8 - 0xff
-CONTROL		0x00 - 0x1f 0x7f - 0x9f
-DIGIT		'0' - '9'
-GRAPH		0x21 - 0x7e 0xa1 - 0xff
-LOWER		'a' - 'z' 0xa8 0xb8 0xbd 0xdf - 0xf6 0xf8 - 0xff
-PUNCT		0x21 - 0x2f 0x3a - 0x40 0x5b - 0x60 0x7b - 0x7e 0xa1 - 0xa5 0xa7 0xa9 - 0xb3 0xb5 - 0xb7 0xb9 - 0xbb 0xbf 0xd7 0xf7
-SPACE		0x09 - 0x0d ' ' 0xa0
-UPPER		'A' - 'Z' 0xa6 0xb4 0xbc 0xc0 - 0xd6 0xd8 - 0xde
-XDIGIT		'0' - '9' 'a' - 'f' 'A' - 'F'
-BLANK		' ' '\t' 0xa0
-PRINT		0x20 - 0x7e 0xa0 - 0xff
-# IDEOGRAM
-# SPECIAL
-# PHONEGRAM
-
-MAPLOWER	<'A' - 'Z' : 'a'>
-MAPLOWER	<'a' - 'z' : 'a'>
-MAPLOWER	<0xa6 - 0xa6 : 0xa8>
-MAPLOWER	<0xb4 - 0xb4 : 0xb8>
-MAPLOWER	<0xbc - 0xbc : 0xbd>
-MAPLOWER	<0xbe - 0xbe : 0xff>
-MAPLOWER	<0xc0 - 0xd6 : 0xe0>
-MAPLOWER	<0xd8 - 0xde : 0xf8>
-MAPLOWER	<0xdf - 0xf6 : 0xdf>
-MAPLOWER	<0xf8 - 0xff : 0xf8>
-MAPUPPER	<'A' - 'Z' : 'A'>
-MAPUPPER	<'a' - 'z' : 'A'>
-MAPUPPER	<0xa8 - 0xa8 : 0xa6>
-MAPUPPER	<0xb8 - 0xb8 : 0xb4>
-MAPUPPER	<0xbd - 0xbd : 0xbc>
-MAPUPPER	<0xc0 - 0xd6 : 0xc0>
-MAPUPPER	<0xd8 - 0xde : 0xd8>
-MAPUPPER	<0xe0 - 0xf6 : 0xc0>
-MAPUPPER	<0xf8 - 0xfe : 0xd8>
-MAPUPPER	<0xff - 0xff : 0xbe>
-TODIGIT		<'0' - '9' : 0>
-TODIGIT		<'A' - 'F' : 10>
-TODIGIT		<'a' - 'f' : 10>
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index b2eca3f..f256dac 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -63,7 +63,7 @@ afterinstall:
 	done
 	for l in ${8859_15_LINKS}; do \
 		ln -fs ../$$l.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.DIS_8859-15/LC_TIME; \
+		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
 	done
 	for l in ${DE_LINKS}; do \
 		ln -fs ../de_DE.ISO_8859-1/LC_TIME \
@@ -71,7 +71,7 @@ afterinstall:
 	done
 	for l in ${DE_LINKS}; do \
 		ln -fs ../de_DE.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.DIS_8859-15/LC_TIME; \
+		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
 	done
 	for l in ${IT_LINKS}; do \
 		ln -fs ../it_IT.ISO_8859-1/LC_TIME \
@@ -79,7 +79,7 @@ afterinstall:
 	done
 	for l in ${IT_LINKS}; do \
 		ln -fs ../it_IT.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.DIS_8859-15/LC_TIME; \
+		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
 	done
 	for l in ${FR_LINKS}; do \
 		ln -fs ../fr_FR.ISO_8859-1/LC_TIME \
@@ -87,7 +87,7 @@ afterinstall:
 	done
 	for l in ${FR_LINKS}; do \
 		ln -fs ../fr_FR.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.DIS_8859-15/LC_TIME; \
+		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
 	done
 	for l in ${LN_LINKS}; do \
 		ln -fs ../la_LN.ISO_8859-1/LC_TIME \
@@ -99,7 +99,7 @@ afterinstall:
 	done
 	for l in ${NL_LINKS}; do \
 		ln -fs ../nl_NL.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.DIS_8859-15/LC_TIME; \
+		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
 	done
 	for l in ${US_LINKS}; do \
 		ln -fs ../en_US.ISO_8859-1/LC_TIME \
@@ -107,7 +107,7 @@ afterinstall:
 	done
 	for l in ${US_LINKS}; do \
 		ln -fs ../en_US.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.DIS_8859-15/LC_TIME; \
+		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
 	done
 	for l in ${GB_LINKS}; do \
 		ln -fs ../en_GB.ISO_8859-1/LC_TIME \
@@ -115,7 +115,7 @@ afterinstall:
 	done
 	for l in ${GB_LINKS}; do \
 		ln -fs ../en_GB.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.DIS_8859-15/LC_TIME; \
+		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
 	done
 	for l in ${JP_LINKS}; do \
 		ln -fs ../ja_JP.SJIS/LC_TIME \