From b3e87f1334547b15596a98c030c3d99278685aa5 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 5 Aug 2021 13:39:36 -0500 Subject: [PATCH] ctypedef: fix installation of C.UTF-8 The appropriate directory and name were assigned to the FILESDIR grouping, but not the ALWAYS grouping where C.UTF-8 is actually assigned. Add the appropriate bits for ALWAYSDIR, and remove an obsolete *PACKAGE= assignment since C.UTF-8 is explicitly not included in FILES. Prior to this change, C.UTF-8 was being installed as /usr/share/C.UTF-8.LC_CTYPE. Reviewed by: manu Fixes: 0fa5403d493b ("pkgbase: move locales into their own package") Differential Revision: https://reviews.freebsd.org/D31429 --- ObsoleteFiles.inc | 3 +++ share/ctypedef/Makefile | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d23562072214..99db0e591090 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -40,6 +40,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20210805: C.UTF-8 installed to the wrong location +OLD_FILES+=usr/share/C.UTF-8.LC_CTYPE + # 20210619: new clang import which bumps version from 12.0.0 to 12.0.1. OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/algorithm OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/complex diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index 912b4e6f4757..a717e94db5e6 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -5,6 +5,7 @@ FILESGROUPS= FILES ALWAYS ALWAYSPACKAGE= runtime LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_CTYPE +ALWAYSNAME= LC_CTYPE .SUFFIXES: .src .LC_CTYPE MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps @@ -231,7 +232,7 @@ SYMLINKS+= ../$f/${FILESNAME} \ .for f in ${LOCALES} FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f} .endfor -FILESDIR_C.UTF-8.LC_CTYPEPACKAGE= runtime +ALWAYSDIR_C.UTF-8.LC_CTYPE= ${LOCALEDIR}/C.UTF-8 SYMPAIRS+= zh_CN.eucCN.src zh_CN.GB18030.src SYMPAIRS+= zh_CN.eucCN.src zh_CN.GB2312.src