--- a/locale/bg_BG.ISO8859-5.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/bg_BG.ISO8859-5.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-bg-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_5
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Bulgarian, Bulgaria (ISO8859-5)
 locale_desc	Bulgaria (ISO8859-5)

--- a/locale/ca_ES.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/ca_ES.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,5 +1,5 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	ca_ES@currency=ESP
 pkg_name	SUNWlang-ca-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_aliases misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_aliases
 locale_desc	Catalan, Spain (ISO8859-1)

--- a/locale/ca_ES.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/ca_ES.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-ca-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_15
+prototype	misc/prototype.iso_alt

--- a/locale/cs_CZ.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/cs_CZ.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,3 +1,3 @@
 pkg_name	SUNWlang-cs-extra
-prototype	misc/prototype.iso misc/prototype.locale_aliases misc/prototype.iso8859_2
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 locale_desc	Czech Republic (ISO8859-2)

--- a/locale/da_DK.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/da_DK.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-da-extra
-prototype	misc/prototype.iso misc/prototype.locale_aliases misc/prototype.iso8859_1
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Danish, Denmark (ISO8859-1)
 locale_desc	Denmark (ISO8859-1)

--- a/locale/da_DK.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/da_DK.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-da-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_15
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Danish, Denmark (ISO8859-15)
 locale_desc	Denmark (ISO8859-15)

--- a/locale/de_AT.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/de_AT.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,5 +1,5 @@
 # iso8859-1 locale should use old currency instead of Euro
 pkg_name	SUNWlang-de-extra
-prototype	misc/prototype.de_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # German, Austria (ISO8859-1)
 locale_desc	Austria (ISO8859-1)

--- a/locale/de_AT.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/de_AT.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-de-extra
-prototype	misc/prototype.de_iso misc/prototype.iso8859_15
+prototype	misc/prototype.iso_alt
 # German, Austria (ISO8859-15)
 locale_desc	Austria (ISO8859-15)

--- a/locale/de_AT.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/de_AT.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,3 +1,3 @@
 # German, Austria (UTF-8)
 locale_desc	Austria (UTF-8)
-prototype	misc/prototype.de
+prototype	misc/prototype.utf8_alt

--- a/locale/de_CH.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/de_CH.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-de-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias

--- a/locale/de_CH.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/de_CH.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.de
+prototype	misc/prototype.utf8_alt

--- a/locale/de_DE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/de_DE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,5 +1,5 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	de_DE@currency=DEM
 pkg_name	SUNWlang-de-extra
-prototype	misc/prototype.de_iso misc/prototype.locale_aliases misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_aliases
 locale_desc	Germany (ISO8859-1)

--- a/locale/de_DE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/de_DE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-de-extra
-prototype	misc/prototype.de_iso misc/prototype.locale_alias misc/prototype.iso8859_15
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # German, Germany (ISO8859-15)
 locale_desc	Germany (ISO8859-15)

--- a/locale/de_DE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/de_DE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 # German, Germany (UTF-8)
 locale_desc	Germany (UTF-8)
 pkg_name	SUNWlang-deDE
-prototype	misc/prototype.de misc/prototype.locale_alias
+prototype	misc/prototype.utf8_alt misc/prototype.locale_alias

--- a/locale/de_LU.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/de_LU.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.de
+prototype	misc/prototype.utf8_alt

--- a/locale/el_CY.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/el_CY.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.default misc/prototype.el
+prototype	misc/prototype.utf8 misc/prototype.locale_alias

--- a/locale/el_GR.ISO8859-7.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/el_GR.ISO8859-7.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-el-extra
-prototype	misc/prototype.iso misc/prototype.locale_aliases misc/prototype.iso8859_7
+prototype	misc/prototype.iso misc/prototype.locale_aliases misc/prototype.el.sun_eu_greek
 # Greek, Greece (ISO8859-7)
 locale_desc	Greece (ISO8859-7)

--- a/locale/en_AU.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/en_AU.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # English, Australia (ISO8859-1)
 locale_desc	Australia (ISO8859-1)

--- a/locale/en_CA.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/en_CA.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-en-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso misc/prototype.locale_alias

--- a/locale/en_GB.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/en_GB.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_1
-# English, United Kingdom (ISO8859-15)
+prototype	misc/prototype.iso misc/prototype.locale_alias
+# English, United Kingdom (ISO8859-1)
 locale_desc	United Kingdom (ISO8859-1)

--- a/locale/en_GB.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/en_GB.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_15
+prototype	misc/prototype.iso
 # English, United Kingdom (ISO8859-15)
 locale_desc	United Kingdom (ISO8859-15)

--- a/locale/en_IE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/en_IE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	en_IE@currency=IEP
 pkg_name	SUNWlang-en-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso misc/prototype.locale_alias

--- a/locale/en_IE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/en_IE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-en-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_15
+prototype	misc/prototype.iso

--- a/locale/en_NZ.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/en_NZ.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # English, New Zealand (ISO8859-1)
 locale_desc	New Zealand (ISO8859-1)

--- a/locale/en_US.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/en_US.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_1 misc/prototype.en_extra
+prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.en_extra
 # English, United States (ISO8859-1)
 locale_desc	U.S.A. (en_US.ISO8859-1)

--- a/locale/en_US.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/en_US.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_15
+prototype	misc/prototype.iso
 # English, United States (ISO8859-15)
 locale_desc	U.S.A. (en_US.ISO8859-15)

--- a/locale/es_AR.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_AR.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Argentina (ISO8859-1)
 locale_desc	Argentina (ISO8859-1)

--- a/locale/es_AR.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_AR.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_BO.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_BO.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Bolivia (ISO8859-1)
 locale_desc	Bolivia (ISO8859-1)

--- a/locale/es_BO.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_BO.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_CL.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_CL.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Chile (ISO8859-1)
 locale_desc	Chile (ISO8859-1)

--- a/locale/es_CL.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_CL.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_CO.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_CO.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Colombia (ISO8859-1)
 locale_desc	Colombia (ISO8859-1)

--- a/locale/es_CO.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_CO.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_CR.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_CR.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Costa Rica (ISO8859-1)
 locale_desc	Costa Rica (ISO8859-1)

--- a/locale/es_CR.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_CR.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_EC.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_EC.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Ecuador (ISO8859-1)
 locale_desc	Ecuador (ISO8859-1)

--- a/locale/es_EC.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_EC.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_ES.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_ES.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,6 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	es_ES@currency=ESP
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_aliases misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_aliases
 # Spanish, Spain (ISO8859-1)
 locale_desc	Spain (ISO8859-1)

--- a/locale/es_ES.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_ES.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_15
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Spain (ISO8859-15)
 locale_desc	Spain (ISO8859-15)

--- a/locale/es_ES.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_ES.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-esES
-prototype	misc/prototype.es misc/prototype.locale_alias
+prototype	misc/prototype.utf8_alt misc/prototype.locale_alias
 # Spanish, Spain (UTF-8)
 locale_desc	Spain (UTF-8)

--- a/locale/es_GT.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_GT.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Guatemala (ISO8859-1)
 locale_desc	Guatemala (ISO8859-1)

--- a/locale/es_GT.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_GT.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_MX.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_MX.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Mexico (ISO8859-1)
 locale_desc	Mexico (ISO8859-1)

--- a/locale/es_MX.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_MX.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_NI.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_NI.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Nicaragua (ISO8859-1)
 locale_desc	Nicaragua (ISO8859-1)

--- a/locale/es_NI.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_NI.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_PA.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_PA.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Panama (ISO8859-1)
 locale_desc	Panama (ISO8859-1)

--- a/locale/es_PA.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_PA.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_PE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_PE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Peru (ISO8859-1)
 locale_desc	Peru (ISO8859-1)

--- a/locale/es_PE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_PE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_PY.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_PY.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Paraguay (ISO8859-1)
 locale_desc	Paraguay (ISO8859-1)

--- a/locale/es_PY.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_PY.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_SV.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_SV.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, El Salvador (ISO8859-1)
 locale_desc	El Salvador (ISO8859-1)

--- a/locale/es_SV.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_SV.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_US.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_US.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,3 +1,3 @@
 # Spanish, United States (UTF-8)
 locale_desc	Spanish, U.S.A. (UTF-8)
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_UY.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_UY.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Uruguay (ISO8859-1)
 locale_desc	Uruguay (ISO8859-1)

--- a/locale/es_UY.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_UY.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/es_VE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_VE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-es-extra
-prototype	misc/prototype.es_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Spanish, Venezuela (ISO8859-1)
 locale_desc	Venezuela (ISO8859-1)

--- a/locale/es_VE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/es_VE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.es
+prototype	misc/prototype.utf8_alt

--- a/locale/et_EE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/et_EE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-et-extra
-prototype	misc/prototype.iso misc/prototype.locale_aliases misc/prototype.iso8859_15
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Estonian, Estonia (ISO8859-15)
 locale_desc	Estonia (ISO8859-15)

--- a/locale/fi_FI.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fi_FI.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,6 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	fi_FI@currency=FIM
 pkg_name	SUNWlang-fi-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Finnish, Finland (ISO8859-1)
 locale_desc	Finland (ISO8859-1)

--- a/locale/fi_FI.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fi_FI.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-fi-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_15
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Finnish, Finland (ISO8859-15)
 locale_desc	Finland (ISO8859-15)

--- a/locale/fr_BE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_BE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	fr_BE@currency=BEF
 pkg_name	SUNWlang-fr-extra
-prototype	misc/prototype.fr_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias

--- a/locale/fr_BE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_BE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-fr-extra
-prototype	misc/prototype.fr_iso misc/prototype.iso8859_15
+prototype	misc/prototype.iso_alt

--- a/locale/fr_BE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_BE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.fr
+prototype	misc/prototype.utf8_alt

--- a/locale/fr_CA.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_CA.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-fr-extra
-prototype	misc/prototype.fr_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias

--- a/locale/fr_CA.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_CA.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.fr
+prototype	misc/prototype.utf8_alt

--- a/locale/fr_CH.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_CH.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-fr-extra
-prototype	misc/prototype.fr_iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias

--- a/locale/fr_CH.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_CH.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.fr
+prototype	misc/prototype.utf8_alt

--- a/locale/fr_FR.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_FR.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,6 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	fr_FR@currency=FRF
 pkg_name	SUNWlang-fr-extra
-prototype	misc/prototype.fr_iso misc/prototype.locale_aliases misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_aliases
 # French, France (ISO8859-1)
 locale_desc	France (ISO8859-1)

--- a/locale/fr_FR.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_FR.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-fr-extra
-prototype	misc/prototype.fr_iso misc/prototype.locale_alias misc/prototype.iso8859_15
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # French, France (ISO8859-15)
 locale_desc	France (ISO8859-15)

--- a/locale/fr_FR.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_FR.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-frFR
-prototype	misc/prototype.fr misc/prototype.locale_alias
+prototype	misc/prototype.utf8_alt misc/prototype.locale_alias
 # French, France (UTF-8)
 locale_desc	France (UTF-8)

--- a/locale/fr_LU.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/fr_LU.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,1 +1,1 @@
-prototype	misc/prototype.fr
+prototype	misc/prototype.utf8_alt

--- a/locale/he_IL.ISO8859-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/he_IL.ISO8859-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-he-extra
-prototype	misc/prototype.iso
+prototype	misc/prototype.iso_alt misc/prototype.locale_aliases misc/prototype.he_extra

--- a/locale/hr_HR.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/hr_HR.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-hr-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_2
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Croatian, Croatia (ISO8859-2)
 locale_desc	Croatia (ISO8859-2)

--- a/locale/hu_HU.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/hu_HU.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-hu-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_2
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Hungarian, Hungary (ISO8859-2)
 locale_desc	Hungary (ISO8859-2)

--- a/locale/is_IS.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/is_IS.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-is-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_1
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Icelandic, Iceland (ISO8859-1)
 locale_desc	Iceland (ISO8859-1)

--- a/locale/it_IT.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/it_IT.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,6 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	it_IT@currency=ITL
 pkg_name	SUNWlang-it-extra
-prototype	misc/prototype.iso misc/prototype.locale_aliases misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_aliases
 # Italian, Italy (ISO8859-1)
 locale_desc	Italy (ISO8859-1)

--- a/locale/it_IT.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/it_IT.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-it-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_15
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Italian, Italy (ISO8859-15)
 locale_desc	Italy (ISO8859-15 - Euro)

--- a/locale/it_IT.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/it_IT.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,3 +1,3 @@
 # Italian, Italy (UTF-8)
 locale_desc	Italy (UTF-8)
-prototype	misc/prototype.it misc/prototype.locale_alias
+prototype	misc/prototype.utf8_alt misc/prototype.locale_alias

--- a/locale/lt_LT.ISO8859-13.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/lt_LT.ISO8859-13.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-lt-extra
-prototype	misc/prototype.iso
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Lithuanian, Lithuania (ISO8859-13)
 locale_desc	Lithuania (ISO8859-13)

--- a/locale/make.mk	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/make.mk	Fri Aug 28 21:06:52 2009 +0200
@@ -28,6 +28,7 @@
 charmap = $(firstword $(subst @, ,$(lastword $(subst ., ,$(1)))))
 spec_gen = $(if $(shell $(GNU_GREP) '^$(1)' $<| cut -f2-),$(shell $(GNU_GREP) '^$(1)' $<| cut -f2-),$(2))
 classpath = $(subst $() $(),:,$(filter %.jar,$^))
+locale_alias = $(shell ${PERL} -ne 'next unless /^$(1)\s/; s/^\S+\s+//; print' < misc/locale.alias)
 
 
 
@@ -44,7 +45,13 @@
 		    fi) > $@
 quiet_cmd_expand = EXPAND $<
       cmd_expand = (for src in $(shell cat $<); do \
-			bash -c 'while read l; do LOC=$* MACH=$(MACH) MACH64=$(MACH64) LOC_ALIAS='$(shell ${PERL} -ne 'next unless /^$*\s/; s/^\S+\s+//; print' < misc/locale.alias)' eval "echo \"$$l\""; done' < $$src; \
+			bash -c 'while read l; do \
+				LOC=$* \
+				MACH=$(MACH) \
+				MACH64=$(MACH64) \
+				LOC_ALIAS='$(call locale_alias,$*)' \
+				CHARMAP='$(call charmap,$*)' \
+					eval "echo \"$$l\""; done' < $$src; \
 		   done) > $@
 
 
@@ -58,10 +65,10 @@
 	$(call cmd,gendesc)
 
 $(LOCALES:%=locale/.prototype/%): locale/.prototype/%: locale/%.spec locale/.prototype/.dir
-	$(Q)echo "$(call spec_gen,prototype,misc/prototype.default)" >$@
+	$(Q)echo "$(call spec_gen,prototype,misc/prototype.utf8)" >$@
 
 $(LOCALES:%=locale/.manifest/%): locale/.manifest/%: locale/%.spec locale/.manifest/.dir
-	$(Q)echo "$(call spec_gen,manifest,misc/manifest.header misc/manifest.default)" >$@
+	$(Q)echo "$(call spec_gen,manifest,misc/manifest.header misc/manifest.utf-8)" >$@
 
 $(LOCALES:%=locale/.locale_map/%): locale/.locale_map/%: locale/%.spec locale/.locale_map/.dir
 	$(Q)echo "$(call spec_gen,locale_map,misc/locale_map.default)" >$@
@@ -70,7 +77,7 @@
 
 $(LOCALES:%=locale/.prototype/%.expand): locale/.prototype/%.expand: locale/.prototype/%
 	$(call cmd,expand)
-	$(Q)cat $< | xargs echo "$(@D)/$*.expand $(@D)/$*.d: misc/locale.alias " > $(@D)/$*.d
+	$(Q)cat $< | xargs echo "$(@D)/$*.expand: misc/locale.alias " > $(@D)/$*.d
 
 $(LOCALES:%=locale/.manifest/%.expand): locale/.manifest/%.expand: locale/.manifest/%
 	$(call cmd,expand)

--- a/locale/mk_MK.ISO8859-5.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/mk_MK.ISO8859-5.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-mk-extra
-prototype	misc/prototype.iso misc/prototype.locale_alias misc/prototype.iso8859_5
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Macedonian, Macedonia (ISO8859-5)
 locale_desc	Macedonia (ISO8859-5)

--- a/locale/nl_BE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/nl_BE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	nl_BE@currency=BEF
 pkg_name	SUNWlang-nl-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_1
+prototype	misc/prototype.iso

--- a/locale/nl_BE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/nl_BE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-nl-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_15
+prototype	misc/prototype.iso

--- a/locale/nl_NL.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/nl_NL.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,6 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	nl_NL@currency=NLG
 pkg_name	SUNWlang-nl-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_1
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Dutch, Netherlands (ISO8859-1)
 locale_desc	Netherlands (ISO8859-1)

--- a/locale/nl_NL.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/nl_NL.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-nl-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_15
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Dutch, Netherlands (ISO8859-15)
 locale_desc	Netherlands (ISO8859-15)

--- a/locale/pl_PL.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/pl_PL.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-pl-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_2
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Polish, Poland (ISO8859-2)
 locale_desc	Poland (ISO8859-2)

--- a/locale/pl_PL.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/pl_PL.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,3 +1,3 @@
 # Polish, Poland (UTF-8)
 locale_desc	Poland (UTF-8)
-prototype	misc/prototype.default misc/prototype.locale_alias
+prototype	misc/prototype.utf8 misc/prototype.locale_alias

--- a/locale/pt_BR.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/pt_BR.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
-pkg_name	SUNWlang-pt-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_1
+pkg_name	SUNWlang-ptBR-extra
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Portuguese, Brazil (ISO8859-1)
 locale_desc	Brazil (ISO8859-1)

--- a/locale/pt_PT.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/pt_PT.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,6 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	pt_PT@currency=PTE
 pkg_name	SUNWlang-pt-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_1
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Portuguese, Portugal (ISO8859-1)
 locale_desc	Portugal (ISO8859-1)

--- a/locale/pt_PT.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/pt_PT.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-pt-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_15
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Portuguese, Portugal (ISO8859-15)
 locale_desc	Portugal (ISO8859-15)

--- a/locale/ro_RO.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/ro_RO.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-ro-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_2
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Romanian, Romania (ISO8859-2)
 locale_desc	Romania (ISO8859-2)

--- a/locale/ru_RU.ISO8859-5.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/ru_RU.ISO8859-5.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-ru-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_5
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Russian, Russia (ISO8859-5)
 locale_desc	Russia (ISO8859-5)

--- a/locale/ru_RU.KOI8-R.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/ru_RU.KOI8-R.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-ru-extra
-prototype	misc/prototype.iso
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Russian, Russia (KOI8-R)
 locale_desc	Russia (KOI8-R)

--- a/locale/ru_RU.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/ru_RU.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,3 +1,3 @@
 # Russian, Russia (UTF-8)
 locale_desc	Russia (UTF-8)
-prototype	misc/prototype.default misc/prototype.locale_alias
+prototype	misc/prototype.utf8 misc/prototype.locale_alias

--- a/locale/sk_SK.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/sk_SK.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,6 +1,6 @@
 # iso locale should use SKK (Slovak has Euro from 2009-01-01)
 cldr_variant	sk_SK@currency=SKK
 pkg_name	SUNWlang-sk-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_2
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Slovak, Slovakia (ISO8859-2)
 locale_desc	Slovakia (ISO8859-2)

--- a/locale/sl_SI.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/sl_SI.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,6 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	sl_SI@currency=SIT
 pkg_name	SUNWlang-sl-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_2
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Slovenian, Slovenia (ISO8859-2)
 locale_desc	Slovenia (ISO8859-2)

--- a/locale/sq_AL.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/sq_AL.ISO8859-2.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-sq-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_2
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Albanian, Albania (ISO8859-2)
 locale_desc	Albania (ISO8859-2)

--- a/locale/sr_CS.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/sr_CS.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -2,3 +2,4 @@
 cldr_variant	sr_Cyrl_RS
 # Serbian, Serbia (UTF-8)
 locale_desc	Serbia And Montenegro (UTF-8)
+prototype	misc/prototype.utf8 misc/prototype.locale_alias

--- a/locale/sr_YU.ISO8859-5.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/sr_YU.ISO8859-5.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,6 +1,6 @@
 # because CLDR bug #2023, can not use sr_YU@...
 cldr_variant	sr_Cyrl_RS
 pkg_name	SUNWlang-sr-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_5
+prototype	misc/prototype.iso misc/prototype.locale_alias
 # Serbian, Serbia (ISO8859-5)
 locale_desc	Serbia (ISO8859-5)

--- a/locale/sv_SE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/sv_SE.ISO8859-1.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-sv-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_1
+prototype	misc/prototype.iso_alt misc/prototype.locale_aliases
 # Swedish, Sweden (ISO8859-1)
 locale_desc	Sweden (ISO8859-1)

--- a/locale/sv_SE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/sv_SE.ISO8859-15.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-sv-extra
-prototype	misc/prototype.iso misc/prototype.iso8859_15
+prototype	misc/prototype.iso_alt misc/prototype.locale_alias
 # Swedish, Sweden (ISO8859-15)
 locale_desc	Sweden (ISO8859-15)

--- a/locale/sv_SE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/sv_SE.UTF-8.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,3 +1,3 @@
 # Swedish, Sweden (UTF-8)
 locale_desc	Sweden (UTF-8)
-prototype	misc/prototype.sv misc/prototype.locale_alias
+prototype	misc/prototype.utf8_alt misc/prototype.locale_alias

--- a/locale/tr_TR.ISO8859-9.spec	Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/tr_TR.ISO8859-9.spec	Fri Aug 28 21:06:52 2009 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-tr-extra
-prototype	misc/prototype.iso
+prototype	misc/prototype.iso misc/prototype.locale_aliases
 # Turkish, Turkey (ISO8859-9)
 locale_desc	Turkey (ISO8859-9)

--- a/misc/locale.alias	Fri Aug 28 21:06:52 2009 +0200
+++ b/misc/locale.alias	Fri Aug 28 21:06:52 2009 +0200
@@ -1,24 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").  
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+
 #ca_ES.ISO8859-1	ca
 #cs_CZ.ISO8859-2	cs
 #da_DK.ISO8859-1	da
 #de_DE.ISO8859-1	de
+#el_GR.ISO8859-7	el
+#el_GR.ISO8859-7	el.sun_eu_greek
+#es_ES.ISO8859-1	es
+#et_EE.ISO8859-15	e
+#fi_FI.ISO8859-1	fi
+#fr_FR.ISO8859-1	fr
+#hu_HU.ISO8859-2	hu
 #it_IT.ISO8859-1	it
+#lt_LT.ISO8859-13	lt
 #lv_LV.ISO8859-13	lv
-es_BO.ISO8859-1	es_BO
-es_CL.ISO8859-1	es_CL
-es_CO.ISO8859-1	es_CO
+#nl_NL.ISO8859-1	nl
+#pl_PL.ISO8859-2	pl
+#pt_PT.ISO8859-1	pt
+#ru_RU.ISO8859-5	ru
+#sv_SE.ISO8859-1	sv
+#tr_TR.ISO8859-9	tr
 bg_BG.ISO8859-5	bg_BG
 ca_ES.ISO8859-1	ca_ES
-ca_ES.ISO8859-15	ca_ES.ISO8859-15@euro
 cs_CZ.ISO8859-2	cs_CZ
 da_DK.ISO8859-1	da_DK
 da_DK.ISO8859-15	da.ISO8859-15
 de_AT.ISO8859-1	de_AT
+de_CH.ISO8859-1	de_CH
 de_DE.ISO8859-1	de_DE
 de_DE.ISO8859-15	de.ISO8859-15
-de_CH.ISO8859-1	de_CH
 de_DE.UTF-8	de.UTF-8
-#el_GR.ISO8859-7	el
+el_CY.UTF-8	el.UTF-8
 el_GR.ISO8859-7	el_GR
 en_AU.ISO8859-1	en_AU
 en_CA.ISO8859-1	en_CA
@@ -27,39 +62,62 @@
 en_NZ.ISO8859-1	en_NZ
 en_US.ISO8859-1 en_US
 es_AR.ISO8859-1	es_AR
-#es_ES.ISO8859-1	es
+es_BO.ISO8859-1	es_BO
+es_CL.ISO8859-1	es_CL
+es_CO.ISO8859-1	es_CO
+es_CR.ISO8859-1	es_CR
+es_EC.ISO8859-1	es_EC
 es_ES.ISO8859-1	es_ES
-es_CR.ISO8859-1	es_CR
+es_ES.ISO8859-15	es.ISO8859-15
+es_ES.UTF-8	es.UTF-8
+es_GT.ISO8859-1	es_GT
+es_MX.ISO8859-1	es_MX
+es_NI.ISO8859-1	es_NI
 es_PA.ISO8859-1	es_PA
 es_PE.ISO8859-1	es_PE
+es_PY.ISO8859-1	es_PY
 es_SV.ISO8859-1	es_SV
 es_UY.ISO8859-1	es_UY
 es_VE.ISO8859-1	es_VE
-es_ES.ISO8859-15	es.ISO8859-15
-es_GT.ISO8859-1	es_GT
-es_MX.ISO8859-1	es_MX
-es_NI.ISO8859-1	es_NI
-es_ES.UTF-8	es.UTF-8
-es_EC.ISO8859-1	es_EC
-#et_EE.ISO8859-15	e
 et_EE.ISO8859-15	et_EE
 fi_FI.ISO8859-1	fi_FI
 fi_FI.ISO8859-15	fi.ISO8859-15
 fr_BE.ISO8859-1	fr_BE
 fr_CA.ISO8859-1 fr_CA
 fr_CH.ISO8859-1 fr_CH
-#fr_FR.ISO8859-1	fr
 fr_FR.ISO8859-1	fr_FR
 fr_FR.ISO8859-15	fr.ISO8859-15
 fr_FR.UTF-8	fr.UTF-8
+#he_IL.ISO8859-8	he
+he_IL.ISO8859-8	he_IL
 hr_HR.ISO8859-2	hr_HR
 hu_HU.ISO8859-2	hu_HU
 is_IS.ISO8859-1	is_IS
 it_IT.ISO8859-1	it_IT
 it_IT.ISO8859-15	it.ISO8859-15
 it_IT.UTF-8	it.UTF-8
+lt_LT.ISO8859-13	lt_LT
 lv_LV.ISO8859-13	lv_LV
 mk_MK.ISO8859-5	mk_MK
+nl_BE.ISO8859-1	nl_BE
+nl_NL.ISO8859-1	nl_NL
+nl_NL.ISO8859-15	nl.ISO8859-15
+pl_PL.ISO8859-2	pl_PL
 pl_PL.UTF-8	pl.UTF-8
+pt_BR.ISO8859-1	pt_BR
+pt_PT.ISO8859-1	pt_PT
+pt_PT.ISO8859-15	pt.ISO8859-15
+ro_RO.ISO8859-2	ro_RO
+ru_RU.ISO8859-5	ru_RU
+ru_RU.KOI8-R	ru.koi8-r
 ru_RU.UTF-8	ru.UTF-8
+sk_SK.ISO8859-2	sk_SK
+sl_SI.ISO8859-2	sl_SI
+sq_AL.ISO8859-2	sq_AL
+sr_CS.UTF-8	sr_CS
+#sr_YU.ISO8859-5	sr_SP
+sr_YU.ISO8859-5	sr_YU
+sv_SE.ISO8859-1	sv_SE
+sv_SE.ISO8859-15	sv.ISO8859-15
 sv_SE.UTF-8	sv.UTF-8
+tr_TR.ISO8859-9	tr_TR

--- a/misc/manifest.default	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# manifest.default
-# LOC:$LOC LANG:$LANG MACH64:$MACH64
-
-dir mode=0755 owner=root group=sys path=usr
-dir mode=0755 owner=root group=bin path=usr/lib
-dir mode=0755 owner=root group=bin path=usr/lib/locale
-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}
-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_COLLATE
-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_CTYPE
-link path=usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF target=../../common/LC_CTYPE/LCL_DEF_unicode
-link path=usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat target=../../common/LC_CTYPE/ldterm_unicode.dat
-link path=usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so target=../../common/LC_CTYPE/wdresolve_unicode.so
-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_MESSAGES
-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_MONETARY
-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_NUMERIC
-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_TIME
-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LO_LTYPE
-link path=usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1 target=../../common/LO_LTYPE/umle.layout.so.1
-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/${MACH64}
-file usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 mode=0555 owner=root group=bin path=usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3
-link path=usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3 target=../../common/amd64/methods_unicode.so.3
-file usr/lib/locale/${LOC}/${LOC}.so.3 mode=0555 owner=root group=bin path=usr/lib/locale/${LOC}/${LOC}.so.3
-file usr/lib/locale/${LOC}/locale_description mode=0644 owner=root group=bin path=usr/lib/locale/${LOC}/locale_description
-file usr/lib/locale/${LOC}/locale_map mode=0644 owner=root group=bin path=usr/lib/locale/${LOC}/locale_map
-link path=usr/lib/locale/${LOC}/methods_unicode.so.3 target=../common/methods_unicode.so.3

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/manifest.utf8	Fri Aug 28 21:06:52 2009 +0200
@@ -0,0 +1,25 @@
+# manifest.default
+# LOC:$LOC LANG:$LANG MACH64:$MACH64
+
+dir mode=0755 owner=root group=sys path=usr
+dir mode=0755 owner=root group=bin path=usr/lib
+dir mode=0755 owner=root group=bin path=usr/lib/locale
+dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}
+dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_COLLATE
+dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_CTYPE
+link path=usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF target=../../common/LC_CTYPE/LCL_DEF_unicode
+link path=usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat target=../../common/LC_CTYPE/ldterm_unicode.dat
+link path=usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so target=../../common/LC_CTYPE/wdresolve_unicode.so
+dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_MESSAGES
+dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_MONETARY
+dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_NUMERIC
+dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_TIME
+dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LO_LTYPE
+link path=usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1 target=../../common/LO_LTYPE/umle.layout.so.1
+dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/${MACH64}
+file usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 mode=0555 owner=root group=bin path=usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3
+link path=usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3 target=../../common/amd64/methods_unicode.so.3
+file usr/lib/locale/${LOC}/${LOC}.so.3 mode=0555 owner=root group=bin path=usr/lib/locale/${LOC}/${LOC}.so.3
+file usr/lib/locale/${LOC}/locale_description mode=0644 owner=root group=bin path=usr/lib/locale/${LOC}/locale_description
+file usr/lib/locale/${LOC}/locale_map mode=0644 owner=root group=bin path=usr/lib/locale/${LOC}/locale_map
+link path=usr/lib/locale/${LOC}/methods_unicode.so.3 target=../common/methods_unicode.so.3

--- a/misc/prototype.de	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# prototype.de	LOC: $LOC, MACH64: $MACH64
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
-s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
-s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
-d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
-s none usr/lib/locale/${LOC}/LC_MESSAGES=../de.UTF-8/LC_MESSAGES
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-s none usr/lib/locale/${LOC}/LC_TIME=../de.UTF-8/LC_TIME
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
-s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3

--- a/misc/prototype.de_iso	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# LOC: $LOC, MACH64: $MACH64
-# default.de_iso
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_MESSAGES=../de/LC_MESSAGES
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-s none usr/lib/locale/${LOC}/LC_TIME=../de/LC_TIME
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin

--- a/misc/prototype.default	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# prototype.default	LOC: $LOC, MACH64: $MACH64
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
-s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
-s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
-d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
-d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
-s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3

--- a/misc/prototype.el	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-# prototype.el	LOC: $LOC, MACH64: $MACH64
-
-d none usr/lib/locale/el.UTF-8 0755 root bin
-d none usr/lib/locale/el.UTF-8/LC_MESSAGES 0755 root bin
-d none usr/lib/locale/el.UTF-8/LC_TIME 0755 root bin
-d none usr/lib/locale/el.UTF-8/${MACH64} 0755 root bin
-s none usr/lib/locale/el.UTF-8/${MACH64}/el.UTF-8.so.3=../../el_CY.UTF-8/${MACH64}/el_CY.UTF-8.so.3
-s none usr/lib/locale/el.UTF-8/el.UTF-8.so.3=../el_CY.UTF-8/el_CY.UTF-8.so.3
-s none usr/lib/locale/el.UTF-8/locale_description=../el_CY.UTF-8/locale_description

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/prototype.el.sun_eu_greek	Fri Aug 28 21:06:52 2009 +0200
@@ -0,0 +1,7 @@
+# prototype.el.sun_eu_greek	LOC: $LOC, LOC_ALIAS: $LOC_ALIAS MACH64: $MACH64
+
+d none usr/lib/locale/el.sun_eu_greek 0755 root bin
+s none usr/lib/locale/el.sun_eu_greek/el.sun_eu_greek.so.3=../${LOC}/${LOC}.so.3
+s none usr/lib/locale/el.sun_eu_greek/locale_description=../${LOC}/locale_description
+d none usr/lib/locale/el.sun_eu_greek/${MACH64} 0755 root bin
+s none usr/lib/locale/el.sun_eu_greek/${MACH64}/el.sun_eu_greek.so.3=../../${LOC}/${MACH64}/${LOC}.so.3

--- a/misc/prototype.es	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# prototype.de	LOC: $LOC, MACH64: $MACH64
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
-s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
-s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
-d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
-s none usr/lib/locale/${LOC}/LC_MESSAGES=../es.UTF-8/LC_MESSAGES
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-s none usr/lib/locale/${LOC}/LC_TIME=../es.UTF-8/LC_TIME
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
-s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3

--- a/misc/prototype.es_iso	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# LOC: $LOC, MACH64: $MACH64
-# default.es_iso
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_MESSAGES=../es/LC_MESSAGES
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-s none usr/lib/locale/${LOC}/LC_TIME=../es/LC_TIME
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin

--- a/misc/prototype.fr	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# prototype.de	LOC: $LOC, MACH64: $MACH64
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
-s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
-s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
-d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
-s none usr/lib/locale/${LOC}/LC_MESSAGES=../fr.UTF-8/LC_MESSAGES
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-s none usr/lib/locale/${LOC}/LC_TIME=../fr.UTF-8/LC_TIME
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
-s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3

--- a/misc/prototype.fr_iso	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# default.fr_iso	LOC: $LOC, MACH64: $MACH64
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_MESSAGES=../fr/LC_MESSAGES
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-s none usr/lib/locale/${LOC}/LC_TIME=../fr/LC_TIME
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/prototype.he_extra	Fri Aug 28 21:06:52 2009 +0200
@@ -0,0 +1,7 @@
+# prototype.he (LOC: $LOC, MACH64: $MACH64): 	special files for 'he' locale
+
+d none usr/lib/lp 0755 root lp
+d none usr/lib/lp/locale 0755 root lp
+d none usr/lib/lp/locale/he 0755 root lp
+d none usr/lib/lp/locale/he/mp 0755 root lp
+f none usr/lib/lp/locale/he/mp/mp.conf 0444 root lp

--- a/misc/prototype.iso	Fri Aug 28 21:06:52 2009 +0200
+++ b/misc/prototype.iso	Fri Aug 28 21:06:52 2009 +0200
@@ -1,5 +1,4 @@
-# LOC: $LOC, MACH64: $MACH64
-# default.iso
+# prototype.iso (LOC: $LOC, MACH64: $MACH64): 	default iso locale prototype template
 
 d none usr 0755 root sys
 d none usr/lib 0755 root bin
@@ -7,12 +6,15 @@
 d none usr/lib/locale/${LOC} 0755 root bin
 d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
 d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
+s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../iso_8859_${CHARMAP#*ISO8859-}/LC_CTYPE/LCL_DEF
 d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin
 d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
 d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
 d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin
 d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
 s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
+d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
+s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
 d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
 f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
 f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin

--- a/misc/prototype.iso8859_1	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# prototype.iso8859_1	LOC: $LOC, MACH64: $MACH64
-
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../iso_8859_1/LC_CTYPE/LCL_DEF                                                                                                              

--- a/misc/prototype.iso8859_15	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# prototype.iso8859_15	LOC: $LOC, MACH64: $MACH64
-
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../iso_8859_15/LC_CTYPE/LCL_DEF                                                                                                              

--- a/misc/prototype.iso8859_2	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# prototype.iso8859_2	LOC: $LOC, MACH64: $MACH64
-
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../iso_8859_2/LC_CTYPE/LCL_DEF                                                                                                              

--- a/misc/prototype.iso8859_5	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# prototype.iso8859_5	LOC: $LOC, MACH64: $MACH64
-
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../iso_8859_5/LC_CTYPE/LCL_DEF                                                                                                              

--- a/misc/prototype.iso8859_7	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# prototype.iso8859_7	LOC: $LOC, MACH64: $MACH64
-
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../iso_8859_7/LC_CTYPE/LCL_DEF                                                                                                              

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/prototype.iso_alt	Fri Aug 28 21:06:52 2009 +0200
@@ -0,0 +1,22 @@
+# prototype.iso_alt (LOC: $LOC, MACH64: $MACH64):	 equal to prototype.iso except LC_TIME/ and LC_MESSAGES are links to xx
+
+d none usr 0755 root sys
+d none usr/lib 0755 root bin
+d none usr/lib/locale 0755 root bin
+d none usr/lib/locale/${LOC} 0755 root bin
+d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
+d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
+s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../iso_8859_${CHARMAP#*ISO8859-}/LC_CTYPE/LCL_DEF
+s none usr/lib/locale/${LOC}/LC_MESSAGES=../${LOC:0:2}/LC_MESSAGES
+d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
+d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
+s none usr/lib/locale/${LOC}/LC_TIME=../${LOC:0:2}/LC_TIME
+d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
+s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
+d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
+s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
+d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
+f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
+f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
+f none usr/lib/locale/${LOC}/locale_description 0644 root bin
+f none usr/lib/locale/${LOC}/locale_map 0644 root bin

--- a/misc/prototype.it	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# prototype.de	LOC: $LOC, MACH64: $MACH64
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
-s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
-s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
-d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
-s none usr/lib/locale/${LOC}/LC_MESSAGES=../it.UTF-8/LC_MESSAGES
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-s none usr/lib/locale/${LOC}/LC_TIME=../it.UTF-8/LC_TIME
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
-s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3

--- a/misc/prototype.sv	Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# prototype.sv	LOC: $LOC, MACH64: $MACH64
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/locale 0755 root bin
-d none usr/lib/locale/${LOC} 0755 root bin
-d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
-d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
-s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
-s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
-d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
-s none usr/lib/locale/${LOC}/LC_MESSAGES=../sv.UTF-8/LC_MESSAGES
-d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
-d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
-s none usr/lib/locale/${LOC}/LC_TIME=../sv.UTF-8/LC_TIME
-d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
-d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
-d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
-f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
-s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
-f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
-s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/prototype.utf8	Fri Aug 28 21:06:52 2009 +0200
@@ -0,0 +1,28 @@
+# prototype.utf8 (LOC: $LOC, MACH64: $MACH64):	 default utf8 locale prototype template
+
+d none usr 0755 root sys
+d none usr/lib 0755 root bin
+d none usr/lib/locale 0755 root bin
+d none usr/lib/locale/${LOC} 0755 root bin
+d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
+d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
+s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
+s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
+s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
+d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
+s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
+d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin
+d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
+d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
+d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin
+d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
+s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
+d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
+s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
+d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
+f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
+s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
+f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
+f none usr/lib/locale/${LOC}/locale_description 0644 root bin
+f none usr/lib/locale/${LOC}/locale_map 0644 root bin
+s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/prototype.utf8_alt	Fri Aug 28 21:06:52 2009 +0200
@@ -0,0 +1,28 @@
+# prototype.utf8_alt (LOC: $LOC, MACH64: $MACH64):	 equal to prototype.utf8 except LC_TIME/ and LC_MESSAGES are links to xx.UTF8
+
+d none usr 0755 root sys
+d none usr/lib 0755 root bin
+d none usr/lib/locale 0755 root bin
+d none usr/lib/locale/${LOC} 0755 root bin
+d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
+d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
+s none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF=../../common/LC_CTYPE/LCL_DEF_unicode
+s none usr/lib/locale/${LOC}/LC_CTYPE/ldterm.dat=../../common/LC_CTYPE/ldterm_unicode.dat
+s none usr/lib/locale/${LOC}/LC_CTYPE/wdresolve.so=../../common/LC_CTYPE/wdresolve_unicode.so
+d none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64} 0755 root bin
+s none usr/lib/locale/${LOC}/LC_CTYPE/${MACH64}/wdresolve.so=../../../common/LC_CTYPE/${MACH64}/wdresolve_unicode.so
+s none usr/lib/locale/${LOC}/LC_MESSAGES=../${LOC:0:2}.UTF-8/LC_MESSAGES
+d none usr/lib/locale/${LOC}/LC_MONETARY 0755 root bin
+d none usr/lib/locale/${LOC}/LC_NUMERIC 0755 root bin
+s none usr/lib/locale/${LOC}/LC_TIME=../${LOC:0:2}.UTF-8/LC_TIME
+d none usr/lib/locale/${LOC}/LO_LTYPE 0755 root bin
+s none usr/lib/locale/${LOC}/LO_LTYPE/${LOC}.layout.so.1=../../common/LO_LTYPE/umle.layout.so.1
+d none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64} 0755 root bin
+s none usr/lib/locale/${LOC}/LO_LTYPE/${MACH64}/${LOC}.layout.so.1=../../../common/LO_LTYPE/${MACH64}/umle.layout.so.1
+d none usr/lib/locale/${LOC}/${MACH64} 0755 root bin
+f none usr/lib/locale/${LOC}/${MACH64}/${LOC}.so.3 0555 root bin
+s none usr/lib/locale/${LOC}/${MACH64}/methods_unicode.so.3=../../common/${MACH64}/methods_unicode.so.3
+f none usr/lib/locale/${LOC}/${LOC}.so.3 0555 root bin
+f none usr/lib/locale/${LOC}/locale_description 0644 root bin
+f none usr/lib/locale/${LOC}/locale_map 0644 root bin
+s none usr/lib/locale/${LOC}/methods_unicode.so.3=../common/methods_unicode.so.3