From owner-svn-src-user@FreeBSD.ORG  Mon Aug 17 21:15:05 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C6E5A106568B;
	Mon, 17 Aug 2009 21:15:05 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AFDF38FC41;
	Mon, 17 Aug 2009 21:15:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7HLF5ZW093947;
	Mon, 17 Aug 2009 21:15:05 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7HLF5mv093944;
	Mon, 17 Aug 2009 21:15:05 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908172115.n7HLF5mv093944@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Mon, 17 Aug 2009 21:15:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196345 - in user/edwin/locale: etc tools
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Aug 2009 21:15:05 -0000

Author: edwin
Date: Mon Aug 17 21:15:05 2009
New Revision: 196345
URL: http://svn.freebsd.org/changeset/base/196345

Log:
  Map d_t_fmt on c_fmt.

Modified:
  user/edwin/locale/etc/charmaps.xml
  user/edwin/locale/tools/cldr2def.pl

Modified: user/edwin/locale/etc/charmaps.xml
==============================================================================
--- user/edwin/locale/etc/charmaps.xml	Mon Aug 17 20:06:00 2009	(r196344)
+++ user/edwin/locale/etc/charmaps.xml	Mon Aug 17 21:15:05 2009	(r196345)
@@ -508,6 +508,11 @@
 
 </translations>
 
+<c_fmt>
+	<!-- The format of the output of date(1) and ctime(3) is different:
+	-->
+</c_fmt>
+
 <alternativemonths>
 	<!-- Months which are different in dates ("21 december 1980") and in
 		sentence usage ("We will do that in December.").

Modified: user/edwin/locale/tools/cldr2def.pl
==============================================================================
--- user/edwin/locale/tools/cldr2def.pl	Mon Aug 17 20:06:00 2009	(r196344)
+++ user/edwin/locale/tools/cldr2def.pl	Mon Aug 17 21:15:05 2009	(r196345)
@@ -107,7 +107,7 @@ my %DESC = (
 	"day"		=> "Long weekday names",
 	"t_fmt"		=> "X_fmt",
 	"d_fmt"		=> "x_fmt",
-	"XXX"		=> "c_fmt",
+	"d_t_fmt"	=> "c_fmt",
 	"am_pm"		=> "AM/PM",
 	"d_t_fmt"	=> "date_fmt",
 	"altmon"	=> "Long month names (without case ending)",
@@ -174,7 +174,6 @@ if ($TYPE eq "timedef") {
 	    "am_pm"		=> "as",
 	    "d_fmt"		=> "s",
 	    "d_t_fmt"		=> "s",
-#	    "altmon"		=> ">mon",		# repeat them for now
 	    "altmon"		=> "<altmon<mon<as",
 	    "md_order"		=> "<mdorder<d_fmt<s",
 	    "t_fmt_ampm"	=> "s",

From owner-svn-src-user@FreeBSD.ORG  Mon Aug 17 21:17:20 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 025AC106568B;
	Mon, 17 Aug 2009 21:17:20 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CAD228FC68;
	Mon, 17 Aug 2009 21:17:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7HLHIUU094019;
	Mon, 17 Aug 2009 21:17:18 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7HLHI0j094018;
	Mon, 17 Aug 2009 21:17:18 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908172117.n7HLHI0j094018@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Mon, 17 Aug 2009 21:17:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196346 - in user/edwin: cldr locale
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Aug 2009 21:17:20 -0000

Author: edwin
Date: Mon Aug 17 21:17:18 2009
New Revision: 196346
URL: http://svn.freebsd.org/changeset/base/196346

Log:
  Rename for preparation of move of data.

Added:
  user/edwin/cldr/
     - copied from r196345, user/edwin/locale/
Deleted:
  user/edwin/locale/

From owner-svn-src-user@FreeBSD.ORG  Mon Aug 17 21:18:12 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0D34106568B;
	Mon, 17 Aug 2009 21:18:12 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 985978FC59;
	Mon, 17 Aug 2009 21:18:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7HLICNF094069;
	Mon, 17 Aug 2009 21:18:12 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7HLICA7094068;
	Mon, 17 Aug 2009 21:18:12 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908172118.n7HLICA7094068@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Mon, 17 Aug 2009 21:18:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196347 - user/edwin/locale
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Aug 2009 21:18:12 -0000

Author: edwin
Date: Mon Aug 17 21:18:12 2009
New Revision: 196347
URL: http://svn.freebsd.org/changeset/base/196347

Log:
  Re-create directory for this project.

Added:
  user/edwin/locale/

From owner-svn-src-user@FreeBSD.ORG  Mon Aug 17 21:19:24 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A6FBC106568D;
	Mon, 17 Aug 2009 21:19:24 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7DD3E8FC3D;
	Mon, 17 Aug 2009 21:19:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7HLJOpn094138;
	Mon, 17 Aug 2009 21:19:24 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7HLJODj094137;
	Mon, 17 Aug 2009 21:19:24 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908172119.n7HLJODj094137@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Mon, 17 Aug 2009 21:19:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196348 - in user/edwin: cldr locale/cldr
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Aug 2009 21:19:24 -0000

Author: edwin
Date: Mon Aug 17 21:19:24 2009
New Revision: 196348
URL: http://svn.freebsd.org/changeset/base/196348

Log:
  Move directory cldr into locale directory.

Added:
  user/edwin/locale/cldr/
     - copied from r196347, user/edwin/cldr/
Deleted:
  user/edwin/cldr/

From owner-svn-src-user@FreeBSD.ORG  Mon Aug 17 21:23:53 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 93F3F106568F;
	Mon, 17 Aug 2009 21:23:53 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C8B98FC65;
	Mon, 17 Aug 2009 21:23:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7HLNrqU094292;
	Mon, 17 Aug 2009 21:23:53 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7HLNr1t094291;
	Mon, 17 Aug 2009 21:23:53 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908172123.n7HLNr1t094291@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Mon, 17 Aug 2009 21:23:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196349 - user/edwin/locale/share
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Aug 2009 21:23:53 -0000

Author: edwin
Date: Mon Aug 17 21:23:53 2009
New Revision: 196349
URL: http://svn.freebsd.org/changeset/base/196349

Log:
  Grab a working copy of share

Added:
  user/edwin/locale/share/   (props changed)
     - copied from r196348, head/share/

From owner-svn-src-user@FreeBSD.ORG  Thu Aug 20 13:59:53 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 845D9106568C;
	Thu, 20 Aug 2009 13:59:53 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6FA3A8FC16;
	Thu, 20 Aug 2009 13:59:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7KDxr3T088497;
	Thu, 20 Aug 2009 13:59:53 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7KDxqSX088455;
	Thu, 20 Aug 2009 13:59:52 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908201359.n7KDxqSX088455@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 20 Aug 2009 13:59:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196401 - user/edwin/locale/share/msgdef
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Aug 2009 13:59:53 -0000

Author: edwin
Date: Thu Aug 20 13:59:52 2009
New Revision: 196401
URL: http://svn.freebsd.org/changeset/base/196401

Log:
  New datafiles for the share/msgdef collection.
  
  The data files contain the unicode encoded character for the locale
  msgdef data. This can be converted to either UTF-8 (which will be
  the main file) and symlinked where possible or to other charactermaps.
  
  This way we don't end up with high-ascii or otherwise encoded data
  files in the repository and we will be able to edit the files without
  having to worry about the right characters because they later get
  converted into the right encoding.

Added:
  user/edwin/locale/share/msgdef/af_ZA.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/af_ZA.ISO8859-1.src
  user/edwin/locale/share/msgdef/am_ET.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/am_ET.UTF-8.src
  user/edwin/locale/share/msgdef/be_BY.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/be_BY.UTF-8.src
  user/edwin/locale/share/msgdef/bg_BG.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/bg_BG.UTF-8.src
  user/edwin/locale/share/msgdef/ca_ES.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/ca_ES.ISO8859-1.src
  user/edwin/locale/share/msgdef/cs_CZ.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/cs_CZ.ISO8859-2.src
  user/edwin/locale/share/msgdef/da_DK.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/da_DK.ISO8859-1.src
  user/edwin/locale/share/msgdef/de_DE.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/de_DE.ISO8859-1.src
  user/edwin/locale/share/msgdef/el_GR.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/el_GR.UTF-8.src
  user/edwin/locale/share/msgdef/en_CA.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/en_CA.ISO8859-1.src
  user/edwin/locale/share/msgdef/en_GB.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/en_GB.ISO8859-1.src
  user/edwin/locale/share/msgdef/en_US.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/en_US.ISO8859-1.src
  user/edwin/locale/share/msgdef/es_ES.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/es_ES.ISO8859-1.src
  user/edwin/locale/share/msgdef/et_EE.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/et_EE.ISO8859-15.src
  user/edwin/locale/share/msgdef/eu_ES.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/eu_ES.ISO8859-1.src
  user/edwin/locale/share/msgdef/fi_FI.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/fi_FI.ISO8859-1.src
  user/edwin/locale/share/msgdef/fr_BE.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/fr_BE.ISO8859-1.src
  user/edwin/locale/share/msgdef/fr_CH.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/fr_CH.ISO8859-1.src
  user/edwin/locale/share/msgdef/fr_FR.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/fr_FR.ISO8859-1.src
  user/edwin/locale/share/msgdef/he_IL.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/he_IL.UTF-8.src
  user/edwin/locale/share/msgdef/hr_HR.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/hr_HR.ISO8859-2.src
  user/edwin/locale/share/msgdef/hu_HU.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/hu_HU.ISO8859-2.src
  user/edwin/locale/share/msgdef/hy_AM.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/hy_AM.UTF-8.src
  user/edwin/locale/share/msgdef/is_IS.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/is_IS.ISO8859-1.src
  user/edwin/locale/share/msgdef/it_IT.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/it_IT.ISO8859-1.src
  user/edwin/locale/share/msgdef/ja_JP.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/ja_JP.UTF-8.src
  user/edwin/locale/share/msgdef/kk_KZ.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/kk_KZ.UTF-8.src
  user/edwin/locale/share/msgdef/ko_KR.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/ko_KR.UTF-8.src
  user/edwin/locale/share/msgdef/lt_LT.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/lt_LT.ISO8859-13.src
  user/edwin/locale/share/msgdef/mn_MN.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/mn_MN.UTF-8.src
  user/edwin/locale/share/msgdef/nl_NL.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/nl_NL.ISO8859-1.src
  user/edwin/locale/share/msgdef/no_NO.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/no_NO.ISO8859-1.src
  user/edwin/locale/share/msgdef/pl_PL.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/pl_PL.ISO8859-2.src
  user/edwin/locale/share/msgdef/pt_PT.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/pt_PT.ISO8859-1.src
  user/edwin/locale/share/msgdef/ro_RO.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/ro_RO.ISO8859-2.src
  user/edwin/locale/share/msgdef/ru_RU.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/ru_RU.UTF-8.src
  user/edwin/locale/share/msgdef/sl_SI.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/sl_SI.ISO8859-2.src
  user/edwin/locale/share/msgdef/sr_Cyrl_RS.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/sr_YU.ISO8859-5.src
  user/edwin/locale/share/msgdef/sr_Latn_RS.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/sr_YU.ISO8859-2.src
  user/edwin/locale/share/msgdef/sr_YU.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/sr_YU.UTF-8.src
  user/edwin/locale/share/msgdef/sv_SE.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/sv_SE.ISO8859-1.src
  user/edwin/locale/share/msgdef/tr_TR.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/tr_TR.ISO8859-9.src
  user/edwin/locale/share/msgdef/uk_UA.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/uk_UA.UTF-8.src
  user/edwin/locale/share/msgdef/zh_Hans_CN.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/zh_CN.UTF-8.src
  user/edwin/locale/share/msgdef/zh_Hant_TW.unicode
     - copied, changed from r196349, user/edwin/locale/share/msgdef/zh_TW.UTF-8.src
Deleted:
  user/edwin/locale/share/msgdef/af_ZA.ISO8859-1.src
  user/edwin/locale/share/msgdef/am_ET.UTF-8.src
  user/edwin/locale/share/msgdef/be_BY.CP1131.src
  user/edwin/locale/share/msgdef/be_BY.CP1251.src
  user/edwin/locale/share/msgdef/be_BY.ISO8859-5.src
  user/edwin/locale/share/msgdef/be_BY.UTF-8.src
  user/edwin/locale/share/msgdef/bg_BG.CP1251.src
  user/edwin/locale/share/msgdef/bg_BG.UTF-8.src
  user/edwin/locale/share/msgdef/ca_ES.ISO8859-1.src
  user/edwin/locale/share/msgdef/cs_CZ.ISO8859-2.src
  user/edwin/locale/share/msgdef/da_DK.ISO8859-1.src
  user/edwin/locale/share/msgdef/de_DE.ISO8859-1.src
  user/edwin/locale/share/msgdef/el_GR.ISO8859-7.src
  user/edwin/locale/share/msgdef/el_GR.UTF-8.src
  user/edwin/locale/share/msgdef/en_CA.ISO8859-1.src
  user/edwin/locale/share/msgdef/en_GB.ISO8859-1.src
  user/edwin/locale/share/msgdef/en_US.ISO8859-1.src
  user/edwin/locale/share/msgdef/es_ES.ISO8859-1.src
  user/edwin/locale/share/msgdef/et_EE.ISO8859-15.src
  user/edwin/locale/share/msgdef/eu_ES.ISO8859-1.src
  user/edwin/locale/share/msgdef/fi_FI.ISO8859-1.src
  user/edwin/locale/share/msgdef/fr_BE.ISO8859-1.src
  user/edwin/locale/share/msgdef/fr_CH.ISO8859-1.src
  user/edwin/locale/share/msgdef/fr_FR.ISO8859-1.src
  user/edwin/locale/share/msgdef/he_IL.UTF-8.src
  user/edwin/locale/share/msgdef/hr_HR.ISO8859-2.src
  user/edwin/locale/share/msgdef/hu_HU.ISO8859-2.src
  user/edwin/locale/share/msgdef/hy_AM.ARMSCII-8.src
  user/edwin/locale/share/msgdef/hy_AM.UTF-8.src
  user/edwin/locale/share/msgdef/is_IS.ISO8859-1.src
  user/edwin/locale/share/msgdef/it_IT.ISO8859-1.src
  user/edwin/locale/share/msgdef/ja_JP.SJIS.src
  user/edwin/locale/share/msgdef/ja_JP.UTF-8.src
  user/edwin/locale/share/msgdef/ja_JP.eucJP.src
  user/edwin/locale/share/msgdef/kk_KZ.PT154.src
  user/edwin/locale/share/msgdef/kk_KZ.UTF-8.src
  user/edwin/locale/share/msgdef/ko_KR.UTF-8.src
  user/edwin/locale/share/msgdef/ko_KR.eucKR.src
  user/edwin/locale/share/msgdef/lt_LT.ISO8859-13.src
  user/edwin/locale/share/msgdef/mn_MN.UTF-8.src
  user/edwin/locale/share/msgdef/nl_NL.ISO8859-1.src
  user/edwin/locale/share/msgdef/no_NO.ISO8859-1.src
  user/edwin/locale/share/msgdef/pl_PL.ISO8859-2.src
  user/edwin/locale/share/msgdef/pt_PT.ISO8859-1.src
  user/edwin/locale/share/msgdef/ro_RO.ISO8859-2.src
  user/edwin/locale/share/msgdef/ru_RU.CP1251.src
  user/edwin/locale/share/msgdef/ru_RU.CP866.src
  user/edwin/locale/share/msgdef/ru_RU.ISO8859-5.src
  user/edwin/locale/share/msgdef/ru_RU.KOI8-R.src
  user/edwin/locale/share/msgdef/ru_RU.UTF-8.src
  user/edwin/locale/share/msgdef/sl_SI.ISO8859-2.src
  user/edwin/locale/share/msgdef/sr_YU.ISO8859-2.src
  user/edwin/locale/share/msgdef/sr_YU.ISO8859-5.src
  user/edwin/locale/share/msgdef/sr_YU.UTF-8.src
  user/edwin/locale/share/msgdef/sv_SE.ISO8859-1.src
  user/edwin/locale/share/msgdef/tr_TR.ISO8859-9.src
  user/edwin/locale/share/msgdef/uk_UA.CP1251.src
  user/edwin/locale/share/msgdef/uk_UA.ISO8859-5.src
  user/edwin/locale/share/msgdef/uk_UA.KOI8-U.src
  user/edwin/locale/share/msgdef/uk_UA.UTF-8.src
  user/edwin/locale/share/msgdef/zh_CN.GB18030.src
  user/edwin/locale/share/msgdef/zh_CN.GB2312.src
  user/edwin/locale/share/msgdef/zh_CN.UTF-8.src
  user/edwin/locale/share/msgdef/zh_CN.eucCN.src
  user/edwin/locale/share/msgdef/zh_TW.Big5.src
  user/edwin/locale/share/msgdef/zh_TW.UTF-8.src
Modified:
  user/edwin/locale/share/msgdef/Makefile

Modified: user/edwin/locale/share/msgdef/Makefile
==============================================================================
--- user/edwin/locale/share/msgdef/Makefile	Thu Aug 20 11:04:31 2009	(r196400)
+++ user/edwin/locale/share/msgdef/Makefile	Thu Aug 20 13:59:52 2009	(r196401)
@@ -1,142 +1,251 @@
 # $FreeBSD$
 
-LOCALES=	af_ZA.ISO8859-1 \
-		am_ET.UTF-8 \
-		be_BY.CP1131 \
-		be_BY.CP1251 \
-		be_BY.ISO8859-5 \
-		be_BY.UTF-8 \
-		bg_BG.CP1251 \
-		bg_BG.UTF-8 \
-		ca_ES.ISO8859-1 \
-		cs_CZ.ISO8859-2 \
-		da_DK.ISO8859-1 \
-		de_DE.ISO8859-1 \
-		el_GR.ISO8859-7 \
-		el_GR.UTF-8 \
-		en_CA.ISO8859-1 \
-		en_GB.ISO8859-1 \
-		en_US.ISO8859-1 \
-		es_ES.ISO8859-1 \
-		et_EE.ISO8859-15 \
-		eu_ES.ISO8859-1 \
-		fi_FI.ISO8859-1 \
-		fr_BE.ISO8859-1 \
-		fr_CH.ISO8859-1 \
-		fr_FR.ISO8859-1 \
-		he_IL.UTF-8 \
-		hi_IN.ISCII-DEV \
-		hr_HR.ISO8859-2 \
-		hu_HU.ISO8859-2 \
-		hy_AM.ARMSCII-8 \
-		hy_AM.UTF-8 \
-		is_IS.ISO8859-1 \
-		it_IT.ISO8859-1 \
-		ja_JP.eucJP \
-		ja_JP.SJIS \
-		ja_JP.UTF-8 \
-		kk_KZ.PT154 \
-		kk_KZ.UTF-8 \
-		ko_KR.UTF-8 \
-		ko_KR.eucKR \
-		lt_LT.ISO8859-13 \
-		mn_MN.UTF-8 \
-		nl_NL.ISO8859-1 \
-		no_NO.ISO8859-1 \
-		pl_PL.ISO8859-2 \
-		pt_PT.ISO8859-1 \
-		ro_RO.ISO8859-2 \
-		ru_RU.CP1251 \
-		ru_RU.CP866 \
-		ru_RU.ISO8859-5 \
-		ru_RU.KOI8-R \
-		ru_RU.UTF-8 \
-		sl_SI.ISO8859-2 \
-		sr_YU.ISO8859-2 \
-		sr_YU.ISO8859-5 \
-		sr_YU.UTF-8 \
-		sv_SE.ISO8859-1 \
-		tr_TR.ISO8859-9 \
-		uk_UA.CP1251 \
-		uk_UA.ISO8859-5 \
-		uk_UA.KOI8-U \
-		uk_UA.UTF-8 \
-		zh_CN.eucCN \
-		zh_CN.GB18030 \
-		zh_CN.GB2312 \
-		zh_CN.UTF-8 \
-		zh_TW.Big5 \
-		zh_TW.UTF-8
+# All locales to be created.
+CCLN=           af_ZA am_ET be_BY bg_BG ca_ES cs_CZ da_DK de_DE \
+		el_GR en_CA en_GB en_US es_ES et_EE eu_ES fi_FI \
+		fr_BE fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS \
+		it_IT ja_JP kk_KZ ko_KR lt_LT mn_MN nl_NL no_NO \
+		pl_PL pt_PT ro_RO ru_RU sl_SI sr_Cyrl_RS sr_Latn_RS \
+		sv_SE tr_TR uk_UA zh_Hans_CN zh_Hant_TW
+# hi_IN.ISCII-DEV.src
+
+# For these locales, beside creating the UTF-8 map also create these
+# charactermaps.
+CMS_be_BY=	CP1131 CP1251 ISO8859-5
+CMS_bg_BG=	CP1251
+CMS_el_GR=	ISO8859-7
+CMS_hy_AM=	ARMSCII-8
+CMS_ja_JP=	SJIS eucJP
+CMS_kk_KZ=	PT154
+CMS_ko_KR=	eucKR
+CMS_ru_RU=	CP1251 CP866 ISO8859-5 KOI8-R
+CMS_sr_Cyrl_RS=	ISO8859-5
+CMS_sr_Latn_RS=	ISO8859-2
+CMS_uk_UA=	CP1251 ISO8859-5 KOI8-U
+CMS_zh_Hans_CN=	GB18030 GB2312 eucCN
+CMS_zh_Hant_TW=	Big5
+
+# For these locales, link the following charactermaps to the UTF-8 map.
+# (unless the origin charactermap is defined)
+CMSLINK_af_ZA=	ISO8859-1 ISO8859-15
+CMSLINK_ca_ES=	ISO8859-1 ISO8859-15
+CMSLINK_cs_CZ=	ISO8859-2
+CMSLINK_da_DK=	ISO8859-1 ISO8859-15
+CMSLINK_de_DE=	ISO8859-1 ISO8859-15
+CMSLINK_en_CA=	ISO8859-1 ISO8859-15 US-ASCII
+CMSLINK_en_GB=	ISO8859-1 ISO8859-15 US-ASCII
+CMSLINK_en_US=	ISO8859-1 ISO8859-15 US-ASCII
+CMSLINK_es_ES=	ISO8859-1 ISO8859-15
+CMSLINK_et_EE=	ISO8859-15
+CMSLINK_eu_ES=	ISO8859-1 ISO8859-15
+CMSLINK_fi_FI=	ISO8859-1 ISO8859-15
+CMSLINK_fr_BE=	ISO8859-1 ISO8859-15
+CMSLINK_fr_CH=	ISO8859-1 ISO8859-15
+CMSLINK_fr_FR=	ISO8859-1 ISO8859-15
+CMSLINK_hr_HR=	ISO8859-2
+CMSLINK_hu_HU=	ISO8859-2
+CMSLINK_is_IS=	ISO8859-1 ISO8859-15
+CMSLINK_it_IT=	ISO8859-1 ISO8859-15
+CMSLINK_ko_KR.eucKR=	ko_KR.CP949
+CMSLINK_lt_LT=	ISO8859-4 ISO8859-13
+CMSLINK_nl_NL=	ISO8859-1 ISO8859-15
+CMSLINK_no_NO=	ISO8859-1 ISO8859-15
+CMSLINK_pl_PL=	ISO8859-2
+CMSLINK_pt_PT=	ISO8859-1 ISO8859-15
+CMSLINK_ro_RO=	ISO8859-2
+CMSLINK_sl_SI=	ISO8859-2
+CMSLINK_sv_SE=	ISO8859-1 ISO8859-15
+CMSLINK_tr_TR=	ISO8859-9
+CMSLINK_zh_Hans_CN.GB2312=	zh_Hans_CN.GBK
+CMSLINK_zh_Hant_TW.Big5=	zh_Hant_TW.Big5HKSCS
+
+# For these locales, also create symlinks to the main locale.
+CCLNLINK_ca_ES=		ca_AD ca_FR ca_IT
+CCLNLINK_cs_CZ=		sk_SK
+CCLNLINK_de_DE=		de_AT de_CH
+CCLNLINK_en_GB=		en_AU en_NZ
+CCLNLINK_fr_FR=		fr_CA
+CCLNLINK_it_IT=		it_CH
+CCLNLINK_nl_NL=		nl_BE
+CCLNLINK_no_NO=		nb_NO nn_NO
+CCLNLINK_pt_PT=		pt_BR
+CCLNLINK_zh_Hant_TW=	zh_Hant_HK
+CCLNLINK_en_GB.UTF-8=	en_IE.UTF-8
+
+# For these locales, create symlinks to the main locale for historical reasons.
+LEGLINK_ja_JP=		jp_JP
+LEGLINK_zh_Hans_CN=	zh_CN
+LEGLINK_zh_Hant_TW=	zh_TW zh_HK
+LEGLINK_sr_Cyrl_RS=	sr_YU
+LEGLINK_sr_Latn_RS.ISO8859-2=	sr_YU.ISO8859-2
+
+#
+# In theory there are no parts after here which should be touched when adding
+# or removing locales and charactermaps.
+#
 
 LOCALEDIR=	/usr/share/locale
+LCTYPE=		LC_MESSAGES
+DESTDIR=	/home/edwin/locale/new/
+SHAREOWN=	edwin
+SHAREGRP=	edwin
+
+#
+# All variables
+#
+
+# All charactermaps
+CMS=UTF-8
+.for ccln in ${CCLN}
+. if defined(CMS_${ccln})
+.  for cm in ${CMS_${ccln}}
+.   if ${CMS:M${cm}} == ""
+CMS+=	${cm}
+.   endif
+.  endfor
+. endif
+.endfor
 
-.SUFFIXES: .src .out
-
-.src.out:
-	grep -v '^#' < ${.IMPSRC} > ${.TARGET}
-
-FILES=		${LOCALES:S/$/.out/}
-FILESNAME=	LC_MESSAGES
+# All files generated and their locations
+ALLFILES=	${CCLN:S/$/.UTF-8/}
+.for ccln in ${CCLN}
+FILESDIR_${ccln}.UTF-8.out= ${LOCALEDIR}/${ccln}.UTF-8
+. if defined(CMS_${ccln})
+.  for cm in ${CMS_${ccln}}
+ALLFILES+=	${ccln}.${cm}
+FILESDIR_${ccln}.${cm}.out= ${LOCALEDIR}/${ccln}.${cm}
+.  endfor
+. endif
+.endfor
 
-.for locale in ${LOCALES}
-FILESDIR_${locale}.out= ${LOCALEDIR}/${locale}
-.endfor
-
-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
-GB_LINKS=	en_GB:en_AU en_GB:en_NZ
-IT_LINKS=	it_IT:it_CH
-NL_LINKS=	nl_NL:nl_BE
-NO_LINKS=	no_NO:nb_NO no_NO:nn_NO
-PT_LINKS=	pt_PT:pt_BR
-
-ENCODINGS=	Big5 Big5HKSCS CP949 eucKR GB2312 GBK \
-		ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-9 ISO8859-13 ISO8859-15 \
-		US-ASCII UTF-8
-
-Big5_Big5HKSCS=	zh_TW:zh_HK
-eucKR_CP949=	ko_KR
-GB2312_GBK=	zh_CN
-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 \
-		${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 \
-		fi_FI fr_BE fr_CH fr_FR is_IS it_IT nb_NO nl_NL nn_NO no_NO \
-		pt_PT sv_SE
-ISO8859-2_ISO8859-2= ${CZ_LINKS}
-ISO8859-2_UTF-8= cs_CZ hr_HR hu_HU pl_PL ro_RO sl_SI
-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=	${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
+FILES=		${ALLFILES:S/$/.out/}
+CLEANFILES=	${ALLFILES:S/$/.out/} ${CCLN:S/$/.src/}
+FILESNAME=	${LCTYPE}
 
+# All links
 SYMLINKS=
-.for enc1 in ${ENCODINGS}
-.for enc2 in ${ENCODINGS}
-.for lang_terr in ${${enc1}_${enc2}}
-SYMLINKS+=	../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \
-		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}
-.endfor
+.for ccln in ${CCLN}
+. if defined(CMSLINK_${ccln})
+.  for cm in ${CMSLINK_${ccln}}
+SYMLINKS+=	../${ccln}.UTF-8/${LCTYPE} ${LOCALEDIR}/${ccln}.${cm}
+.  endfor
+. endif
+. for cm in ${CMS}
+.  if defined(CMSLINK_${ccln}.${cm})
+.   for cclncm in ${CMSLINK_${ccln}.${cm}}
+SYMLINKS+=	../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${cclncm}
+.   endfor
+.  endif
+. endfor
 .endfor
+
+.for ccln in ${CCLN}
+
+. if defined(LEGLINK_${ccln})
+.  for _ccln in ${LEGLINK_${ccln}}
+SYMLINKS+=	../${ccln}.UTF-8/${LCTYPE} ${LOCALEDIR}/${_ccln}.UTF-8
+.   if defined(CMS_${ccln})
+.    for cm in ${CMS_${ccln}}
+SYMLINKS+=	../${ccln}.UTF-8/${LCTYPE} ${LOCALEDIR}/${_ccln}.${cm}
+.    endfor
+.   endif
+
+.   if defined(CMSLINK_${ccln})
+.    for cm in ${CMSLINK_${ccln}}
+SYMLINKS+=	../${ccln}.UTF-8/${LCTYPE} ${LOCALEDIR}/${_ccln}.${cm}
+.    endfor
+.   endif
+
+.   for cm in ${CMS}
+.    if defined(CMSLINK_${ccln}.${cm})
+.     for cclncm in ${CMSLINK_${ccln}.${cm}}
+SYMLINKS+=	../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${cclncm}
+.     endfor
+.    endif
+.   endfor
+.  endfor
+. endif
+
+. for cm in ${CMS}
+.  if defined(LEGLINK_${ccln}.${cm})
+.   for cclncm in ${LEGLINK_${ccln}.${cm}}
+SYMLINKS+=	../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${cclncm}
+.   endfor
+.  endif
+. endfor
+
+. if defined(CCLNLINK_${ccln})
+.  for _ccln in ${CCLNLINK_${ccln}}
+SYMLINKS+=	../${ccln}.UTF-8/${LCTYPE} ${LOCALEDIR}/${_ccln}.UTF-8
+.   if defined(CMS_${ccln})
+.    for cm in ${CMS_${ccln}}
+SYMLINKS+=	../${ccln}.UTF-8/${LCTYPE} ${LOCALEDIR}/${_ccln}.${cm}
+.    endfor
+.   endif
+
+.   if defined(CMSLINK_${ccln})
+.    for cm in ${CMSLINK_${ccln}}
+SYMLINKS+=	../${ccln}.UTF-8/${LCTYPE} ${LOCALEDIR}/${_ccln}.${cm}
+.    endfor
+.   endif
+
+.   for cm in ${CMS}
+.    if defined(CMSLINK_${ccln}.${cm})
+.     for cclncm in ${CMSLINK_${ccln}.${cm}}
+SYMLINKS+=	../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${cclncm}
+.     endfor
+.    endif
+.   endfor
+.  endfor
+. endif
+
+. for cm in ${CMS}
+.  if defined(CCNLLINK_${ccln}.${cm})
+.   for cclncm in ${CCNLLINK_${ccln}.${cm}}
+SYMLINKS+=	../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${cclncm}
+.   endfor
+.  endif
+. endfor
+
 .endfor
 
-beforeinstall:
-.for locale in ${LOCALES}
-.if exists(${DESTDIR}${LOCALEDIR}/${locale}/LC_MESSAGES/)
-	rm -rf ${DESTDIR}${LOCALEDIR}/${locale}/LC_MESSAGES
+#
+# All targets
+#
+
+.for ccln in ${CCLN}
+${ccln}.src: ${ccln}.unicode
+	echo ${.ALLSRC} > ${.TARGET}
+${ccln}.UTF-8.out: ${ccln}.src
+	grep -v '^#' < ${.ALLSRC} > ${.TARGET}
+.if defined(CMS_${ccln})
+.for cms in ${CMS_${ccln}}
+${ccln}.${cms}.out: ${ccln}.src
+	grep -v '^#' < ${.ALLSRC} > ${.TARGET}
+.endfor
 .endif
 .endfor
 
+#.for locale in ${LOCALES}
+#.endfor
+#
+#CLEANFILES=	${FILES}
+#
+#SYMLINKS=
+#.for enc1 in ${ENCODINGS}
+#.for enc2 in ${ENCODINGS}
+#.for lang_terr in ${${enc1}_${enc2}}
+#SYMLINKS+=	../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \
+#		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}
+#.endfor
+#.endfor
+#.endfor
+#
+#beforeinstall:
+#.for locale in ${LOCALES}
+#.if exists(${DESTDIR}${LOCALEDIR}/${locale}/LC_MESSAGES/)
+#	rm -rf ${DESTDIR}${LOCALEDIR}/${locale}/LC_MESSAGES
+#.endif
+#.endfor
+
 .include <bsd.prog.mk>

Copied and modified: user/edwin/locale/share/msgdef/af_ZA.unicode (from r196349, user/edwin/locale/share/msgdef/af_ZA.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/af_ZA.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/af_ZA.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[jJyY].*
+^[<LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/am_ET.unicode (from r196349, user/edwin/locale/share/msgdef/am_ET.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/am_ET.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/am_ET.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[ይሁንyY].*
+^[<ETHIOPIC SYLLABLE YE><ETHIOPIC SYLLABLE HU><ETHIOPIC SYLLABLE NE><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[አይሁንnN].*
+^[<ETHIOPIC SYLLABLE GLOTTAL A><ETHIOPIC SYLLABLE YE><ETHIOPIC SYLLABLE HU><ETHIOPIC SYLLABLE NE><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-ይሁን
+<ETHIOPIC SYLLABLE YE><ETHIOPIC SYLLABLE HU><ETHIOPIC SYLLABLE NE>
 # nostr
-አይሁን
+<ETHIOPIC SYLLABLE GLOTTAL A><ETHIOPIC SYLLABLE YE><ETHIOPIC SYLLABLE HU><ETHIOPIC SYLLABLE NE>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/be_BY.unicode (from r196349, user/edwin/locale/share/msgdef/be_BY.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/be_BY.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/be_BY.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -3,11 +3,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[тТyY].*
+^[<CYRILLIC SMALL LETTER TE><CYRILLIC CAPITAL LETTER TE><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[нНnN].*
+^[<CYRILLIC SMALL LETTER EN><CYRILLIC CAPITAL LETTER EN><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-так
+<CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER KA>
 # nostr
-не
+<CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER IE>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/bg_BG.unicode (from r196349, user/edwin/locale/share/msgdef/bg_BG.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/bg_BG.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/bg_BG.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[дДyY].*
+^[<CYRILLIC SMALL LETTER DE><CYRILLIC CAPITAL LETTER DE><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[нНnN].*
+^[<CYRILLIC SMALL LETTER EN><CYRILLIC CAPITAL LETTER EN><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-да
+<CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER A>
 # nostr
-не
+<CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER IE>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/ca_ES.unicode (from r196349, user/edwin/locale/share/msgdef/ca_ES.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/ca_ES.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/ca_ES.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[sSyY].*
+^[<LATIN SMALL LETTER S><LATIN CAPITAL LETTER S><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/cs_CZ.unicode (from r196349, user/edwin/locale/share/msgdef/cs_CZ.ISO8859-2.src)
==============================================================================
--- user/edwin/locale/share/msgdef/cs_CZ.ISO8859-2.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/cs_CZ.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[aAyY].*
+^[<LATIN SMALL LETTER A><LATIN CAPITAL LETTER A><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-ano
+<LATIN SMALL LETTER A><LATIN SMALL LETTER N><LATIN SMALL LETTER O>
 # nostr
-ne
+<LATIN SMALL LETTER N><LATIN SMALL LETTER E>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/da_DK.unicode (from r196349, user/edwin/locale/share/msgdef/da_DK.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/da_DK.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/da_DK.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[jJyY].*
+^[<LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/de_DE.unicode (from r196349, user/edwin/locale/share/msgdef/de_DE.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/de_DE.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/de_DE.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[jJyY].*
+^[<LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/el_GR.unicode (from r196349, user/edwin/locale/share/msgdef/el_GR.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/el_GR.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/el_GR.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[νΝyY].*
+^[<GREEK SMALL LETTER NU><GREEK CAPITAL LETTER NU><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[οΟnN].*
+^[<GREEK SMALL LETTER OMICRON><GREEK CAPITAL LETTER OMICRON><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-ΝΑΙ
+<GREEK CAPITAL LETTER NU><GREEK CAPITAL LETTER ALPHA><GREEK CAPITAL LETTER IOTA>
 # nostr
-ΟΧΙ
+<GREEK CAPITAL LETTER OMICRON><GREEK CAPITAL LETTER CHI><GREEK CAPITAL LETTER IOTA>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/en_CA.unicode (from r196349, user/edwin/locale/share/msgdef/en_CA.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/en_CA.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/en_CA.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[yYoO].*
+^[<LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y><LATIN SMALL LETTER O><LATIN CAPITAL LETTER O>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/en_GB.unicode (from r196349, user/edwin/locale/share/msgdef/en_GB.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/en_GB.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/en_GB.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[yY].*
+^[<LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/en_US.unicode (from r196349, user/edwin/locale/share/msgdef/en_US.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/en_US.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/en_US.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[yYsS].*
+^[<LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y><LATIN SMALL LETTER S><LATIN CAPITAL LETTER S>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/es_ES.unicode (from r196349, user/edwin/locale/share/msgdef/es_ES.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/es_ES.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/es_ES.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[sSyY].*
+^[<LATIN SMALL LETTER S><LATIN CAPITAL LETTER S><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/et_EE.unicode (from r196349, user/edwin/locale/share/msgdef/et_EE.ISO8859-15.src)
==============================================================================
--- user/edwin/locale/share/msgdef/et_EE.ISO8859-15.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/et_EE.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[1JjYy].*
+^[<DIGIT ONE><LATIN CAPITAL LETTER J><LATIN SMALL LETTER J><LATIN CAPITAL LETTER Y><LATIN SMALL LETTER Y>].*
 # noexpr
-^[0EeNn].*
+^[<DIGIT ZERO><LATIN CAPITAL LETTER E><LATIN SMALL LETTER E><LATIN CAPITAL LETTER N><LATIN SMALL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/eu_ES.unicode (from r196349, user/edwin/locale/share/msgdef/eu_ES.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/eu_ES.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/eu_ES.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[bByY].*
+^[<LATIN SMALL LETTER B><LATIN CAPITAL LETTER B><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[eEnN].*
+^[<LATIN SMALL LETTER E><LATIN CAPITAL LETTER E><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-bai
+<LATIN SMALL LETTER B><LATIN SMALL LETTER A><LATIN SMALL LETTER I>
 # nostr
-ez
+<LATIN SMALL LETTER E><LATIN SMALL LETTER Z>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/fi_FI.unicode (from r196349, user/edwin/locale/share/msgdef/fi_FI.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/fi_FI.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/fi_FI.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[kKjJyY].*
+^[<LATIN SMALL LETTER K><LATIN CAPITAL LETTER K><LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nNeE].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N><LATIN SMALL LETTER E><LATIN CAPITAL LETTER E>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/fr_BE.unicode (from r196349, user/edwin/locale/share/msgdef/fr_BE.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/fr_BE.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/fr_BE.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[oOyYjJ1].*
+^[<LATIN SMALL LETTER O><LATIN CAPITAL LETTER O><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y><LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><DIGIT ONE>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/fr_CH.unicode (from r196349, user/edwin/locale/share/msgdef/fr_CH.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/fr_CH.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/fr_CH.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[oOjJsSyY].*
+^[<LATIN SMALL LETTER O><LATIN CAPITAL LETTER O><LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><LATIN SMALL LETTER S><LATIN CAPITAL LETTER S><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/fr_FR.unicode (from r196349, user/edwin/locale/share/msgdef/fr_FR.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/fr_FR.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/fr_FR.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[oOyY].*
+^[<LATIN SMALL LETTER O><LATIN CAPITAL LETTER O><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/he_IL.unicode (from r196349, user/edwin/locale/share/msgdef/he_IL.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/he_IL.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/he_IL.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[yYכ].*
+^[<LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y><HEBREW LETTER KAF>].*
 # noexpr
-^[nNל].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N><HEBREW LETTER LAMED>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/hr_HR.unicode (from r196349, user/edwin/locale/share/msgdef/hr_HR.ISO8859-2.src)
==============================================================================
--- user/edwin/locale/share/msgdef/hr_HR.ISO8859-2.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/hr_HR.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[dDyY].*
+^[<LATIN SMALL LETTER D><LATIN CAPITAL LETTER D><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/hu_HU.unicode (from r196349, user/edwin/locale/share/msgdef/hu_HU.ISO8859-2.src)
==============================================================================
--- user/edwin/locale/share/msgdef/hu_HU.ISO8859-2.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/hu_HU.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[iIyY].*
+^[<LATIN SMALL LETTER I><LATIN CAPITAL LETTER I><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-igen
+<LATIN SMALL LETTER I><LATIN SMALL LETTER G><LATIN SMALL LETTER E><LATIN SMALL LETTER N>
 # nostr
-nem
+<LATIN SMALL LETTER N><LATIN SMALL LETTER E><LATIN SMALL LETTER M>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/hy_AM.unicode (from r196349, user/edwin/locale/share/msgdef/hy_AM.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/hy_AM.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/hy_AM.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -7,11 +7,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[աԱyY].*
+^[<ARMENIAN SMALL LETTER AYB><ARMENIAN CAPITAL LETTER AYB><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[ոՈnN].*
+^[<ARMENIAN SMALL LETTER VO><ARMENIAN CAPITAL LETTER VO><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-Այո
+<ARMENIAN CAPITAL LETTER AYB><ARMENIAN SMALL LETTER YI><ARMENIAN SMALL LETTER VO>
 # nostr
-Ոչ
+<ARMENIAN CAPITAL LETTER VO><ARMENIAN SMALL LETTER CHA>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/is_IS.unicode (from r196349, user/edwin/locale/share/msgdef/is_IS.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/is_IS.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/is_IS.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[jJyY].*
+^[<LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/it_IT.unicode (from r196349, user/edwin/locale/share/msgdef/it_IT.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/it_IT.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/it_IT.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[sSyY].*
+^[<LATIN SMALL LETTER S><LATIN CAPITAL LETTER S><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/ja_JP.unicode (from r196349, user/edwin/locale/share/msgdef/ja_JP.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/ja_JP.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/ja_JP.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[yYｙＹはハ].*
+^[<LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y><FULLWIDTH LATIN SMALL LETTER Y><FULLWIDTH LATIN CAPITAL LETTER Y><HIRAGANA LETTER HA><KATAKANA LETTER HA>].*
 # noexpr
-^[nNｎＮいイ].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N><FULLWIDTH LATIN SMALL LETTER N><FULLWIDTH LATIN CAPITAL LETTER N><HIRAGANA LETTER I><KATAKANA LETTER I>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/kk_KZ.unicode (from r196349, user/edwin/locale/share/msgdef/kk_KZ.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/kk_KZ.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/kk_KZ.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[иИyY].*
+^[<CYRILLIC SMALL LETTER I><CYRILLIC CAPITAL LETTER I><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[жЖnN].*
+^[<CYRILLIC SMALL LETTER ZHE><CYRILLIC CAPITAL LETTER ZHE><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-ия
+<CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER YA>
 # nostr
-жок
+<CYRILLIC SMALL LETTER ZHE><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER KA>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/ko_KR.unicode (from r196349, user/edwin/locale/share/msgdef/ko_KR.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/ko_KR.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/ko_KR.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[yYｙＹ예].*
+^[<LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y><FULLWIDTH LATIN SMALL LETTER Y><FULLWIDTH LATIN CAPITAL LETTER Y><HANGUL SYLLABLE YE>].*
 # noexpr
-^[nNｎＮ아].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N><FULLWIDTH LATIN SMALL LETTER N><FULLWIDTH LATIN CAPITAL LETTER N><HANGUL SYLLABLE A>].*
 # yesstr
-예
+<HANGUL SYLLABLE YE>
 # nostr
-아니오
+<HANGUL SYLLABLE A><HANGUL SYLLABLE NI><HANGUL SYLLABLE O>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/lt_LT.unicode (from r196349, user/edwin/locale/share/msgdef/lt_LT.ISO8859-13.src)
==============================================================================
--- user/edwin/locale/share/msgdef/lt_LT.ISO8859-13.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/lt_LT.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[tTyY].*
+^[<LATIN SMALL LETTER T><LATIN CAPITAL LETTER T><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-taip
+<LATIN SMALL LETTER T><LATIN SMALL LETTER A><LATIN SMALL LETTER I><LATIN SMALL LETTER P>
 # nostr
-ne
+<LATIN SMALL LETTER N><LATIN SMALL LETTER E>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/mn_MN.unicode (from r196349, user/edwin/locale/share/msgdef/mn_MN.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/mn_MN.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/mn_MN.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[тТyY].*
+^[<CYRILLIC SMALL LETTER TE><CYRILLIC CAPITAL LETTER TE><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[үҮnN].*
+^[<CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC CAPITAL LETTER STRAIGHT U><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-тийм
+<CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER SHORT I><CYRILLIC SMALL LETTER EM>
 # nostr
-үгүй
+<CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER SHORT I>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/nl_NL.unicode (from r196349, user/edwin/locale/share/msgdef/nl_NL.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/nl_NL.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/nl_NL.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[jJyY].*
+^[<LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/no_NO.unicode (from r196349, user/edwin/locale/share/msgdef/no_NO.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/no_NO.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/no_NO.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[jJyY].*
+^[<LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/pl_PL.unicode (from r196349, user/edwin/locale/share/msgdef/pl_PL.ISO8859-2.src)
==============================================================================
--- user/edwin/locale/share/msgdef/pl_PL.ISO8859-2.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/pl_PL.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[tTyY].*
+^[<LATIN SMALL LETTER T><LATIN CAPITAL LETTER T><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-tak
+<LATIN SMALL LETTER T><LATIN SMALL LETTER A><LATIN SMALL LETTER K>
 # nostr
-nie
+<LATIN SMALL LETTER N><LATIN SMALL LETTER I><LATIN SMALL LETTER E>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/pt_PT.unicode (from r196349, user/edwin/locale/share/msgdef/pt_PT.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/pt_PT.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/pt_PT.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[sSyY].*
+^[<LATIN SMALL LETTER S><LATIN CAPITAL LETTER S><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/ro_RO.unicode (from r196349, user/edwin/locale/share/msgdef/ro_RO.ISO8859-2.src)
==============================================================================
--- user/edwin/locale/share/msgdef/ro_RO.ISO8859-2.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/ro_RO.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[dDyY].*
+^[<LATIN SMALL LETTER D><LATIN CAPITAL LETTER D><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/ru_RU.unicode (from r196349, user/edwin/locale/share/msgdef/ru_RU.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/ru_RU.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/ru_RU.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[дДyY].*
+^[<CYRILLIC SMALL LETTER DE><CYRILLIC CAPITAL LETTER DE><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[нНnN].*
+^[<CYRILLIC SMALL LETTER EN><CYRILLIC CAPITAL LETTER EN><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-да
+<CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER A>
 # nostr
-нет
+<CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER TE>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/sl_SI.unicode (from r196349, user/edwin/locale/share/msgdef/sl_SI.ISO8859-2.src)
==============================================================================
--- user/edwin/locale/share/msgdef/sl_SI.ISO8859-2.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/sl_SI.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[YyJj].*
+^[<LATIN CAPITAL LETTER Y><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER J><LATIN SMALL LETTER J>].*
 # noexpr
-^[Nn].*
+^[<LATIN CAPITAL LETTER N><LATIN SMALL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/sr_Cyrl_RS.unicode (from r196349, user/edwin/locale/share/msgdef/sr_YU.ISO8859-5.src)
==============================================================================
--- user/edwin/locale/share/msgdef/sr_YU.ISO8859-5.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/sr_Cyrl_RS.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,15 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[ԴyY].*
+^[<ARMENIAN CAPITAL LETTER DA><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[ݽnN].*
+^[<ARABIC LETTER SEEN WITH EXTENDED ARABIC-INDIC DIGIT FOUR ABOVE><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-��
+<CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_A>:<CYRILLIC_SMALL_LE
+TTER_DE>:<CYRILLIC_CAPITAL_LETTER_DE><CYRILLIC_CAPITAL_LETTER_A>:<CYRILLIC_CAPIT
+AL_LETTER_DE>
 # nostr
-��
+<CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_IE>:<CYRILLIC_SMALL_L
+ETTER_EN>:<CYRILLIC_CAPITAL_LETTER_EN><CYRILLIC_CAPITAL_LETTER_IE>:<CYRILLIC_CAP
+ITAL_LETTER_EN>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/sr_Latn_RS.unicode (from r196349, user/edwin/locale/share/msgdef/sr_YU.ISO8859-2.src)
==============================================================================
--- user/edwin/locale/share/msgdef/sr_YU.ISO8859-2.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/sr_Latn_RS.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[dDyY].*
+^[<LATIN SMALL LETTER D><LATIN CAPITAL LETTER D><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/sr_YU.unicode (from r196349, user/edwin/locale/share/msgdef/sr_YU.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/sr_YU.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/sr_YU.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[дДyY].*
+^[<CYRILLIC SMALL LETTER DE><CYRILLIC CAPITAL LETTER DE><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[нНnN].*
+^[<CYRILLIC SMALL LETTER EN><CYRILLIC CAPITAL LETTER EN><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-да
+<CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER A>
 # nostr
-не
+<CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER IE>
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/sv_SE.unicode (from r196349, user/edwin/locale/share/msgdef/sv_SE.ISO8859-1.src)
==============================================================================
--- user/edwin/locale/share/msgdef/sv_SE.ISO8859-1.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/sv_SE.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,7 +4,7 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[jJyY].*
+^[<LATIN SMALL LETTER J><LATIN CAPITAL LETTER J><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/tr_TR.unicode (from r196349, user/edwin/locale/share/msgdef/tr_TR.ISO8859-9.src)
==============================================================================
--- user/edwin/locale/share/msgdef/tr_TR.ISO8859-9.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/tr_TR.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -5,7 +5,7 @@
 #
 # yesexpr
 # XXX: I with dot above also should be included to yesexpr
-^[IiYy].*
+^[<LATIN CAPITAL LETTER I><LATIN SMALL LETTER I><LATIN CAPITAL LETTER Y><LATIN SMALL LETTER Y>].*
 # noexpr
-^[nN].*
+^[<LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # EOF

Copied and modified: user/edwin/locale/share/msgdef/uk_UA.unicode (from r196349, user/edwin/locale/share/msgdef/uk_UA.UTF-8.src)
==============================================================================
--- user/edwin/locale/share/msgdef/uk_UA.UTF-8.src	Mon Aug 17 21:23:53 2009	(r196349, copy source)
+++ user/edwin/locale/share/msgdef/uk_UA.unicode	Thu Aug 20 13:59:52 2009	(r196401)
@@ -4,11 +4,11 @@
 # WARNING: empty lines are essential too
 #
 # yesexpr
-^[тТyY].*
+^[<CYRILLIC SMALL LETTER TE><CYRILLIC CAPITAL LETTER TE><LATIN SMALL LETTER Y><LATIN CAPITAL LETTER Y>].*
 # noexpr
-^[нНnN].*
+^[<CYRILLIC SMALL LETTER EN><CYRILLIC CAPITAL LETTER EN><LATIN SMALL LETTER N><LATIN CAPITAL LETTER N>].*
 # yesstr
-так
+<CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER KA>
 # nostr

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-user@FreeBSD.ORG  Thu Aug 20 14:20:57 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 043531065690;
	Thu, 20 Aug 2009 14:20:57 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E80588FC6D;
	Thu, 20 Aug 2009 14:20:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7KEKuee088925;
	Thu, 20 Aug 2009 14:20:56 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7KEKueR088923;
	Thu, 20 Aug 2009 14:20:56 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908201420.n7KEKueR088923@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 20 Aug 2009 14:20:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196402 - user/edwin/locale/share/msgdef
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Aug 2009 14:20:57 -0000

Author: edwin
Date: Thu Aug 20 14:20:56 2009
New Revision: 196402
URL: http://svn.freebsd.org/changeset/base/196402

Log:
  Proper create zh_CN things.
  Also CCNLLINKS -> CCLNLINKS

Modified:
  user/edwin/locale/share/msgdef/Makefile

Modified: user/edwin/locale/share/msgdef/Makefile
==============================================================================
--- user/edwin/locale/share/msgdef/Makefile	Thu Aug 20 13:59:52 2009	(r196401)
+++ user/edwin/locale/share/msgdef/Makefile	Thu Aug 20 14:20:56 2009	(r196402)
@@ -56,8 +56,8 @@ CMSLINK_ro_RO=	ISO8859-2
 CMSLINK_sl_SI=	ISO8859-2
 CMSLINK_sv_SE=	ISO8859-1 ISO8859-15
 CMSLINK_tr_TR=	ISO8859-9
-CMSLINK_zh_Hans_CN.GB2312=	zh_Hans_CN.GBK
-CMSLINK_zh_Hant_TW.Big5=	zh_Hant_TW.Big5HKSCS
+CMSLINK_zh_Hans_CN=	GBK
+CMSLINK_zh_Hant_TW=	Big5HKSCS
 
 # For these locales, also create symlinks to the main locale.
 CCLNLINK_ca_ES=		ca_AD ca_FR ca_IT
@@ -78,6 +78,7 @@ LEGLINK_zh_Hans_CN=	zh_CN
 LEGLINK_zh_Hant_TW=	zh_TW zh_HK
 LEGLINK_sr_Cyrl_RS=	sr_YU
 LEGLINK_sr_Latn_RS.ISO8859-2=	sr_YU.ISO8859-2
+LEGLINK_zh_Hans_CN.GBK2312=	zh_CN.GBK
 
 #
 # In theory there are no parts after here which should be touched when adding
@@ -200,8 +201,8 @@ SYMLINKS+=	../${ccln}.${cm}/${LCTYPE} ${
 . endif
 
 . for cm in ${CMS}
-.  if defined(CCNLLINK_${ccln}.${cm})
-.   for cclncm in ${CCNLLINK_${ccln}.${cm}}
+.  if defined(CCLNLINK_${ccln}.${cm})
+.   for cclncm in ${CCLNLINK_${ccln}.${cm}}
 SYMLINKS+=	../${ccln}.${cm}/${LCTYPE} ${LOCALEDIR}/${cclncm}
 .   endfor
 .  endif

From owner-svn-src-user@FreeBSD.ORG  Fri Aug 21 20:06:34 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2444106564A;
	Fri, 21 Aug 2009 20:06:33 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E1A598FC08;
	Fri, 21 Aug 2009 20:06:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7LK6Xnv034044;
	Fri, 21 Aug 2009 20:06:33 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7LK6X9r034042;
	Fri, 21 Aug 2009 20:06:33 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908212006.n7LK6X9r034042@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 21 Aug 2009 20:06:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196427 - user/kmacy/releng_7_2_fcs/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Aug 2009 20:06:34 -0000

Author: kmacy
Date: Fri Aug 21 20:06:33 2009
New Revision: 196427
URL: http://svn.freebsd.org/changeset/base/196427

Log:
  revert change that causes huge slowdown on loopback connections

Modified:
  user/kmacy/releng_7_2_fcs/sys/netinet/in.c

Modified: user/kmacy/releng_7_2_fcs/sys/netinet/in.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/netinet/in.c	Fri Aug 21 17:40:24 2009	(r196426)
+++ user/kmacy/releng_7_2_fcs/sys/netinet/in.c	Fri Aug 21 20:06:33 2009	(r196427)
@@ -45,16 +45,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
-#include <sys/syslog.h>
 #include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/if_dl.h>
 #include <net/if_llatbl.h>
 #include <net/if_types.h>
 #include <net/route.h>
-#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -731,9 +728,6 @@ in_ifinit(struct ifnet *ifp, struct in_i
 	INIT_VNET_INET(ifp->if_vnet);
 	register u_long i = ntohl(sin->sin_addr.s_addr);
 	struct sockaddr_in oldaddr;
-	struct rtentry *rt = NULL;
-	struct rt_addrinfo info;
-	static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK};
 	int s = splimp(), flags = RTF_UP, error = 0;
 
 	oldaddr = ia->ia_addr;
@@ -822,34 +816,6 @@ in_ifinit(struct ifnet *ifp, struct in_i
 	if ((error = in_addprefix(ia, flags)) != 0)
 		return (error);
 
-	if (ia->ia_addr.sin_addr.s_addr == INADDR_ANY)
-		return (0);
-
-	/*
-	 * add a loopback route to self
-	 */
-	if (!(ifp->if_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
-		bzero(&info, sizeof(info));
-		info.rti_ifp = V_loif;
-		info.rti_flags = ia->ia_flags | RTF_HOST | RTF_STATIC;
-		info.rti_info[RTAX_DST] = (struct sockaddr *)&ia->ia_addr;
-		info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl;
-		error = rtrequest1_fib(RTM_ADD, &info, &rt, 0);
-
-		if (error == 0 && rt != NULL) {
-			RT_LOCK(rt);
-			((struct sockaddr_dl *)rt->rt_gateway)->sdl_type  =
-				rt->rt_ifp->if_type;
-			((struct sockaddr_dl *)rt->rt_gateway)->sdl_index =
-				rt->rt_ifp->if_index;
-			KASSERT(rt->rt_refcnt == 1,
-			    ("invalid refcnt %d", rt->rt_refcnt));
-			rt->rt_refcnt = 0;
-			RT_UNLOCK(rt);
-		} else if (error != 0)
-			log(LOG_INFO, "in_ifinit: insertion failed\n");
-	}
-
 	return (error);
 }
 
@@ -931,28 +897,10 @@ in_scrubprefix(struct in_ifaddr *target)
 	int error;
 	struct sockaddr_in prefix0, mask0;
 	struct rt_addrinfo info;
-	struct sockaddr_dl null_sdl;
 
 	if ((target->ia_flags & IFA_ROUTE) == 0)
 		return (0);
 
-	if ((target->ia_addr.sin_addr.s_addr != INADDR_ANY) &&
-	    !(target->ia_ifp->if_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
-		bzero(&null_sdl, sizeof(null_sdl));
-		null_sdl.sdl_len = sizeof(null_sdl);
-		null_sdl.sdl_family = AF_LINK;
-		null_sdl.sdl_type = V_loif->if_type;
-		null_sdl.sdl_index = V_loif->if_index;
-		bzero(&info, sizeof(info));
-		info.rti_flags = target->ia_flags | RTF_HOST | RTF_STATIC;
-		info.rti_info[RTAX_DST] = (struct sockaddr *)&target->ia_addr;
-		info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl;
-		error = rtrequest1_fib(RTM_DELETE, &info, NULL, 0);
-
-		if (error != 0)
-			log(LOG_INFO, "in_scrubprefix: deletion failed\n");
-	}
-
 	if (rtinitflags(target))
 		prefix = target->ia_dstaddr.sin_addr;
 	else {
@@ -1095,6 +1043,7 @@ in_ifdetach(struct ifnet *ifp)
 	in_purgemaddrs(ifp);
 }
 
+#include <sys/syslog.h>
 #include <net/if_dl.h>
 #include <netinet/if_ether.h>
 

From owner-svn-src-user@FreeBSD.ORG  Sat Aug 22 00:56:17 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0627106568E;
	Sat, 22 Aug 2009 00:56:17 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF8958FC0A;
	Sat, 22 Aug 2009 00:56:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7M0uHTN039772;
	Sat, 22 Aug 2009 00:56:17 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7M0uHYt039770;
	Sat, 22 Aug 2009 00:56:17 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908220056.n7M0uHYt039770@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 22 Aug 2009 00:56:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196428 - user/kmacy/releng_7_2_fcs/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Aug 2009 00:56:17 -0000

Author: kmacy
Date: Sat Aug 22 00:56:17 2009
New Revision: 196428
URL: http://svn.freebsd.org/changeset/base/196428

Log:
  revert the revert

Modified:
  user/kmacy/releng_7_2_fcs/sys/netinet/in.c

Modified: user/kmacy/releng_7_2_fcs/sys/netinet/in.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/netinet/in.c	Fri Aug 21 20:06:33 2009	(r196427)
+++ user/kmacy/releng_7_2_fcs/sys/netinet/in.c	Sat Aug 22 00:56:17 2009	(r196428)
@@ -45,13 +45,16 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/syslog.h>
 #include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
+#include <net/if_dl.h>
 #include <net/if_llatbl.h>
 #include <net/if_types.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -728,6 +731,9 @@ in_ifinit(struct ifnet *ifp, struct in_i
 	INIT_VNET_INET(ifp->if_vnet);
 	register u_long i = ntohl(sin->sin_addr.s_addr);
 	struct sockaddr_in oldaddr;
+	struct rtentry *rt = NULL;
+	struct rt_addrinfo info;
+	static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK};
 	int s = splimp(), flags = RTF_UP, error = 0;
 
 	oldaddr = ia->ia_addr;
@@ -816,6 +822,34 @@ in_ifinit(struct ifnet *ifp, struct in_i
 	if ((error = in_addprefix(ia, flags)) != 0)
 		return (error);
 
+	if (ia->ia_addr.sin_addr.s_addr == INADDR_ANY)
+		return (0);
+
+	/*
+	 * add a loopback route to self
+	 */
+	if (!(ifp->if_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
+		bzero(&info, sizeof(info));
+		info.rti_ifp = V_loif;
+		info.rti_flags = ia->ia_flags | RTF_HOST | RTF_STATIC;
+		info.rti_info[RTAX_DST] = (struct sockaddr *)&ia->ia_addr;
+		info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl;
+		error = rtrequest1_fib(RTM_ADD, &info, &rt, 0);
+
+		if (error == 0 && rt != NULL) {
+			RT_LOCK(rt);
+			((struct sockaddr_dl *)rt->rt_gateway)->sdl_type  =
+				rt->rt_ifp->if_type;
+			((struct sockaddr_dl *)rt->rt_gateway)->sdl_index =
+				rt->rt_ifp->if_index;
+			KASSERT(rt->rt_refcnt == 1,
+			    ("invalid refcnt %d", rt->rt_refcnt));
+			rt->rt_refcnt = 0;
+			RT_UNLOCK(rt);
+		} else if (error != 0)
+			log(LOG_INFO, "in_ifinit: insertion failed\n");
+	}
+
 	return (error);
 }
 
@@ -897,10 +931,28 @@ in_scrubprefix(struct in_ifaddr *target)
 	int error;
 	struct sockaddr_in prefix0, mask0;
 	struct rt_addrinfo info;
+	struct sockaddr_dl null_sdl;
 
 	if ((target->ia_flags & IFA_ROUTE) == 0)
 		return (0);
 
+	if ((target->ia_addr.sin_addr.s_addr != INADDR_ANY) &&
+	    !(target->ia_ifp->if_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
+		bzero(&null_sdl, sizeof(null_sdl));
+		null_sdl.sdl_len = sizeof(null_sdl);
+		null_sdl.sdl_family = AF_LINK;
+		null_sdl.sdl_type = V_loif->if_type;
+		null_sdl.sdl_index = V_loif->if_index;
+		bzero(&info, sizeof(info));
+		info.rti_flags = target->ia_flags | RTF_HOST | RTF_STATIC;
+		info.rti_info[RTAX_DST] = (struct sockaddr *)&target->ia_addr;
+		info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl;
+		error = rtrequest1_fib(RTM_DELETE, &info, NULL, 0);
+
+		if (error != 0)
+			log(LOG_INFO, "in_scrubprefix: deletion failed\n");
+	}
+
 	if (rtinitflags(target))
 		prefix = target->ia_dstaddr.sin_addr;
 	else {
@@ -1043,7 +1095,6 @@ in_ifdetach(struct ifnet *ifp)
 	in_purgemaddrs(ifp);
 }
 
-#include <sys/syslog.h>
 #include <net/if_dl.h>
 #include <netinet/if_ether.h>
 

From owner-svn-src-user@FreeBSD.ORG  Sat Aug 22 00:56:48 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4B0BE106568B;
	Sat, 22 Aug 2009 00:56:48 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3AE3E8FC0C;
	Sat, 22 Aug 2009 00:56:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7M0ummx039817;
	Sat, 22 Aug 2009 00:56:48 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7M0umXM039815;
	Sat, 22 Aug 2009 00:56:48 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908220056.n7M0umXM039815@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 22 Aug 2009 00:56:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196429 - user/kmacy/releng_7_2_fcs/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Aug 2009 00:56:48 -0000

Author: kmacy
Date: Sat Aug 22 00:56:47 2009
New Revision: 196429
URL: http://svn.freebsd.org/changeset/base/196429

Log:
  don't delay acks on localhost

Modified:
  user/kmacy/releng_7_2_fcs/sys/netinet/tcp_input.c

Modified: user/kmacy/releng_7_2_fcs/sys/netinet/tcp_input.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/netinet/tcp_input.c	Sat Aug 22 00:56:17 2009	(r196428)
+++ user/kmacy/releng_7_2_fcs/sys/netinet/tcp_input.c	Sat Aug 22 00:56:47 2009	(r196429)
@@ -257,6 +257,8 @@ do { \
  */
 #define DELAY_ACK(tp)							\
 	((!tcp_timer_active(tp, TT_DELACK) &&				\
+	    !((tp->t_inpcb->inp_flags2 & INP_RT_VALID) &&		\
+		(tp->t_inpcb->inp_rt->rt_ifp->if_flags & IFF_LOOPBACK))	&& \
 	    (tp->t_flags & TF_RXWIN0SENT) == 0) &&			\
 	    (V_tcp_delack_enabled || (tp->t_flags & TF_NEEDSYN)))