--- a/locale/ar_EG.ISO8859-6.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/ar_EG.ISO8859-6.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-ar-extra
-prototype	legacy locale_aliases geo_map mp_files
+prototype	legacy mp_files

--- a/locale/bg_BG.ISO8859-5.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/bg_BG.ISO8859-5.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-bg-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # Bulgarian, Bulgaria (ISO8859-5)
 locale_desc	Bulgaria (ISO8859-5)

--- a/locale/ca_ES.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/ca_ES.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +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	legacy_alt locale_aliases geo_maps
+prototype	legacy_alt
 locale_desc	Catalan, Spain (ISO8859-1)

--- a/locale/cs_CZ.ISO8859-2.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/cs_CZ.ISO8859-2.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,3 +1,3 @@
 pkg_name	SUNWlang-cs-extra
-prototype	legacy locale_aliases geo_map
+prototype	legacy
 locale_desc	Czech Republic (ISO8859-2)

--- a/locale/da_DK.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/da_DK.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-da-extra
-prototype	legacy locale_aliases geo_map
+prototype	legacy
 # Danish, Denmark (ISO8859-1)
 locale_desc	Denmark (ISO8859-1)

--- a/locale/da_DK.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/da_DK.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-da-extra
-prototype	legacy locale_alias
+prototype	legacy
 # Danish, Denmark (ISO8859-15)
 locale_desc	Denmark (ISO8859-15)

--- a/locale/de_AT.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/de_AT.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,7 +1,7 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	de_AT@currency=ATS
 pkg_name	SUNWlang-de-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # German, Austria (ISO8859-1)
 locale_desc	Austria (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/de_CH.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/de_CH.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,3 +1,3 @@
 pkg_name	SUNWlang-de-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 locale_map	legacy_alt

--- a/locale/de_DE.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/de_DE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,6 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	de_DE@currency=DEM
 pkg_name	SUNWlang-de-extra
-prototype	legacy_alt locale_aliases geo_maps
+prototype	legacy_alt
 locale_desc	Germany (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/de_DE.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/de_DE.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-de-extra
-prototype	legacy_alt locale_alias
+prototype	legacy_alt
 # German, Germany (ISO8859-15)
 locale_desc	Germany (ISO8859-15)
 locale_map	legacy_alt

--- a/locale/de_DE.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/de_DE.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 # German, Germany (UTF-8)
 locale_desc	Germany (UTF-8)
 pkg_name	SUNWlang-deDE
-prototype	utf8_alt locale_alias
+prototype	utf8_alt
 locale_map	utf8_alt

--- a/locale/el_CY.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/el_CY.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,1 +1,1 @@
-prototype	utf8 locale_alias
+prototype	utf8

--- a/locale/el_GR.ISO8859-7.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/el_GR.ISO8859-7.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-el-extra
-prototype	legacy locale_aliases el.sun_eu_greek geo_map
+prototype	legacy
 # Greek, Greece (ISO8859-7)
 locale_desc	Greece (ISO8859-7)

--- a/locale/en_AU.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/en_AU.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # English, Australia (ISO8859-1)
 locale_desc	Australia (ISO8859-1)

--- a/locale/en_CA.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/en_CA.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-en-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy

--- a/locale/en_GB.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/en_GB.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # English, United Kingdom (ISO8859-1)
 locale_desc	United Kingdom (ISO8859-1)

--- a/locale/en_IE.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/en_IE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +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	legacy locale_alias geo_map
+prototype	legacy

--- a/locale/en_NZ.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/en_NZ.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # English, New Zealand (ISO8859-1)
 locale_desc	New Zealand (ISO8859-1)

--- a/locale/en_US.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/en_US.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-en-extra
-prototype	legacy locale_alias en_extra geo_map
+prototype	legacy en_extra
 # English, United States (ISO8859-1)
 locale_desc	U.S.A. (en_US.ISO8859-1)

--- a/locale/es_AR.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_AR.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Argentina (ISO8859-1)
 locale_desc	Argentina (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_BO.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_BO.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Bolivia (ISO8859-1)
 locale_desc	Bolivia (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_CL.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_CL.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Chile (ISO8859-1)
 locale_desc	Chile (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_CO.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_CO.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Colombia (ISO8859-1)
 locale_desc	Colombia (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_CR.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_CR.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Costa Rica (ISO8859-1)
 locale_desc	Costa Rica (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_EC.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_EC.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Ecuador (ISO8859-1)
 locale_desc	Ecuador (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_ES.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_ES.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,7 +1,7 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	es_ES@currency=ESP
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_aliases geo_maps
+prototype	legacy_alt
 # Spanish, Spain (ISO8859-1)
 locale_desc	Spain (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_ES.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_ES.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias
+prototype	legacy_alt
 # Spanish, Spain (ISO8859-15)
 locale_desc	Spain (ISO8859-15)
 locale_map	legacy_alt

--- a/locale/es_ES.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_ES.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-esES
-prototype	utf8_alt locale_alias
+prototype	utf8_alt
 # Spanish, Spain (UTF-8)
 locale_desc	Spain (UTF-8)
 locale_map	utf8_alt

--- a/locale/es_GT.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_GT.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Guatemala (ISO8859-1)
 locale_desc	Guatemala (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_MX.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_MX.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Mexico (ISO8859-1)
 locale_desc	Mexico (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_NI.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_NI.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Nicaragua (ISO8859-1)
 locale_desc	Nicaragua (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_PA.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_PA.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Panama (ISO8859-1)
 locale_desc	Panama (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_PE.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_PE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Peru (ISO8859-1)
 locale_desc	Peru (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_PY.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_PY.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Paraguay (ISO8859-1)
 locale_desc	Paraguay (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_SV.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_SV.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, El Salvador (ISO8859-1)
 locale_desc	El Salvador (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_UY.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_UY.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Uruguay (ISO8859-1)
 locale_desc	Uruguay (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/es_VE.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/es_VE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 # Spanish, Venezuela (ISO8859-1)
 locale_desc	Venezuela (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/et_EE.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/et_EE.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-et-extra
-prototype	legacy locale_aliases geo_map
+prototype	legacy
 # Estonian, Estonia (ISO8859-15)
 locale_desc	Estonia (ISO8859-15)

--- a/locale/fi_FI.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/fi_FI.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +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	legacy locale_aliases geo_map
+prototype	legacy
 # Finnish, Finland (ISO8859-1)
 locale_desc	Finland (ISO8859-1)

--- a/locale/fi_FI.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/fi_FI.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-fi-extra
-prototype	legacy locale_alias
+prototype	legacy
 # Finnish, Finland (ISO8859-15)
 locale_desc	Finland (ISO8859-15)

--- a/locale/fr_BE.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/fr_BE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	fr_BE@currency=BEF
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 locale_map	legacy_alt

--- a/locale/fr_CA.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/fr_CA.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,3 +1,3 @@
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 locale_map	legacy_alt

--- a/locale/fr_CH.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/fr_CH.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,3 +1,3 @@
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt locale_alias geo_map
+prototype	legacy_alt
 locale_map	legacy_alt

--- a/locale/fr_FR.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/fr_FR.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,7 +1,7 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	fr_FR@currency=FRF
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt locale_aliases geo_maps
+prototype	legacy_alt
 # French, France (ISO8859-1)
 locale_desc	France (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/fr_FR.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/fr_FR.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt locale_alias
+prototype	legacy_alt
 # French, France (ISO8859-15)
 locale_desc	France (ISO8859-15)
 locale_map	legacy_alt

--- a/locale/fr_FR.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/fr_FR.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-frFR
-prototype	utf8_alt locale_alias
+prototype	utf8_alt
 # French, France (UTF-8)
 locale_desc	France (UTF-8)
 locale_map	utf8_alt

--- a/locale/he_IL.ISO8859-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/he_IL.ISO8859-8.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-he-extra
-prototype	legacy_alt locale_aliases mp_files
+prototype	legacy_alt mp_files

--- a/locale/hr_HR.ISO8859-2.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/hr_HR.ISO8859-2.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-hr-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # Croatian, Croatia (ISO8859-2)
 locale_desc	Croatia (ISO8859-2)

--- a/locale/hu_HU.ISO8859-2.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/hu_HU.ISO8859-2.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-hu-extra
-prototype	legacy locale_aliases geo_map
+prototype	legacy
 # Hungarian, Hungary (ISO8859-2)
 locale_desc	Hungary (ISO8859-2)

--- a/locale/is_IS.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/is_IS.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-is-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # Icelandic, Iceland (ISO8859-1)
 locale_desc	Iceland (ISO8859-1)

--- a/locale/it_IT.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/it_IT.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,7 +1,7 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	it_IT@currency=ITL
 pkg_name	SUNWlang-it-extra
-prototype	legacy_alt locale_aliases geo_maps
+prototype	legacy_alt
 # Italian, Italy (ISO8859-1)
 locale_desc	Italy (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/it_IT.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/it_IT.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-it-extra
-prototype	legacy_alt locale_alias
+prototype	legacy_alt
 # Italian, Italy (ISO8859-15)
 locale_desc	Italy (ISO8859-15 - Euro)
 locale_map	legacy_alt

--- a/locale/it_IT.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/it_IT.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,3 +1,3 @@
 pkg_name	SUNWlang-itIT
-prototype	utf8_alt locale_alias
+prototype	utf8_alt
 locale_map	utf8_alt

--- a/locale/lt_LT.ISO8859-13.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/lt_LT.ISO8859-13.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-lt-extra
-prototype	legacy locale_aliases geo_map
+prototype	legacy
 # Lithuanian, Lithuania (ISO8859-13)
 locale_desc	Lithuania (ISO8859-13)

--- a/locale/lv_LV.ISO8859-13.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/lv_LV.ISO8859-13.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-lv-extra
-prototype	legacy locale_aliases geo_map
+prototype	legacy
 # Latvian, Latvia (ISO8859-13)
 locale_desc	Latvia (ISO8859-13)

--- a/locale/mk_MK.ISO8859-5.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/mk_MK.ISO8859-5.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-mk-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # Macedonian, Macedonia (ISO8859-5)
 locale_desc	Macedonia (ISO8859-5)

--- a/locale/nl_BE.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/nl_BE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +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	legacy locale_alias geo_map
+prototype	legacy

--- a/locale/nl_NL.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/nl_NL.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +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	legacy locale_aliases geo_map
+prototype	legacy
 # Dutch, Netherlands (ISO8859-1)
 locale_desc	Netherlands (ISO8859-1)

--- a/locale/nl_NL.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/nl_NL.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-nl-extra
-prototype	legacy locale_alias
+prototype	legacy
 # Dutch, Netherlands (ISO8859-15)
 locale_desc	Netherlands (ISO8859-15)

--- a/locale/pl_PL.ISO8859-2.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/pl_PL.ISO8859-2.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-pl-extra
-prototype	legacy locale_aliases geo_map
+prototype	legacy
 # Polish, Poland (ISO8859-2)
 locale_desc	Poland (ISO8859-2)

--- a/locale/pl_PL.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/pl_PL.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,3 +1,3 @@
 # Polish, Poland (UTF-8)
 locale_desc	Poland (UTF-8)
-prototype	utf8 locale_alias
+prototype	utf8

--- a/locale/pt_BR.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/pt_BR.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-ptBR-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # Portuguese, Brazil (ISO8859-1)
 locale_desc	Brazil (ISO8859-1)

--- a/locale/pt_PT.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/pt_PT.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +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	legacy locale_aliases geo_map
+prototype	legacy
 # Portuguese, Portugal (ISO8859-1)
 locale_desc	Portugal (ISO8859-1)

--- a/locale/pt_PT.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/pt_PT.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-pt-extra
-prototype	legacy locale_alias
+prototype	legacy
 # Portuguese, Portugal (ISO8859-15)
 locale_desc	Portugal (ISO8859-15)

--- a/locale/ro_RO.ISO8859-2.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/ro_RO.ISO8859-2.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-ro-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # Romanian, Romania (ISO8859-2)
 locale_desc	Romania (ISO8859-2)

--- a/locale/ru_RU.ISO8859-5.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/ru_RU.ISO8859-5.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-ru-extra
-prototype	legacy locale_aliases geo_map
+prototype	legacy
 # Russian, Russia (ISO8859-5)
 locale_desc	Russia (ISO8859-5)

--- a/locale/ru_RU.KOI8-R.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/ru_RU.KOI8-R.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-ru-extra
-prototype	legacy_alt2 locale_alias
+prototype	legacy_alt2
 # Russian, Russia (KOI8-R)
 locale_desc	Russia (KOI8-R)

--- a/locale/ru_RU.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/ru_RU.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-ruRU
-prototype	utf8 locale_alias
+prototype	utf8

--- a/locale/sh_BA.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# because CLDR bug #2023, can not use sr_BA@...
-cldr_variant	sr_Latn_BA
-# Serbian, Bosnia and Herzegovina (UTF-8)
-locale_desc	Bosnia and Herzegovina (UTF-8)

--- a/locale/sk_SK.ISO8859-2.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/sk_SK.ISO8859-2.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,6 +1,6 @@
 # legacy locale should use SKK (Slovak has Euro from 2009-01-01)
 cldr_variant	sk_SK@currency=SKK
 pkg_name	SUNWlang-sk-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # Slovak, Slovakia (ISO8859-2)
 locale_desc	Slovakia (ISO8859-2)

--- a/locale/sl_SI.ISO8859-2.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/sl_SI.ISO8859-2.spec	Mon Jul 26 16:41:58 2010 +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	legacy locale_alias geo_map
+prototype	legacy
 # Slovenian, Slovenia (ISO8859-2)
 locale_desc	Slovenia (ISO8859-2)

--- a/locale/sq_AL.ISO8859-2.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/sq_AL.ISO8859-2.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-sq-extra
-prototype	legacy locale_alias geo_map
+prototype	legacy
 # Albanian, Albania (ISO8859-2)
 locale_desc	Albania (ISO8859-2)

--- a/locale/sr_CS.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# because CLDR bug #2023, can not use sr_CS@...
-cldr_variant	sr_Cyrl_RS
-# Serbian, Serbia (UTF-8)
-locale_desc	Serbia And Montenegro (UTF-8)
-prototype	utf8 locale_alias

--- a/locale/sr_YU.ISO8859-5.spec	Wed Jun 23 12:20:54 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# because CLDR bug #2023, can not use sr_YU@...
-cldr_variant	sr_Cyrl_RS
-pkg_name	SUNWlang-sr-extra
-prototype	legacy locale_alias geo_map
-# Serbian, Serbia (ISO8859-5)
-locale_desc	Serbia (ISO8859-5)

--- a/locale/sv_SE.ISO8859-1.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/sv_SE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-sv-extra
-prototype	legacy_alt locale_aliases geo_maps
+prototype	legacy_alt
 # Swedish, Sweden (ISO8859-1)
 locale_desc	Sweden (ISO8859-1)
 locale_map	legacy_alt

--- a/locale/sv_SE.ISO8859-15.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/sv_SE.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,5 +1,5 @@
 pkg_name	SUNWlang-sv-extra
-prototype	legacy_alt locale_alias
+prototype	legacy_alt
 # Swedish, Sweden (ISO8859-15)
 locale_desc	Sweden (ISO8859-15)
 locale_map	legacy_alt

--- a/locale/sv_SE.UTF-8.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/sv_SE.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 # Swedish, Sweden (UTF-8)
 locale_desc	Sweden (UTF-8)
-prototype	utf8_alt locale_alias
+prototype	utf8_alt
 locale_map	utf8_alt

--- a/locale/tr_TR.ISO8859-9.spec	Wed Jun 23 12:20:54 2010 +0200
+++ b/locale/tr_TR.ISO8859-9.spec	Mon Jul 26 16:41:58 2010 +0200
@@ -1,4 +1,4 @@
 pkg_name	SUNWlang-tr-extra
-prototype	legacy locale_aliases geo_map
+prototype	legacy
 # Turkish, Turkey (ISO8859-9)
 locale_desc	Turkey (ISO8859-9)

--- a/misc/templates/prototype/el.sun_eu_greek	Wed Jun 23 12:20:54 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#
-# 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.
-#
-
-# 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