Module Name: src
Committed By: snj
Date: Tue Sep 29 23:30:05 UTC 2009
Modified Files:
src/distrib/sets/lists/base [netbsd-5]: mi
src/etc/mtree [netbsd-5]: NetBSD.dist
src/share/locale [netbsd-5]: Makefile.locale
src/share/locale/ctype [netbsd-5]: Makefile
src/share/locale/messages [netbsd-5]: Makefile
src/share/locale/monetary [netbsd-5]: Makefile
src/share/locale/numeric [netbsd-5]: Makefile
src/share/locale/time [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1037):
distrib/sets/lists/base/mi: revision 1.811
etc/mtree/NetBSD.dist: revision 1.403
share/locale/Makefile.locale: revision 1.2
share/locale/ctype/Makefile: revision 1.29
share/locale/messages/Makefile: revision 1.6
share/locale/monetary/Makefile: revision 1.6
share/locale/numeric/Makefile: revision 1.5
share/locale/time/Makefile: revision 1.6
Add support for fr_*.UTF-8 locale. Setting LANG to fr_*.UTF-8 won't get
the message catalog right (they're encoded in iso-8859-1), but other locale
functions should work right.
Proposed on tech-userlevel on 20 May 2009.
To generate a diff of this commit:
cvs rdiff -u -r1.780.2.10 -r1.780.2.11 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.385.2.2 -r1.385.2.3 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/share/locale/Makefile.locale
cvs rdiff -u -r1.27.2.1 -r1.27.2.2 src/share/locale/ctype/Makefile
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/share/locale/messages/Makefile
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/share/locale/monetary/Makefile
cvs rdiff -u -r1.3.4.1 -r1.3.4.2 src/share/locale/numeric/Makefile
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/share/locale/time/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.780.2.10 src/distrib/sets/lists/base/mi:1.780.2.11
--- src/distrib/sets/lists/base/mi:1.780.2.10 Thu Sep 17 04:24:26 2009
+++ src/distrib/sets/lists/base/mi Tue Sep 29 23:30:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.780.2.10 2009/09/17 04:24:26 snj Exp $
+# $NetBSD: mi,v 1.780.2.11 2009/09/29 23:30:04 snj Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -2889,6 +2889,13 @@
./usr/share/locale/fr_BE.ISO8859-15/LC_MONETARY base-locale-fr nls
./usr/share/locale/fr_BE.ISO8859-15/LC_NUMERIC base-locale-fr nls
./usr/share/locale/fr_BE.ISO8859-15/LC_TIME base-locale-fr nls
+./usr/share/locale/fr_BE.UTF-8 base-locale-fr
+./usr/share/locale/fr_BE.UTF-8/LC_CTYPE base-locale-fr nls
+./usr/share/locale/fr_BE.UTF-8/LC_MESSAGES base-locale-fr
+./usr/share/locale/fr_BE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-fr nls
+./usr/share/locale/fr_BE.UTF-8/LC_MONETARY base-locale-fr nls
+./usr/share/locale/fr_BE.UTF-8/LC_NUMERIC base-locale-fr nls
+./usr/share/locale/fr_BE.UTF-8/LC_TIME base-locale-fr nls
./usr/share/locale/fr_CA.ISO8859-1 base-locale-fr
./usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE base-locale-fr nls
./usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES base-locale-fr
@@ -2903,6 +2910,13 @@
./usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY base-locale-fr nls
./usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC base-locale-fr nls
./usr/share/locale/fr_CA.ISO8859-15/LC_TIME base-locale-fr nls
+./usr/share/locale/fr_CA.UTF-8 base-locale-fr
+./usr/share/locale/fr_CA.UTF-8/LC_CTYPE base-locale-fr nls
+./usr/share/locale/fr_CA.UTF-8/LC_MESSAGES base-locale-fr
+./usr/share/locale/fr_CA.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-fr nls
+./usr/share/locale/fr_CA.UTF-8/LC_MONETARY base-locale-fr nls
+./usr/share/locale/fr_CA.UTF-8/LC_NUMERIC base-locale-fr nls
+./usr/share/locale/fr_CA.UTF-8/LC_TIME base-locale-fr nls
./usr/share/locale/fr_CH.ISO8859-1 base-locale-fr
./usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE base-locale-fr nls
./usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES base-locale-fr
@@ -2917,6 +2931,13 @@
./usr/share/locale/fr_CH.ISO8859-15/LC_MONETARY base-locale-fr nls
./usr/share/locale/fr_CH.ISO8859-15/LC_NUMERIC base-locale-fr nls
./usr/share/locale/fr_CH.ISO8859-15/LC_TIME base-locale-fr nls
+./usr/share/locale/fr_CH.UTF-8 base-locale-fr
+./usr/share/locale/fr_CH.UTF-8/LC_CTYPE base-locale-fr nls
+./usr/share/locale/fr_CH.UTF-8/LC_MESSAGES base-locale-fr
+./usr/share/locale/fr_CH.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-fr nls
+./usr/share/locale/fr_CH.UTF-8/LC_MONETARY base-locale-fr nls
+./usr/share/locale/fr_CH.UTF-8/LC_NUMERIC base-locale-fr nls
+./usr/share/locale/fr_CH.UTF-8/LC_TIME base-locale-fr nls
./usr/share/locale/fr_FR.ISO8859-1 base-locale-fr
./usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE base-locale-fr nls
./usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES base-locale-fr
@@ -2931,6 +2952,13 @@
./usr/share/locale/fr_FR.ISO8859-15/LC_MONETARY base-locale-fr nls
./usr/share/locale/fr_FR.ISO8859-15/LC_NUMERIC base-locale-fr nls
./usr/share/locale/fr_FR.ISO8859-15/LC_TIME base-locale-fr nls
+./usr/share/locale/fr_FR.UTF-8 base-locale-fr
+./usr/share/locale/fr_FR.UTF-8/LC_CTYPE base-locale-fr nls
+./usr/share/locale/fr_FR.UTF-8/LC_MESSAGES base-locale-fr
+./usr/share/locale/fr_FR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-fr nls
+./usr/share/locale/fr_FR.UTF-8/LC_MONETARY base-locale-fr nls
+./usr/share/locale/fr_FR.UTF-8/LC_NUMERIC base-locale-fr nls
+./usr/share/locale/fr_FR.UTF-8/LC_TIME base-locale-fr nls
./usr/share/locale/gl base-locale-gl
./usr/share/locale/gl/LC_MESSAGES base-locale-gl
./usr/share/locale/gl/LC_MESSAGES/grep.mo base-util_locale-gl nls
Index: src/etc/mtree/NetBSD.dist
diff -u src/etc/mtree/NetBSD.dist:1.385.2.2 src/etc/mtree/NetBSD.dist:1.385.2.3
--- src/etc/mtree/NetBSD.dist:1.385.2.2 Thu Sep 17 04:24:28 2009
+++ src/etc/mtree/NetBSD.dist Tue Sep 29 23:30:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist,v 1.385.2.2 2009/09/17 04:24:28 snj Exp $
+# $NetBSD: NetBSD.dist,v 1.385.2.3 2009/09/29 23:30:04 snj Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -859,18 +859,26 @@
./usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES
./usr/share/locale/fr_BE.ISO8859-15
./usr/share/locale/fr_BE.ISO8859-15/LC_MESSAGES
+./usr/share/locale/fr_BE.UTF-8
+./usr/share/locale/fr_BE.UTF-8/LC_MESSAGES
./usr/share/locale/fr_CA.ISO8859-1
./usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES
./usr/share/locale/fr_CA.ISO8859-15
./usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
+./usr/share/locale/fr_CA.UTF-8
+./usr/share/locale/fr_CA.UTF-8/LC_MESSAGES
./usr/share/locale/fr_CH.ISO8859-1
./usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES
./usr/share/locale/fr_CH.ISO8859-15
./usr/share/locale/fr_CH.ISO8859-15/LC_MESSAGES
+./usr/share/locale/fr_CH.UTF-8
+./usr/share/locale/fr_CH.UTF-8/LC_MESSAGES
./usr/share/locale/fr_FR.ISO8859-1
./usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES
./usr/share/locale/fr_FR.ISO8859-15
./usr/share/locale/fr_FR.ISO8859-15/LC_MESSAGES
+./usr/share/locale/fr_FR.UTF-8
+./usr/share/locale/fr_FR.UTF-8/LC_MESSAGES
./usr/share/locale/gl
./usr/share/locale/gl/LC_MESSAGES
./usr/share/locale/he
Index: src/share/locale/Makefile.locale
diff -u src/share/locale/Makefile.locale:1.1.2.2 src/share/locale/Makefile.locale:1.1.2.3
--- src/share/locale/Makefile.locale:1.1.2.2 Thu Jan 15 03:24:09 2009
+++ src/share/locale/Makefile.locale Tue Sep 29 23:30:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.locale,v 1.1.2.2 2009/01/15 03:24:09 snj Exp $
+# $NetBSD: Makefile.locale,v 1.1.2.3 2009/09/29 23:30:05 snj Exp $
LANGUAGE= af be bg ca cs da de el en es \
et eu fi fr hr hu hy is it ja \
@@ -113,10 +113,10 @@
CODESET_et_EE= ISO8859-15
CODESET_eu_ES= ISO8859-1 ISO8859-15
CODESET_fi_FI= ISO8859-1 ISO8859-15
-CODESET_fr_BE= ISO8859-1 ISO8859-15
-CODESET_fr_CA= ISO8859-1 ISO8859-15
-CODESET_fr_CH= ISO8859-1 ISO8859-15
-CODESET_fr_FR= ISO8859-1 ISO8859-15
+CODESET_fr_BE= ISO8859-1 ISO8859-15 UTF-8
+CODESET_fr_CA= ISO8859-1 ISO8859-15 UTF-8
+CODESET_fr_CH= ISO8859-1 ISO8859-15 UTF-8
+CODESET_fr_FR= ISO8859-1 ISO8859-15 UTF-8
CODESET_hr_HR= ISO8859-2
CODESET_hu_HU= ISO8859-2
CODESET_hy_AM= ARMSCII-8
Index: src/share/locale/ctype/Makefile
diff -u src/share/locale/ctype/Makefile:1.27.2.1 src/share/locale/ctype/Makefile:1.27.2.2
--- src/share/locale/ctype/Makefile:1.27.2.1 Thu Jan 15 03:24:09 2009
+++ src/share/locale/ctype/Makefile Tue Sep 29 23:30:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27.2.1 2009/01/15 03:24:09 snj Exp $
+# $NetBSD: Makefile,v 1.27.2.2 2009/09/29 23:30:05 snj Exp $
NOMAN= # defined
@@ -46,12 +46,16 @@
LOCALESRC_fi_FI.ISO8859-15= en_US.DIS_8859-15
LOCALESRC_fr_BE.ISO8859-1= en_US.ISO_8859-1
LOCALESRC_fr_BE.ISO8859-15= en_US.DIS_8859-15
+LOCALESRC_fr_BE.UTF-8= en_US.UTF-8
LOCALESRC_fr_CA.ISO8859-1= en_US.ISO_8859-1
LOCALESRC_fr_CA.ISO8859-15= en_US.DIS_8859-15
+LOCALESRC_fr_CA.UTF-8= en_US.UTF-8
LOCALESRC_fr_CH.ISO8859-1= en_US.ISO_8859-1
LOCALESRC_fr_CH.ISO8859-15= en_US.DIS_8859-15
+LOCALESRC_fr_CH.UTF-8= en_US.UTF-8
LOCALESRC_fr_FR.ISO8859-1= en_US.ISO_8859-1
LOCALESRC_fr_FR.ISO8859-15= en_US.DIS_8859-15
+LOCALESRC_fr_FR.UTF-8= en_US.UTF-8
#LOCALESRC_he_IL.UTF-8= en_US.UTF-8
LOCALESRC_hr_HR.ISO8859-2= en_US.ISO_8859-2
LOCALESRC_hu_HU.ISO8859-2= en_US.ISO_8859-2
Index: src/share/locale/messages/Makefile
diff -u src/share/locale/messages/Makefile:1.4.4.1 src/share/locale/messages/Makefile:1.4.4.2
--- src/share/locale/messages/Makefile:1.4.4.1 Thu Jan 15 03:24:09 2009
+++ src/share/locale/messages/Makefile Tue Sep 29 23:30:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.4.1 2009/01/15 03:24:09 snj Exp $
+# $NetBSD: Makefile,v 1.4.4.2 2009/09/29 23:30:05 snj Exp $
NOMAN= # defined
@@ -28,10 +28,14 @@
LOCALESRC_eu_ES.ISO8859-15= eu_ES.ISO8859-1
LOCALESRC_fi_FI.ISO8859-15= fi_FI.ISO8859-1
LOCALESRC_fr_BE.ISO8859-15= fr_BE.ISO8859-1
+LOCALESRC_fr_BE.UTF-8= fr_BE.ISO8859-1
LOCALESRC_fr_CA.ISO8859-1= fr_FR.ISO8859-1
LOCALESRC_fr_CA.ISO8859-15= fr_FR.ISO8859-1
+LOCALESRC_fr_CA.UTF-8= fr_FR.ISO8859-1
LOCALESRC_fr_CH.ISO8859-15= fr_CH.ISO8859-1
+LOCALESRC_fr_CH.UTF-8= fr_CH.ISO8859-1
LOCALESRC_fr_FR.ISO8859-15= fr_FR.ISO8859-1
+LOCALESRC_fr_FR.UTF-8= fr_FR.ISO8859-1
LOCALESRC_is_IS.ISO8859-15= is_IS.ISO8859-1
LOCALESRC_it_CH.ISO8859-1= it_IT.ISO8859-1
LOCALESRC_it_CH.ISO8859-15= it_IT.ISO8859-1
Index: src/share/locale/monetary/Makefile
diff -u src/share/locale/monetary/Makefile:1.4.4.1 src/share/locale/monetary/Makefile:1.4.4.2
--- src/share/locale/monetary/Makefile:1.4.4.1 Thu Jan 15 03:24:09 2009
+++ src/share/locale/monetary/Makefile Tue Sep 29 23:30:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.4.1 2009/01/15 03:24:09 snj Exp $
+# $NetBSD: Makefile,v 1.4.4.2 2009/09/29 23:30:05 snj Exp $
NOMAN= # defined
@@ -25,10 +25,14 @@
LOCALESRC_eu_ES.ISO8859-15= es_ES.ISO8859-1
LOCALESRC_fi_FI.ISO8859-15= fi_FI.ISO8859-1
LOCALESRC_fr_BE.ISO8859-15= fr_BE.ISO8859-1
+LOCALESRC_fr_BE.UTF-8= fr_BE.ISO8859-1
LOCALESRC_fr_CA.ISO8859-15= fr_CA.ISO8859-1
+LOCALESRC_fr_CA.UTF-8= fr_CA.ISO8859-1
LOCALESRC_fr_CH.ISO8859-1= de_CH.ISO8859-1
LOCALESRC_fr_CH.ISO8859-15= de_CH.ISO8859-1
+LOCALESRC_fr_CH.UTF-8= de_CH.ISO8859-1
LOCALESRC_fr_FR.ISO8859-15= fr_FR.ISO8859-1
+LOCALESRC_fr_FR.UTF-8= fr_FR.ISO8859-1
LOCALESRC_is_IS.ISO8859-15= is_IS.ISO8859-1
LOCALESRC_it_CH.ISO8859-1= de_CH.ISO8859-1
LOCALESRC_it_CH.ISO8859-15= de_CH.ISO8859-1
Index: src/share/locale/numeric/Makefile
diff -u src/share/locale/numeric/Makefile:1.3.4.1 src/share/locale/numeric/Makefile:1.3.4.2
--- src/share/locale/numeric/Makefile:1.3.4.1 Thu Jan 15 03:24:10 2009
+++ src/share/locale/numeric/Makefile Tue Sep 29 23:30:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.4.1 2009/01/15 03:24:10 snj Exp $
+# $NetBSD: Makefile,v 1.3.4.2 2009/09/29 23:30:05 snj Exp $
NOMAN= # defined
@@ -32,11 +32,15 @@
LOCALESRC_eu_ES.ISO8859-15= eu_ES.ISO8859-1
LOCALESRC_fi_FI.ISO8859-15= fi_FI.ISO8859-1
LOCALESRC_fr_BE.ISO8859-15= fr_BE.ISO8859-1
+LOCALESRC_fr_BE.UTF-8= fr_BE.ISO8859-1
LOCALESRC_fr_CA.ISO8859-1= fr_FR.ISO8859-1
LOCALESRC_fr_CA.ISO8859-15= fr_FR.ISO8859-1
+LOCALESRC_fr_CA.UTF-8= fr_FR.ISO8859-1
LOCALESRC_fr_CH.ISO8859-1= fr_FR.ISO8859-1
LOCALESRC_fr_CH.ISO8859-15= fr_FR.ISO8859-1
+LOCALESRC_fr_CH.UTF-8= fr_FR.ISO8859-1
LOCALESRC_fr_FR.ISO8859-15= fr_FR.ISO8859-1
+LOCALESRC_fr_FR.UTF-8= fr_FR.ISO8859-1
#LOCALESRC_he_IL.UTF-8= en_US.US-ASCII
LOCALESRC_is_IS.ISO8859-15= is_IS.ISO8859-1
LOCALESRC_it_CH.ISO8859-1= it_IT.ISO8859-1
Index: src/share/locale/time/Makefile
diff -u src/share/locale/time/Makefile:1.4.4.1 src/share/locale/time/Makefile:1.4.4.2
--- src/share/locale/time/Makefile:1.4.4.1 Thu Jan 15 03:24:11 2009
+++ src/share/locale/time/Makefile Tue Sep 29 23:30:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.4.1 2009/01/15 03:24:11 snj Exp $
+# $NetBSD: Makefile,v 1.4.4.2 2009/09/29 23:30:05 snj Exp $
NOMAN= # defined
@@ -30,10 +30,13 @@
LOCALESRC_fi_FI.ISO8859-15= fi_FI.ISO8859-1
LOCALESRC_fr_BE.ISO8859-1= fr_FR.ISO8859-1
LOCALESRC_fr_BE.ISO8859-15= fr_FR.ISO8859-1
+LOCALESRC_fr_BE.UTF-8= fr_FR.UTF-8
LOCALESRC_fr_CA.ISO8859-1= fr_FR.ISO8859-1
LOCALESRC_fr_CA.ISO8859-15= fr_FR.ISO8859-1
+LOCALESRC_fr_CA.UTF-8= fr_FR.UTF-8
LOCALESRC_fr_CH.ISO8859-1= fr_FR.ISO8859-1
LOCALESRC_fr_CH.ISO8859-15= fr_FR.ISO8859-1
+LOCALESRC_fr_CH.UTF-8= fr_FR.UTF-8
LOCALESRC_fr_FR.ISO8859-15= fr_FR.ISO8859-1
LOCALESRC_is_IS.ISO8859-15= is_IS.ISO8859-1
LOCALESRC_it_CH.ISO8859-1= it_IT.ISO8859-1
