--- a/README Fri Aug 28 21:06:52 2009 +0200
+++ b/README Fri Aug 28 21:12:33 2009 +0200
@@ -2,21 +2,21 @@
OPENSOLARIS.ORG G11N LOCALE WORKSPACE
=====================================
-This file contains the structure and the instructions for downloading and
-building the G11n Locale workspace for OpenSolaris.
+This file describes the structure and contains the instructions for
+downloading and building the G11n Locale workspace for OpenSolaris.
Description of the Workspace
----------------------------
-The workspace is part of Common G11n Workspace (CWS). Together with other parts it
-allows to build all OpenSolaris.org G11n packages. See build instructions at
+This workspace is a part of G11n Common Workspace (CWS). Along with other parts
+it allows to build all OpenSolaris.org G11n packages. See build instructions at:
http://XXX
-The workspace allow to compile OpenSolaris locale data objects (locales) based
-on CLDR data. This workspace does not contain the upstream sources and tools,
-the sources are downloaed during the build process so you need internet access
-to build this workspace.
+The workspace allows to compile OpenSolaris locale data objects (locales) based
+on the CLDR data (http://cldr.unicode.org/). This workspace does not contain the
+upstream sources and tools. The sources are downloaded during the build process,
+so internet access is required to build the workspace.
Structure of the Workspace
@@ -25,9 +25,9 @@
./Makefile master makefile
./config.mk build configuration
./downloads/ all data downloaded from internet,
- 'make clean' does not clean this dir
+ 'make clean' does not clean this directory
./jars/ all jars necessary to build the locale data,
- some of the jars are builded from upstream
+ some are built from upstream
./locales/*.spec locale spec files (see 'Locale Spec File Structure' section)
./locales/charmap/ charmap files are generated there
./locales/src/ posix src files are generated there
@@ -43,15 +43,15 @@
Locale Specification File Structure
-----------------------------------
-locale is described by files locale/*.spec. The files have the names:
+Locale is described by files locale/*.spec. The files are named:
locales/xx_YY.eee[@variant].spec
-Format of the files is
+Format of the files is:
# comments ...
<key>TAB+<data>
-if a key is missing, a default value is used. For most locales the default
-value is perfect, so the file is for ordinary locales empty.
+If a key is missing default value is used. The default value is perfect for
+most of the locales, so for ordinary locales the file is empty.
Keys:
@@ -71,12 +71,13 @@
default: misc/locale_map.default
-Build Insctructions
--------------------
+Build Instructions
+------------------
-The build instructions are for OpenSolaris 2009.06. It build process works on
-older versions of Solaris, only the installation of the build tools needs to be
-adjusted.
+The following build instructions are for OpenSolaris 2009.06 (and later).
+Building on older versions of Solaris/OpenSolaris is possible, but there
+would be difference in installation of the build tools.
+
Prepare the build environment:
--- a/config.mk Fri Aug 28 21:06:52 2009 +0200
+++ b/config.mk Fri Aug 28 21:12:33 2009 +0200
@@ -5,13 +5,13 @@
# 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 misc/OPENSOLARIS.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 misc/OPENSOLARIS.LICENSE.
+# 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]
@@ -23,15 +23,15 @@
#
# common applications
-CC := /opt/SUNWspro/bin/cc
-JAVA := java
-ANT := ant
-LOCALEDEF := localedef
-WGET := wget
-GNU_PATCH := gpatch
-UNZIP := unzip
-GNU_GREP := ggrep
-PERL := perl
+CC ?= /opt/SUNWspro/bin/cc
+JAVA ?= java
+ANT ?= ant
+LOCALEDEF ?= localedef
+WGET ?= wget
+GNU_PATCH ?= gpatch
+UNZIP ?= unzip
+GNU_GREP ?= ggrep
+PERL ?= perl
# architecture
MACH := $(shell uname -p)
@@ -58,14 +58,18 @@
CFLAGS32_i386 = -xspace
CFLAGS64_i386 = -xarch=sse2 -Ui386 -U__i386
-CFLAGS32 = $(CFLAGS_common) $(CFLAGS32_common) $(CFLAGS_$(MACH)) $(CFLAGS32_$(MACH))
-CFLAGS64 = $(CFLAGS_common) $(CFLAGS64_common) $(CFLAGS_$(MACH)) $(CFLAGS64_$(MACH))
-
+CFLAGS32 ?= $(CFLAGS_common) $(CFLAGS32_common) $(CFLAGS_$(MACH)) $(CFLAGS32_$(MACH))
+CFLAGS64 ?= $(CFLAGS_common) $(CFLAGS64_common) $(CFLAGS_$(MACH)) $(CFLAGS64_$(MACH))
-LOCALEDEFFLAGS32 = $(if $(Q),,-v) $(if $(CC),-P $(dir $(CC))) -W cc,"$(CFLAGS32)" -L "-R\\\$$ORIGIN"
-LOCALEDEFFLAGS64 = $(if $(Q),,-v) $(if $(CC),-P $(dir $(CC))) -W cc,"$(CFLAGS64)" -L "-R\\\$$ORIGIN" -m lp64
+# localedef flags for locale compilation
+LOCALEDEFFLAGS32 ?= $(if $(Q),,-v) $(if $(CC),-P $(dir $(CC))) -W cc,"$(CFLAGS32)" -L "-R\\\$$ORIGIN"
+LOCALEDEFFLAGS64 ?= $(if $(Q),,-v) $(if $(CC),-P $(dir $(CC))) -W cc,"$(CFLAGS64)" -L "-R\\\$$ORIGIN" -m lp64
+# flags for cldr posix locale generator
+# '-DCLDR_DTD_CACHE=.dtd_cache': cache dir for temporary files
+# '-Dhttp.proxyHost=webcache.sfbay -Dhttp.proxyPort=8080: default web proxy
+JAVAFLAGS ?= -Xmx256m -Dhttp.proxyHost=webcache.sfbay -Dhttp.proxyPort=8080 -DCLDR_DTD_CACHE=.dtd_cache
# misc
-PKG_REPO = http://localhost:80
-FILEROOT = proto/$(MACH)/fileroot
+PKG_REPO ?= http://localhost:80
+FILEROOT ?= proto/$(MACH)/fileroot
--- a/jars/make.mk Fri Aug 28 21:06:52 2009 +0200
+++ b/jars/make.mk Fri Aug 28 21:12:33 2009 +0200
@@ -20,6 +20,7 @@
#
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
+#
--- 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-bg-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 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.iso_alt misc/prototype.locale_aliases
+prototype misc/prototype.legacy_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:12:33 2009 +0200
@@ -1,2 +1,2 @@
pkg_name SUNWlang-ca-extra
-prototype misc/prototype.iso_alt
+prototype misc/prototype.legacy_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:12:33 2009 +0200
@@ -1,3 +1,3 @@
pkg_name SUNWlang-cs-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-da-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-da-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy misc/prototype.locale_alias
# Danish, Denmark (ISO8859-15)
locale_desc Denmark (ISO8859-15)
--- a/locale/[email protected] Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/[email protected] Fri Aug 28 21:12:33 2009 +0200
@@ -1,5 +1,5 @@
cldr_variant da_DK@currency=EUR
pkg_name SUNWlang-da-extra
-prototype misc/prototype.iso
+prototype misc/prototype.legacy
# Danish, Denmark (ISO8859-15 + Euro)
locale_desc Denmark (ISO8859-15 + Euro)
--- 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:12:33 2009 +0200
@@ -1,5 +1,6 @@
# iso8859-1 locale should use old currency instead of Euro
+cldr_variant de_AT@currency=ATS
pkg_name SUNWlang-de-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-de-extra
-prototype misc/prototype.iso_alt
+prototype misc/prototype.legacy_alt
# German, Austria (ISO8859-15)
locale_desc Austria (ISO8859-15)
--- 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:12:33 2009 +0200
@@ -1,2 +1,3 @@
pkg_name SUNWlang-de-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,5 +1,6 @@
# iso8859-1 locale should use old currency instead of Euro
cldr_variant de_DE@currency=DEM
pkg_name SUNWlang-de-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_aliases
+prototype misc/prototype.legacy_alt misc/prototype.locale_aliases
locale_desc Germany (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-de-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# German, Germany (ISO8859-15)
locale_desc Germany (ISO8859-15)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -2,3 +2,4 @@
locale_desc Germany (UTF-8)
pkg_name SUNWlang-deDE
prototype misc/prototype.utf8_alt misc/prototype.locale_alias
+locale_map misc/locale_map.utf8_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.utf8_alt
--- 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-el-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases misc/prototype.el.sun_eu_greek
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,2 +1,2 @@
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso
+prototype misc/prototype.legacy
# English, United Kingdom (ISO8859-15)
locale_desc United Kingdom (ISO8859-15)
--- a/locale/[email protected] Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/[email protected] Fri Aug 28 21:12:33 2009 +0200
@@ -1,5 +1,5 @@
cldr_variant en_GB@currency=EUR
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso
+prototype misc/prototype.legacy
# English, United Kingdom (ISO8859-15 + Euro)
locale_desc United Kingdom (ISO8859-15 + Euro)
--- 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:12:33 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
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,2 +1,2 @@
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso
+prototype misc/prototype.legacy
--- 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso misc/prototype.locale_alias misc/prototype.en_extra
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso
+prototype misc/prototype.legacy
# English, United States (ISO8859-15)
locale_desc U.S.A. (en_US.ISO8859-15)
--- a/locale/[email protected] Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/[email protected] Fri Aug 28 21:12:33 2009 +0200
@@ -1,5 +1,5 @@
cldr_variant en_US@currency=EUR
pkg_name SUNWlang-en-extra
-prototype misc/prototype.iso
+prototype misc/prototype.legacy
# English, United States (ISO8859-15 + Euro)
locale_desc U.S.A. (en_US.ISO8859-15 + Euro)
--- 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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Argentina (ISO8859-1)
locale_desc Argentina (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Bolivia (ISO8859-1)
locale_desc Bolivia (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Chile (ISO8859-1)
locale_desc Chile (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Colombia (ISO8859-1)
locale_desc Colombia (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Costa Rica (ISO8859-1)
locale_desc Costa Rica (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Ecuador (ISO8859-1)
locale_desc Ecuador (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,6 +1,7 @@
# iso8859-1 locale should use old currency instead of Euro
cldr_variant es_ES@currency=ESP
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_aliases
+prototype misc/prototype.legacy_alt misc/prototype.locale_aliases
# Spanish, Spain (ISO8859-1)
locale_desc Spain (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Spain (ISO8859-15)
locale_desc Spain (ISO8859-15)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -2,3 +2,4 @@
prototype misc/prototype.utf8_alt misc/prototype.locale_alias
# Spanish, Spain (UTF-8)
locale_desc Spain (UTF-8)
+locale_map misc/locale_map.utf8_alt
--- 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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Guatemala (ISO8859-1)
locale_desc Guatemala (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Mexico (ISO8859-1)
locale_desc Mexico (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Nicaragua (ISO8859-1)
locale_desc Nicaragua (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Panama (ISO8859-1)
locale_desc Panama (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Peru (ISO8859-1)
locale_desc Peru (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Paraguay (ISO8859-1)
locale_desc Paraguay (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, El Salvador (ISO8859-1)
locale_desc El Salvador (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Uruguay (ISO8859-1)
locale_desc Uruguay (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-es-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Spanish, Venezuela (ISO8859-1)
locale_desc Venezuela (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-et-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases
+prototype misc/prototype.legacy 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:12:33 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_aliases
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-fi-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,5 @@
# iso8859-1 locale should use old currency instead of Euro
cldr_variant fr_BE@currency=BEF
pkg_name SUNWlang-fr-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,2 +1,3 @@
pkg_name SUNWlang-fr-extra
-prototype misc/prototype.iso_alt
+prototype misc/prototype.legacy_alt
+locale_map misc/locale_map.legacy_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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,2 +1,3 @@
pkg_name SUNWlang-fr-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,2 +1,3 @@
pkg_name SUNWlang-fr-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,6 +1,7 @@
# iso8859-1 locale should use old currency instead of Euro
cldr_variant fr_FR@currency=FRF
pkg_name SUNWlang-fr-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_aliases
+prototype misc/prototype.legacy_alt misc/prototype.locale_aliases
# French, France (ISO8859-1)
locale_desc France (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-fr-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# French, France (ISO8859-15)
locale_desc France (ISO8859-15)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -2,3 +2,4 @@
prototype misc/prototype.utf8_alt misc/prototype.locale_alias
# French, France (UTF-8)
locale_desc France (UTF-8)
+locale_map misc/locale_map.utf8_alt
--- 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:12:33 2009 +0200
@@ -1,1 +1,2 @@
prototype misc/prototype.utf8_alt
+locale_map misc/locale_map.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:12:33 2009 +0200
@@ -1,2 +1,2 @@
pkg_name SUNWlang-he-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_aliases misc/prototype.he_extra
+prototype misc/prototype.legacy_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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-hr-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-hu-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-is-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,6 +1,7 @@
# 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_alt misc/prototype.locale_aliases
+prototype misc/prototype.legacy_alt misc/prototype.locale_aliases
# Italian, Italy (ISO8859-1)
locale_desc Italy (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-it-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Italian, Italy (ISO8859-15)
locale_desc Italy (ISO8859-15 - Euro)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,3 +1,4 @@
# Italian, Italy (UTF-8)
locale_desc Italy (UTF-8)
prototype misc/prototype.utf8_alt misc/prototype.locale_alias
+locale_map misc/locale_map.utf8_alt
--- 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-lt-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases
+prototype misc/prototype.legacy misc/prototype.locale_aliases
# Lithuanian, Lithuania (ISO8859-13)
locale_desc Lithuania (ISO8859-13)
--- a/locale/lv_LV.ISO8859-13.spec Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/lv_LV.ISO8859-13.spec Fri Aug 28 21:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-lv-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases
+prototype misc/prototype.legacy misc/prototype.locale_aliases
# Latvian, Latvia (ISO8859-13)
locale_desc Latvia (ISO8859-13)
--- a/locale/make.mk Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/make.mk Fri Aug 28 21:12:33 2009 +0200
@@ -22,7 +22,6 @@
# Use is subject to license terms.
#
-JAVAFLAGS = -Xmx256m -Dhttp.proxyHost=webcache.sfbay -Dhttp.proxyPort=8080 -DCLDR_DTD_CACHE=.dtd_cache
CLDR_TOOLS_DEPS = jars/icu4j.jar jars/xalan.jar jars/xml-apis.jar jars/utilities.jar jars/cldr.jar locale/src/cldr_core/.src .dtd_cache/.dir
charmap = $(firstword $(subst @, ,$(lastword $(subst ., ,$(1)))))
--- 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-mk-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 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.locale_alias
+prototype misc/prototype.legacy misc/prototype.locale_alias
--- 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:12:33 2009 +0200
@@ -1,2 +1,2 @@
pkg_name SUNWlang-nl-extra
-prototype misc/prototype.iso
+prototype misc/prototype.legacy
--- 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:12:33 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.locale_aliases
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-nl-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-pl-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases
+prototype misc/prototype.legacy misc/prototype.locale_aliases
# Polish, Poland (ISO8859-2)
locale_desc Poland (ISO8859-2)
--- 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-ptBR-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 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.locale_aliases
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-pt-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-ro-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy misc/prototype.locale_alias
# Romanian, Romania (ISO8859-2)
locale_desc Romania (ISO8859-2)
--- a/locale/ru_RU.ANSI1251.spec Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/ru_RU.ANSI1251.spec Fri Aug 28 21:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-ru-extra
-prototype misc/prototype.noiso misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt2 misc/prototype.locale_alias
# Russian, Russia (ANSI1251)
locale_desc Russia (ANSI1251)
--- 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-ru-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-ru-extra
-prototype misc/prototype.noiso misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt2 misc/prototype.locale_alias
# Russian, Russia (KOI8-R)
locale_desc Russia (KOI8-R)
--- 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:12:33 2009 +0200
@@ -1,6 +1,6 @@
-# iso locale should use SKK (Slovak has Euro from 2009-01-01)
+# legacy 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.locale_alias
+prototype misc/prototype.legacy 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:12:33 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.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-sq-extra
-prototype misc/prototype.iso misc/prototype.locale_alias
+prototype misc/prototype.legacy misc/prototype.locale_alias
# Albanian, Albania (ISO8859-2)
locale_desc Albania (ISO8859-2)
--- 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:12:33 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.locale_alias
+prototype misc/prototype.legacy 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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-sv-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_aliases
+prototype misc/prototype.legacy_alt misc/prototype.locale_aliases
# Swedish, Sweden (ISO8859-1)
locale_desc Sweden (ISO8859-1)
+locale_map misc/locale_map.legacy_alt
--- 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:12:33 2009 +0200
@@ -1,4 +1,5 @@
pkg_name SUNWlang-sv-extra
-prototype misc/prototype.iso_alt misc/prototype.locale_alias
+prototype misc/prototype.legacy_alt misc/prototype.locale_alias
# Swedish, Sweden (ISO8859-15)
locale_desc Sweden (ISO8859-15)
+locale_map misc/locale_map.legacy_alt
--- a/locale/[email protected] Fri Aug 28 21:06:52 2009 +0200
+++ b/locale/[email protected] Fri Aug 28 21:12:33 2009 +0200
@@ -1,5 +1,5 @@
cldr_variant sv_SE@currency=EUR
pkg_name SUNWlang-sv-extra
-prototype misc/prototype.iso
+prototype misc/prototype.legacy
# Swedish, Sweden (ISO8859-15 + Euro)
locale_desc Sweden (ISO8859-15 + Euro)
--- 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:12:33 2009 +0200
@@ -1,3 +1,4 @@
# Swedish, Sweden (UTF-8)
locale_desc Sweden (UTF-8)
prototype misc/prototype.utf8_alt misc/prototype.locale_alias
+locale_map misc/locale_map.utf8_alt
--- 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:12:33 2009 +0200
@@ -1,4 +1,4 @@
pkg_name SUNWlang-tr-extra
-prototype misc/prototype.iso misc/prototype.locale_aliases
+prototype misc/prototype.legacy misc/prototype.locale_aliases
# Turkish, Turkey (ISO8859-9)
locale_desc Turkey (ISO8859-9)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/8-bit_codesets.x Fri Aug 28 21:12:33 2009 +0200
@@ -0,0 +1,92 @@
+#
+# 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 2005 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+#ident "@(#)iso_8859_1.extension.src 1.4 05/06/23 SMI"
+
+METHODS
+process_code euc
+cswidth 1:1,0:0,0:0
+
+eucpctowc "__eucpctowc_gen" "libc" "/usr/lib" "libc.so.1"
+fgetwc "__fgetwc_euc"
+fgetwc@native "__fgetwc_sb"
+fnmatch "__fnmatch_sb"
+getdate "__getdate_std"
+iswctype "__iswctype_bc"
+iswctype@native "__iswctype_sb"
+mbftowc "__mbftowc_euc"
+mbftowc@native "__mbftowc_sb"
+mblen "__mblen_sb"
+mbstowcs "__mbstowcs_euc"
+mbstowcs@native "__mbstowcs_sb"
+mbtowc "__mbtowc_euc"
+mbtowc@native "__mbtowc_sb"
+regcomp "__regcomp_std"
+regexec "__regexec_std"
+regerror "__regerror_std"
+regfree "__regfree_std"
+strcoll "__strcoll_sb"
+strfmon "__strfmon_std"
+strftime "__strftime_std"
+strptime "__strptime_std"
+strxfrm "__strxfrm_sb"
+towctrans "__towctrans_bc"
+towctrans@native "__towctrans_std"
+towlower "__towlower_bc"
+towlower@native "__towlower_std"
+towupper "__towupper_bc"
+towupper@native "__towupper_std"
+trwctype "__trwctype_std"
+wcscoll "__wcscoll_bc"
+wcscoll@native "__wcscoll_std"
+wcsftime "__wcsftime_std"
+wcstombs "__wcstombs_euc"
+wcstombs@native "__wcstombs_sb"
+wcswidth "__wcswidth_euc"
+wcswidth@native "__wcswidth_sb"
+wcsxfrm "__wcsxfrm_bc"
+wcsxfrm@native "__wcsxfrm_std"
+wctoeucpc "__wctoeucpc_gen"
+wctomb "__wctomb_euc"
+wctomb@native "__wctomb_sb"
+wctrans "__wctrans_std"
+wctype "__wctype_std"
+wcwidth "__wcwidth_euc"
+wcwidth@native "__wcwidth_sb"
+btowc "__btowc_euc"
+btowc@native "__btowc_sb"
+wctob "__wctob_euc"
+wctob@native "__wctob_sb"
+mbsinit "__mbsinit_gen"
+mbrlen "__mbrlen_sb"
+mbrtowc "__mbrtowc_euc"
+mbrtowc@native "__mbrtowc_sb"
+wcrtomb "__wcrtomb_euc"
+wcrtomb@native "__wcrtomb_sb"
+mbsrtowcs "__mbsrtowcs_euc"
+mbsrtowcs@native "__mbsrtowcs_sb"
+wcsrtombs "__wcsrtombs_euc"
+wcsrtombs@native "__wcsrtombs_sb"
+
+END METHODS
--- a/misc/ISO8859.x Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +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 2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "@(#)iso_8859_1.extension.src 1.4 05/06/23 SMI"
-
-METHODS
-process_code euc
-cswidth 1:1,0:0,0:0
-
-eucpctowc "__eucpctowc_gen" "libc" "/usr/lib" "libc.so.1"
-fgetwc "__fgetwc_euc"
-fgetwc@native "__fgetwc_sb"
-fnmatch "__fnmatch_sb"
-getdate "__getdate_std"
-iswctype "__iswctype_bc"
-iswctype@native "__iswctype_sb"
-mbftowc "__mbftowc_euc"
-mbftowc@native "__mbftowc_sb"
-mblen "__mblen_sb"
-mbstowcs "__mbstowcs_euc"
-mbstowcs@native "__mbstowcs_sb"
-mbtowc "__mbtowc_euc"
-mbtowc@native "__mbtowc_sb"
-regcomp "__regcomp_std"
-regexec "__regexec_std"
-regerror "__regerror_std"
-regfree "__regfree_std"
-strcoll "__strcoll_sb"
-strfmon "__strfmon_std"
-strftime "__strftime_std"
-strptime "__strptime_std"
-strxfrm "__strxfrm_sb"
-towctrans "__towctrans_bc"
-towctrans@native "__towctrans_std"
-towlower "__towlower_bc"
-towlower@native "__towlower_std"
-towupper "__towupper_bc"
-towupper@native "__towupper_std"
-trwctype "__trwctype_std"
-wcscoll "__wcscoll_bc"
-wcscoll@native "__wcscoll_std"
-wcsftime "__wcsftime_std"
-wcstombs "__wcstombs_euc"
-wcstombs@native "__wcstombs_sb"
-wcswidth "__wcswidth_euc"
-wcswidth@native "__wcswidth_sb"
-wcsxfrm "__wcsxfrm_bc"
-wcsxfrm@native "__wcsxfrm_std"
-wctoeucpc "__wctoeucpc_gen"
-wctomb "__wctomb_euc"
-wctomb@native "__wctomb_sb"
-wctrans "__wctrans_std"
-wctype "__wctype_std"
-wcwidth "__wcwidth_euc"
-wcwidth@native "__wcwidth_sb"
-btowc "__btowc_euc"
-btowc@native "__btowc_sb"
-wctob "__wctob_euc"
-wctob@native "__wctob_sb"
-mbsinit "__mbsinit_gen"
-mbrlen "__mbrlen_sb"
-mbrtowc "__mbrtowc_euc"
-mbrtowc@native "__mbrtowc_sb"
-wcrtomb "__wcrtomb_euc"
-wcrtomb@native "__wcrtomb_sb"
-mbsrtowcs "__mbsrtowcs_euc"
-mbsrtowcs@native "__mbsrtowcs_sb"
-wcsrtombs "__wcsrtombs_euc"
-wcsrtombs@native "__wcsrtombs_sb"
-
-END METHODS
--- a/misc/locale.alias Fri Aug 28 21:06:52 2009 +0200
+++ b/misc/locale.alias Fri Aug 28 21:12:33 2009 +0200
@@ -1,28 +1,3 @@
-#
-# 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.
-#
-
-
#
# CDDL HEADER START
#
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/locale_map.legacy_alt Fri Aug 28 21:12:33 2009 +0200
@@ -0,0 +1,7 @@
+LC_COLLATE=$LOC
+LC_CTYPE=$LOC
+LC_MESSAGES=${LOC:0:2}
+LC_MONETARY=$LOC
+LC_NUMERIC=$LOC
+LC_TIME=$LOC
+LANG=$LOC
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/locale_map.utf8_alt Fri Aug 28 21:12:33 2009 +0200
@@ -0,0 +1,7 @@
+LC_COLLATE=$LOC
+LC_CTYPE=$LOC
+LC_MESSAGES=${LOC:0:2}.UTF-8
+LC_MONETARY=$LOC
+LC_NUMERIC=$LOC
+LC_TIME=$LOC
+LANG=$LOC
--- a/misc/prototype.he_extra Fri Aug 28 21:06:52 2009 +0200
+++ b/misc/prototype.he_extra Fri Aug 28 21:12:33 2009 +0200
@@ -22,7 +22,7 @@
# Use is subject to license terms.
#
-# prototype.he (LOC: $LOC, MACH64: $MACH64): special files for 'he' locale
+# prototype.he_extra (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
--- a/misc/prototype.iso Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +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.iso (LOC: $LOC, MACH64: $MACH64): default iso 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=../../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
-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.iso_alt Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +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.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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/prototype.legacy Fri Aug 28 21:12:33 2009 +0200
@@ -0,0 +1,46 @@
+#
+# 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.legacy (LOC: $LOC, MACH64: $MACH64): default iso 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=../../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
+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.legacy_alt Fri Aug 28 21:12:33 2009 +0200
@@ -0,0 +1,46 @@
+#
+# 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.legacy_alt (LOC: $LOC, MACH64: $MACH64): equal to prototype.legacy 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/prototype.legacy_alt2 Fri Aug 28 21:12:33 2009 +0200
@@ -0,0 +1,46 @@
+#
+# 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.legacy_alt2 (LOC: $LOC, MACH64: $MACH64): equal to prototype.legacy except LC_TYPE/LCL_DEF is not symlink to locale/<charmap>
+
+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
+f none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF 0755 root bin
+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
+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.noiso Fri Aug 28 21:06:52 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# prototype.iso (LOC: $LOC, MACH64: $MACH64): equal to prototype.iso except LC_TYPE/LCL_DEF is not symlink to locale/<charmap>
-
-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
-f none usr/lib/locale/${LOC}/LC_CTYPE/LCL_DEF 0755 root bin
-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
-f none usr/lib/locale/${LOC}/locale_description 0644 root bin
-f none usr/lib/locale/${LOC}/locale_map 0644 root bin
--- a/pkgs/make.mk Fri Aug 28 21:06:52 2009 +0200
+++ b/pkgs/make.mk Fri Aug 28 21:12:33 2009 +0200
@@ -26,8 +26,8 @@
.SECONDEXPANSION: prototypes ips
prototypes: pkgs/.prototype.mk $$(addprefix pkgs/prototype.,$$(shell sort -u locale/.pkg_name/* 2>/dev/null))
- $(Q)[ -d pkgmaps ] || mkdir pkgmaps
- $(Q)for a in $(filter pkgs/prototype.%,$^); do cp $$a `echo $$a|$(PERL) -npe 's|pkgs/prototype.SUNW(.*)|pkgmaps/prototype.\1|'`; done
+ $(Q)[ -d pkgmaps/locale ] || mkdir -p pkgmaps/locale
+ $(Q)for a in $(filter pkgs/prototype.%,$^); do cp $$a `echo $$a|$(PERL) -npe 's|pkgs/prototype.SUNW(.*)|pkgmaps/locale/prototype.\1|'`; done
ips: pkgs/.manifest.mk $$(addprefix pkgs/.ips.,$$(shell sort -u locale/.pkg_name/* 2>/dev/null))