Switch to new locale names

1 files changed, 64 insertions, 67 deletions

diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index 8650127..636b262 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -3,39 +3,39 @@
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
 
-LOCALES=	cs_CZ.ISO_8859-2 \
-		da_DK.ISO_8859-1 \
-		de_AT.ISO_8859-1 \
-		de_DE.ISO_8859-1 \
-		el_GR.ISO_8859-7 \
-		en_GB.ISO_8859-1 \
-		en_US.ISO_8859-1 \
-		es_ES.ISO_8859-1 \
-		et_EE.ISO_8859-15 \
-		fi_FI.ISO_8859-1 \
-		fr_FR.ISO_8859-1 \
-		hr_HR.ISO_8859-2 \
-		hu_HU.ISO_8859-2 \
-		is_IS.ISO_8859-1 \
-		ja_JP.EUC	 \
-		ja_JP.SJIS 	 \
-		it_IT.ISO_8859-1 \
-		ko_KR.EUC        \
-		la_LN.ISO_8859-1 \
-		lt_LT.ISO_8859-4 \
-		nl_NL.ISO_8859-1 \
-		no_NO.ISO_8859-1 \
-		pl_PL.ISO_8859-2 \
-		pt_PT.ISO_8859-1 \
-		ru_RU.CP866 	 \
-		ru_RU.ISO_8859-5 \
-		ru_RU.KOI8-R     \
-		sk_SK.ISO_8859-2 \
-		sl_SI.ISO_8859-2 \
-		sv_SE.ISO_8859-1 \
-		tr_TR.ISO_8859-9 \
-		uk_UA.KOI8-U     \
-		zh_CN.EUC	 \
+LOCALES=        cs_CZ.ISO8859-2 \
+		da_DK.ISO8859-1 \
+		de_AT.ISO8859-1 \
+		de_DE.ISO8859-1 \
+		el_GR.ISO8859-7 \
+		en_GB.ISO8859-1 \
+		en_US.ISO8859-1 \
+		es_ES.ISO8859-1 \
+		et_EE.ISO8859-15 \
+		fi_FI.ISO8859-1 \
+		fr_FR.ISO8859-1 \
+		hr_HR.ISO8859-2 \
+		hu_HU.ISO8859-2 \
+		is_IS.ISO8859-1 \
+		ja_JP.eucJP     \
+		ja_JP.SJIS      \
+		it_IT.ISO8859-1 \
+		ko_KR.eucKR     \
+		la_LN.ISO8859-1 \
+		lt_LT.ISO8859-4 \
+		nl_NL.ISO8859-1 \
+		no_NO.ISO8859-1 \
+		pl_PL.ISO8859-2 \
+		pt_PT.ISO8859-1 \
+		ru_RU.CP866     \
+		ru_RU.ISO8859-5 \
+		ru_RU.KOI8-R    \
+		sk_SK.ISO8859-2 \
+		sl_SI.ISO8859-2 \
+		sv_SE.ISO8859-1 \
+		tr_TR.ISO8859-9 \
+		uk_UA.KOI8-U    \
+		zh_CN.eucCN     \
 		zh_TW.Big5
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
@@ -45,11 +45,10 @@ LOCALEDIR=      ${DESTDIR}/usr/share/locale
 DE_LINKS =      de_CH
 FR_LINKS =      fr_BE fr_CA fr_CH
 IT_LINKS =      it_CH
-LN_LINKS =      la_LN.ASCII la_LN.ISO_8859-2 la_LN.ISO_8859-4
+LN_LINKS =      la_LN.US-ASCII la_LN.ISO8859-2 la_LN.ISO8859-4
 NL_LINKS =      nl_BE
-US_LINKS =      en_CA
+US_LINKS =      en_CA en_NZ
 GB_LINKS =      en_AU
-JP_LINKS = 	ja_JP.Shift_JIS
 
 .SUFFIXES: .src .out
 
@@ -64,64 +63,62 @@ afterinstall:
 			   ${LOCALEDIR}/$$l/LC_TIME; \
 	done
 	for l in ${8859_15_LINKS}; do \
-		ln -fs ../$$l.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
+		ln -fs ../$$l.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${DE_LINKS}; do \
-		ln -fs ../de_DE.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-1/LC_TIME; \
+		ln -fs ../de_DE.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${DE_LINKS}; do \
-		ln -fs ../de_DE.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
+		ln -fs ../de_DE.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${IT_LINKS}; do \
-		ln -fs ../it_IT.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-1/LC_TIME; \
+		ln -fs ../it_IT.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${IT_LINKS}; do \
-		ln -fs ../it_IT.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
+		ln -fs ../it_IT.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${FR_LINKS}; do \
-		ln -fs ../fr_FR.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-1/LC_TIME; \
+		ln -fs ../fr_FR.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${FR_LINKS}; do \
-		ln -fs ../fr_FR.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
+		ln -fs ../fr_FR.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${LN_LINKS}; do \
-		ln -fs ../la_LN.ISO_8859-1/LC_TIME \
+		ln -fs ../la_LN.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l/LC_TIME; \
 	done
 	for l in ${NL_LINKS}; do \
-		ln -fs ../nl_NL.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-1/LC_TIME; \
+		ln -fs ../nl_NL.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${NL_LINKS}; do \
-		ln -fs ../nl_NL.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
+		ln -fs ../nl_NL.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${US_LINKS}; do \
-		ln -fs ../en_US.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-1/LC_TIME; \
+		ln -fs ../en_US.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${US_LINKS}; do \
-		ln -fs ../en_US.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
+		ln -fs ../en_US.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${GB_LINKS}; do \
-		ln -fs ../en_GB.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-1/LC_TIME; \
+		ln -fs ../en_GB.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${GB_LINKS}; do \
-		ln -fs ../en_GB.ISO_8859-1/LC_TIME \
-		       ${LOCALEDIR}/$$l.ISO_8859-15/LC_TIME; \
-	done
-	for l in ${JP_LINKS}; do \
-		ln -fs ../ja_JP.SJIS/LC_TIME \
-		       ${LOCALEDIR}/$$l/LC_TIME; \
+		ln -fs ../en_GB.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
+		ln -fs ../en_US.ISO8859-1/LC_TIME \
+		       ${LOCALEDIR}/en_US.US-ASCII/LC_TIME
 
 .include <bsd.prog.mk>