--- a/Makefile	Mon Jul 26 16:41:58 2010 +0200
+++ b/Makefile	Tue Aug 10 16:17:48 2010 +0200
@@ -2,7 +2,7 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
+# 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
@@ -268,11 +268,10 @@
 add_platform = $(1)$(call contains,$(1),platform=,,$(call sep,$(1))platform=solaris)
 add_yesno = $(1)$(call contains,$(1),yesno=,,$(call sep,$(1))yesno=solaris)
 
-spec_key = $(if $(shell $(GNU_GREP) '^$(1)' $<| cut -f2-),$(shell $(GNU_GREP) '^$(1)' $<| cut -f2-),$(2))
+spec_key = $(if $(shell $(GNU_GREP) '^$(1)' $<| cut -f2-),$(shell $(PERL) -ne 'print $$1 if /^$(1)\s*(.*)/' < $<),$(2))
+spec_key_is_set = $(if $(shell $(GNU_GREP) '^$(1)' $<| cut -f2-),\# $(1) is set,)
 spec_fkey = $(addprefix misc/templates/$(1)/,$(spec_key))
 
-locale_alias = $(shell ${PERL} -ne 'next unless /^$(1)\s/; s/^\S+\s+//; print' < misc/locale.alias)
-
 # if $(1) contains $(2), return $(3) else $(4)
 contains = $(if $(filter-out xx,x$(subst $(1),,$(subst $(2),=-=,$(1))x)),$(3),$(4))
 comma := ,
@@ -290,7 +289,10 @@
 	     MACH=$(MACH) \
 	     MACH64=$(MACH64) \
 	     CHARMAP='$(call charmap,$*)' \
-	     LOC_ALIAS='$(call locale_alias,$*)' 
+	     LCMESSAGES='$(call spec_key,lc_messages,default)' \
+	     LCTIME='$(call spec_key,lc_time,default)' \
+	     IS_SET_LC_MESSAGES='$(call spec_key_is_set,lc_messages)' \
+	     IS_SET_LC_TIME='$(call spec_key_is_set,lc_time)' 
 		
 
 $(LOCALES:%=build/%/locale_map): build/%/locale_map: locale/%.spec build/%/.dir

--- a/locale/ca_ES.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/ca_ES.ISO8859-1.spec	Tue Aug 10 16:17:48 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
+prototype	legacy
 locale_desc	Catalan, Spain (ISO8859-1)

--- a/locale/ca_ES.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/ca_ES.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,4 @@
 pkg_name	SUNWlang-ca-extra
-prototype	legacy_alt
+prototype	legacy
+lc_messages	ca_ES.ISO8859-1
+lc_time		ca_ES.ISO8859-1

--- a/locale/da_DK.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/da_DK.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -2,3 +2,5 @@
 prototype	legacy
 # Danish, Denmark (ISO8859-15)
 locale_desc	Denmark (ISO8859-15)
+lc_messages	da_DK.ISO8859-1
+lc_time		da_DK.ISO8859-1

--- a/locale/[email protected]	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/[email protected]	Tue Aug 10 16:17:48 2010 +0200
@@ -3,3 +3,5 @@
 prototype	legacy
 # Danish, Denmark (ISO8859-15 + Euro)
 locale_desc	Denmark (ISO8859-15 + Euro)
+lc_messages	da_DK.ISO8859-1
+lc_time		da_DK.ISO8859-1

--- a/locale/de_AT.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/de_AT.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,7 +1,8 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	de_AT@currency=ATS
 pkg_name	SUNWlang-de-extra
-prototype	legacy_alt
+prototype	legacy
 # German, Austria (ISO8859-1)
 locale_desc	Austria (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	de_DE.ISO8859-1
+lc_time		de_DE.ISO8859-1

--- a/locale/de_AT.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/de_AT.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,4 +1,6 @@
 pkg_name	SUNWlang-de-extra
-prototype	legacy_alt
+prototype	legacy
 # German, Austria (ISO8859-15)
 locale_desc	Austria (ISO8859-15)
+lc_messages	de_DE.ISO8859-1
+lc_time		de_DE.ISO8859-1

--- a/locale/de_AT.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/de_AT.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,4 +1,3 @@
 # German, Austria (UTF-8)
 locale_desc	Austria (UTF-8)
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	de_DE.UTF-8

--- a/locale/de_CH.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/de_CH.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,3 +1,4 @@
 pkg_name	SUNWlang-de-extra
-prototype	legacy_alt
-locale_map	legacy_alt
+prototype	legacy
+lc_messages	de_DE.ISO8859-1
+lc_time		de_DE.ISO8859-1

--- a/locale/de_CH.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/de_CH.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	de_DE.UTF-8

--- a/locale/de_DE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/de_DE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,6 +1,5 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	de_DE@currency=DEM
 pkg_name	SUNWlang-de-extra
-prototype	legacy_alt
+prototype	legacy
 locale_desc	Germany (ISO8859-1)
-locale_map	legacy_alt

--- a/locale/de_DE.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/de_DE.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-de-extra
-prototype	legacy_alt
+prototype	legacy
 # German, Germany (ISO8859-15)
 locale_desc	Germany (ISO8859-15)
-locale_map	legacy_alt
+lc_messages	de_DE.ISO8859-1
+lc_time		de_DE.ISO8859-1

--- a/locale/de_DE.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/de_DE.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,3 @@
 # German, Germany (UTF-8)
 locale_desc	Germany (UTF-8)
 pkg_name	SUNWlang-deDE
-prototype	utf8_alt
-locale_map	utf8_alt

--- a/locale/de_LU.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/de_LU.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	de_DE.UTF-8

--- a/locale/el_CY.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/el_CY.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,1 +0,0 @@
-prototype	utf8

--- a/locale/en_IE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/en_IE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,4 +1,3 @@
-# iso8859-1 locale should use old currency instead of Euro
 cldr_variant	en_IE@currency=IEP
 pkg_name	SUNWlang-en-extra
 prototype	legacy

--- a/locale/es_AR.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_AR.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Argentina (ISO8859-1)
 locale_desc	Argentina (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_AR.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_AR.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_BO.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_BO.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Bolivia (ISO8859-1)
 locale_desc	Bolivia (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_BO.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_BO.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_CL.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_CL.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Chile (ISO8859-1)
 locale_desc	Chile (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_CL.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_CL.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_CO.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_CO.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Colombia (ISO8859-1)
 locale_desc	Colombia (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_CO.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_CO.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_CR.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_CR.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Costa Rica (ISO8859-1)
 locale_desc	Costa Rica (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_CR.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_CR.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_EC.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_EC.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Ecuador (ISO8859-1)
 locale_desc	Ecuador (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_EC.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_EC.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_ES.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_ES.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,7 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	es_ES@currency=ESP
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Spain (ISO8859-1)
 locale_desc	Spain (ISO8859-1)
-locale_map	legacy_alt

--- a/locale/es_ES.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_ES.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Spain (ISO8859-15)
 locale_desc	Spain (ISO8859-15)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_ES.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_ES.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,3 @@
 pkg_name	SUNWlang-esES
-prototype	utf8_alt
 # Spanish, Spain (UTF-8)
 locale_desc	Spain (UTF-8)
-locale_map	utf8_alt

--- a/locale/es_GT.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_GT.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Guatemala (ISO8859-1)
 locale_desc	Guatemala (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_GT.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_GT.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_MX.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_MX.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Mexico (ISO8859-1)
 locale_desc	Mexico (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_MX.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_MX.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_NI.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_NI.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Nicaragua (ISO8859-1)
 locale_desc	Nicaragua (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_NI.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_NI.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_PA.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_PA.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Panama (ISO8859-1)
 locale_desc	Panama (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_PA.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_PA.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_PE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_PE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Peru (ISO8859-1)
 locale_desc	Peru (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_PE.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_PE.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_PY.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_PY.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Paraguay (ISO8859-1)
 locale_desc	Paraguay (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_PY.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_PY.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_SV.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_SV.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, El Salvador (ISO8859-1)
 locale_desc	El Salvador (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_SV.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_SV.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_US.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_US.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,3 +1,3 @@
 # Spanish, United States (UTF-8)
 locale_desc	Spanish, U.S.A. (UTF-8)
-prototype	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_UY.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_UY.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Uruguay (ISO8859-1)
 locale_desc	Uruguay (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_UY.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_UY.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/es_VE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_VE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-es-extra
-prototype	legacy_alt
+prototype	legacy
 # Spanish, Venezuela (ISO8859-1)
 locale_desc	Venezuela (ISO8859-1)
-locale_map	legacy_alt
+lc_messages	es_ES.ISO8859-1
+lc_time		es_ES.ISO8859-1

--- a/locale/es_VE.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/es_VE.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	es_ES.UTF-8

--- a/locale/fr_BE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_BE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 # 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_map	legacy_alt
+prototype	legacy
+lc_messages	fr_FR.ISO8859-1
+lc_time		fr_FR.ISO8859-1

--- a/locale/fr_BE.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_BE.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,3 +1,4 @@
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt
-locale_map	legacy_alt
+prototype	legacy
+lc_messages	fr_FR.ISO8859-1
+lc_time		fr_FR.ISO8859-1

--- a/locale/fr_BE.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_BE.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	fr_FR.UTF-8

--- a/locale/fr_CA.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_CA.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,3 +1,4 @@
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt
-locale_map	legacy_alt
+prototype	legacy
+lc_messages	fr_FR.ISO8859-1
+lc_time		fr_FR.ISO8859-1

--- a/locale/fr_CA.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_CA.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	fr_FR.UTF-8

--- a/locale/fr_CH.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_CH.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,3 +1,4 @@
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt
-locale_map	legacy_alt
+prototype	legacy
+lc_messages	fr_FR.ISO8859-1
+lc_time		fr_FR.ISO8859-1

--- a/locale/fr_CH.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_CH.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	fr_FR.UTF-8

--- a/locale/fr_FR.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_FR.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,7 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	fr_FR@currency=FRF
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt
+prototype	legacy
 # French, France (ISO8859-1)
 locale_desc	France (ISO8859-1)
-locale_map	legacy_alt

--- a/locale/fr_FR.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_FR.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-fr-extra
-prototype	legacy_alt
+prototype	legacy
 # French, France (ISO8859-15)
 locale_desc	France (ISO8859-15)
-locale_map	legacy_alt
+lc_messages	fr_FR.ISO8859-1
+lc_time		fr_FR.ISO8859-1

--- a/locale/fr_FR.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_FR.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,3 @@
 pkg_name	SUNWlang-frFR
-prototype	utf8_alt
 # French, France (UTF-8)
 locale_desc	France (UTF-8)
-locale_map	utf8_alt

--- a/locale/fr_LU.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/fr_LU.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
-prototype	utf8_alt
-locale_map	utf8_alt
+lc_messages	fr_FR.UTF-8

--- a/locale/he_IL.ISO8859-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/he_IL.ISO8859-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,2 @@
 pkg_name	SUNWlang-he-extra
-prototype	legacy_alt mp_files
+prototype	legacy mp_files

--- a/locale/hy_AM.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/hy_AM.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,3 +1,3 @@
 cldr_variant	hy_AM_REVISED
 # because bug in LocaleDescription.java the locale_desc must be defined there
-locale_desc Armenian, Armenia (UTF-8)
+locale_desc	Armenian, Armenia (UTF-8)

--- a/locale/it_IT.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/it_IT.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,7 +1,6 @@
 # iso8859-1 locale should use old currency instead of Euro
 cldr_variant	it_IT@currency=ITL
 pkg_name	SUNWlang-it-extra
-prototype	legacy_alt
+prototype	legacy
 # Italian, Italy (ISO8859-1)
 locale_desc	Italy (ISO8859-1)
-locale_map	legacy_alt

--- a/locale/it_IT.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/it_IT.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-it-extra
-prototype	legacy_alt
+prototype	legacy
 # Italian, Italy (ISO8859-15)
 locale_desc	Italy (ISO8859-15 - Euro)
-locale_map	legacy_alt
+lc_messages	it_IT.ISO8859-1
+lc_time		it_IT.ISO8859-1

--- a/locale/it_IT.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/it_IT.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,3 +1,1 @@
 pkg_name	SUNWlang-itIT
-prototype	utf8_alt
-locale_map	utf8_alt

--- a/locale/pl_PL.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/pl_PL.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,3 +1,2 @@
 # Polish, Poland (UTF-8)
 locale_desc	Poland (UTF-8)
-prototype	utf8

--- a/locale/ru_RU.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/ru_RU.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,2 +1,1 @@
 pkg_name	SUNWlang-ruRU
-prototype	utf8

--- a/locale/sv_SE.ISO8859-1.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/sv_SE.ISO8859-1.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,4 @@
 pkg_name	SUNWlang-sv-extra
-prototype	legacy_alt
+prototype	legacy
 # Swedish, Sweden (ISO8859-1)
 locale_desc	Sweden (ISO8859-1)
-locale_map	legacy_alt

--- a/locale/sv_SE.ISO8859-15.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/sv_SE.ISO8859-15.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,5 +1,6 @@
 pkg_name	SUNWlang-sv-extra
-prototype	legacy_alt
+prototype	legacy
 # Swedish, Sweden (ISO8859-15)
 locale_desc	Sweden (ISO8859-15)
-locale_map	legacy_alt
+lc_messages	sv_SE.ISO8859-1
+lc_time		sv_SE.ISO8859-1

--- a/locale/[email protected]	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/[email protected]	Tue Aug 10 16:17:48 2010 +0200
@@ -3,3 +3,5 @@
 prototype	legacy
 # Swedish, Sweden (ISO8859-15 + Euro)
 locale_desc	Sweden (ISO8859-15 + Euro)
+lc_messages	sv_SE.ISO8859-1
+lc_time		sv_SE.ISO8859-1

--- a/locale/sv_SE.UTF-8.spec	Mon Jul 26 16:41:58 2010 +0200
+++ b/locale/sv_SE.UTF-8.spec	Tue Aug 10 16:17:48 2010 +0200
@@ -1,4 +1,2 @@
 # Swedish, Sweden (UTF-8)
 locale_desc	Sweden (UTF-8)
-prototype	utf8_alt
-locale_map	utf8_alt

--- a/misc/locale.alias	Mon Jul 26 16:41:58 2010 +0200
+++ b/misc/locale.alias	Tue Aug 10 16:17:48 2010 +0200
@@ -2,7 +2,7 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
+# 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
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 
@@ -116,9 +115,9 @@
 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_CS.UTF-8	sr_CS
 #sr_YU.ISO8859-5	sr_SP
-sr_YU.ISO8859-5	sr_YU
+#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

--- a/misc/templates/locale_map/legacy_alt	Mon Jul 26 16:41:58 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-LC_COLLATE=$LOC
-LC_CTYPE=$LOC
-LC_MESSAGES=${LOC:0:2}
-LC_MONETARY=$LOC
-LC_NUMERIC=$LOC
-LC_TIME=$LOC

--- a/misc/templates/locale_map/utf8_alt	Mon Jul 26 16:41:58 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-LC_COLLATE=$LOC
-LC_CTYPE=$LOC
-LC_MESSAGES=${LOC:0:2}.UTF-8
-LC_MONETARY=$LOC
-LC_NUMERIC=$LOC
-LC_TIME=$LOC

--- a/misc/templates/manifest/utf8	Mon Jul 26 16:41:58 2010 +0200
+++ b/misc/templates/manifest/utf8	Tue Aug 10 16:17:48 2010 +0200
@@ -10,10 +10,12 @@
 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
+${IS_SET_LC_MESSAGES:-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_MESSAGES}
+${IS_SET_LC_MESSAGES:+link path=usr/lib/locale/${LOC}/LC_MESSAGES target=../${LCMESSAGES}/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
+${IS_SET_LC_TIME:-dir mode=0755 owner=root group=bin path=usr/lib/locale/${LOC}/LC_TIME}
+${IS_SET_LC_TIME:+link path=usr/lib/locale/${LOC}/LC_MESSAGES target=../${LCTIME}/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}

--- a/misc/templates/prototype/enUS	Mon Jul 26 16:41:58 2010 +0200
+++ b/misc/templates/prototype/enUS	Tue Aug 10 16:17:48 2010 +0200
@@ -2,7 +2,7 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
+# 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
@@ -18,13 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 # enUS	LOC: $LOC, MACH64: $MACH64
 
-f none usr/lib/locale/${LOC}/geo_map 0644 root bin
 s none usr/lib/locale/${LOC}/32=.
 s none usr/lib/locale/${LOC}/64=${MACH64}
 s none usr/lib/locale/${LOC}/LC_CTYPE/32=.

--- a/misc/templates/prototype/legacy	Mon Jul 26 16:41:58 2010 +0200
+++ b/misc/templates/prototype/legacy	Tue Aug 10 16:17:48 2010 +0200
@@ -2,7 +2,7 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
+# 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
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 # prototype.legacy (LOC: $LOC, MACH64: $MACH64): 	default iso locale prototype template
@@ -31,10 +30,12 @@
 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
+${IS_SET_LC_MESSAGES:-d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin}
+${IS_SET_LC_MESSAGES:+s none usr/lib/locale/${LOC}/LC_MESSAGES=../${LCMESSAGES}/LC_MESSAGES}
 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
+${IS_SET_LC_TIME:-d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin}
+${IS_SET_LC_TIME:+s none usr/lib/locale/${LOC}/LC_TIME=../${LCTIME}/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

--- a/misc/templates/prototype/legacy_alt2	Mon Jul 26 16:41:58 2010 +0200
+++ b/misc/templates/prototype/legacy_alt2	Tue Aug 10 16:17:48 2010 +0200
@@ -2,7 +2,7 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
+# 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
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 # prototype.legacy_alt2 (LOC: $LOC, MACH64: $MACH64): 	equal to prototype.legacy except LC_TYPE/LCL_DEF is not symlink to locale/<charmap>
@@ -31,10 +30,12 @@
 d none usr/lib/locale/${LOC}/LC_COLLATE 0755 root bin
 d none usr/lib/locale/${LOC}/LC_CTYPE 0755 root bin
 f none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF 0755 root bin
-d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin
+${IS_SET_LC_MESSAGES:-d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin}
+${IS_SET_LC_MESSAGES:+s none usr/lib/locale/${LOC}/LC_MESSAGES=../${LCMESSAGES}/LC_MESSAGES}
 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
+${IS_SET_LC_TIME:-d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin}
+${IS_SET_LC_TIME:+s none usr/lib/locale/${LOC}/LC_TIME=../${LCTIME}/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

--- a/misc/templates/prototype/locale_alias	Mon Jul 26 16:41:58 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.locale_alias	LOC: $LOC, LOC_ALIAS: $LOC_ALIAS MACH64: $MACH64
-
-d none usr/lib/locale/${LOC_ALIAS} 0755 root bin
-s none usr/lib/locale/${LOC_ALIAS}/${LOC_ALIAS}.so.3=../${LOC}/${LOC}.so.3
-s none usr/lib/locale/${LOC_ALIAS}/locale_description=../${LOC}/locale_description
-d none usr/lib/locale/${LOC_ALIAS}/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC_ALIAS}/${MACH64}/${LOC_ALIAS}.so.3=../../${LOC}/${MACH64}/${LOC}.so.3

--- a/misc/templates/prototype/locale_aliases	Mon Jul 26 16:41:58 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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.locale_aliases	LOC: $LOC, LOC_ALIAS: $LOC_ALIAS MACH64: $MACH64
-
-d none usr/lib/locale/${LOC_ALIAS} 0755 root bin
-s none usr/lib/locale/${LOC_ALIAS}/${LOC_ALIAS}.so.3=../${LOC}/${LOC}.so.3
-s none usr/lib/locale/${LOC_ALIAS}/locale_description=../${LOC}/locale_description
-d none usr/lib/locale/${LOC_ALIAS}/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC_ALIAS}/${MACH64}/${LOC_ALIAS}.so.3=../../${LOC}/${MACH64}/${LOC}.so.3
-
-d none usr/lib/locale/${LOC_ALIAS:0:2} 0755 root bin
-s none usr/lib/locale/${LOC_ALIAS:0:2}/${LOC_ALIAS:0:2}.so.3=../${LOC}/${LOC}.so.3
-s none usr/lib/locale/${LOC_ALIAS:0:2}/locale_description=../${LOC}/locale_description
-d none usr/lib/locale/${LOC_ALIAS:0:2}/${MACH64} 0755 root bin
-s none usr/lib/locale/${LOC_ALIAS:0:2}/${MACH64}/${LOC_ALIAS:0:2}.so.3=../../${LOC}/${MACH64}/${LOC}.so.3
-d none usr/lib/locale/${LOC_ALIAS:0:2}/LC_MESSAGES 0755 root bin
-d none usr/lib/locale/${LOC_ALIAS:0:2}/LC_TIME 0755 root bin

--- a/misc/templates/prototype/utf8	Mon Jul 26 16:41:58 2010 +0200
+++ b/misc/templates/prototype/utf8	Tue Aug 10 16:17:48 2010 +0200
@@ -2,7 +2,7 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
+# 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
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-# prototype.utf8 (LOC: $LOC, MACH64: $MACH64):	 default utf8 locale prototype template
+# default utf8 locale prototype template
+#	(LOC: $LOC, MACH64: $MACH64, LCMESSAGES: $LCMESSAGES, LCTIME: $LCTIME)
 
 d none usr 0755 root sys
 d none usr/lib 0755 root bin
@@ -35,10 +35,13 @@
 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
+${IS_SET_LC_MESSAGES:-d none usr/lib/locale/${LOC}/LC_MESSAGES 0755 root bin}
+${IS_SET_LC_MESSAGES:+s none usr/lib/locale/${LOC}/LC_MESSAGES=../${LCMESSAGES}/LC_MESSAGES}
 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
+${IS_SET_LC_TIME:-d none usr/lib/locale/${LOC}/LC_TIME 0755 root bin}
+${IS_SET_LC_TIME:+s none usr/lib/locale/${LOC}/LC_TIME=../${LCTIME}/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

--- a/misc/templates/prototype/utf8_alt	Mon Jul 26 16:41:58 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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.utf8_alt (LOC: $LOC, MACH64: $MACH64):	 equal to prototype.utf8 except LC_MESSAGES is link 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
-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