From rmh@io.debian.net  Mon Jan 30 12:54:25 2006
Return-Path: <rmh@io.debian.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BCF2B16A422
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 30 Jan 2006 12:54:25 +0000 (GMT)
	(envelope-from rmh@io.debian.net)
Received: from io.debian.net (io.ethz.ch [195.176.48.199])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6055443D48
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 30 Jan 2006 12:54:25 +0000 (GMT)
	(envelope-from rmh@io.debian.net)
Received: from rmh by io.debian.net with local (Exim 4.60)
	(envelope-from <rmh@io.debian.net>)
	id 1F3YY3-000E74-Pf
	for FreeBSD-gnats-submit@freebsd.org; Mon, 30 Jan 2006 13:54:23 +0100
Message-Id: <E1F3YY3-000E74-Pf@io.debian.net>
Date: Mon, 30 Jan 2006 13:54:23 +0100
From: <rmh@io.debian.net>
Reply-To: <rmh@io.debian.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] add ca_AD, ca_FR and ca_IT locales
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         92541
>Category:       conf
>Synopsis:       [patch] [locale] add ca_AD, ca_FR and ca_IT locales
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 30 13:00:23 GMT 2006
>Closed-Date:    Wed Jun 17 03:16:24 UTC 2009
>Last-Modified:  Wed Jun 17 03:16:24 UTC 2009
>Originator:     
>Release:        -CURRENT
>Organization:
>Environment:
System: GNU/kFreeBSD io.debian.net 5.4-1-586 #0 Mon Dec 5 19:45:10 CET 2005 i586 i386 AMD-K6(tm) 3D processor GNU/kFreeBSD
Architecture: i586

	
>Description:
Catalan language is not only spoken in Spain (ca_ES), but also in Andorra, 
France and Italy.  In Andorra it is the official language. 
 
(see http://en.wikipedia.org/wiki/Catalan_language#Geographic_distribution) 
 
This patch adds ca_AD, ca_FR and ca_IT locales.

The new files just have to be copied from their ca_ES versions.  They're
the same.

>How-To-Repeat:
	
>Fix:

diff -ur src.old/share/monetdef/Makefile src/share/monetdef/Makefile
--- src.old/share/monetdef/Makefile	2005-03-04 15:24:29.000000000 +0100
+++ src/share/monetdef/Makefile	2006-01-30 13:38:11.000000000 +0100
@@ -8,7 +8,10 @@
 		be_BY.UTF-8 \
 		bg_BG.CP1251 \
 		bg_BG.UTF-8 \
+		ca_AD.ISO8859-1 \
 		ca_ES.ISO8859-1 \
+		ca_FR.ISO8859-1 \
+		ca_IT.ISO8859-1 \
 		cs_CZ.ISO8859-2 \
 		cs_CZ.UTF-8 \
 		da_DK.ISO8859-1 \
@@ -100,11 +103,11 @@
 eucKR_CP949=	ko_KR
 GB2312_GBK=	zh_CN
 ISO8859-1_ISO8859-1= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
-ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA \
+ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE en_AU en_CA \
 		en_GB en_NZ en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR \
 		is_IS it_IT it_CH nl_BE nl_NL no_NO pt_PT sv_SE
 ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US
-ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \
+ISO8859-1_UTF-8= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \
 		en_US es_ES fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \
 		nl_NL no_NO pt_BR pt_PT sv_SE
 ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU
diff -ur src.old/share/msgdef/Makefile src/share/msgdef/Makefile
--- src.old/share/msgdef/Makefile	2005-09-28 09:40:03.000000000 +0200
+++ src/share/msgdef/Makefile	2006-01-30 13:39:31.000000000 +0100
@@ -8,7 +8,10 @@
 		be_BY.UTF-8 \
 		bg_BG.CP1251 \
 		bg_BG.UTF-8 \
+		ca_AD.ISO8859-1 \
 		ca_ES.ISO8859-1 \
+		ca_FR.ISO8859-1 \
+		ca_IT.ISO8859-1 \
 		cs_CZ.ISO8859-2 \
 		da_DK.ISO8859-1 \
 		de_DE.ISO8859-1 \
@@ -100,13 +103,13 @@
 GB2312_GBK=	zh_CN
 ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 		${NL_LINKS} ${PT_LINKS}
-ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES \
+ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_DE en_CA en_GB en_US es_ES \
 		eu_ES fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \
 		pt_PT sv_SE \
 		${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 		${NL_LINKS}
 ISO8859-1_US-ASCII= ${GB_LINKS} en_CA en_GB en_US
-ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES eu_ES \
+ISO8859-1_UTF-8= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_DE en_CA en_GB en_US es_ES eu_ES \
 		fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO pt_PT \
 		sv_SE
 ISO8859-2_ISO8859-2= ${CZ_LINKS}
diff -ur src.old/share/numericdef/Makefile src/share/numericdef/Makefile
--- src.old/share/numericdef/Makefile	2005-03-04 15:24:30.000000000 +0100
+++ src/share/numericdef/Makefile	2006-01-30 13:41:58.000000000 +0100
@@ -4,7 +4,10 @@
 		am_ET.UTF-8 \
 		be_BY.CP1251 \
 		bg_BG.CP1251 \
+		ca_AD.ISO8859-1 \
 		ca_ES.ISO8859-1 \
+		ca_FR.ISO8859-1 \
+		ca_IT.ISO8859-1 \
 		cs_CZ.ISO8859-2 \
 		da_DK.ISO8859-1 \
 		de_DE.ISO8859-1 \
@@ -88,14 +91,14 @@
 eucJP_UTF-8=	ja_JP
 eucKR_CP949=	ko_KR
 eucKR_UTF-8=	ko_KR
-ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_US es_ES eu_ES fi_FI \
+ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_DE en_US es_ES eu_ES fi_FI \
 		fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT sv_SE \
 		${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 		${IT_LINKS} ${US_LINKS}
 ISO8859-1_ISO8859-1= ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 		${IT_LINKS} ${US_LINKS}
 ISO8859-1_US-ASCII= en_US ${GB_LINKS} ${US_LINKS}
-ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_US es_ES eu_ES fi_FI fr_BE \
+ISO8859-1_UTF-8= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_DE en_US es_ES eu_ES fi_FI fr_BE \
 		fr_FR is_IS it_IT nl_NL no_NO pt_BR pt_PT sv_SE
 ISO8859-2_UTF-8= cs_CZ hr_HR hu_HU pl_PL ro_RO sk_SK sl_SI
 ISO8859-5_UTF-8= sr_YU uk_UA
diff -ur src.old/share/timedef/Makefile src/share/timedef/Makefile
--- src.old/share/timedef/Makefile	2005-03-04 15:24:30.000000000 +0100
+++ src/share/timedef/Makefile	2006-01-30 13:43:24.000000000 +0100
@@ -7,8 +7,14 @@
 		be_BY.UTF-8 \
 		bg_BG.CP1251 \
 		bg_BG.UTF-8 \
+		ca_AD.ISO8859-1 \
+		ca_AD.UTF-8 \
 		ca_ES.ISO8859-1 \
 		ca_ES.UTF-8 \
+		ca_FR.ISO8859-1 \
+		ca_FR.UTF-8 \
+		ca_IT.ISO8859-1 \
+		ca_IT.UTF-8 \
 		cs_CZ.ISO8859-2 \
 		cs_CZ.UTF-8 \
 		da_DK.ISO8859-1 \


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-i18n 
Responsible-Changed-By: gavin 
Responsible-Changed-When: Mon May 18 15:13:29 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer(s) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92541 
Responsible-Changed-From-To: freebsd-i18n->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jun 10 12:16:57 UTC 2009 
Responsible-Changed-Why:  
I'll do the commit 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92541 
State-Changed-From-To: open->patched 
State-Changed-By: edwin 
State-Changed-When: Wed Jun 10 12:20:53 UTC 2009 
State-Changed-Why:  
Commit to head, MFC in one week. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92541 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/92541: commit references a PR
Date: Wed, 10 Jun 2009 12:20:25 +0000 (UTC)

 Author: edwin
 Date: Wed Jun 10 12:20:11 2009
 New Revision: 193908
 URL: http://svn.freebsd.org/changeset/base/193908
 
 Log:
   add ca_AD, ca_FR and ca_IT locales
   
       Catalan language is not only spoken in Spain (ca_ES), but also
       in Andorra, France and Italy. In Andorra it is the official
       language.
   
       (see http://en.wikipedia.org/wiki/Catalan_language#Geographic_distribution)
   
   Add a bunch of symlinks to between ca_ES and ca_AD, ca_FR and ca_IT.
   
   PR:		conf/92541
   Submitted by:	<rmh@io.debian.net>
   MFC after:	1 week
 
 Modified:
   head/etc/mtree/BSD.local.dist
   head/etc/mtree/BSD.usr.dist
   head/share/colldef/Makefile
   head/share/mklocale/Makefile
   head/share/monetdef/Makefile
   head/share/msgdef/Makefile
   head/share/numericdef/Makefile
   head/share/timedef/Makefile
 
 Modified: head/etc/mtree/BSD.local.dist
 ==============================================================================
 --- head/etc/mtree/BSD.local.dist	Wed Jun 10 12:07:55 2009	(r193907)
 +++ head/etc/mtree/BSD.local.dist	Wed Jun 10 12:20:11 2009	(r193908)
 @@ -541,12 +541,30 @@
              ..
              bg_BG.UTF-8
              ..
 +            ca_AD.ISO8859-1
 +            ..
              ca_ES.ISO8859-1
              ..
 +            ca_FR.ISO8859-1
 +            ..
 +            ca_IT.ISO8859-1
 +            ..
 +            ca_AD.ISO8859-15
 +            ..
              ca_ES.ISO8859-15
              ..
 +            ca_FR.ISO8859-15
 +            ..
 +            ca_IT.ISO8859-15
 +            ..
 +            ca_AD.UTF-8
 +            ..
              ca_ES.UTF-8
              ..
 +            ca_FR.UTF-8
 +            ..
 +            ca_IT.UTF-8
 +            ..
              cs_CZ.ISO8859-2
              ..
              cs_CZ.UTF-8
 
 Modified: head/etc/mtree/BSD.usr.dist
 ==============================================================================
 --- head/etc/mtree/BSD.usr.dist	Wed Jun 10 12:07:55 2009	(r193907)
 +++ head/etc/mtree/BSD.usr.dist	Wed Jun 10 12:20:11 2009	(r193908)
 @@ -357,12 +357,30 @@
              ..
              bg_BG.UTF-8
              ..
 +            ca_AD.ISO8859-1
 +            ..
              ca_ES.ISO8859-1
              ..
 +            ca_FR.ISO8859-1
 +            ..
 +            ca_IT.ISO8859-1
 +            ..
 +            ca_AD.ISO8859-15
 +            ..
              ca_ES.ISO8859-15
              ..
 +            ca_FR.ISO8859-15
 +            ..
 +            ca_IT.ISO8859-15
 +            ..
 +            ca_AD.UTF-8
 +            ..
              ca_ES.UTF-8
              ..
 +            ca_FR.UTF-8
 +            ..
 +            ca_IT.UTF-8
 +            ..
              cs_CZ.ISO8859-2
              ..
              cs_CZ.UTF-8
 
 Modified: head/share/colldef/Makefile
 ==============================================================================
 --- head/share/colldef/Makefile	Wed Jun 10 12:07:55 2009	(r193907)
 +++ head/share/colldef/Makefile	Wed Jun 10 12:20:11 2009	(r193908)
 @@ -69,6 +69,7 @@ ISO8859-1_ISO8859-1= ${ISO8859-15_ISO885
  LATIN1LINKS=	af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \
  		fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL pt_PT
  ISO8859-15_ISO8859-15= \
 +	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
  	de_DE:de_AT de_DE:de_CH \
  	no_NO:nb_NO no_NO:nn_NO \
  	${LATIN1LINKS:C/^/la_LN:/}
 @@ -89,11 +90,11 @@ US-ASCII_SJIS=	la_LN:ja_JP
  ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
  US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/}
  
 -UTF8LINKS=	af_ZA am_ET be_BY bg_BG ca_ES cs_CZ da_DK de_AT de_CH \
 -		de_DE el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES \
 -		et_EE eu_ES fi_FI fr_BE \
 -		fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \
 -		ja_JP kk_KZ ko_KR lt_LT mn_MN \
 +UTF8LINKS=	af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
 +		da_DK de_AT de_CH de_DE \
 +		el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES \
 +		fi_FI fr_BE fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM \
 +		is_IS it_CH it_IT ja_JP kk_KZ ko_KR lt_LT mn_MN \
  		nb_NO nl_BE nl_NL nn_NO no_NO pl_PL pt_BR pt_PT \
  		ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \
  		zh_TW
 
 Modified: head/share/mklocale/Makefile
 ==============================================================================
 --- head/share/mklocale/Makefile	Wed Jun 10 12:07:55 2009	(r193907)
 +++ head/share/mklocale/Makefile	Wed Jun 10 12:20:11 2009	(r193908)
 @@ -52,8 +52,9 @@ ENCODINGS=      CP1251 ISO8859-1 ISO8859
  ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
  US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/}
  
 -LATIN1XLINKS=   af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \
 -		en_US es_ES eu_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH \
 +LATIN1XLINKS=	af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
 +		en_AU en_CA en_GB en_NZ en_US es_ES eu_ES \
 +		fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH \
  		it_IT nb_NO nl_BE nl_NL nn_NO no_NO pt_PT sv_SE
  LATIN1LINKS=	${LATIN1XLINKS} pt_BR
  ISO8859-1_ISO8859-1= ${LATIN1LINKS:C/^/la_LN:/}
 @@ -73,7 +74,8 @@ ISO8859-5_ISO8859-5= ${LATIN5LINKS:C/^/r
  CP1251LINKS=    ru_RU be_BY uk_UA
  CP1251_CP1251=	${CP1251LINKS:C/^/bg_BG:/}
  
 -UTF8LINKS=	af_ZA be_BY bg_BG ca_ES cs_CZ da_DK de_AT de_CH de_DE el_GR \
 +UTF8LINKS=	af_ZA be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
 +		da_DK de_AT de_CH de_DE el_GR \
  		en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \
  		fr_BE \
  		fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \
 
 Modified: head/share/monetdef/Makefile
 ==============================================================================
 --- head/share/monetdef/Makefile	Wed Jun 10 12:07:55 2009	(r193907)
 +++ head/share/monetdef/Makefile	Wed Jun 10 12:20:11 2009	(r193908)
 @@ -100,13 +100,16 @@ Big5_UTF-8=	zh_TW
  eucJP_SJIS=	ja_JP
  eucKR_CP949=	ko_KR
  GB2312_GBK=	zh_CN
 -ISO8859-1_ISO8859-1= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH no_NO:nb_NO no_NO:nn_NO
 -ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA \
 -		en_GB en_NZ en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR \
 +ISO8859-1_ISO8859-1= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT es_ES:eu_ES \
 +		de_CH:fr_CH de_CH:it_CH no_NO:nb_NO no_NO:nn_NO
 +ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
 +		en_AU en_CA en_GB en_NZ en_US es_ES \
 +		fi_FI fr_BE fr_CA fr_CH fr_FR \
  		is_IS it_IT it_CH nl_BE nl_NL nb_NO nn_NO no_NO pt_PT sv_SE
  ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US
 -ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \
 -		en_US es_ES fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \
 +ISO8859-1_UTF-8= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
 +		en_AU en_CA en_NZ en_US es_ES \
 +		fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \
  		nl_NL nb_NO nn_NO no_NO pt_BR pt_PT sv_SE
  ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU
  ISO8859-7_UTF-8= el_GR
 @@ -116,7 +119,8 @@ ISO8859-13_UTF-8= lt_LT
  ISO8859-15_ISO8859-15= es_ES:eu_ES
  ISO8859-15_UTF-8= et_EE
  UTF-8_Big5HKSCS= zh_HK
 -UTF-8_UTF-8=	es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
 +UTF-8_UTF-8=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
 +		es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
  
  SYMLINKS=
  .for enc1 in ${ENCODINGS}
 
 Modified: head/share/msgdef/Makefile
 ==============================================================================
 --- head/share/msgdef/Makefile	Wed Jun 10 12:07:55 2009	(r193907)
 +++ head/share/msgdef/Makefile	Wed Jun 10 12:20:11 2009	(r193908)
 @@ -84,6 +84,7 @@ FILESDIR_${locale}.out= ${LOCALEDIR}/${l
  
  CLEANFILES=	${FILES}
  
 +CA_LINKS=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
  CZ_LINKS=	cs_CZ:sk_SK
  DE_LINKS=	de_DE:de_AT de_DE:de_CH
  FR_LINKS=	fr_FR:fr_CA
 @@ -100,12 +101,12 @@ ENCODINGS=	Big5 Big5HKSCS CP949 eucKR GB
  Big5_Big5HKSCS=	zh_TW:zh_HK
  eucKR_CP949=	ko_KR
  GB2312_GBK=	zh_CN
 -ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 -		${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
 +ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
  ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES \
  		eu_ES fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \
  		pt_PT sv_SE \
 -		${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 +		${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
  		${NL_LINKS} ${NO_LINKS}
  ISO8859-1_US-ASCII= ${GB_LINKS} en_CA en_GB en_US
  ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES eu_ES \
 @@ -117,7 +118,8 @@ ISO8859-9_UTF-8= tr_TR
  ISO8859-13_ISO8859-4= lt_LT
  ISO8859-13_UTF-8= lt_LT
  ISO8859-15_UTF-8= et_EE
 -UTF-8_UTF-8=	${CZ_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} en_GB:en_IE \
 +UTF-8_UTF-8=	${CA_LINKS} ${CZ_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		en_GB:en_IE \
  		${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS} zh_TW:zh_HK
  
  SYMLINKS=
 
 Modified: head/share/numericdef/Makefile
 ==============================================================================
 --- head/share/numericdef/Makefile	Wed Jun 10 12:07:55 2009	(r193907)
 +++ head/share/numericdef/Makefile	Wed Jun 10 12:20:11 2009	(r193908)
 @@ -68,6 +68,7 @@ ENCODINGS=	ARMSCII-8 Big5 Big5HKSCS \
  		KOI8-R KOI8-U PT154 SJIS US-ASCII UTF-8
  
  BE_LINKS=	fr_BE:nl_BE
 +CA_LINKS=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
  DE_LINKS=	de_DE:de_AT
  FR_LINKS=	fr_FR:fr_CA fr_FR:fr_CH
  GB_LINKS=	en_GB:en_AU en_GB:en_NZ
 @@ -92,11 +93,11 @@ eucJP_UTF-8=	ja_JP
  eucKR_CP949=	ko_KR
  eucKR_UTF-8=	ko_KR
  ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES \
 -		fi_FI fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT \
 -		sv_SE ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 -		${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 -ISO8859-1_ISO8859-1= ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		fi_FI fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT sv_SE \
 +		${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
  		${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 +ISO8859-1_ISO8859-1= ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} \
 +		${GB_LINKS} ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
  ISO8859-1_US-ASCII= en_US ${GB_LINKS} ${US_LINKS}
  ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES fi_FI \
  		fr_BE fr_FR is_IS it_IT nl_NL no_NO pt_BR pt_PT sv_SE
 @@ -114,8 +115,8 @@ KOI8-R_ISO8859-5= ru_RU
  KOI8-U_ISO8859-5= uk_UA
  PT154_UTF-8=	kk_KZ
  US-ASCII_UTF-8=	en_US:he_IL
 -UTF-8_UTF-8=	${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} en_GB:en_IE \
 -		${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 +UTF-8_UTF-8=	${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		en_GB:en_IE ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
  
  SYMLINKS=
  .for enc1 in ${ENCODINGS}
 
 Modified: head/share/timedef/Makefile
 ==============================================================================
 --- head/share/timedef/Makefile	Wed Jun 10 12:07:55 2009	(r193907)
 +++ head/share/timedef/Makefile	Wed Jun 10 12:20:11 2009	(r193908)
 @@ -114,6 +114,7 @@ ENCODINGS=	Big5HKSCS CP949 eucKR GB2312 
  		ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-15 \
  		US-ASCII UTF-8
  
 +CA_LINKS=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
  DE_LINKS=	de_DE:de_CH
  FR_LINKS=	fr_FR:fr_BE fr_FR:fr_CA fr_FR:fr_CH
  IT_LINKS=	it_IT:it_CH
 @@ -123,20 +124,21 @@ GB_LINKS=	en_GB:en_AU en_GB:en_CA en_GB:
  
  eucKR_CP949=	ko_KR
  GB2312_GBK=	zh_CN
 -ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 -		${NL_LINKS} ${NO_LINKS} en_US:af_ZA
 +ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		${IT_LINKS} ${NL_LINKS} ${NO_LINKS} en_US:af_ZA
  ISO8859-1_ISO8859-15= ca_ES da_DK de_AT de_DE en_GB en_US es_ES eu_ES \
  		fi_FI fr_FR is_IS it_IT la_LN nb_NO nl_NL nn_NO no_NO pt_PT \
  		sv_SE \
 -		${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS}
 +		${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 +		${NL_LINKS}
  ISO8859-1_US-ASCII= ${GB_LINKS} en_GB en_US la_LN
  ISO8859-1_ISO8859-2= la_LN
  ISO8859-1_ISO8859-4= la_LN
  ISO8859-1_UTF-8= en_GB en_US eu_ES nl_NL
  ISO8859-15_ISO8859-15= en_US:af_ZA
  UTF-8_Big5HKSCS= zh_TW:zh_HK
 -UTF-8_UTF-8=	${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS} \
 -		${NO_LINKS} \
 +UTF-8_UTF-8=	${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 +		${NL_LINKS} ${NO_LINKS} \
  		en_GB:en_IE en_US:af_ZA zh_TW:zh_HK
  
  SYMLINKS=
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/92541: commit references a PR
Date: Wed, 17 Jun 2009 03:04:47 +0000 (UTC)

 Author: edwin
 Date: Wed Jun 17 03:04:30 2009
 New Revision: 194323
 URL: http://svn.freebsd.org/changeset/base/194323
 
 Log:
   MFC of 193908:
   
   add ca_AD, ca_FR and ca_IT locales
   
         Catalan language is not only spoken in Spain (ca_ES), but
         also in Andorra, France and Italy. In Andorra it is the
         official language.
   
         (see http://en.wikipedia.org/wiki/Catalan_language#Geographic_distribution)
   
   PR:		conf/92541
   Submitted by:	<rmh@io.debian.net>
 
 Modified:
   stable/7/etc/mtree/   (props changed)
   stable/7/etc/mtree/BSD.local.dist
   stable/7/etc/mtree/BSD.usr.dist
   stable/7/share/colldef/   (props changed)
   stable/7/share/colldef/Makefile
   stable/7/share/mklocale/   (props changed)
   stable/7/share/mklocale/Makefile
   stable/7/share/monetdef/   (props changed)
   stable/7/share/monetdef/Makefile
   stable/7/share/msgdef/   (props changed)
   stable/7/share/msgdef/Makefile
   stable/7/share/numericdef/   (props changed)
   stable/7/share/numericdef/Makefile
   stable/7/share/timedef/   (props changed)
   stable/7/share/timedef/Makefile
 
 Modified: stable/7/etc/mtree/BSD.local.dist
 ==============================================================================
 --- stable/7/etc/mtree/BSD.local.dist	Wed Jun 17 02:55:53 2009	(r194322)
 +++ stable/7/etc/mtree/BSD.local.dist	Wed Jun 17 03:04:30 2009	(r194323)
 @@ -541,12 +541,30 @@
              ..
              bg_BG.UTF-8
              ..
 +            ca_AD.ISO8859-1
 +            ..
              ca_ES.ISO8859-1
              ..
 +            ca_FR.ISO8859-1
 +            ..
 +            ca_IT.ISO8859-1
 +            ..
 +            ca_AD.ISO8859-15
 +            ..
              ca_ES.ISO8859-15
              ..
 +            ca_FR.ISO8859-15
 +            ..
 +            ca_IT.ISO8859-15
 +            ..
 +            ca_AD.UTF-8
 +            ..
              ca_ES.UTF-8
              ..
 +            ca_FR.UTF-8
 +            ..
 +            ca_IT.UTF-8
 +            ..
              cs_CZ.ISO8859-2
              ..
              cs_CZ.UTF-8
 
 Modified: stable/7/etc/mtree/BSD.usr.dist
 ==============================================================================
 --- stable/7/etc/mtree/BSD.usr.dist	Wed Jun 17 02:55:53 2009	(r194322)
 +++ stable/7/etc/mtree/BSD.usr.dist	Wed Jun 17 03:04:30 2009	(r194323)
 @@ -369,12 +369,30 @@
              ..
              bg_BG.UTF-8
              ..
 +            ca_AD.ISO8859-1
 +            ..
              ca_ES.ISO8859-1
              ..
 +            ca_FR.ISO8859-1
 +            ..
 +            ca_IT.ISO8859-1
 +            ..
 +            ca_AD.ISO8859-15
 +            ..
              ca_ES.ISO8859-15
              ..
 +            ca_FR.ISO8859-15
 +            ..
 +            ca_IT.ISO8859-15
 +            ..
 +            ca_AD.UTF-8
 +            ..
              ca_ES.UTF-8
              ..
 +            ca_FR.UTF-8
 +            ..
 +            ca_IT.UTF-8
 +            ..
              cs_CZ.ISO8859-2
              ..
              cs_CZ.UTF-8
 
 Modified: stable/7/share/colldef/Makefile
 ==============================================================================
 --- stable/7/share/colldef/Makefile	Wed Jun 17 02:55:53 2009	(r194322)
 +++ stable/7/share/colldef/Makefile	Wed Jun 17 03:04:30 2009	(r194323)
 @@ -69,6 +69,7 @@ ISO8859-1_ISO8859-1= ${ISO8859-15_ISO885
  LATIN1LINKS=	af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \
  		fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL pt_PT
  ISO8859-15_ISO8859-15= \
 +	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
  	de_DE:de_AT de_DE:de_CH \
  	no_NO:nb_NO no_NO:nn_NO \
  	${LATIN1LINKS:C/^/la_LN:/}
 @@ -89,11 +90,11 @@ US-ASCII_SJIS=	la_LN:ja_JP
  ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
  US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/}
  
 -UTF8LINKS=	af_ZA am_ET be_BY bg_BG ca_ES cs_CZ da_DK de_AT de_CH \
 -		de_DE el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES \
 -		et_EE eu_ES fi_FI fr_BE \
 -		fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \
 -		ja_JP kk_KZ ko_KR lt_LT mn_MN \
 +UTF8LINKS=	af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
 +		da_DK de_AT de_CH de_DE \
 +		el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES \
 +		fi_FI fr_BE fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM \
 +		is_IS it_CH it_IT ja_JP kk_KZ ko_KR lt_LT mn_MN \
  		nb_NO nl_BE nl_NL nn_NO no_NO pl_PL pt_BR pt_PT \
  		ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \
  		zh_TW
 
 Modified: stable/7/share/mklocale/Makefile
 ==============================================================================
 --- stable/7/share/mklocale/Makefile	Wed Jun 17 02:55:53 2009	(r194322)
 +++ stable/7/share/mklocale/Makefile	Wed Jun 17 03:04:30 2009	(r194323)
 @@ -51,8 +51,9 @@ ENCODINGS=	CP1251 ISO8859-1 ISO8859-2 IS
  ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
  US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/}
  
 -LATIN1XLINKS=   af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \
 -		en_US es_ES eu_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH \
 +LATIN1XLINKS=	af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
 +		en_AU en_CA en_GB en_NZ en_US es_ES eu_ES \
 +		fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH \
  		it_IT nb_NO nl_BE nl_NL nn_NO no_NO pt_PT sv_SE
  LATIN1LINKS=	${LATIN1XLINKS} pt_BR
  ISO8859-1_ISO8859-1= ${LATIN1LINKS:C/^/la_LN:/}
 @@ -72,7 +73,8 @@ ISO8859-5_ISO8859-5= ${LATIN5LINKS:C/^/r
  CP1251LINKS=    ru_RU be_BY uk_UA
  CP1251_CP1251=	${CP1251LINKS:C/^/bg_BG:/}
  
 -UTF8LINKS=	af_ZA be_BY bg_BG ca_ES cs_CZ da_DK de_AT de_CH de_DE el_GR \
 +UTF8LINKS=	af_ZA be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
 +		da_DK de_AT de_CH de_DE el_GR \
  		en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \
  		fr_BE \
  		fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \
 
 Modified: stable/7/share/monetdef/Makefile
 ==============================================================================
 --- stable/7/share/monetdef/Makefile	Wed Jun 17 02:55:53 2009	(r194322)
 +++ stable/7/share/monetdef/Makefile	Wed Jun 17 03:04:30 2009	(r194323)
 @@ -100,13 +100,16 @@ Big5_UTF-8=	zh_TW
  eucJP_SJIS=	ja_JP
  eucKR_CP949=	ko_KR
  GB2312_GBK=	zh_CN
 -ISO8859-1_ISO8859-1= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH no_NO:nb_NO no_NO:nn_NO
 -ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA \
 -		en_GB en_NZ en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR \
 +ISO8859-1_ISO8859-1= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT es_ES:eu_ES \
 +		de_CH:fr_CH de_CH:it_CH no_NO:nb_NO no_NO:nn_NO
 +ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
 +		en_AU en_CA en_GB en_NZ en_US es_ES \
 +		fi_FI fr_BE fr_CA fr_CH fr_FR \
  		is_IS it_IT it_CH nl_BE nl_NL nb_NO nn_NO no_NO pt_PT sv_SE
  ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US
 -ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \
 -		en_US es_ES fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \
 +ISO8859-1_UTF-8= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
 +		en_AU en_CA en_NZ en_US es_ES \
 +		fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \
  		nl_NL nb_NO nn_NO no_NO pt_BR pt_PT sv_SE
  ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU
  ISO8859-7_UTF-8= el_GR
 @@ -116,7 +119,8 @@ ISO8859-13_UTF-8= lt_LT
  ISO8859-15_ISO8859-15= es_ES:eu_ES
  ISO8859-15_UTF-8= et_EE
  UTF-8_Big5HKSCS= zh_HK
 -UTF-8_UTF-8=	es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
 +UTF-8_UTF-8=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
 +		es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
  
  SYMLINKS=
  .for enc1 in ${ENCODINGS}
 
 Modified: stable/7/share/msgdef/Makefile
 ==============================================================================
 --- stable/7/share/msgdef/Makefile	Wed Jun 17 02:55:53 2009	(r194322)
 +++ stable/7/share/msgdef/Makefile	Wed Jun 17 03:04:30 2009	(r194323)
 @@ -83,6 +83,7 @@ FILESDIR_${locale}.out= ${LOCALEDIR}/${l
  
  CLEANFILES=	${FILES}
  
 +CA_LINKS=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
  CZ_LINKS=	cs_CZ:sk_SK
  DE_LINKS=	de_DE:de_AT de_DE:de_CH
  FR_LINKS=	fr_FR:fr_CA
 @@ -100,12 +101,12 @@ Big5_Big5HKSCS=	zh_TW:zh_HK
  eucKR_CP949=	ko_KR
  eucKR_UTF-8=	ko_KR
  GB2312_GBK=	zh_CN
 -ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 -		${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
 +ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
  ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES \
  		eu_ES fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \
  		pt_PT sv_SE \
 -		${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 +		${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
  		${NL_LINKS} ${NO_LINKS}
  ISO8859-1_US-ASCII= ${GB_LINKS} en_CA en_GB en_US
  ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES eu_ES \
 @@ -117,7 +118,8 @@ ISO8859-9_UTF-8= tr_TR
  ISO8859-13_ISO8859-4= lt_LT
  ISO8859-13_UTF-8= lt_LT
  ISO8859-15_UTF-8= et_EE
 -UTF-8_UTF-8=	${CZ_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} en_GB:en_IE \
 +UTF-8_UTF-8=	${CA_LINKS} ${CZ_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		en_GB:en_IE \
  		${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS} zh_TW:zh_HK
  
  SYMLINKS=
 
 Modified: stable/7/share/numericdef/Makefile
 ==============================================================================
 --- stable/7/share/numericdef/Makefile	Wed Jun 17 02:55:53 2009	(r194322)
 +++ stable/7/share/numericdef/Makefile	Wed Jun 17 03:04:30 2009	(r194323)
 @@ -68,6 +68,7 @@ ENCODINGS=	ARMSCII-8 Big5 Big5HKSCS \
  		KOI8-R KOI8-U PT154 SJIS US-ASCII UTF-8
  
  BE_LINKS=	fr_BE:nl_BE
 +CA_LINKS=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
  DE_LINKS=	de_DE:de_AT
  FR_LINKS=	fr_FR:fr_CA fr_FR:fr_CH
  GB_LINKS=	en_GB:en_AU en_GB:en_NZ
 @@ -92,11 +93,11 @@ eucJP_UTF-8=	ja_JP
  eucKR_CP949=	ko_KR
  eucKR_UTF-8=	ko_KR
  ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES \
 -		fi_FI fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT \
 -		sv_SE ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 -		${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 -ISO8859-1_ISO8859-1= ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		fi_FI fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT sv_SE \
 +		${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
  		${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 +ISO8859-1_ISO8859-1= ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} \
 +		${GB_LINKS} ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
  ISO8859-1_US-ASCII= en_US ${GB_LINKS} ${US_LINKS}
  ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES fi_FI \
  		fr_BE fr_FR is_IS it_IT nl_NL no_NO pt_BR pt_PT sv_SE
 @@ -114,8 +115,8 @@ KOI8-R_ISO8859-5= ru_RU
  KOI8-U_ISO8859-5= uk_UA
  PT154_UTF-8=	kk_KZ
  US-ASCII_UTF-8=	en_US:he_IL
 -UTF-8_UTF-8=	${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} en_GB:en_IE \
 -		${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 +UTF-8_UTF-8=	${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		en_GB:en_IE ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
  
  SYMLINKS=
  .for enc1 in ${ENCODINGS}
 
 Modified: stable/7/share/timedef/Makefile
 ==============================================================================
 --- stable/7/share/timedef/Makefile	Wed Jun 17 02:55:53 2009	(r194322)
 +++ stable/7/share/timedef/Makefile	Wed Jun 17 03:04:30 2009	(r194323)
 @@ -114,6 +114,7 @@ ENCODINGS=	Big5HKSCS CP949 eucKR GB2312 
  		ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-15 \
  		US-ASCII UTF-8
  
 +CA_LINKS=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
  DE_LINKS=	de_DE:de_CH
  FR_LINKS=	fr_FR:fr_BE fr_FR:fr_CA fr_FR:fr_CH
  IT_LINKS=	it_IT:it_CH
 @@ -123,20 +124,21 @@ GB_LINKS=	en_GB:en_AU en_GB:en_CA en_GB:
  
  eucKR_CP949=	ko_KR
  GB2312_GBK=	zh_CN
 -ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 -		${NL_LINKS} ${NO_LINKS} en_US:af_ZA
 +ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 +		${IT_LINKS} ${NL_LINKS} ${NO_LINKS} en_US:af_ZA
  ISO8859-1_ISO8859-15= ca_ES da_DK de_AT de_DE en_GB en_US es_ES eu_ES \
  		fi_FI fr_FR is_IS it_IT la_LN nb_NO nl_NL nn_NO no_NO pt_PT \
  		sv_SE \
 -		${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS}
 +		${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 +		${NL_LINKS}
  ISO8859-1_US-ASCII= ${GB_LINKS} en_GB en_US la_LN
  ISO8859-1_ISO8859-2= la_LN
  ISO8859-1_ISO8859-4= la_LN
  ISO8859-1_UTF-8= en_GB en_US eu_ES nl_NL
  ISO8859-15_ISO8859-15= en_US:af_ZA
  UTF-8_Big5HKSCS= zh_TW:zh_HK
 -UTF-8_UTF-8=	${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS} \
 -		${NO_LINKS} \
 +UTF-8_UTF-8=	${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 +		${NL_LINKS} ${NO_LINKS} \
  		en_GB:en_IE en_US:af_ZA zh_TW:zh_HK
  
  SYMLINKS=
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: edwin 
State-Changed-When: Wed Jun 17 03:16:16 UTC 2009 
State-Changed-Why:  
MFC done, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92541 
>Unformatted:
