From owner-svn-src-all@freebsd.org Sun Nov 15 14:51:11 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0256A2F70E; Sun, 15 Nov 2015 14:51:11 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 665721F2F; Sun, 15 Nov 2015 14:51:11 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFEpAxL080328; Sun, 15 Nov 2015 14:51:10 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFEpAsG080323; Sun, 15 Nov 2015 14:51:10 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511151451.tAFEpAsG080323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 15 Nov 2015 14:51:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290866 - in head: . etc/mtree share/colldef share/ctypedef share/monetdef share/msgdef share/numericdef share/timedef X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 14:51:11 -0000 Author: bapt Date: Sun Nov 15 14:51:10 2015 New Revision: 290866 URL: https://svnweb.freebsd.org/changeset/base/290866 Log: Regenerate locales after readding ISO8859-1 for locales that have ISO8859-15 Requested by: arche Added: head/share/ctypedef/ca_IT.ISO8859-1.src - copied unchanged from r290865, head/share/ctypedef/ca_IT.ISO8859-15.src head/share/ctypedef/ja_JP.eucJP.src - copied unchanged from r290865, head/share/ctypedef/ja_JP.SJIS.src head/share/ctypedef/zh_Hans_CN.eucCN.src - copied unchanged from r290865, head/share/ctypedef/zh_Hans_CN.GB18030.src head/share/monetdef/de_AT.ISO8859-1.src (contents, props changed) head/share/monetdef/en_IE.ISO8859-1.src (contents, props changed) head/share/monetdef/nl_NL.ISO8859-1.src (contents, props changed) head/share/monetdef/sv_FI.ISO8859-1.src (contents, props changed) Deleted: head/share/ctypedef/ca_IT.ISO8859-15.src head/share/ctypedef/ja_JP.SJIS.src head/share/ctypedef/zh_Hans_CN.GB18030.src head/share/monetdef/sk_SK.ISO8859-2.src Modified: head/ObsoleteFiles.inc head/etc/mtree/BSD.usr.dist head/share/colldef/Makefile head/share/ctypedef/Makefile head/share/monetdef/Makefile head/share/msgdef/Makefile head/share/numericdef/Makefile head/share/timedef/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sun Nov 15 14:34:29 2015 (r290865) +++ head/ObsoleteFiles.inc Sun Nov 15 14:51:10 2015 (r290866) @@ -49,69 +49,6 @@ OLD_FILES+=usr/share/locale/zh_TW.UTF-8/ # 20151107: String collation improvements OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE OLD_DIRS+=usr/share/locale/UTF-8 -OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE -OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY -OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC -OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME -OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15 -OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY -OLD_DIRS+=usr/share/locale/ca_AD.ISO8859-1 -OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE -OLD_DIRS+=usr/share/locale/ca_FR.ISO8859-1 -OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME -OLD_DIRS+=usr/share/locale/ca_ES.ISO8859-1 -OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE -OLD_DIRS+=usr/share/locale/ca_IT.ISO8859-1 -OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE -OLD_DIRS+=usr/share/locale/da_DK.ISO8859-1 -OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC -OLD_DIRS+=usr/share/locale/de_AT.ISO8859-1 -OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC -OLD_DIRS+=usr/share/locale/de_CH.ISO8859-1 -OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_NUMERIC -OLD_DIRS+=usr/share/locale/de_DE.ISO8859-1 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME @@ -126,13 +63,6 @@ OLD_FILES+=usr/share/locale/en_AU.ISO885 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY OLD_DIRS+=usr/share/locale/en_AU.ISO8859-15 -OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MONETARY -OLD_DIRS+=usr/share/locale/en_GB.ISO8859-1 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE @@ -140,20 +70,6 @@ OLD_FILES+=usr/share/locale/en_US.ISO885 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC OLD_DIRS+=usr/share/locale/en_US.ISO8859-15 -OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_NUMERIC -OLD_DIRS+=usr/share/locale/es_ES.ISO8859-1 -OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MONETARY -OLD_DIRS+=usr/share/locale/eu_ES.ISO8859-1 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME @@ -161,20 +77,6 @@ OLD_FILES+=usr/share/locale/en_NZ.ISO885 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-15 -OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES -OLD_DIRS+=usr/share/locale/fi_FI.ISO8859-1 -OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_NUMERIC -OLD_DIRS+=usr/share/locale/fr_BE.ISO8859-1 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE @@ -182,41 +84,6 @@ OLD_FILES+=usr/share/locale/fr_CA.ISO885 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-15 -OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MONETARY -OLD_DIRS+=usr/share/locale/fr_CH.ISO8859-1 -OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_COLLATE -OLD_DIRS+=usr/share/locale/fr_FR.ISO8859-1 -OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_TIME -OLD_DIRS+=usr/share/locale/it_CH.ISO8859-1 -OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_NUMERIC -OLD_DIRS+=usr/share/locale/is_IS.ISO8859-1 -OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MONETARY -OLD_DIRS+=usr/share/locale/it_IT.ISO8859-1 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES @@ -268,34 +135,6 @@ OLD_FILES+=usr/share/locale/mn_MN.UTF-8/ OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME OLD_DIRS+=usr/share/locale/mn_MN.UTF-8 -OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE -OLD_DIRS+=usr/share/locale/nb_NO.ISO8859-1 -OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_COLLATE -OLD_DIRS+=usr/share/locale/nl_BE.ISO8859-1 -OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE -OLD_DIRS+=usr/share/locale/nl_NL.ISO8859-1 -OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_NUMERIC -OLD_DIRS+=usr/share/locale/nn_NO.ISO8859-1 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES @@ -317,13 +156,6 @@ OLD_FILES+=usr/share/locale/no_NO.UTF-8/ OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME OLD_DIRS+=usr/share/locale/no_NO.UTF-8 -OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE -OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_COLLATE -OLD_DIRS+=usr/share/locale/pt_PT.ISO8859-1 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_COLLATE OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_TIME OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_CTYPE @@ -345,13 +177,6 @@ OLD_FILES+=usr/share/locale/sr_YU.UTF-8/ OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES OLD_DIRS+=usr/share/locale/sr_YU.UTF-8 -OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MONETARY -OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_NUMERIC -OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_TIME -OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MESSAGES -OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_COLLATE -OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_CTYPE -OLD_DIRS+=usr/share/locale/sv_SE.ISO8859-1 OLD_FILES+=usr/bin/colldef OLD_FILES+=usr/share/man/man1/colldef.1.gz OLD_FILES+=usr/bin/mklocale Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Sun Nov 15 14:34:29 2015 (r290865) +++ head/etc/mtree/BSD.usr.dist Sun Nov 15 14:51:10 2015 (r290866) @@ -543,12 +543,20 @@ .. bg_BG.UTF-8 .. + ca_AD.ISO8859-1 + .. ca_AD.ISO8859-15 .. + ca_ES.ISO8859-1 + .. ca_ES.ISO8859-15 .. + ca_FR.ISO8859-1 + .. ca_FR.ISO8859-15 .. + ca_IT.ISO8859-1 + .. ca_IT.ISO8859-15 .. ca_AD.UTF-8 @@ -563,18 +571,26 @@ .. cs_CZ.UTF-8 .. + da_DK.ISO8859-1 + .. da_DK.ISO8859-15 .. da_DK.UTF-8 .. + de_AT.ISO8859-1 + .. de_AT.ISO8859-15 .. de_AT.UTF-8 .. + de_CH.ISO8859-1 + .. de_CH.ISO8859-15 .. de_CH.UTF-8 .. + de_DE.ISO8859-1 + .. de_DE.ISO8859-15 .. de_DE.UTF-8 @@ -595,6 +611,8 @@ .. en_CA.UTF-8 .. + en_GB.ISO8859-1 + .. en_GB.ISO8859-15 .. en_GB.US-ASCII @@ -605,6 +623,8 @@ .. en_HK.UTF-8 .. + en_IE.ISO8859-1 + .. en_IE.ISO8859-15 .. en_IE.UTF-8 @@ -639,6 +659,8 @@ .. es_CR.UTF-8 .. + es_ES.ISO8859-1 + .. es_ES.ISO8859-15 .. es_ES.UTF-8 @@ -647,18 +669,26 @@ .. es_MX.UTF-8 .. + et_EE.ISO8859-1 + .. et_EE.ISO8859-15 .. et_EE.UTF-8 .. + eu_ES.ISO8859-1 + .. eu_ES.ISO8859-15 .. eu_ES.UTF-8 .. + fi_FI.ISO8859-1 + .. fi_FI.ISO8859-15 .. fi_FI.UTF-8 .. + fr_BE.ISO8859-1 + .. fr_BE.ISO8859-15 .. fr_BE.UTF-8 @@ -667,10 +697,14 @@ .. fr_CA.UTF-8 .. + fr_CH.ISO8859-1 + .. fr_CH.ISO8859-15 .. fr_CH.UTF-8 .. + fr_FR.ISO8859-1 + .. fr_FR.ISO8859-15 .. fr_FR.UTF-8 @@ -693,14 +727,20 @@ .. hy_AM.UTF-8 .. + is_IS.ISO8859-1 + .. is_IS.ISO8859-15 .. is_IS.UTF-8 .. + it_CH.ISO8859-1 + .. it_CH.ISO8859-15 .. it_CH.UTF-8 .. + it_IT.ISO8859-1 + .. it_IT.ISO8859-15 .. it_IT.UTF-8 @@ -729,18 +769,26 @@ .. mn_Cyrl_MN.UTF-8 .. + nb_NO.ISO8859-1 + .. nb_NO.ISO8859-15 .. nb_NO.UTF-8 .. + nl_BE.ISO8859-1 + .. nl_BE.ISO8859-15 .. nl_BE.UTF-8 .. + nl_NL.ISO8859-1 + .. nl_NL.ISO8859-15 .. nl_NL.UTF-8 .. + nn_NO.ISO8859-1 + .. nn_NO.ISO8859-15 .. nn_NO.UTF-8 @@ -753,6 +801,8 @@ .. pt_BR.UTF-8 .. + pt_PT.ISO8859-1 + .. pt_PT.ISO8859-15 .. pt_PT.UTF-8 @@ -791,10 +841,14 @@ .. sr_Latn_RS.UTF-8 .. + sv_FI.ISO8859-1 + .. sv_FI.ISO8859-15 .. sv_FI.UTF-8 .. + sv_SE.ISO8859-1 + .. sv_SE.ISO8859-15 .. sv_SE.UTF-8 @@ -1239,22 +1293,8 @@ .. ko_KR.eucKR .. - la_LN.ISO8859-1 - .. - la_LN.ISO8859-13 - .. - la_LN.ISO8859-15 - .. - la_LN.ISO8859-2 - .. - la_LN.ISO8859-4 - .. - la_LN.US-ASCII - .. lt_LT.ISO8859-13 .. - lt_LT.ISO8859-4 - .. lt_LT.UTF-8 .. lv_LV.ISO8859-13 Modified: head/share/colldef/Makefile ============================================================================== --- head/share/colldef/Makefile Sun Nov 15 14:34:29 2015 (r290865) +++ head/share/colldef/Makefile Sun Nov 15 14:51:10 2015 (r290866) @@ -67,39 +67,54 @@ SAME+= ru_RU.UTF-8:bg_BG.UTF-8 SAME+= ru_RU.UTF-8:bg_BG.CP1251 SAME+= ca_AD.UTF-8:ca_IT.UTF-8 SAME+= ca_AD.UTF-8:ca_IT.ISO8859-15 +SAME+= ca_AD.UTF-8:ca_IT.ISO8859-1 SAME+= ca_AD.UTF-8:ca_FR.UTF-8 SAME+= ca_AD.UTF-8:ca_FR.ISO8859-15 +SAME+= ca_AD.UTF-8:ca_FR.ISO8859-1 SAME+= ca_AD.UTF-8:ca_ES.UTF-8 SAME+= ca_AD.UTF-8:ca_ES.ISO8859-15 +SAME+= ca_AD.UTF-8:ca_ES.ISO8859-1 SAME+= ca_AD.UTF-8:ca_AD.ISO8859-15 +SAME+= ca_AD.UTF-8:ca_AD.ISO8859-1 SAME+= cs_CZ.UTF-8:cs_CZ.ISO8859-2 SAME+= da_DK.UTF-8:da_DK.ISO8859-15 +SAME+= da_DK.UTF-8:da_DK.ISO8859-1 SAME+= en_US.UTF-8:sr_Latn_RS.UTF-8 SAME+= en_US.UTF-8:sr_Latn_RS.ISO8859-2 SAME+= en_US.UTF-8:pt_PT.UTF-8 SAME+= en_US.UTF-8:pt_PT.ISO8859-15 +SAME+= en_US.UTF-8:pt_PT.ISO8859-1 SAME+= en_US.UTF-8:pt_BR.UTF-8 SAME+= en_US.UTF-8:pt_BR.ISO8859-1 SAME+= en_US.UTF-8:nn_NO.UTF-8 SAME+= en_US.UTF-8:nn_NO.ISO8859-15 +SAME+= en_US.UTF-8:nn_NO.ISO8859-1 SAME+= en_US.UTF-8:nl_NL.UTF-8 SAME+= en_US.UTF-8:nl_NL.ISO8859-15 +SAME+= en_US.UTF-8:nl_NL.ISO8859-1 SAME+= en_US.UTF-8:nl_BE.UTF-8 SAME+= en_US.UTF-8:nl_BE.ISO8859-15 +SAME+= en_US.UTF-8:nl_BE.ISO8859-1 SAME+= en_US.UTF-8:it_IT.UTF-8 SAME+= en_US.UTF-8:it_IT.ISO8859-15 +SAME+= en_US.UTF-8:it_IT.ISO8859-1 SAME+= en_US.UTF-8:it_CH.UTF-8 SAME+= en_US.UTF-8:it_CH.ISO8859-15 +SAME+= en_US.UTF-8:it_CH.ISO8859-1 SAME+= en_US.UTF-8:fr_FR.UTF-8 SAME+= en_US.UTF-8:fr_FR.ISO8859-15 +SAME+= en_US.UTF-8:fr_FR.ISO8859-1 SAME+= en_US.UTF-8:fr_CH.UTF-8 SAME+= en_US.UTF-8:fr_CH.ISO8859-15 +SAME+= en_US.UTF-8:fr_CH.ISO8859-1 SAME+= en_US.UTF-8:fr_CA.UTF-8 SAME+= en_US.UTF-8:fr_CA.ISO8859-1 SAME+= en_US.UTF-8:fr_BE.UTF-8 SAME+= en_US.UTF-8:fr_BE.ISO8859-15 +SAME+= en_US.UTF-8:fr_BE.ISO8859-1 SAME+= en_US.UTF-8:eu_ES.UTF-8 SAME+= en_US.UTF-8:eu_ES.ISO8859-15 +SAME+= en_US.UTF-8:eu_ES.ISO8859-1 SAME+= en_US.UTF-8:en_ZA.UTF-8 SAME+= en_US.UTF-8:en_ZA.US-ASCII SAME+= en_US.UTF-8:en_ZA.ISO8859-1 @@ -113,11 +128,13 @@ SAME+= en_US.UTF-8:en_NZ.US-ASCII SAME+= en_US.UTF-8:en_NZ.ISO8859-1 SAME+= en_US.UTF-8:en_IE.UTF-8 SAME+= en_US.UTF-8:en_IE.ISO8859-15 +SAME+= en_US.UTF-8:en_IE.ISO8859-1 SAME+= en_US.UTF-8:en_HK.UTF-8 SAME+= en_US.UTF-8:en_HK.ISO8859-1 SAME+= en_US.UTF-8:en_GB.UTF-8 SAME+= en_US.UTF-8:en_GB.US-ASCII SAME+= en_US.UTF-8:en_GB.ISO8859-15 +SAME+= en_US.UTF-8:en_GB.ISO8859-1 SAME+= en_US.UTF-8:en_CA.UTF-8 SAME+= en_US.UTF-8:en_CA.US-ASCII SAME+= en_US.UTF-8:en_CA.ISO8859-1 @@ -126,38 +143,48 @@ SAME+= en_US.UTF-8:en_AU.US-ASCII SAME+= en_US.UTF-8:en_AU.ISO8859-1 SAME+= en_US.UTF-8:de_DE.UTF-8 SAME+= en_US.UTF-8:de_DE.ISO8859-15 +SAME+= en_US.UTF-8:de_DE.ISO8859-1 SAME+= en_US.UTF-8:de_CH.UTF-8 SAME+= en_US.UTF-8:de_CH.ISO8859-15 +SAME+= en_US.UTF-8:de_CH.ISO8859-1 SAME+= en_US.UTF-8:de_AT.UTF-8 SAME+= en_US.UTF-8:de_AT.ISO8859-15 +SAME+= en_US.UTF-8:de_AT.ISO8859-1 SAME+= el_GR.UTF-8:el_GR.ISO8859-7 SAME+= es_MX.UTF-8:es_MX.ISO8859-1 SAME+= es_MX.UTF-8:es_ES.UTF-8 SAME+= es_MX.UTF-8:es_ES.ISO8859-15 +SAME+= es_MX.UTF-8:es_ES.ISO8859-1 SAME+= es_MX.UTF-8:es_CR.UTF-8 SAME+= es_MX.UTF-8:es_AR.UTF-8 SAME+= es_MX.UTF-8:es_AR.ISO8859-1 SAME+= et_EE.UTF-8:et_EE.ISO8859-15 +SAME+= et_EE.UTF-8:et_EE.ISO8859-1 SAME+= fi_FI.UTF-8:fi_FI.ISO8859-15 +SAME+= fi_FI.UTF-8:fi_FI.ISO8859-1 SAME+= hi_IN.UTF-8:hi_IN.ISCII-DEV SAME+= hr_HR.UTF-8:hr_HR.ISO8859-2 SAME+= hu_HU.UTF-8:hu_HU.ISO8859-2 SAME+= hy_AM.UTF-8:hy_AM.ARMSCII-8 SAME+= is_IS.UTF-8:is_IS.ISO8859-15 +SAME+= is_IS.UTF-8:is_IS.ISO8859-1 SAME+= ja_JP.UTF-8:ja_JP.SJIS SAME+= ja_JP.UTF-8:ja_JP.eucJP SAME+= ko_KR.UTF-8:ko_KR.eucKR SAME+= lt_LT.UTF-8:lt_LT.ISO8859-13 SAME+= lv_LV.UTF-8:lv_LV.ISO8859-13 SAME+= nb_NO.UTF-8:nb_NO.ISO8859-15 +SAME+= nb_NO.UTF-8:nb_NO.ISO8859-1 SAME+= pl_PL.UTF-8:pl_PL.ISO8859-2 SAME+= ro_RO.UTF-8:ro_RO.ISO8859-2 SAME+= se_NO.UTF-8:se_FI.UTF-8 SAME+= sk_SK.UTF-8:sk_SK.ISO8859-2 SAME+= sl_SI.UTF-8:sl_SI.ISO8859-2 SAME+= sv_SE.UTF-8:sv_SE.ISO8859-15 +SAME+= sv_SE.UTF-8:sv_SE.ISO8859-1 SAME+= sv_SE.UTF-8:sv_FI.UTF-8 SAME+= sv_SE.UTF-8:sv_FI.ISO8859-15 +SAME+= sv_SE.UTF-8:sv_FI.ISO8859-1 SAME+= tr_TR.UTF-8:tr_TR.ISO8859-9 SAME+= uk_UA.UTF-8:uk_UA.KOI8-U SAME+= uk_UA.UTF-8:uk_UA.ISO8859-5 Modified: head/share/ctypedef/Makefile ============================================================================== --- head/share/ctypedef/Makefile Sun Nov 15 14:34:29 2015 (r290865) +++ head/share/ctypedef/Makefile Sun Nov 15 14:51:10 2015 (r290866) @@ -13,6 +13,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/lo -i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R} || true LOCALES+= be_BY.CP1131 +LOCALES+= ca_IT.ISO8859-1 LOCALES+= ca_IT.ISO8859-15 LOCALES+= el_GR.ISO8859-7 LOCALES+= en_GB.ISO8859-15 @@ -117,21 +118,47 @@ SAME+= en_US.UTF-8:ar_EG.UTF-8 SAME+= en_US.UTF-8:ar_AE.UTF-8 SAME+= en_US.UTF-8:am_ET.UTF-8 SAME+= en_US.UTF-8:af_ZA.UTF-8 +SAME+= en_US.ISO8859-1:sv_SE.ISO8859-1 +SAME+= en_US.ISO8859-1:sv_FI.ISO8859-1 +SAME+= en_US.ISO8859-1:pt_PT.ISO8859-1 SAME+= en_US.ISO8859-1:pt_BR.ISO8859-1 +SAME+= en_US.ISO8859-1:nn_NO.ISO8859-1 +SAME+= en_US.ISO8859-1:nl_NL.ISO8859-1 +SAME+= en_US.ISO8859-1:nl_BE.ISO8859-1 +SAME+= en_US.ISO8859-1:nb_NO.ISO8859-1 +SAME+= en_US.ISO8859-1:it_IT.ISO8859-1 +SAME+= en_US.ISO8859-1:it_CH.ISO8859-1 +SAME+= en_US.ISO8859-1:is_IS.ISO8859-1 +SAME+= en_US.ISO8859-1:fr_FR.ISO8859-1 +SAME+= en_US.ISO8859-1:fr_CH.ISO8859-1 SAME+= en_US.ISO8859-1:fr_CA.ISO8859-1 +SAME+= en_US.ISO8859-1:fr_BE.ISO8859-1 +SAME+= en_US.ISO8859-1:fi_FI.ISO8859-1 +SAME+= en_US.ISO8859-1:eu_ES.ISO8859-1 +SAME+= en_US.ISO8859-1:et_EE.ISO8859-1 SAME+= en_US.ISO8859-1:es_MX.ISO8859-1 +SAME+= en_US.ISO8859-1:es_ES.ISO8859-1 SAME+= en_US.ISO8859-1:es_AR.ISO8859-1 SAME+= en_US.ISO8859-1:en_ZA.ISO8859-1 SAME+= en_US.ISO8859-1:en_SG.ISO8859-1 SAME+= en_US.ISO8859-1:en_NZ.ISO8859-1 +SAME+= en_US.ISO8859-1:en_IE.ISO8859-1 SAME+= en_US.ISO8859-1:en_HK.ISO8859-1 +SAME+= en_US.ISO8859-1:en_GB.ISO8859-1 SAME+= en_US.ISO8859-1:en_CA.ISO8859-1 SAME+= en_US.ISO8859-1:en_AU.ISO8859-1 +SAME+= en_US.ISO8859-1:de_DE.ISO8859-1 +SAME+= en_US.ISO8859-1:de_CH.ISO8859-1 +SAME+= en_US.ISO8859-1:de_AT.ISO8859-1 +SAME+= en_US.ISO8859-1:da_DK.ISO8859-1 SAME+= en_US.ISO8859-1:af_ZA.ISO8859-1 SAME+= ru_RU.CP1251:bg_BG.CP1251 SAME+= ru_RU.CP1251:be_BY.CP1251 SAME+= ru_RU.ISO8859-5:sr_Cyrl_RS.ISO8859-5 SAME+= ru_RU.ISO8859-5:be_BY.ISO8859-5 +SAME+= ca_IT.ISO8859-1:ca_FR.ISO8859-1 +SAME+= ca_IT.ISO8859-1:ca_ES.ISO8859-1 +SAME+= ca_IT.ISO8859-1:ca_AD.ISO8859-1 SAME+= ca_IT.ISO8859-15:ca_FR.ISO8859-15 SAME+= ca_IT.ISO8859-15:ca_ES.ISO8859-15 SAME+= ca_IT.ISO8859-15:ca_AD.ISO8859-15 @@ -184,22 +211,23 @@ SYMLINKS+= ../${f:C/:.*$//}/${FILESNAME} FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f} .endfor +SYMPAIRS+= ca_IT.ISO8859-1.src:ca_IT.ISO8859-15.src SYMPAIRS+= be_BY.CP1131.src:ru_RU.CP1251.src SYMPAIRS+= be_BY.CP1131.src:ru_RU.CP866.src SYMPAIRS+= be_BY.CP1131.src:ru_RU.ISO8859-5.src SYMPAIRS+= be_BY.CP1131.src:ru_RU.KOI8-R.src SYMPAIRS+= uk_UA.CP1251.src:uk_UA.ISO8859-5.src SYMPAIRS+= uk_UA.CP1251.src:uk_UA.KOI8-U.src -SYMPAIRS+= zh_Hans_CN.GB18030.src:zh_Hans_CN.GB2312.src -SYMPAIRS+= zh_Hans_CN.GB18030.src:zh_Hans_CN.GBK.src -SYMPAIRS+= zh_Hans_CN.GB18030.src:zh_Hans_CN.eucCN.src +SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GB18030.src +SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GB2312.src +SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GBK.src SYMPAIRS+= zh_Hant_HK.Big5HKSCS.src:zh_Hant_TW.Big5.src SYMPAIRS+= en_GB.ISO8859-15.src:en_US.ISO8859-1.src SYMPAIRS+= en_GB.ISO8859-15.src:en_US.US-ASCII.src SYMPAIRS+= en_GB.ISO8859-15.src:lv_LV.ISO8859-13.src SYMPAIRS+= en_GB.ISO8859-15.src:sr_Latn_RS.ISO8859-2.src SYMPAIRS+= en_GB.ISO8859-15.src:tr_TR.ISO8859-9.src -SYMPAIRS+= ja_JP.SJIS.src:ja_JP.eucJP.src +SYMPAIRS+= ja_JP.eucJP.src:ja_JP.SJIS.src .for PAIR in ${SYMPAIRS} ${PAIR:C/^.*://:S/src$/LC_CTYPE/}: ${PAIR:C/:.*//} Copied: head/share/ctypedef/ca_IT.ISO8859-1.src (from r290865, head/share/ctypedef/ca_IT.ISO8859-15.src) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/ctypedef/ca_IT.ISO8859-1.src Sun Nov 15 14:51:10 2015 (r290866, copy of r290865, head/share/ctypedef/ca_IT.ISO8859-15.src) @@ -0,0 +1,5166 @@ +# Warning: Do not edit. This file is automatically extracted from the +# tools in /usr/src/tools/tools/locale. The data is obtained from the +# CLDR project, obtained from http://cldr.unicode.org/ +# ----------------------------------------------------------------------------- +comment_char * +escape_char / +LC_CTYPE +************* + +upper ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ +

;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***