From 08a158ed9e3b32854b9fbefa35e4a8b559878533 Mon Sep 17 00:00:00 2001 From: julian Date: Sat, 5 Jun 1999 03:04:03 +0000 Subject: Support the IANA definition of Shift Jis nameley ja_JP.Shift_JIS as well as the X11 version ja_JP.SJIS --- etc/mtree/BSD.local.dist | 4 +++- etc/mtree/BSD.usr.dist | 6 +++++- share/colldef/Makefile | 4 ++-- share/mklocale/Makefile | 4 +++- share/timedef/data/Makefile | 7 ++++++- usr.bin/colldef/data/Makefile | 4 ++-- usr.bin/mklocale/data/Makefile | 4 +++- 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist index 0ff160d..4143f1c 100644 --- a/etc/mtree/BSD.local.dist +++ b/etc/mtree/BSD.local.dist @@ -1,4 +1,4 @@ -# $Id: BSD.local.dist,v 1.43 1998/12/14 07:44:46 dillon Exp $ +# $Id: BSD.local.dist,v 1.44 1998/12/18 08:06:34 asami Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -221,6 +221,8 @@ .. ja_JP.SJIS .. + ja_JP.Shift_JIS + .. ko_KR.EUC .. lt_LN.ASCII diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 8a7e281..4de18ea 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -1,4 +1,4 @@ -# $Id: BSD.usr.dist,v 1.155 1999/05/03 17:42:34 gpalmer Exp $ +# $Id: BSD.usr.dist,v 1.156 1999/05/05 19:44:14 markm Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -507,6 +507,8 @@ .. ja_JP.SJIS .. + ja_JP.Shift_JIS + .. ko_KR.EUC .. lt_LN.ASCII @@ -745,6 +747,8 @@ .. ja_JP.SJIS .. + ja_JP.Shift_JIS + .. ko_KR.EUC .. lt_LN.ASCII diff --git a/share/colldef/Makefile b/share/colldef/Makefile index 1f71dc5..00825f4 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.20 1999/03/20 11:49:23 foxfair Exp $ +# $Id: Makefile,v 1.21 1999/04/10 12:22:25 foxfair Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -19,7 +19,7 @@ LOCALES= de_DE.DIS_8859-15 \ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS = \ - ko_KR.EUC ja_JP.EUC ja_JP.SJIS zh_CN.EUC + ko_KR.EUC ja_JP.EUC ja_JP.SJIS ja_JP.Shift_JIS zh_CN.EUC ZHLINKS = zh_TW.BIG5 diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile index 5e9075d..a3e817d 100644 --- a/share/mklocale/Makefile +++ b/share/mklocale/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.16 1998/08/15 12:51:48 phk Exp $ +# $Id: Makefile,v 1.17 1998/12/14 02:59:15 dillon Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -51,6 +51,8 @@ afterinstall: ln -fs ../lt_LN.ISO_8859-2/LC_CTYPE \ ${LOCALEDIR}/${link}.ISO_8859-2/LC_CTYPE .endfor + ln -fs ../ja_JP.SJIS/LC_CTYPE \ + ${LOCALEDIR}/ja_JP.Shift_JIS/LC_CTYPE .endif .include diff --git a/share/timedef/data/Makefile b/share/timedef/data/Makefile index 152eaeb..0cfdc10 100644 --- a/share/timedef/data/Makefile +++ b/share/timedef/data/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.29 1999/01/21 19:41:37 imp Exp $ +# $Id: Makefile,v 1.30 1999/03/20 11:48:55 foxfair Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -41,6 +41,7 @@ LN_LINKS = lt_LN.ASCII lt_LN.ISO_8859-2 NL_LINKS = nl_BE US_LINKS = en_CA GB_LINKS = en_AU +JP_LINKS = ja_JP.Shift_JIS .SUFFIXES: .src .out @@ -110,5 +111,9 @@ afterinstall: ln -fs ../en_GB.ISO_8859-1/LC_TIME \ ${LOCALEDIR}/$$l.DIS_8859-15/LC_TIME; \ done + for l in ${JP_LINKS}; do \ + ln -fs ../ja_JP.SJIS/LC_TIME \ + ${LOCALEDIR}/$$l/LC_TIME; \ + done .include diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile index 1f71dc5..00825f4 100644 --- a/usr.bin/colldef/data/Makefile +++ b/usr.bin/colldef/data/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.20 1999/03/20 11:49:23 foxfair Exp $ +# $Id: Makefile,v 1.21 1999/04/10 12:22:25 foxfair Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -19,7 +19,7 @@ LOCALES= de_DE.DIS_8859-15 \ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS = \ - ko_KR.EUC ja_JP.EUC ja_JP.SJIS zh_CN.EUC + ko_KR.EUC ja_JP.EUC ja_JP.SJIS ja_JP.Shift_JIS zh_CN.EUC ZHLINKS = zh_TW.BIG5 diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile index 5e9075d..a3e817d 100644 --- a/usr.bin/mklocale/data/Makefile +++ b/usr.bin/mklocale/data/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.16 1998/08/15 12:51:48 phk Exp $ +# $Id: Makefile,v 1.17 1998/12/14 02:59:15 dillon Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -51,6 +51,8 @@ afterinstall: ln -fs ../lt_LN.ISO_8859-2/LC_CTYPE \ ${LOCALEDIR}/${link}.ISO_8859-2/LC_CTYPE .endfor + ln -fs ../ja_JP.SJIS/LC_CTYPE \ + ${LOCALEDIR}/ja_JP.Shift_JIS/LC_CTYPE .endif .include -- cgit v1.1