Re: svn commit: r295204 - head/bin/csh

2016-02-03 Thread Bryan Drewery 
On 2/3/2016 3:44 AM, Hajimu UMEMOTO wrote:
> Author: ume
> Date: Wed Feb  3 11:44:43 2016
> New Revision: 295204
> URL: https://svnweb.freebsd.org/changeset/base/295204
> 
> Log:
>   The charset of NLS catalogs were converted to UTF-8
>   since r231990.
> 
> Modified:
>   head/bin/csh/Makefile
> 
> Modified: head/bin/csh/Makefile
> ==
> --- head/bin/csh/Makefile Wed Feb  3 11:41:55 2016(r295203)
> +++ head/bin/csh/Makefile Wed Feb  3 11:44:43 2016(r295204)
> @@ -51,41 +51,40 @@ FILESDIR= ${SHAREDIR}/examples/tcsh
>  FILES= complete.tcsh csh-mode.el
>  .endif
>  
> -CATALOGS=et:et_EE.ISO8859-15 \
> - finnish:fi_FI.ISO8859-1 \
> - french:fr_FR.ISO8859-1 \
> - german:de_DE.ISO8859-1 \
> - greek:el_GR.ISO8859-7 \
> - italian:it_IT.ISO8859-1 \
> - ja:ja_JP.eucJP \
> - russian:ru_RU.KOI8-R \
> - spanish:es_ES.ISO8859-1 \
> - ukrainian:uk_UA.KOI8-U
> -
> -NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15
> -NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
> - fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \
> - fr_CH.ISO8859-15 fr_FR.ISO8859-15
> -NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
> - de_CH.ISO8859-15 de_DE.ISO8859-15
> -NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15
> -NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15
> +CATALOGS=et:et_EE.UTF-8 \
> + finnish:fi_FI.UTF-8 \
> + french:fr_FR.UTF-8 \
> + german:de_DE.UTF-8 \
> + greek:el_GR.UTF-8 \
> + italian:it_IT.UTF-8 \
> + ja:ja_JP.UTF-8 \
> + russian:ru_RU.UTF-8 \
> + spanish:es_ES.UTF-8 \
> + ukrainian:uk_UA.UTF-8
> +
> +NLSLINKS_de_DE.UTF-8 = de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8

This is linking /usr/share/nls/de_DE.UTF-8/tcsh.cat to itself. I removed
that in r295224. I'm not sure if it should be linked to something else
though.

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature

svn commit: r295204 - head/bin/csh

2016-02-03 Thread Hajimu UMEMOTO 
Author: ume
Date: Wed Feb  3 11:44:43 2016
New Revision: 295204
URL: https://svnweb.freebsd.org/changeset/base/295204

Log:
  The charset of NLS catalogs were converted to UTF-8
  since r231990.

Modified:
  head/bin/csh/Makefile

Modified: head/bin/csh/Makefile
==
--- head/bin/csh/Makefile   Wed Feb  3 11:41:55 2016(r295203)
+++ head/bin/csh/Makefile   Wed Feb  3 11:44:43 2016(r295204)
@@ -51,41 +51,40 @@ FILESDIR= ${SHAREDIR}/examples/tcsh
 FILES= complete.tcsh csh-mode.el
 .endif
 
-CATALOGS=  et:et_EE.ISO8859-15 \
-   finnish:fi_FI.ISO8859-1 \
-   french:fr_FR.ISO8859-1 \
-   german:de_DE.ISO8859-1 \
-   greek:el_GR.ISO8859-7 \
-   italian:it_IT.ISO8859-1 \
-   ja:ja_JP.eucJP \
-   russian:ru_RU.KOI8-R \
-   spanish:es_ES.ISO8859-1 \
-   ukrainian:uk_UA.KOI8-U
-
-NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15
-NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
-   fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \
-   fr_CH.ISO8859-15 fr_FR.ISO8859-15
-NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
-   de_CH.ISO8859-15 de_DE.ISO8859-15
-NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15
-NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15
+CATALOGS=  et:et_EE.UTF-8 \
+   finnish:fi_FI.UTF-8 \
+   french:fr_FR.UTF-8 \
+   german:de_DE.UTF-8 \
+   greek:el_GR.UTF-8 \
+   italian:it_IT.UTF-8 \
+   ja:ja_JP.UTF-8 \
+   russian:ru_RU.UTF-8 \
+   spanish:es_ES.UTF-8 \
+   ukrainian:uk_UA.UTF-8
+
+NLSLINKS_de_DE.UTF-8 = de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8
+NLSLINKS_fr_FR.UTF-8 = fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8
+NLSLINKS_it_IT.UTF-8 = it_CH.UTF-8
 
 .if ${MK_NLS_CATALOGS} == "no" || defined(RESCUE)
 CFLAGS+= -DNO_NLS_CATALOGS
 .else
 CFLAGS+= -DHAVE_ICONV
 .if ${MK_ICONV} != "no"
-NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8
-NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8
-NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8
-NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8
-NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8
-NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8
-NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8
-NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8
-NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8
-NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8
+NLSLINKS_de_DE.UTF-8 += de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
+   de_CH.ISO8859-15 de_DE.ISO8859-1 de_DE.ISO8859-15
+NLSLINKS_el_GR.UTF-8 = el_GR.ISO8859-7
+NLSLINKS_es_ES.UTF-8 = es_ES.ISO8859-1 es_ES.ISO8859-15
+NLSLINKS_et_EE.UTF-8 = et_EE.ISO8859-15
+NLSLINKS_fi_FI.UTF-8 = fi_FI.ISO8859-1 fi_FI.ISO8859-15
+NLSLINKS_fr_FR.UTF-8 += fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
+   fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \
+   fr_CH.ISO8859-15 fr_FR.ISO8859-1 fr_FR.ISO8859-15
+NLSLINKS_it_IT.UTF-8 += it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-1 \
+   it_IT.ISO8859-15
+NLSLINKS_ja_JP.UTF-8 = ja_JP.SJIS ja_JP.eucJP
+NLSLINKS_ru_RU.UTF-8 = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.KOI8-R
+NLSLINKS_uk_UA.UTF-8 = uk_UA.ISO8859-5 uk_UA.KOI8-U
 .else
 # Above links can be installed from ports/shells/tcsh_nls
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"