Module Name:    src
Committed By:   bouyer
Date:           Wed Jun  3 18:47:07 UTC 2009

Modified Files:
        src/distrib/sets/lists/base: mi
        src/etc/mtree: NetBSD.dist
        src/share/locale: Makefile.locale
        src/share/locale/ctype: Makefile
        src/share/locale/messages: Makefile
        src/share/locale/monetary: Makefile
        src/share/locale/numeric: Makefile
        src/share/locale/time: Makefile

Log Message:
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.810 -r1.811 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.402 -r1.403 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.1 -r1.2 src/share/locale/Makefile.locale
cvs rdiff -u -r1.28 -r1.29 src/share/locale/ctype/Makefile
cvs rdiff -u -r1.5 -r1.6 src/share/locale/messages/Makefile
cvs rdiff -u -r1.5 -r1.6 src/share/locale/monetary/Makefile
cvs rdiff -u -r1.4 -r1.5 src/share/locale/numeric/Makefile
cvs rdiff -u -r1.5 -r1.6 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.810 src/distrib/sets/lists/base/mi:1.811
--- src/distrib/sets/lists/base/mi:1.810	Tue May 26 21:58:31 2009
+++ src/distrib/sets/lists/base/mi	Wed Jun  3 18:47:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.810 2009/05/26 21:58:31 pooka Exp $
+# $NetBSD: mi,v 1.811 2009/06/03 18:47:05 bouyer Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -2912,6 +2912,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
@@ -2926,6 +2933,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
@@ -2940,6 +2954,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
@@ -2954,6 +2975,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.402 src/etc/mtree/NetBSD.dist:1.403
--- src/etc/mtree/NetBSD.dist:1.402	Tue May 26 21:58:32 2009
+++ src/etc/mtree/NetBSD.dist	Wed Jun  3 18:47:06 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist,v 1.402 2009/05/26 21:58:32 pooka Exp $
+#	$NetBSD: NetBSD.dist,v 1.403 2009/06/03 18:47:06 bouyer Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -870,18 +870,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 src/share/locale/Makefile.locale:1.2
--- src/share/locale/Makefile.locale:1.1	Fri Jan  2 00:20:21 2009
+++ src/share/locale/Makefile.locale	Wed Jun  3 18:47:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.locale,v 1.1 2009/01/02 00:20:21 tnozaki Exp $
+# $NetBSD: Makefile.locale,v 1.2 2009/06/03 18:47:06 bouyer 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.28 src/share/locale/ctype/Makefile:1.29
--- src/share/locale/ctype/Makefile:1.28	Fri Jan  2 00:20:21 2009
+++ src/share/locale/ctype/Makefile	Wed Jun  3 18:47:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/01/02 00:20:21 tnozaki Exp $
+# $NetBSD: Makefile,v 1.29 2009/06/03 18:47:06 bouyer 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.5 src/share/locale/messages/Makefile:1.6
--- src/share/locale/messages/Makefile:1.5	Fri Jan  2 00:20:21 2009
+++ src/share/locale/messages/Makefile	Wed Jun  3 18:47:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/01/02 00:20:21 tnozaki Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/03 18:47:06 bouyer 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.5 src/share/locale/monetary/Makefile:1.6
--- src/share/locale/monetary/Makefile:1.5	Fri Jan  2 00:20:21 2009
+++ src/share/locale/monetary/Makefile	Wed Jun  3 18:47:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/01/02 00:20:21 tnozaki Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/03 18:47:06 bouyer 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.4 src/share/locale/numeric/Makefile:1.5
--- src/share/locale/numeric/Makefile:1.4	Fri Jan  2 00:20:23 2009
+++ src/share/locale/numeric/Makefile	Wed Jun  3 18:47:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/01/02 00:20:23 tnozaki Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/03 18:47:06 bouyer 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.5 src/share/locale/time/Makefile:1.6
--- src/share/locale/time/Makefile:1.5	Fri Jan  2 00:20:23 2009
+++ src/share/locale/time/Makefile	Wed Jun  3 18:47:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/01/02 00:20:23 tnozaki Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/03 18:47:07 bouyer 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

Reply via email to