--- ./localedata/Makefile.orig 2003-01-30 12:09:21.000000000 -0800 +++ ./localedata/Makefile 2004-02-12 13:27:22.000000000 -0800 @@ -215,6 +215,7 @@ echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ $(LOCALEDEF) --alias-file=../intl/locale.alias \ + --no-archive \ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ --- ./localedata/locales/en_GB.orig 2000-10-26 10:48:05.000000000 -0700 +++ ./localedata/locales/en_GB 2004-02-12 13:27:22.000000000 -0800 @@ -112,8 +112,8 @@ d_t_fmt "" d_fmt "" t_fmt "" -am_pm "";"" -t_fmt_ampm "" +am_pm "";"" +t_fmt_ampm "" date_fmt "/ / " --- ./localedata/SUPPORTED.orig 2002-02-23 11:30:27.000000000 -0800 +++ ./localedata/SUPPORTED 2004-02-12 13:27:22.000000000 -0800 @@ -30,6 +30,7 @@ cs_CZ/ISO-8859-2 \ cy_GB/ISO-8859-14 \ da_DK/ISO-8859-1 \ +da_DK.ISO-8859-15/ISO-8859-15 \ de_AT/ISO-8859-1 \ de_AT@euro/ISO-8859-15 \ de_BE/ISO-8859-1 \ @@ -45,6 +46,7 @@ en_CA/ISO-8859-1 \ en_DK/ISO-8859-1 \ en_GB/ISO-8859-1 \ +en_GB.ISO-8859-15/ISO-8859-15 \ en_HK/ISO-8859-1 \ en_IE/ISO-8859-1 \ en_IE@euro/ISO-8859-15 \ @@ -53,6 +55,7 @@ en_PH/ISO-8859-1 \ en_SG/ISO-8859-1 \ en_US/ISO-8859-1 \ +en_US.ISO-8859-15/ISO-8859-15 \ en_ZA/ISO-8859-1 \ en_ZW/ISO-8859-1 \ es_AR/ISO-8859-1 \ @@ -143,6 +146,7 @@ sv_FI/ISO-8859-1 \ sv_FI@euro/ISO-8859-15 \ sv_SE/ISO-8859-1 \ +sv_SE.ISO-8859-15/ISO-8859-15 \ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ/KOI8-T \ @@ -163,3 +167,134 @@ zh_HK/BIG5-HKSCS \ zh_TW/BIG5 \ zh_TW.EUC-TW/EUC-TW \ +ar_AE.UTF-8/UTF-8 \ +ar_BH.UTF-8/UTF-8 \ +ar_DZ.UTF-8/UTF-8 \ +ar_EG.UTF-8/UTF-8 \ +ar_IQ.UTF-8/UTF-8 \ +ar_JO.UTF-8/UTF-8 \ +ar_KW.UTF-8/UTF-8 \ +ar_LB.UTF-8/UTF-8 \ +ar_LY.UTF-8/UTF-8 \ +ar_MA.UTF-8/UTF-8 \ +ar_OM.UTF-8/UTF-8 \ +ar_QA.UTF-8/UTF-8 \ +ar_SA.UTF-8/UTF-8 \ +ar_SD.UTF-8/UTF-8 \ +ar_SY.UTF-8/UTF-8 \ +ar_TN.UTF-8/UTF-8 \ +ar_YE.UTF-8/UTF-8 \ +be_BY.UTF-8/UTF-8 \ +bg_BG.UTF-8/UTF-8 \ +ca_ES.UTF-8/UTF-8 \ +ca_ES.UTF-8@euro/UTF-8 \ +cs_CZ.UTF-8/UTF-8 \ +da_DK.UTF-8/UTF-8 \ +de_AT.UTF-8/UTF-8 \ +de_AT.UTF-8@euro/UTF-8 \ +de_BE.UTF-8/UTF-8 \ +de_BE.UTF-8@euro/UTF-8 \ +de_CH.UTF-8/UTF-8 \ +de_DE.UTF-8/UTF-8 \ +de_DE.UTF-8@euro/UTF-8 \ +de_LU.UTF-8/UTF-8 \ +de_LU.UTF-8@euro/UTF-8 \ +el_GR.UTF-8/UTF-8 \ +en_AU.UTF-8/UTF-8 \ +en_BW.UTF-8/UTF-8 \ +en_CA.UTF-8/UTF-8 \ +en_DK.UTF-8/UTF-8 \ +en_GB.UTF-8/UTF-8 \ +en_HK.UTF-8/UTF-8 \ +en_IE.UTF-8/UTF-8 \ +en_IE.UTF-8@euro/UTF-8 \ +en_NZ.UTF-8/UTF-8 \ +en_PH.UTF-8/UTF-8 \ +en_SG.UTF-8/UTF-8 \ +en_US.UTF-8/UTF-8 \ +en_ZA.UTF-8/UTF-8 \ +en_ZW.UTF-8/UTF-8 \ +es_AR.UTF-8/UTF-8 \ +es_BO.UTF-8/UTF-8 \ +es_CL.UTF-8/UTF-8 \ +es_CO.UTF-8/UTF-8 \ +es_CR.UTF-8/UTF-8 \ +es_DO.UTF-8/UTF-8 \ +es_EC.UTF-8/UTF-8 \ +es_ES.UTF-8/UTF-8 \ +es_ES.UTF-8@euro/UTF-8 \ +es_GT.UTF-8/UTF-8 \ +es_HN.UTF-8/UTF-8 \ +es_MX.UTF-8/UTF-8 \ +es_NI.UTF-8/UTF-8 \ +es_PA.UTF-8/UTF-8 \ +es_PE.UTF-8/UTF-8 \ +es_PR.UTF-8/UTF-8 \ +es_PY.UTF-8/UTF-8 \ +es_SV.UTF-8/UTF-8 \ +es_US.UTF-8/UTF-8 \ +es_UY.UTF-8/UTF-8 \ +es_VE.UTF-8/UTF-8 \ +et_EE.UTF-8/UTF-8 \ +eu_ES.UTF-8/UTF-8 \ +eu_ES.UTF-8@euro/UTF-8 \ +fi_FI.UTF-8/UTF-8 \ +fi_FI.UTF-8@euro/UTF-8 \ +fo_FO.UTF-8/UTF-8 \ +fr_BE.UTF-8/UTF-8 \ +fr_BE.UTF-8@euro/UTF-8 \ +fr_CA.UTF-8/UTF-8 \ +fr_CH.UTF-8/UTF-8 \ +fr_FR.UTF-8/UTF-8 \ +fr_FR.UTF-8@euro/UTF-8 \ +fr_LU.UTF-8/UTF-8 \ +fr_LU.UTF-8@euro/UTF-8 \ +ga_IE.UTF-8/UTF-8 \ +ga_IE.UTF-8@euro/UTF-8 \ +gl_ES.UTF-8/UTF-8 \ +gl_ES.UTF-8@euro/UTF-8 \ +gv_GB.UTF-8/UTF-8 \ +he_IL.UTF-8/UTF-8 \ +hr_HR.UTF-8/UTF-8 \ +hu_HU.UTF-8/UTF-8 \ +id_ID.UTF-8/UTF-8 \ +is_IS.UTF-8/UTF-8 \ +it_CH.UTF-8/UTF-8 \ +it_IT.UTF-8/UTF-8 \ +it_IT.UTF-8@euro/UTF-8 \ +iw_IL.UTF-8/UTF-8 \ +ja_JP.UTF-8/UTF-8 \ +kl_GL.UTF-8/UTF-8 \ +kw_GB.UTF-8/UTF-8 \ +lt_LT.UTF-8/UTF-8 \ +lv_LV.UTF-8/UTF-8 \ +mk_MK.UTF-8/UTF-8 \ +ms_MY.UTF-8/UTF-8 \ +mt_MT.UTF-8/UTF-8 \ +nl_BE.UTF-8/UTF-8 \ +nl_BE.UTF-8@euro/UTF-8 \ +nl_NL.UTF-8/UTF-8 \ +nl_NL.UTF-8@euro/UTF-8 \ +nn_NO.UTF-8/UTF-8 \ +no_NO.UTF-8/UTF-8 \ +pl_PL.UTF-8/UTF-8 \ +pt_BR.UTF-8/UTF-8 \ +pt_PT.UTF-8/UTF-8 \ +pt_PT.UTF-8@euro/UTF-8 \ +ro_RO.UTF-8/UTF-8 \ +ru_RU.UTF-8/UTF-8 \ +ru_UA.UTF-8/UTF-8 \ +sk_SK.UTF-8/UTF-8 \ +sl_SI.UTF-8/UTF-8 \ +sq_AL.UTF-8/UTF-8 \ +sr_YU.UTF-8/UTF-8 \ +sr_YU.UTF-8@cyrillic/UTF-8 \ +sv_FI.UTF-8/UTF-8 \ +sv_FI.UTF-8@euro/UTF-8 \ +sv_SE.UTF-8/UTF-8 \ +th_TH.UTF-8/UTF-8 \ +tr_TR.UTF-8/UTF-8 \ +uk_UA.UTF-8/UTF-8 \ +zh_CN.UTF-8/UTF-8 \ +zh_HK.UTF-8/UTF-8 \ +zh_TW.UTF-8/UTF-8 \ --- ./locale/setlocale.c.orig 2002-12-04 01:53:49.000000000 -0800 +++ ./locale/setlocale.c 2004-02-12 13:27:22.000000000 -0800 @@ -330,9 +330,15 @@ /* Make a copy of locale name. */ if (newnames[category] != _nl_C_name) { - newnames[category] = __strdup (newnames[category]); - if (newnames[category] == NULL) - break; + if (! strcmp (newnames[category], + _nl_global_locale.__names[category])) + newnames[category] = _nl_global_locale.__names[category]; + else + { + newnames[category] = __strdup (newnames[category]); + if (newnames[category] == NULL) + break; + } } } @@ -356,7 +362,8 @@ } else for (++category; category < __LC_LAST; ++category) - if (category != LC_ALL && newnames[category] != _nl_C_name) + if (category != LC_ALL && newnames[category] != _nl_C_name + && newnames[category] != _nl_global_locale.__names[category]) free ((char *) newnames[category]); /* Critical section left. */ --- ./locale/iso-4217.def.orig 2002-02-28 01:11:39.000000000 -0800 +++ ./locale/iso-4217.def 2004-02-12 13:27:22.000000000 -0800 @@ -6,6 +6,7 @@ * * !!! The list has to be sorted !!! */ +DEFINE_INT_CURR("ADP ") /* Andorran Peseta -> EUR */ DEFINE_INT_CURR("AED ") /* United Arab Emirates Dirham */ DEFINE_INT_CURR("AFA ") /* Afghanistan Afgani */ DEFINE_INT_CURR("ALL ") /* Albanian Lek */ @@ -13,12 +14,14 @@ DEFINE_INT_CURR("ANG ") /* Netherlands Antilles */ DEFINE_INT_CURR("AOA ") /* Angolan Kwanza */ DEFINE_INT_CURR("ARS ") /* Argentine Peso */ +DEFINE_INT_CURR("ATS ") /* Austrian Schilling -> EUR */ DEFINE_INT_CURR("AUD ") /* Australian Dollar */ DEFINE_INT_CURR("AWG ") /* Aruba Guilder */ DEFINE_INT_CURR("AZM ") /* Azerbaijan Manat */ DEFINE_INT_CURR("BAK ") /* Bosnian and Herzegovina Convertible Mark */ DEFINE_INT_CURR("BBD ") /* Barbados Dollar */ DEFINE_INT_CURR("BDT ") /* Bangladesh Taka */ +DEFINE_INT_CURR("BEF ") /* Belgian Franc -> EUR */ DEFINE_INT_CURR("BGL ") /* Bulgarian Lev */ DEFINE_INT_CURR("BHD ") /* Bahraini Dinar */ DEFINE_INT_CURR("BIF ") /* Burundi Franc */ @@ -42,6 +45,7 @@ DEFINE_INT_CURR("CVE ") /* Cape Verde Escudo */ DEFINE_INT_CURR("CYP ") /* Cypriot Pound */ DEFINE_INT_CURR("CZK ") /* Czech Koruna */ +DEFINE_INT_CURR("DEM ") /* German Mark -> EUR */ DEFINE_INT_CURR("DJF ") /* Djibouti Franc */ DEFINE_INT_CURR("DKK ") /* Danish Krone (Faroe Islands, Greenland) */ DEFINE_INT_CURR("DOP ") /* Dominican Republic */ @@ -49,16 +53,20 @@ DEFINE_INT_CURR("EEK ") /* Estonian Kroon */ DEFINE_INT_CURR("EGP ") /* Egyptian Pound */ DEFINE_INT_CURR("ERN ") /* Eritrean Nakfa */ +DEFINE_INT_CURR("ESP ") /* Spanish Peseta -> EUR */ DEFINE_INT_CURR("ETB ") /* Ethiopian Birr */ DEFINE_INT_CURR("EUR ") /* European Union Euro */ +DEFINE_INT_CURR("FIM ") /* Finnish Markka -> EUR */ DEFINE_INT_CURR("FJD ") /* Fiji Dollar */ DEFINE_INT_CURR("FKP ") /* Falkland Islands Pound (Malvinas) */ +DEFINE_INT_CURR("FRF ") /* French Franc -> EUR */ DEFINE_INT_CURR("GBP ") /* British Pound */ DEFINE_INT_CURR("GEL ") /* Georgia Lari */ DEFINE_INT_CURR("GHC ") /* Ghana Cedi */ DEFINE_INT_CURR("GIP ") /* Gibraltar Pound */ DEFINE_INT_CURR("GMD ") /* Gambian Dalasi */ DEFINE_INT_CURR("GNF ") /* Guinea Franc */ +DEFINE_INT_CURR("GRD ") /* Greek Drachma -> EUR */ DEFINE_INT_CURR("GTQ ") /* Guatemala Quetzal */ DEFINE_INT_CURR("GYD ") /* Guyana Dollar */ DEFINE_INT_CURR("HKD ") /* Hong Kong Dollar */ @@ -67,12 +75,14 @@ DEFINE_INT_CURR("HTG ") /* Haiti Gourde */ DEFINE_INT_CURR("HUF ") /* Hungarian Forint */ DEFINE_INT_CURR("IDR ") /* Indonesia Rupiah */ +DEFINE_INT_CURR("IEP ") /* Irish Pound -> EUR */ DEFINE_INT_CURR("ILS ") /* Israeli Shekel */ DEFINE_INT_CURR("IMP ") /* Isle of Man Pounds */ DEFINE_INT_CURR("INR ") /* Indian Rupee (Bhutan) */ DEFINE_INT_CURR("IQD ") /* Iraqi Dinar */ DEFINE_INT_CURR("IRR ") /* Iranian Rial */ DEFINE_INT_CURR("ISK ") /* Iceland Krona */ +DEFINE_INT_CURR("ITL ") /* Italian Lira -> EUR */ DEFINE_INT_CURR("JMD ") /* Jamaican Dollar */ DEFINE_INT_CURR("JOD ") /* Jordanian Dinar */ DEFINE_INT_CURR("JPY ") /* Japanese Yen */ @@ -91,6 +101,7 @@ DEFINE_INT_CURR("LRD ") /* Liberian Dollar */ DEFINE_INT_CURR("LSL ") /* Lesotho Maloti */ DEFINE_INT_CURR("LTL ") /* Lithuanian Litas */ +DEFINE_INT_CURR("LUF ") /* Luxembourg Franc -> EUR */ DEFINE_INT_CURR("LVL ") /* Latvia Lat */ DEFINE_INT_CURR("LYD ") /* Libyan Arab Jamahiriya Dinar */ DEFINE_INT_CURR("MAD ") /* Moroccan Dirham */ @@ -111,6 +122,7 @@ DEFINE_INT_CURR("NAD ") /* Namibia Dollar */ DEFINE_INT_CURR("NGN ") /* Nigeria Naira */ DEFINE_INT_CURR("NIO ") /* Nicaragua Cordoba Oro */ +DEFINE_INT_CURR("NLG ") /* Netherlands Guilder -> EUR */ DEFINE_INT_CURR("NOK ") /* Norwegian Krone */ DEFINE_INT_CURR("NPR ") /* Nepalese Rupee */ DEFINE_INT_CURR("NZD ") /* New Zealand Dollar */ @@ -121,6 +133,7 @@ DEFINE_INT_CURR("PHP ") /* Philippines Peso */ DEFINE_INT_CURR("PKR ") /* Pakistan Rupee */ DEFINE_INT_CURR("PLN ") /* Polish Zloty */ +DEFINE_INT_CURR("PTE ") /* Portugese Escudo -> EUR */ DEFINE_INT_CURR("PYG ") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR ") /* Qatar Rial */ DEFINE_INT_CURR("ROL ") /* Romanian Leu */